mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-27 11:13:24 +02:00
Merge branch 'aarch64' into next
Conflicts: config/rootfiles/core/121/filelists/acpid config/rootfiles/core/121/filelists/apache2 config/rootfiles/core/121/filelists/apr config/rootfiles/core/121/filelists/aprutil config/rootfiles/core/121/filelists/armv5tel/files config/rootfiles/core/121/filelists/armv5tel/linux-initrd-kirkwood config/rootfiles/core/121/filelists/armv5tel/linux-initrd-multi config/rootfiles/core/121/filelists/armv5tel/linux-kirkwood config/rootfiles/core/121/filelists/armv5tel/linux-multi config/rootfiles/core/121/filelists/armv5tel/rpi-firmware config/rootfiles/core/121/filelists/armv5tel/u-boot config/rootfiles/core/121/filelists/armv5tel/u-boot-kirkwood config/rootfiles/core/121/filelists/armv5tel/u-boot-mkimage config/rootfiles/core/121/filelists/beep config/rootfiles/core/121/filelists/cmake config/rootfiles/core/121/filelists/crda config/rootfiles/core/121/filelists/dhcp config/rootfiles/core/121/filelists/flex config/rootfiles/core/121/filelists/i586/grub config/rootfiles/core/121/filelists/i586/intel-microcode config/rootfiles/core/121/filelists/i586/linux config/rootfiles/core/121/filelists/i586/linux-initrd config/rootfiles/core/121/filelists/iw config/rootfiles/core/121/filelists/jwhois config/rootfiles/core/121/filelists/libidn config/rootfiles/core/121/filelists/multipath-tools config/rootfiles/core/121/filelists/pcre config/rootfiles/core/121/filelists/tar config/rootfiles/core/121/filelists/unbound config/rootfiles/core/121/filelists/wget config/rootfiles/core/121/filelists/x86_64/grub config/rootfiles/core/121/filelists/x86_64/intel-microcode config/rootfiles/core/121/filelists/x86_64/linux config/rootfiles/core/121/filelists/x86_64/linux-initrd config/rootfiles/core/122/filelists/aarch64/files config/rootfiles/core/122/filelists/acpid config/rootfiles/core/122/filelists/apache2 config/rootfiles/core/122/filelists/apr config/rootfiles/core/122/filelists/aprutil config/rootfiles/core/122/filelists/armv5tel/linux-initrd-kirkwood config/rootfiles/core/122/filelists/armv5tel/linux-initrd-multi config/rootfiles/core/122/filelists/armv5tel/linux-kirkwood config/rootfiles/core/122/filelists/armv5tel/linux-multi config/rootfiles/core/122/filelists/armv5tel/rpi-firmware config/rootfiles/core/122/filelists/armv5tel/u-boot config/rootfiles/core/122/filelists/armv5tel/u-boot-kirkwood config/rootfiles/core/122/filelists/armv5tel/u-boot-mkimage config/rootfiles/core/122/filelists/beep config/rootfiles/core/122/filelists/cmake config/rootfiles/core/122/filelists/crda config/rootfiles/core/122/filelists/dhcp config/rootfiles/core/122/filelists/flex config/rootfiles/core/122/filelists/i586/grub config/rootfiles/core/122/filelists/i586/intel-microcode config/rootfiles/core/122/filelists/i586/linux config/rootfiles/core/122/filelists/i586/linux-initrd config/rootfiles/core/122/filelists/iw config/rootfiles/core/122/filelists/jwhois config/rootfiles/core/122/filelists/libidn config/rootfiles/core/122/filelists/multipath-tools config/rootfiles/core/122/filelists/pcre config/rootfiles/core/122/filelists/tar config/rootfiles/core/122/filelists/unbound config/rootfiles/core/122/filelists/wget config/rootfiles/core/122/filelists/x86_64/grub config/rootfiles/core/122/filelists/x86_64/intel-microcode config/rootfiles/core/122/filelists/x86_64/linux config/rootfiles/core/122/filelists/x86_64/linux-initrd config/rootfiles/core/123/filelists/unbound config/rootfiles/oldcore/121/filelists/acpid config/rootfiles/oldcore/121/filelists/apache2 config/rootfiles/oldcore/121/filelists/apr config/rootfiles/oldcore/121/filelists/aprutil config/rootfiles/oldcore/121/filelists/armv5tel/files config/rootfiles/oldcore/121/filelists/armv5tel/linux-initrd-kirkwood config/rootfiles/oldcore/121/filelists/armv5tel/linux-initrd-multi config/rootfiles/oldcore/121/filelists/armv5tel/linux-initrd-rpi config/rootfiles/oldcore/121/filelists/armv5tel/linux-kirkwood config/rootfiles/oldcore/121/filelists/armv5tel/linux-multi config/rootfiles/oldcore/121/filelists/armv5tel/linux-rpi config/rootfiles/oldcore/121/filelists/armv5tel/rpi-firmware config/rootfiles/oldcore/121/filelists/armv5tel/u-boot config/rootfiles/oldcore/121/filelists/armv5tel/u-boot-kirkwood config/rootfiles/oldcore/121/filelists/armv5tel/u-boot-mkimage config/rootfiles/oldcore/121/filelists/beep config/rootfiles/oldcore/121/filelists/cmake config/rootfiles/oldcore/121/filelists/crda config/rootfiles/oldcore/121/filelists/dhcp config/rootfiles/oldcore/121/filelists/flex config/rootfiles/oldcore/121/filelists/i586/grub config/rootfiles/oldcore/121/filelists/i586/intel-microcode config/rootfiles/oldcore/121/filelists/i586/linux config/rootfiles/oldcore/121/filelists/i586/linux-initrd config/rootfiles/oldcore/121/filelists/iw config/rootfiles/oldcore/121/filelists/jwhois config/rootfiles/oldcore/121/filelists/libidn config/rootfiles/oldcore/121/filelists/multipath-tools config/rootfiles/oldcore/121/filelists/pcre config/rootfiles/oldcore/121/filelists/tar config/rootfiles/oldcore/121/filelists/wget config/rootfiles/oldcore/121/filelists/x86_64/grub config/rootfiles/oldcore/121/filelists/x86_64/intel-microcode config/rootfiles/oldcore/121/filelists/x86_64/linux config/rootfiles/oldcore/121/filelists/x86_64/linux-initrd make.sh
This commit is contained in:
Arne Fitzenreiter
@@ -31,6 +31,9 @@ case "$1" in
|
||||
if [ "${machine:0:3}" = "arm" ]; then
|
||||
touch /etc/sysconfig/lm_sensors
|
||||
fi
|
||||
if [ "${machine:0:7}" = "aarch64" ]; then
|
||||
touch /etc/sysconfig/lm_sensors
|
||||
fi
|
||||
|
||||
# At first run search for sensors with sensors-detect
|
||||
if [ ! -e /etc/sysconfig/lm_sensors ]; then
|
||||
|
||||
@@ -1,28 +1,45 @@
|
||||
#!/bin/sh
|
||||
# Begin $rc_base/init.d/random
|
||||
|
||||
# Based on sysklogd script from LFS-3.1 and earlier.
|
||||
# Rewritten by Gerard Beekmans - gerard@linuxfromscratch.org
|
||||
# Random script elements by Larry Lawrence
|
||||
|
||||
. /etc/sysconfig/rc
|
||||
. $rc_functions
|
||||
|
||||
if [ -e /proc/sys/kernel/random/poolsize ]; then
|
||||
poolsize=$(</proc/sys/kernel/random/poolsize);
|
||||
poolsize=$(expr $poolsize / 8 );
|
||||
else
|
||||
poolsize=512;
|
||||
fi
|
||||
|
||||
case "$1" in
|
||||
start)
|
||||
boot_mesg "Initializing kernel random number generator..."
|
||||
|
||||
#CRNG init need 128bit so wait until there is more)
|
||||
avail=$(</proc/sys/kernel/random/entropy_avail)
|
||||
while [ $avail -lt 130 ]; do
|
||||
avail=$(</proc/sys/kernel/random/entropy_avail)
|
||||
boot_mesg -n "\rWait for entropy: $avail/130 "
|
||||
# Generate some disc access to gather entropy
|
||||
echo avail > /var/tmp/random-tmpfile
|
||||
sync
|
||||
rm -f /var/tmp/random-tmpfile
|
||||
done;
|
||||
|
||||
boot_mesg "\rInitializing kernel random number generator..."
|
||||
if [ -f /var/tmp/random-seed ]; then
|
||||
/bin/cat /var/tmp/random-seed >/dev/urandom
|
||||
fi
|
||||
touch /var/tmp/random-seed
|
||||
chmod 600 /var/tmp/random-seed
|
||||
/bin/dd if=/dev/urandom of=/var/tmp/random-seed \
|
||||
count=4 &>/dev/null
|
||||
count=1 bs=$poolsize &>/dev/null
|
||||
evaluate_retval
|
||||
;;
|
||||
|
||||
stop)
|
||||
boot_mesg "Saving random seed..."
|
||||
touch /var/tmp/random-seed
|
||||
chmod 600 /var/tmp/random-seed
|
||||
/bin/dd if=/dev/urandom of=/var/tmp/random-seed \
|
||||
count=4 &>/dev/null
|
||||
count=1 bs=$poolsize &>/dev/null
|
||||
evaluate_retval
|
||||
;;
|
||||
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
#include <libintl.h>
|
||||
#define _(x) dgettext("installer", x)
|
||||
|
||||
#define INST_FILECOUNT 21000
|
||||
#define INST_FILECOUNT 24800
|
||||
#define LICENSE_FILE "/cdrom/COPYING"
|
||||
#define SOURCE_TEMPFILE "/tmp/downloads/image.iso"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user