commit b74b2c9370fa55b55b4c3821ad73a2ff3a4ec82a Author: Anthony G. Basile blueness@gentoo.org Date: Tue Feb 25 10:24:04 2014 -0500
Move haveged to tty4 --- build.sh | 4 ++-- configs/kernel-3.13.3.x86.config | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/build.sh b/build.sh index 30bb0c2..9fa9b16 100755 --- a/build.sh +++ b/build.sh @@ -216,7 +216,7 @@ cat << EOF > inittab tty1::respawn:/bin/setup tty2::respawn:/bin/nmeter '%79c' tty3::respawn:/bin/ntpd -s -d -tty4::askfirst:-/bin/sh +tty4::respawn:/bin/haveged -r 0 -w 1024 -v 1 -F -f - tty5::askfirst:-/bin/sh tty6::askfirst:-/bin/sh EOF @@ -226,6 +226,7 @@ cat << EOF > inittab tty1::respawn:/bin/setup tty2::respawn:/bin/nmeter '%79c' tty3::respawn:/bin/ntpd -s -d +tty4::respawn:/bin/haveged -r 0 -w 1024 -v 1 -F -f - EOF fi
@@ -234,7 +235,6 @@ cat << EOF > rcS /bin/mount -t proc proc /proc /bin/mount -o remount,rw /dev/ram0 / /sbin/ifconfig lo 127.0.0.1 -/bin/haveged -r 0 -w 1024 -v 0 EOF
chmod 755 rcS diff --git a/configs/kernel-3.13.3.x86.config b/configs/kernel-3.13.3.x86.config index 3621fd6..e1d5e8a 100644 --- a/configs/kernel-3.13.3.x86.config +++ b/configs/kernel-3.13.3.x86.config @@ -447,7 +447,7 @@ CONFIG_BINFMT_ELF=y CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set CONFIG_BINFMT_SCRIPT=y -# CONFIG_HAVE_AOUT is not set +CONFIG_HAVE_AOUT=y # CONFIG_BINFMT_MISC is not set CONFIG_COREDUMP=y CONFIG_HAVE_ATOMIC_IOMAP=y
tor-commits@lists.torproject.org