Author: glen
Date: Sun Mar 18 16:55:50 2012
New Revision: 12499
Modified:
geninitrd/trunk/geninitrd
geninitrd/trunk/mod-lvm.sh
Log:
do not leak linuxrc variables to init
Modified: geninitrd/trunk/geninitrd
==============================================================================
--- geninitrd/trunk/geninitrd (original)
+++ geninitrd/trunk/geninitrd Sun Mar 18 16:55:50 2012
@@ -1289,7 +1289,7 @@
EOF
mount_proc
add_linuxrc <<-'EOF'
- read CMDLINE < /proc/cmdline; export CMDLINE
+ read CMDLINE < /proc/cmdline
for arg in $CMDLINE; do
if [ "${arg}" = "debuginitrd" ]; then
Modified: geninitrd/trunk/mod-lvm.sh
==============================================================================
--- geninitrd/trunk/mod-lvm.sh (original)
+++ geninitrd/trunk/mod-lvm.sh Sun Mar 18 16:55:50 2012
@@ -181,9 +181,9 @@
initrd_gen_devices
add_linuxrc <<-EOF
- export ROOTDEV=$rootdev
- export ROOTVG="$VGVOLUMES"
- export SUSPENDVG=$SUSPENDVG
+ ROOTDEV=$rootdev
+ ROOTVG="$VGVOLUMES"
+ SUSPENDVG=$SUSPENDVG
EOF
# need awk for "s/--/-/g" subst when parsing kernel root
commandline
@@ -222,9 +222,9 @@
# skip duplicate VG
if [ "$SUSPENDVG" = "$ROOTVG" ]; then
- export VGVOLUMES="$ROOTVG"
+ VGVOLUMES="$ROOTVG"
else
- export VGVOLUMES="$SUSPENDVG $ROOTVG"
+ VGVOLUMES="$SUSPENDVG $ROOTVG"
fi
# disable noise from LVM accessing devices that aren't
ready.
@@ -258,6 +258,8 @@
# Pass it to kernel
echo $((256 * $major + $minor)) >
/proc/sys/kernel/real-root-dev
fi
+
+ unset LVM_SYSTEM_DIR
EOF
fi
}
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
