X-Git-Url: https://git.tld-linux.org/?p=packages%2Frc-scripts.git;a=blobdiff_plain;f=rc-scripts-raid_lvm.patch;fp=rc-scripts-raid_lvm.patch;h=8173a1be4352d54002aa36a8698056595b5b3470;hp=f8691c06f25d05c3fe06c7926e472b90b3951090;hb=7eecf979560f5fbd06f940677f99a5cd743e8347;hpb=be10dac1baff45e310deaa5ef45bf8980cd57d23

diff --git a/rc-scripts-raid_lvm.patch b/rc-scripts-raid_lvm.patch
index f8691c0..8173a1b 100644
--- a/rc-scripts-raid_lvm.patch
+++ b/rc-scripts-raid_lvm.patch
@@ -1,7 +1,7 @@
-diff -ur rc-scripts-0.4.12.orig/rc.d/rc.sysinit rc-scripts-0.4.12/rc.d/rc.sysinit
---- rc-scripts-0.4.12.orig/rc.d/rc.sysinit	2014-08-05 14:20:11.411000000 +0000
-+++ rc-scripts-0.4.12/rc.d/rc.sysinit	2014-08-05 15:22:35.445000000 +0000
-@@ -301,63 +301,26 @@
+diff -urNp rc-scripts-0.4.13.orig/rc.d/rc.sysinit rc-scripts-0.4.13/rc.d/rc.sysinit
+--- rc-scripts-0.4.13.orig/rc.d/rc.sysinit	2015-02-06 13:41:29.000000000 +0000
++++ rc-scripts-0.4.13/rc.d/rc.sysinit	2015-02-06 13:53:26.288314244 +0000
+@@ -301,63 +301,26 @@ check_root_fs() {
  	fi
  }
  
@@ -73,7 +73,7 @@ diff -ur rc-scripts-0.4.12.orig/rc.d/rc.sysinit rc-scripts-0.4.12/rc.d/rc.sysini
  }
  
  # Init LVM
-@@ -390,8 +353,10 @@
+@@ -390,8 +353,10 @@ init_lvm() {
  
  	run_cmd "Scanning for LVM volume groups" /sbin/vgscan $lvmignorelocking
  	run_cmd "Activating LVM volume groups" /sbin/vgchange -a y $lvmsysinit
@@ -85,7 +85,7 @@ diff -ur rc-scripts-0.4.12.orig/rc.d/rc.sysinit rc-scripts-0.4.12/rc.d/rc.sysini
  		# display VG statistics
  		/sbin/vgdisplay -s $lvmignorelocking
  	fi
-@@ -830,7 +795,10 @@
+@@ -830,7 +795,10 @@ if ! is_yes "$VSERVER" && [[ "$container
  		fi
  	fi
  
@@ -97,7 +97,7 @@ diff -ur rc-scripts-0.4.12.orig/rc.d/rc.sysinit rc-scripts-0.4.12/rc.d/rc.sysini
  	if ! is_no "$LVM2"; then
  		init_lvm
  	fi
-@@ -842,10 +810,6 @@
+@@ -842,10 +810,6 @@ if ! is_yes "$VSERVER" && [[ "$container
  		[ $delay_cryptsetup = 0 ] && ok || fail
  	fi