From 41f44b1d4229b6781ccb2af16e35eb8bbc26d901 Mon Sep 17 00:00:00 2001 From: Andrew Gaffney Date: Fri, 14 Nov 2008 13:58:33 -0600 Subject: [PATCH] Call switch_root with full path --- ChangeLog | 4 ++++ defaults/initrd.scripts | 4 ++-- defaults/linuxrc | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1ac994b..d0f466b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2008 Gentoo Foundation; 2008 Chris Gianelloni, Andrew Gaffney # Distributed under the GPL v2 + 14 Nov 2008; Andrew Gaffney defaults/initrd.scripts, + defaults/linuxrc: + Call switch_root with full path + 14 Nov 2008; Andrew Gaffney defaults/linuxrc: Call switch_root with 'env -i' to clean out the kernel-defined key/value pairs diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts index 0de1e1f..4dfc4ad 100644 --- a/defaults/initrd.scripts +++ b/defaults/initrd.scripts @@ -991,8 +991,8 @@ setup_unionfs() { # mount -t tmpfs tmpfs $MEMORY # fi # else - good_msg "Mounting ramdisk to $MEMORY for unionfs support..." - mount -t tmpfs tmpfs $MEMORY +# good_msg "Mounting ramdisk to $MEMORY for unionfs support..." +# mount -t tmpfs tmpfs $MEMORY # fi mkdir /tmp diff --git a/defaults/linuxrc b/defaults/linuxrc index ba5d0c7..84b23a0 100644 --- a/defaults/linuxrc +++ b/defaults/linuxrc @@ -668,7 +668,7 @@ umount /sys || echo '*: Failed to unmount the ramdisk /sys!' umount /proc || echo '*: Failed to unmount the ramdisk /proc!' echo -e "${BOLD}.${NORMAL}" -exec env -i switch_root -c "/dev/console" "${CHROOT}" "${REAL_INIT:-/sbin/init}" "${INIT_OPTS}" +exec env -i /sbin/switch_root -c "/dev/console" "${CHROOT}" "${REAL_INIT:-/sbin/init}" "${INIT_OPTS}" # If we get here, something bad has happened splash 'verbose' -- 2.26.2