Attachment 308991 Details for Bug 447273 – fix all =~ syntax instances

[patch] fix all =~ syntax instances

mkinitrd.patch (text/plain), 2.55 KB, created by Corey Henderson on 2008-06-11 20:30:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Corey Henderson

Created: 2008-06-11 20:30:48 UTC

Size: 2.55 KB

patch

obsolete

>--- a/sbin/mkinitrd	2008-06-11 12:39:59.000000000 -0400
>+++ b/sbin/mkinitrd	2008-06-11 15:03:09.000000000 -0400
>@@ -487,11 +487,11 @@
> 
> findblockdevinsys() {
>     devname=$(resolve_device_name "$1")
>-    if [[ "$devname" =~ ^/sys/block/ ]]; then
>+    if [[ "$devname" =~ "^/sys/block/" ]]; then
>         echo "$devname"
>     fi
>     # check if it's a dm-crypt device. if so, just return the /dev/mapper path
>-    if [[ "$devname" =~ ^/dev/mapper/ ]]; then
>+    if [[ "$devname" =~ "^/dev/mapper/" ]]; then
>         type=$(/sbin/dmsetup table $(basename $devname) | awk '{print $3}')
>         if [ "$type" == "crypt" ]; then
>             echo "$devname"
>@@ -555,12 +555,12 @@
>             continue
>         fi
>         vecho "Looking for driver for device $device"
>-        if [[ "$device" =~ ^(dm-|mapper/) ]]; then
>+        if [[ "$device" =~ "^(dm-|mapper/)" ]]; then
>             majmin=$(get_numeric_dev dec "/dev/$device")
>             sysfs=$(finddevnoinsys $majmin)
>             handledm $(echo "$majmin" |cut -d : -f 1) $(echo "$majmin" |cut -d : -f 2)
>         else
>-            if [[ "$device" =~ ^/sys ]]; then
>+            if [[ "$device" =~ "^/sys" ]]; then
>                 device=${device##*/}
>             fi
>             sysfs=""
>@@ -695,7 +695,7 @@
>                 dmname=$(dmsetup info -j $major -m $minor -c --noheadings -o name)
>                 # do the device resolution dance to get /dev/mapper/foo
>                 # since 'lvm lvs' doesn't like dm-X device nodes
>-                if [[ "$slavedev" =~ ^dm- ]]; then
>+                if [[ "$slavedev" =~ "^dm-" ]]; then
>                     majmin=$(get_numeric_dev dec "/dev/$slavedev")
>                     for dmdev in /dev/mapper/* ; do
>                         dmnum=$(get_numeric_dev dev $dmdev)
>@@ -1187,7 +1187,7 @@
>         handlenfs $rootdev
>     else
>         # check if it's root by label
>-        if [[ "$rootdev" =~ ^(UUID=|LABEL=) ]]; then
>+        if [[ "$rootdev" =~ "^(UUID=|LABEL=)" ]]; then
>             rootdev=$(resolve_device_name "$rootdev")
>         fi
>         rootopts=$(echo $rootopts | sed -e 's/^r[ow],//' -e 's/,_netdev//' -e 's/_netdev//' -e 's/,r[ow],$//' -e 's/,r[ow],/,/' -e 's/^r[ow]$/defaults/' -e 's/$/,ro/')
>@@ -1209,7 +1209,7 @@
>     # find the first swap dev which would get used for swsusp
>     swsuspdev=$(awk '/^[ \t]*[^#]/ { if ($3 == "swap") { print $1; exit }}' $fstab)
>     if [ -n "$swsuspdev" ]; then
>-        if [[ "$swsuspdev" =~ ^(UUID=|LABEL=) ]]; then
>+        if [[ "$swsuspdev" =~ "^(UUID=|LABEL=)" ]]; then
>             swsuspdev=$(resolve_device_name "$swsuspdev")
>         fi
>

Actions: View | Diff

Attachments on bug 447273: 305915 | 305917 | 308991