CVS: moonbase/utils/e2fsprogs/init.d mount,1.7,1.8

[Stefan Wold]

Update of /var/cvs/lunar/moonbase/utils/e2fsprogs/init.d
In directory dbguin.lunar-linux.org:/tmp/cvs-serv13810

Modified Files:
	mount 
Log Message:
Added support for LVM and LVM2

Index: mount
===================================================================
RCS file: /var/cvs/lunar/moonbase/utils/e2fsprogs/init.d/mount,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- mount	1 Nov 2003 01:37:16 -0000	1.7
+++ mount	24 Nov 2003 19:16:17 -0000	1.8
@@ -84,12 +84,23 @@
   chkresult  
 
   echo       " * Mounting remaining filesystems:"
+  
+  # Mounting /proc to maintain compatibility with LVM
+  echo -n "  * Mounting: /proc"
+  mount      /proc    &> /dev/null
+  chkresult
+
+  # Enable LVM or LVM2 if configured
+  if [ -e /etc/config.d/lvm -a -x /sbin/vgscan -a -x /sbin/vgchange ]; then
+      /sbin/vgscan
+      /sbin/vgchange -a y
+  fi
 
   # /etc/fast should be in order
   # ex. /usr should comes before /usr/local
   # and /proc before /proc/bus/usb
   # better to fail if a mounting dosn't exist than, do it silently
-  grep -v '#' /etc/fstab | grep -v ^$ | grep -v noauto | 
+  grep -v '#' /etc/fstab | grep -v ^$ | grep -v noauto | grep -v '/proc ' |
   while  read  DEVICE MOUNTPOINT FSTYPE REST;  do
   
     # Filter out already mounted fs's: devfs and root
@@ -217,6 +228,10 @@
     done
   done
   
+  # Deactivate LVM or LVM2
+  if [ -e /etc/config.d/lvm -a -x /sbin/vgchange ]; then
+      /sbin/vgchange -a n
+  fi
   
   sync; sync