aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJudd Vinet <judd@archlinux.org>2004-02-29 07:03:00 +0000
committerJudd Vinet <judd@archlinux.org>2004-02-29 07:03:00 +0000
commit0d76f45bffddced00c83b0c06f1be796a780366b (patch)
treefa5a5fbd7e070a54f5b6c92f2d9652d82c418620
parentd9f8f3c07bcf1ab349fa6484980a04ef57c7212c (diff)
downloadinitscripts-0d76f45bffddced00c83b0c06f1be796a780366b.tar.xz
updated for LVM2
-rwxr-xr-xrc.shutdown15
-rwxr-xr-xrc.sysinit11
2 files changed, 19 insertions, 7 deletions
diff --git a/rc.shutdown b/rc.shutdown
index 8bfc9ac..538eb96 100755
--- a/rc.shutdown
+++ b/rc.shutdown
@@ -62,10 +62,21 @@ stat_done
stat_busy "Unmounting Filesystems"
/bin/umount -a
-# for LVM:
-#/sbin/vgchange --ignorelockingfailure -a n
stat_done
+if [ -f /etc/lvmtab ]; then
+ if [ -x /sbin/lvm ]; then
+ stat_busy "Deactivating LVM2 groups"
+ /sbin/lvm vgchange --ignorelockingfailure -a n
+ stat_done
+ elif [ -x /sbin/vgchange ]; then
+ stat_busy "Deactivating LVM1 groups"
+ /sbin/vgchange -a n
+ stat_done
+ fi
+ umount /proc
+fi
+
stat_busy "Remounting Root Filesystem Read-only"
/bin/mount -n -o remount,ro /
stat_done
diff --git a/rc.sysinit b/rc.sysinit
index f37379e..c5b6bfb 100755
--- a/rc.sysinit
+++ b/rc.sysinit
@@ -27,8 +27,12 @@ if [ -f /etc/lvmtab ]; then
# /proc is temporarily mounted to check for LVM support - it is
# re-mounted later from /etc/fstab
/bin/mount -n -t proc none /proc
- if [ -f /proc/lvm/global -a -x /sbin/vgchange ]; then
- stat_busy "Activating LVM groups"
+ if [ -x /sbin/lvm ]; then
+ stat_busy "Activating LVM2 groups"
+ /sbin/lvm vgscan
+ /sbin/lvm vgchange -a y
+ elif [ -f /proc/lvm/global -a -x /sbin/vgchange ]; then
+ stat_busy "Activating LVM1 groups"
/sbin/vgchange -a y
stat_done
fi
@@ -69,9 +73,6 @@ stat_busy "Mounting Local Filesystems"
/bin/mount -n -o remount,rw /
/bin/rm -f /etc/mtab*
/bin/mount /proc
-# for LVM:
-#/sbin/vgscan
-#/sbin/vgchange -a y
/bin/mount -a -t nonfs,nosmbfs,noncpfs
stat_done