Author: gotar
Date: Tue Nov 24 12:07:36 2009
New Revision: 11001
Modified:
rc-scripts/trunk/rc.d/rc.shutdown
rc-scripts/trunk/rc.d/rc.sysinit
Log:
- having EVMS_LVM=yes without the tools doesn't make them work
- having EVMS_LVM=no mustn't prevent plain LVM from bringing up
- conclusion: these parts of code are EVMS_LVM independant
Modified: rc-scripts/trunk/rc.d/rc.shutdown
==============================================================================
--- rc-scripts/trunk/rc.d/rc.shutdown (original)
+++ rc-scripts/trunk/rc.d/rc.shutdown Tue Nov 24 12:07:36 2009
@@ -110,9 +110,9 @@
run_cmd "Remounting root filesystem in ro mode" mount -n -o remount,ro /
- if is_yes "$EVMS_LVM" || [ -x /sbin/vgchange ]; then
+ if [ -x /sbin/vgchange ]; then
lvmversion=$(LC_ALL=C /sbin/vgchange --version 2>/dev/null |
awk '/LVM version:/{if ($3 >= 2) print "2"}')
- if [ "$lvmversion" = "2" ] ; then
+ if [ "$lvmversion" = "2" ]; then
lvmignorelock="--ignorelockingfailure"
else
lvmignorelock=""
Modified: rc-scripts/trunk/rc.d/rc.sysinit
==============================================================================
--- rc-scripts/trunk/rc.d/rc.sysinit (original)
+++ rc-scripts/trunk/rc.d/rc.sysinit Tue Nov 24 12:07:36 2009
@@ -750,7 +750,7 @@
fi
# LVM on RAID (keep in sync with LVM setting few lines
above)
if [ "$golvm" -eq "1" ]; then
- if ! is_no "$EVMS_LVM" && [ -x /sbin/vgscan -a
-x /sbin/vgchange ]; then
+ if [ -x /sbin/vgscan -a -x /sbin/vgchange ];
then
run_cmd "Scanning for LVM volume groups
(on RAID)" /sbin/vgscan $lvmignorelock
run_cmd "Activating LVM volume groups
(on RAID)" /sbin/vgchange -a y $lvmignorelock
[ "$lvmversion" = "2" ] &&
/sbin/vgmknodes
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
