From c6b758e562a15c23c991ce783a9f0b9dbb527601 Mon Sep 17 00:00:00 2001 From: Dirk von Suchodoletz Date: Fri, 15 Dec 2006 00:39:48 +0000 Subject: Added new busybox in new place (tools, Makefile, ...) Busybox has modified switch_root (same as for run-init ...) Updated mkdxsinitrd for busybox usage (same has to be done for slxmkramfs when tested properly) Minor fixes ... git-svn-id: http://svn.openslx.org/svn/openslx/trunk@536 95ad53e4-c205-0410-b2fa-d234c58c8868 --- initramfs/initrd-stuff/init | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'initramfs/initrd-stuff/init') 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 , 02-12-2006 +# Dirk von Suchodoletz , 15-12-2006 # (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" -- cgit v1.2.3-55-g7522