diff options
Diffstat (limited to 'initramfs/initrd-stuff')
-rw-r--r-- | initramfs/initrd-stuff/etc/functions | 6 | ||||
-rwxr-xr-x | initramfs/initrd-stuff/init | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/initramfs/initrd-stuff/etc/functions b/initramfs/initrd-stuff/etc/functions index 75af6c29..b27dfc66 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>, 14-12-2006 +# Dirk von Suchodoletz <dvs@OpenSLX.com>, 15-12-2006 # Felix Endres, 30-04-2006 # <mj0@uni-freiburg.de> (xenbr), 12-12-2006 # Tobias Maier @@ -318,7 +318,7 @@ case $mnt in portmap || { echo "$error_portm"; ret=1; } # fixme: busybox mount uses nfs ... mount -n -t nfs -o ro,nolock $nfsroot $dest || ret=1 - killall -9 portmap + killall -9 portmap 2>/dev/null ;; none) error "$error_mntt" @@ -406,7 +406,7 @@ command line)." >> /etc/machine-setup [ -n $vci ] && vci="-V $vci" testmkd /usr/share/udhcpc ln -s /bin/dhcpmkconfig /usr/share/udhcpc/default.script - udhcpc -b -q $vci -s /usr/share/udhcpc/default.script -i eth0 + udhcpc -b -q $vci -s /usr/share/udhcpc/default.script -i eth0 2>/dev/null ;; *) ;; diff --git a/initramfs/initrd-stuff/init b/initramfs/initrd-stuff/init index 097e8c15..b5630bdc 100755 --- a/initramfs/initrd-stuff/init +++ b/initramfs/initrd-stuff/init @@ -2,7 +2,7 @@ # main script for new type of initial ramdisk for OpenSLX linux diskless # clients version 4 # -# Dirk von Suchodoletz <dirk@goe.net>, 02-12-2006 +# Dirk von Suchodoletz <dirk@goe.net>, 15-12-2006 # <mj0@uni-freiburg.de> (xenbr), 27-09-2006 # # (c) 2006 - RZ Universitaet Freiburg @@ -535,7 +535,7 @@ waitfor /tmp/hwcfg 20000 || error "$init_errhw" waitfor /tmp/svcfg 20000 || error "$init_errsw" # IP configuration is made and should not be updated automatically, udevd # should be killed if started within init -killall -9 dhcpcd dhclient pump 2>/dev/null +killall -9 dhcpcd dhclient pump udhcpc 2>/dev/null cp /etc/machine-setup /mnt/etc # post init for some distro specific (fixme!! more elegant solution) @@ -577,3 +577,5 @@ unset BOOT_IMAGE KCMDLINE KERNEL MODPRV NWMODULES OLDPWD UDEVD_EVENT_TIMEOUT \ #strinstr "bash" "$(ls -la /bin/sh)" && EE="-c" # new style of pivoting (exec -c would set an empty environment in bash) exec run-init -c dev/console /mnt /sbin/init || error "$init_runinit" +# run-init could be replaced with switch_root from busybox ... +#exec switch_root -c dev/console /mnt /sbin/init || error "$init_runinit" |