Call switch_root with 'env -i' to clean out the kernel-defined key/value pairs

diff --git a/ChangeLog b/ChangeLog
index 0c0fbd320443e0becaa1277f50cc3f9220b0bcf5..1ac994b414f98af913a07eb7e97f2401d36e18a8 100644 (file)
--- 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 <agaffney@gentoo.org> defaults/linuxrc:
+  Call switch_root with 'env -i' to clean out the kernel-defined key/value
+  pairs
+
   14 Nov 2008; Andrew Gaffney <agaffney@gentoo.org> defaults/linuxrc:
   Skip good_root check for /dev/nfs for gentoo bug #246759
 

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 2d363329615c809b4f0aeeee08abefb27ac8ae22..ba5d0c7e31deba1bf70334d60234355d6b602345 100644 (file)
--- 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 switch_root -c "/dev/console" "${CHROOT}" "${REAL_INIT:-/sbin/init}" "${INIT_OPTS}"
+exec env -i switch_root -c "/dev/console" "${CHROOT}" "${REAL_INIT:-/sbin/init}" "${INIT_OPTS}"
 
 # If we get here, something bad has happened
 splash 'verbose'