Sophie

Sophie

distrib > Mandriva > 2009.0 > i586 > by-pkgid > bd83eed6316a8b1c5c9b7e319c5581d0 > files > 30

mkinitrd-6.0.63-1mnb2.src.rpm

diff -p -up mkinitrd-6.0.63/mkinitrd.rmatch mkinitrd-6.0.63/mkinitrd
--- mkinitrd-6.0.63/mkinitrd.rmatch	2008-09-12 19:19:35.000000000 +0200
+++ mkinitrd-6.0.63/mkinitrd	2008-09-12 19:20:35.000000000 +0200
@@ -362,7 +362,7 @@ findstoragedriver () {
                 continue ;;
             *) handleddevices="$handleddevices $device" ;;
         esac
-        if [[ "$device" =~ "^md[0-9]+" ]]; then
+        if [[ "$device" =~ ^md[0-9]+ ]]; then
             vecho "Found RAID component $device"
             handleraid "$device"
             continue
@@ -1175,7 +1175,7 @@ if [ -n "$testdm" \
                     # requires real parsing... 
                     # XXX also covered by #132001
                     for mod in $TABLE ; do 
-                        DMMODS="$DMMODS $([[ "$mod" =~ "[[:alpha:]]" ]] && echo "$mod")"
+                        DMMODS="$DMMODS $([[ "$mod" =~ [[:alpha:]] ]] && echo "$mod")"
                     done
                     DMDEVS="$DMDEVS $NAME"
                     ;;
@@ -1425,12 +1425,12 @@ emitmodules() {
 
         # we mount usbfs before the first module *after* the HCDs
         if [ "$usb_mounted" == "prep" ]; then
-            if [[ "$module" =~ ".hci[_-]hcd" ]]; then
+            if [[ "$module" =~ .hci[_-]hcd ]]; then
                 usb_mounted="no"
                 found_hcd_module="yes"
             fi
         elif [ "$usb_mounted" == "no" ]; then
-            if [[ ! "$module" =~ ".hci[_-]hcd" ]]; then
+            if [[ ! "$module" =~ .hci[_-]hcd ]]; then
                 usb_mounted=yes
                 emit "mount -t usbfs /proc/bus/usb /proc/bus/usb"
             fi