Accepting request 183370 from home:olh:branches:Base:System

- Remove usage of absolute paths in mkinitrd scripts

- Fix parsing lvdisplay -c output with more than 10 volumes in 
  mkinitrd-lvm2-setup.sh (bnc#826727)

OBS-URL: https://build.opensuse.org/request/show/183370
OBS-URL: https://build.opensuse.org/package/show/Base:System/lvm2?expand=0&rev=62

lvm2.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Tue Jul 16 14:55:10 CEST 2013 - ohering@suse.de
+
+- Remove usage of absolute paths in mkinitrd scripts
+
+-------------------------------------------------------------------
+Tue Jul 16 14:39:31 CEST 2013 - ohering@suse.de
+
+- Fix parsing lvdisplay -c output with more than 10 volumes in 
+  mkinitrd-lvm2-setup.sh (bnc#826727)
+
 -------------------------------------------------------------------
 Mon Apr 22 14:01:29 UTC 2013 - cfarrell@suse.com
 

mkinitrd-devmapper-boot.sh

@@ -2,7 +2,7 @@
 #%stage: boot
 #%depends: start
 #%udevmodules: dm-mod dm-snapshot $dm_modules
-#%programs: /sbin/dmsetup /sbin/blockdev
+#%programs: dmsetup blockdev
 # dm-crypt dm-zero dm-mirror
 #%if: -n "$root_dm"
 #

mkinitrd-devmapper-setup.sh

@@ -5,7 +5,7 @@
 #
 
 # no dmsetup -> no dm
-if [ -x /sbin/dmsetup ]; then	
+if [ -x "$(type -p dmsetup)" ]; then	
     dm_blockdev=
 	
     # if any device before was on dm we have to activate it

mkinitrd-lvm2-boot.sh

@@ -1,7 +1,8 @@
 #!/bin/bash
 #%stage: volumemanager
 #%depends: evms
-#%programs: /sbin/vgscan /sbin/vgchange /sbin/lvm
+#%programs: vgscan vgchange lvm
+#%programs: sed
 #%modules: linear
 #%if: -n "$root_lvm2"
 #

mkinitrd-lvm2-setup.sh

@@ -7,13 +7,13 @@
 update_blockdev
 
 # Check whether we are using LVM2 (only available when not using EVMS)
-if [ -z "$root_evms" ] && [ -x /sbin/lvdisplay ] ; then
+if [ -z "$root_evms" ] && [ -x "$(type -p lvdisplay)" ] ; then
   lvm_blockdev=
 
   for bd in $blockdev; do
     update_blockdev $bd
 	
-    vg_name=$(lvdisplay -c 2> /dev/null | sed -n "/.*:$blockmajor:$blockminor/p")
+    vg_name=$(lvdisplay -c 2> /dev/null | sed -n "/:${blockmajor}:${blockminor}$/p")
     vg_dev=${vg_name%%:*}
     vg_name=${vg_name#*:}
     vg_root=${vg_name%%:*}