packages: rc-scripts/rc-scripts-svn.patch, rc-scripts/rc-scripts.spec - rel...

[arekm]

Author: arekm                        Date: Fri Dec 16 08:48:17 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 3; lvm sysinit vs ignorelockingfailure fixes.

---- Files affected:
packages/rc-scripts:
   rc-scripts-svn.patch (1.16 -> 1.17) , rc-scripts.spec (1.380 -> 1.381) 

---- Diffs:

================================================================
Index: packages/rc-scripts/rc-scripts-svn.patch
diff -u packages/rc-scripts/rc-scripts-svn.patch:1.16 packages/rc-scripts/rc-scripts-svn.patch:1.17
--- packages/rc-scripts/rc-scripts-svn.patch:1.16	Wed Dec 14 18:17:47 2011
+++ packages/rc-scripts/rc-scripts-svn.patch	Fri Dec 16 09:48:11 2011
@@ -9,3 +9,46 @@
  
  		if [ "$closefds" = 1 ]; then
  			exec 1>&-
+Index: rc.d/rc.sysinit
+===================================================================
+--- rc.d/rc.sysinit	(wersja 12454)
++++ rc.d/rc.sysinit	(kopia robocza)
+@@ -617,23 +617,26 @@
+ 		fi
+ 		if [ "$lvmversion" = "1" ] ; then
+ 			modprobe -s lvm-mod >/dev/null 2>&1
++			lvmignorelocking=""
+ 			lvmsysinit=""
+ 		elif [ "$lvmversion" = "2" ] ; then
+ 			modprobe -s dm-mod >/dev/null 2>&1
++			lvmignorelocking="--ignorelockingfailure"
+ 			lvmsysinit="--sysinit"
+ 		else
+ 			modprobe -s lvm-mod >/dev/null 2>&1
+ 			# device mapper (2.5+ and patched 2.4)
+ 			modprobe -s dm-mod >/dev/null 2>&1
++			lvmignorelocking=""
+ 			lvmsysinit=""
+ 		fi
+ 
+-		run_cmd "Scanning for LVM volume groups" /sbin/vgscan $lvmsysinit
++		run_cmd "Scanning for LVM volume groups" /sbin/vgscan $lvmignorelocking
+ 		run_cmd "Activating LVM volume groups" /sbin/vgchange -a y $lvmsysinit
+ 		if [ "$lvmversion" = "2" ]; then
+-			/sbin/vgmknodes $lvmsysinit
++			/sbin/vgmknodes $lvmignorelocking
+ 			# display VG statistics
+-			/sbin/vgdisplay -s $lvmsysinit
++			/sbin/vgdisplay -s $lvmignorelocking
+ 		fi
+ 	fi
+ 
+@@ -732,7 +735,7 @@
+ 			# LVM on RAID (keep in sync with LVM setting few lines above)
+ 			if [ "$golvm" -eq "1" ]; then
+ 				if [ -x /sbin/vgscan -a -x /sbin/vgchange ]; then
+-					run_cmd "Scanning for LVM volume groups (on RAID)" /sbin/vgscan $lvmsysinit
++					run_cmd "Scanning for LVM volume groups (on RAID)" /sbin/vgscan $lvmignorelocking
+ 					run_cmd "Activating LVM volume groups (on RAID)" /sbin/vgchange -a y $lvmsysinit
+ 					[ "$lvmversion" = "2" ] && /sbin/vgmknodes
+ 				fi

================================================================
Index: packages/rc-scripts/rc-scripts.spec
diff -u packages/rc-scripts/rc-scripts.spec:1.380 packages/rc-scripts/rc-scripts.spec:1.381
--- packages/rc-scripts/rc-scripts.spec:1.380	Wed Dec 14 18:17:47 2011
+++ packages/rc-scripts/rc-scripts.spec	Fri Dec 16 09:48:11 2011
@@ -10,7 +10,7 @@
 Summary(tr.UTF-8):	inittab ve /etc/rc.d dosyaları
 Name:		rc-scripts
 Version:	0.4.5.2
-Release:	2
+Release:	3
 License:	GPL v2
 Group:		Base
 #Source0:	ftp://distfiles.pld-linux.org/src/%{name}-%{version}.tar.gz
@@ -392,6 +392,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.381  2011/12/16 08:48:11  arekm
+- rel 3; lvm sysinit vs ignorelockingfailure fixes.
+
 Revision 1.380  2011/12/14 17:17:47  glen
 - fix nice calc for ksh
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rc-scripts/rc-scripts-svn.patch?r1=1.16&r2=1.17&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rc-scripts/rc-scripts.spec?r1=1.380&r2=1.381&f=u