summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDirk von Suchodoletz2007-01-06 23:17:37 +0100
committerDirk von Suchodoletz2007-01-06 23:17:37 +0100
commit030fcbf3ce6ce459afb66cf0061c7fc17d5ec856 (patch)
treeb6efccf297c49eef5d198e54dcab294dfe3e1705
parentList of available applets including the path. (diff)
downloadcore-030fcbf3ce6ce459afb66cf0061c7fc17d5ec856.tar.gz
core-030fcbf3ce6ce459afb66cf0061c7fc17d5ec856.tar.xz
core-030fcbf3ce6ce459afb66cf0061c7fc17d5ec856.zip
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
-rwxr-xr-xinitramfs/initrd-stuff/init2
-rw-r--r--installer/default_files/machine-setup.default5
-rwxr-xr-xtools/busybox.x86_64bin0 -> 464792 bytes
3 files changed, 5 insertions, 2 deletions
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<<EOF > /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 <dvs@OpenSLX.com>, 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
--- /dev/null
+++ b/tools/busybox.x86_64
Binary files differ