diff options
| -rw-r--r-- | initramfs/distro-specs/suse/config-default | 2 | ||||
| -rw-r--r-- | initramfs/distro-specs/suse/functions-10.2 | 2 | ||||
| -rw-r--r-- | initramfs/initrd-stuff/etc/functions | 12 | ||||
| -rwxr-xr-x | initramfs/initrd-stuff/init | 20 | ||||
| -rwxr-xr-x | initramfs/mkdxsinitrd | 2 |
5 files changed, 24 insertions, 14 deletions
diff --git a/initramfs/distro-specs/suse/config-default b/initramfs/distro-specs/suse/config-default index e44aea46..ce6b365a 100644 --- a/initramfs/distro-specs/suse/config-default +++ b/initramfs/distro-specs/suse/config-default @@ -52,5 +52,5 @@ boot.clock boot.sysctl boot.ipconfig boot.swap" D_XF86CONFFILE="/etc/X11/xorg.conf" D_XFONTPATH="/usr/X11R6/lib/X11/fonts/*" D_DEFAULTCOUNTRY="de" -D_HWMODTOIGNORE="i8xx-tco ichxrom snd-atiixp-modem" +D_HWMODTOIGNORE="i8xx-tco ichxrom snd-atiixp-modem intel-rng" D_BOOTLOCAL="init.d/boot.local" diff --git a/initramfs/distro-specs/suse/functions-10.2 b/initramfs/distro-specs/suse/functions-10.2 index a1985662..f4a23adf 100644 --- a/initramfs/distro-specs/suse/functions-10.2 +++ b/initramfs/distro-specs/suse/functions-10.2 @@ -36,7 +36,7 @@ echo "Starting udev" #mknod /dev/kmsg c 1 11 if [ -x /bin/udevd ] ; then echo "" > /proc/sys/kernel/hotplug - udevd --daemon || result=1 + udevd --daemon 2>/dev/null || result=1 trigger_device_events usleep 50 else error "$df_errudev" nonfatal diff --git a/initramfs/initrd-stuff/etc/functions b/initramfs/initrd-stuff/etc/functions index 4ede90c6..75af6c29 100644 --- a/initramfs/initrd-stuff/etc/functions +++ b/initramfs/initrd-stuff/etc/functions @@ -2,7 +2,7 @@ # (included by init, hwautocfg, servconfig, ... within OpenSLX initial # ramfs) # -# Dirk von Suchodoletz <dvs@OpenSLX.com>, 19-11-2006 +# Dirk von Suchodoletz <dvs@OpenSLX.com>, 14-12-2006 # Felix Endres, 30-04-2006 # <mj0@uni-freiburg.de> (xenbr), 12-12-2006 # Tobias Maier @@ -113,6 +113,16 @@ else fi return 0 } +# standard sleep command +sleep () { +if [ -x /bin/sleep ]; then + /bin/sleep $1 +#elif [ -x /bin/bash ]; then +# TMOUT=$1 read +else + usleep `expr $1 \* 100` +fi +} ############################################################################# # (re)generate dynamic linked libraries cache from /etc/ld.so.conf ldcfg () { diff --git a/initramfs/initrd-stuff/init b/initramfs/initrd-stuff/init index 366086ee..097e8c15 100755 --- a/initramfs/initrd-stuff/init +++ b/initramfs/initrd-stuff/init @@ -45,7 +45,7 @@ mkdir -p ${DEVDIR}/.udevdb [ ! -d /sys/class ] && mount -n -t sysfs sysfs /sys # redirect console (after /dev/console is available, and /dev mounted) -exec < /dev/console > /dev/console 2>&1 +#exec < /dev/console > /dev/console 2>&1 # if no kernel version is set, try to get it directly from /proc if [ -z $KERNEL ] ; then @@ -201,15 +201,15 @@ done # or halt of the machine if SLX init does not succeed (e.g. missing kernel # module for the network adaptor) # fixme/testme!! -# errorhalt () { -# if [ "${DEBUGLEVEL}" -lt 3 ] ; then -# [ ! -f /proc/version ] && mount -n -t proc proc /proc -# [ ! -f /proc/sysrq-trigger ] && echo -e $init_nosysrq -# usleep 100000 -# echo "o" > /proc/sysrq-trigger -# fi -# } -# errorhalt & +errorhalt () { +if [ "${DEBUGLEVEL}" -lt 4 ] ; then + [ ! -f /proc/version ] && mount -n -t proc proc /proc + [ ! -f /proc/sysrq-trigger ] && echo -e $init_nosysrq + sleep 120 + echo "o" > /proc/sysrq-trigger +fi +} +errorhalt & # check if at least one type of IP configuration is availabe if [ -z "$DHCP" -a -z "$LDAP" -a -z "$IPINFO" ] ; then diff --git a/initramfs/mkdxsinitrd b/initramfs/mkdxsinitrd index a2992598..e79f7f6a 100755 --- a/initramfs/mkdxsinitrd +++ b/initramfs/mkdxsinitrd @@ -538,7 +538,7 @@ else # binaries useful for debugging purposes if [ $IRFSDEBUG -gt 2 ] ; then for bbins in \ - date lsmod lsof ps strace time + date lsmod lsof ps strace time uptime do cobi ${bbins} bin || echo "Program ${bbins} not found" done |