From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 30 Jul 2009 17:42:04 +0000 (+0200)
Subject: Use switch_root from util-linux-ng instead.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fbfa5187dd47969531963572bf5f5bc9d0c1009e;p=ipfire-3.x.git

Use switch_root from util-linux-ng instead.
---

diff --git a/src/mkinitramfs/functions b/src/mkinitramfs/functions
index b4f44ab9c..b89ab6097 100644
--- a/src/mkinitramfs/functions
+++ b/src/mkinitramfs/functions
@@ -496,7 +496,7 @@ mkdir -p bin sbin dev sys proc sysroot \
 install bash blkid chmod cat cut dd dmesg env find grep head ip kbd_mode \
 	kill killall5 less ln \
 	ls lsmod mkdir mknod modprobe mount mountpoint openvt pidof ps rm sed \
-	setfont sh sleep switchroot udevadm udevd umount \
+	setfont sh sleep switch_root udevadm udevd umount \
 	/lib/udev/console_init
 
 # Copy modprobe.conf and friends over
diff --git a/src/mkinitramfs/mkinitramfs b/src/mkinitramfs/mkinitramfs
index 9e0a083ec..1925acec2 100644
--- a/src/mkinitramfs/mkinitramfs
+++ b/src/mkinitramfs/mkinitramfs
@@ -92,7 +92,7 @@ mount $rootdev /sysroot $rootopts
 kill $(pidof udevd)
 
 vecho "Switching to new root and running init..."
-exec switchroot $(get_verbose) /sysroot
+exec switch_root /sysroot /sbin/init
 
 echo exec switchroot failed...
 bash
diff --git a/src/mkinitramfs/mkliveramfs b/src/mkinitramfs/mkliveramfs
index 44766e3d5..dc9ab509d 100644
--- a/src/mkinitramfs/mkliveramfs
+++ b/src/mkinitramfs/mkliveramfs
@@ -370,7 +370,7 @@ if [ -x /sysroot$init ]; then
 	kill $(pidof udevd)
 	vecho "Transfering control to $init"
 
-	exec switchroot $(get_verbose) /sysroot
+	exec switch_root /sysroot ${init}
 	echo "---------------------------------"
 	echo "WARNING: Error switching to real rootfs!"
 	echo "---------------------------------"