pool/lvm2
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
- 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
This commit is contained in:
Dr. Werner Fink 2013-07-20 11:40:59 +00:00 committed by Git OBS Bridge
parent d6746a1452
commit fc4fb0b87f
5 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lvm2.changes
View File

@ -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 Mon Apr 22 14:01:29 UTC 2013 - cfarrell@suse.com

2
mkinitrd-devmapper-boot.sh
View File

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

2
mkinitrd-devmapper-setup.sh
View File

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

3
mkinitrd-lvm2-boot.sh
View File

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

4
mkinitrd-lvm2-setup.sh
View File

@ -7,13 +7,13 @@
update_blockdev update_blockdev
# Check whether we are using LVM2 (only available when not using EVMS) # 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= lvm_blockdev=
for bd in $blockdev; do for bd in $blockdev; do
update_blockdev $bd 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_dev=${vg_name%%:*}
vg_name=${vg_name#*:} vg_name=${vg_name#*:}
vg_root=${vg_name%%:*} vg_root=${vg_name%%:*}