diff --git a/lvm2.changes b/lvm2.changes index 25bdcf4..2313b6d 100644 --- a/lvm2.changes +++ b/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 diff --git a/mkinitrd-devmapper-boot.sh b/mkinitrd-devmapper-boot.sh index dd32610..06e4bae 100644 --- a/mkinitrd-devmapper-boot.sh +++ b/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" # diff --git a/mkinitrd-devmapper-setup.sh b/mkinitrd-devmapper-setup.sh index 82f87fe..79e9690 100644 --- a/mkinitrd-devmapper-setup.sh +++ b/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 diff --git a/mkinitrd-lvm2-boot.sh b/mkinitrd-lvm2-boot.sh index cc95f74..c1e11ef 100644 --- a/mkinitrd-lvm2-boot.sh +++ b/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" # diff --git a/mkinitrd-lvm2-setup.sh b/mkinitrd-lvm2-setup.sh index 3b400ac..27d2b77 100644 --- a/mkinitrd-lvm2-setup.sh +++ b/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%%:*}