From 3325d167fc1c8edb64cccc92257c4c0af7319dba Mon Sep 17 00:00:00 2001 From: Dirk von Suchodoletz Date: Fri, 15 Dec 2006 21:40:12 +0000 Subject: Renamed run-init to switch_root to simplify the usage of the busybox pendant in stage3 init script... git-svn-id: http://svn.openslx.org/svn/openslx/trunk@545 95ad53e4-c205-0410-b2fa-d234c58c8868 --- initramfs/initrd-stuff/bin/run-init | Bin 10832 -> 0 bytes initramfs/initrd-stuff/bin/switch_root | Bin 0 -> 10832 bytes initramfs/initrd-stuff/init | 4 ++-- 3 files changed, 2 insertions(+), 2 deletions(-) delete mode 100755 initramfs/initrd-stuff/bin/run-init create mode 100755 initramfs/initrd-stuff/bin/switch_root (limited to 'initramfs/initrd-stuff') diff --git a/initramfs/initrd-stuff/bin/run-init b/initramfs/initrd-stuff/bin/run-init deleted file mode 100755 index 556caeb6..00000000 Binary files a/initramfs/initrd-stuff/bin/run-init and /dev/null differ diff --git a/initramfs/initrd-stuff/bin/switch_root b/initramfs/initrd-stuff/bin/switch_root new file mode 100755 index 00000000..556caeb6 Binary files /dev/null and b/initramfs/initrd-stuff/bin/switch_root differ diff --git a/initramfs/initrd-stuff/init b/initramfs/initrd-stuff/init index b5630bdc..86208016 100755 --- a/initramfs/initrd-stuff/init +++ b/initramfs/initrd-stuff/init @@ -576,6 +576,6 @@ unset BOOT_IMAGE KCMDLINE KERNEL MODPRV NWMODULES OLDPWD UDEVD_EVENT_TIMEOUT \ UDEVD_EXPECTED_SEQNUM #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" +#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" +exec switch_root -c dev/console /mnt /sbin/init || error "$init_runinit" -- cgit v1.2.3-55-g7522