From 030fcbf3ce6ce459afb66cf0061c7fc17d5ec856 Mon Sep 17 00:00:00 2001 From: Dirk von Suchodoletz Date: Sat, 6 Jan 2007 22:17:37 +0000 Subject: Busybox compiled for x86_64 (tested on 64bit SuSE9.3, 10.0 and Debian Sarge) git-svn-id: http://svn.openslx.org/svn/openslx/trunk@591 95ad53e4-c205-0410-b2fa-d234c58c8868 --- initramfs/initrd-stuff/init | 2 +- installer/default_files/machine-setup.default | 5 ++++- tools/busybox.x86_64 | Bin 0 -> 464792 bytes 3 files changed, 5 insertions(+), 2 deletions(-) create mode 100755 tools/busybox.x86_64 diff --git a/initramfs/initrd-stuff/init b/initramfs/initrd-stuff/init index 1e6dddd3..ca8bd984 100755 --- a/initramfs/initrd-stuff/init +++ b/initramfs/initrd-stuff/init @@ -202,7 +202,7 @@ done # at this point a timer should be started to ensure an automated reboot # or halt of the machine if SLX init does not succeed (e.g. missing kernel # module for the network adaptor) -if [ "${DEBUGLEVEL}" -lt 4 ] ; then +if [ "${DEBUGLEVEL}" -lt 3 ] ; then [ -x /bin/busybox ] && shtype=a cat< /bin/watchdog #!/bin/${shtype}sh diff --git a/installer/default_files/machine-setup.default b/installer/default_files/machine-setup.default index 0e53a90d..f4ecdc1e 100644 --- a/installer/default_files/machine-setup.default +++ b/installer/default_files/machine-setup.default @@ -15,7 +15,7 @@ # Dirk von Suchodoletz , 2006 # # (c) 2003 - 2006 - RZ Universitaet Freiburg -# +# (c) 2006 OpenSLX GmbH # # password of system administrator (root) as crypt -> 'dxs-root' # (will be changed soon) the password is not used if the admin provides @@ -132,3 +132,6 @@ start_x="yes" # set tvout feature for certain graphic cards - not needed for average systems # "yes" (then PAL is used) or tv standard as expected by card driver #tvout="yes" + +# sane network scanner +#sane_scanner="" diff --git a/tools/busybox.x86_64 b/tools/busybox.x86_64 new file mode 100755 index 00000000..c0d13a2b Binary files /dev/null and b/tools/busybox.x86_64 differ -- cgit v1.2.3-55-g7522