- rel 3; lvm sysinit vs ignorelockingfailure fixes.

Changed files:
    rc-scripts-svn.patch -> 1.17
    rc-scripts.spec -> 1.381

diff --git a/rc-scripts-svn.patch b/rc-scripts-svn.patch
index a099f0b1db276f49eaa1cb332b0926d0c15ea255..c8dc4861131ef51f1438ff954e615dba0f13dd6d 100644 (file)
--- a/rc-scripts-svn.patch
+++ b/rc-scripts-svn.patch
@@ -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

diff --git a/rc-scripts.spec b/rc-scripts.spec
index 704b686dd22f73ddb342b7d309a69da062f8e303..5862ece6e07891f210a34286a59df12b7fb36cad 100644 (file)
--- a/rc-scripts.spec
+++ b/rc-scripts.spec
@@ -9,7 +9,7 @@ Summary(pl.UTF-8):      inittab i skrypty startowe z katalogu /etc/rc.d
 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