One instance of a variable being passed instead of a string and another instance of a tweak in a regular expression that doesn't work on F13. Signed-off-by: Mike Burns <mburns at redhat.com> --- scripts/ovirt-config-storage | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/ovirt-config-storage b/scripts/ovirt-config-storage index 34e84e5..4f3f174 100755 --- a/scripts/ovirt-config-storage +++ b/scripts/ovirt-config-storage @@ -96,7 +96,7 @@ translate_multipath_device() { local dm_dev=/dev/$(multipath -ll $dev | egrep dm-[0-9]+ | sed -r 's/^.& (dm-[0-9]+) .*$/\1/') local mpath_device- get_dm_device $dm_dev $mpath_device + get_dm_device $dm_dev mpath_device if [ -z "$mpath_device" ]; then mpath_device=$dev @@ -580,7 +580,7 @@ wipe_lvm_on_disk() reread_partitions() { local drive=$1 - if [[ $drive =~ "^/dev/mapper" ]]; then + if [[ $drive =~ "/dev/mapper" ]]; then kpartx -a -p p $drive else blockdev --rereadpt $drive -- 1.6.6.1
Darryl L. Pierce
2010-Mar-23 15:01 UTC
[Ovirt-devel] [PATCH node] cleanup a couple small issues
On Thu, Mar 18, 2010 at 03:59:34PM -0400, Mike Burns wrote:> One instance of a variable being passed instead of a string > and another instance of a tweak in a regular expression that doesn't > work on F13. > > Signed-off-by: Mike Burns <mburns at redhat.com> > --- > scripts/ovirt-config-storage | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/scripts/ovirt-config-storage b/scripts/ovirt-config-storage > index 34e84e5..4f3f174 100755 > --- a/scripts/ovirt-config-storage > +++ b/scripts/ovirt-config-storage > @@ -96,7 +96,7 @@ translate_multipath_device() { > local dm_dev=/dev/$(multipath -ll $dev | egrep dm-[0-9]+ | sed -r 's/^.& (dm-[0-9]+) .*$/\1/') > > local mpath_device> - get_dm_device $dm_dev $mpath_device > + get_dm_device $dm_dev mpath_device > > if [ -z "$mpath_device" ]; then > mpath_device=$dev > @@ -580,7 +580,7 @@ wipe_lvm_on_disk() > reread_partitions() > { > local drive=$1 > - if [[ $drive =~ "^/dev/mapper" ]]; then > + if [[ $drive =~ "/dev/mapper" ]]; then > kpartx -a -p p $drive > else > blockdev --rereadpt $drive > -- > 1.6.6.1 > > _______________________________________________ > Ovirt-devel mailing list > Ovirt-devel at redhat.com > https://www.redhat.com/mailman/listinfo/ovirt-develACK. -- Darryl L. Pierce, Sr. Software Engineer @ Red Hat, Inc. Delivering value year after year. Red Hat ranks #1 in value among software vendors. http://www.redhat.com/promo/vendor/ -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 198 bytes Desc: not available URL: <http://listman.redhat.com/archives/ovirt-devel/attachments/20100323/0f5f9620/attachment.sig>