dracut: info which module is sourced; updated dracut usage

index 3be4989..6b590f5 100755
@@ -57,6 +57,8 @@ Creates initial ramdisk images for preloading modules
   -v, --verbose         Verbose output during the build process
   -c, --conf [FILE]     Specify configuration file to use.
                          Default: /etc/dracut.conf
+  --confdir [DIR]       Specify configuration directory to use *.conf files from.
+                         Default: /etc/dracut.conf.d
   -l, --local           Local mode. Use modules from the current working
                          directory instead of the system-wide installed in
                          /usr/share/dracut/modules.d.

@@ -243,6 +245,7 @@ check_modules
 for moddir in "$dracutbasedir/modules.d"/[0-9][0-9]*; do
     mod=${moddir##*/}; mod=${mod#[0-9][0-9]}
     if strstr "$mods_to_load" " $mod "; then
+	dinfo "*** Sourcing module $mod"
 	if [[ $kernel_only = yes ]]; then
 	    [[ -x $moddir/installkernel ]] && . "$moddir/installkernel"
 	else

index 9c2999a..0caf0d6 100755
@@ -335,8 +335,9 @@ inst_rules() {
     inst_dir "/lib/udev/rules.d"
     inst_dir "$target"
     for rule in "$@"; do 
-	rule=$(find_rule "$rule") && \
-	    inst_simple "$rule" "$target/${rule##*/}"
+	rule1=$(find_rule "$rule") && \
+	    inst_simple "$rule1" "$target/${rule1##*/}" \
+	    || dinfo "Skipping udev rule: $rule"
     done
 }
 

index 0caf0d6..6da36ad 100755
@@ -319,11 +319,27 @@ inst_symlink() {
     inst "$realsrc" && ln -s "$realsrc" "$target"
 }
 
-# find a udev rule in the usual places.
+# find a udev rule in the usual places and try to be smart (just a bit).
+# See example:
+#   find_rule default.rules
+#   find_rule udev-default.rules
+#   find_rule 50-udev-default.rules
+# All of them will return: /lib/udev/rules.d/50-udev-default.rules
 find_rule() {
+    local rule
+
     [[ -f $1 ]] && { echo "$1"; return 0; }
     for r in . /lib/udev/rules.d /etc/udev/rules.d $dracutbasedir/rules.d; do
-	[[ -f $r/$1 ]] && { echo "$r/$1"; return 0; }
+        if ls $r/*$1 &>/dev/null; then
+            if [[ -f $r/$1 ]]; then
+                echo "$r/$1"
+                return 0
+            else
+                rule=$(ls "$r"/??"-$1" 2>/dev/null || \
+                    ls "$r"/??"-udev-$1" 2>/dev/null)
+                [[ -f $rule ]] && echo $rule && return 0
+            fi
+        fi
     done
     return 1
 }

@@ -331,13 +347,14 @@ find_rule() {
 # udev rules always get installed in the same place, so
 # create a function to install them to make life simpler.
 inst_rules() { 
-    local target=/etc/udev/rules.d
+    local target=/etc/udev/rules.d rule found
+
     inst_dir "/lib/udev/rules.d"
     inst_dir "$target"
     for rule in "$@"; do 
-	rule1=$(find_rule "$rule") && \
-	    inst_simple "$rule1" "$target/${rule1##*/}" \
-	    || dinfo "Skipping udev rule: $rule"
+        found=$(find_rule "$rule") && \
+            inst_simple "$found" "$target/${found##*/}" \
+            || dinfo "Skipping udev rule: $rule"
     done
 }
 

index be6b2e9..1f2528e 100755
@@ -319,11 +319,32 @@ inst_symlink() {
     inst "$realsrc" && ln -s "$realsrc" "$target"
 }
 
-# find a udev rule in the usual places.
+# find a udev rule in the usual places and try to be smart (just a bit).
+# See example:
+#   find_rule default.rules
+#   find_rule 50-default.rules
+# All of them will return: /lib/udev/rules.d/50-udev-default.rules
+# If there are few matching files, error message is printed.
 find_rule() {
+    local rule t
+
     [[ -f $1 ]] && { echo "$1"; return 0; }
     for r in . /lib/udev/rules.d /etc/udev/rules.d $dracutbasedir/rules.d; do
-	[[ -f $r/$1 ]] && { echo "$r/$1"; return 0; }
+        if ls $r/*$1 &>/dev/null; then
+            if [[ -f $r/$1 ]]; then
+                echo "$r/$1"
+                return 0
+            else
+                rule=$(ls "$r"/??"-$1" 2>/dev/null)
+                t=($rule)
+                if (( ${#t[@]} > 1 )); then
+                    derror "Ambigous rules filename.  Matches: ${t[@]}"
+                elif [[ -f "$rule" ]]; then
+                    echo $rule
+                    return 0
+                fi
+            fi
+        fi
     done
     return 1
 }

index 0caf0d6..7a1d82f 100755
@@ -319,13 +319,36 @@ inst_symlink() {
     inst "$realsrc" && ln -s "$realsrc" "$target"
 }
 
-# find a udev rule in the usual places.
+# find a udev rule in the usual places and try to be smart (just a bit).
+# See example:
+#   find_rule default.rules
+#   find_rule 50-default.rules
+# All of them will return: /lib/udev/rules.d/50-udev-default.rules
+# If there are few matching files, error message is printed.
 find_rule() {
+    local rd f files=()
+
     [[ -f $1 ]] && { echo "$1"; return 0; }
-    for r in . /lib/udev/rules.d /etc/udev/rules.d $dracutbasedir/rules.d; do
-	[[ -f $r/$1 ]] && { echo "$r/$1"; return 0; }
+
+    for rd in . /lib/udev/rules.d /etc/udev/rules.d $dracutbasedir/rules.d; do
+        for f in "$rd/$1" "$rd"/*-"$1"
+        do
+            [[ -f $f ]] || continue
+            [[ ${f##*/} =~ [0-9][0-9]-.*\.rules ]] || continue
+            files+=($f)
+        done
+        # If detecting ambiguousness among different directories isn't desired,
+        # uncomment this:
+        # (( ${#files[@]} >= 1 )) && break
     done
-    return 1
+
+    (( ${#files[@]} < 1 )) && return 1
+    (( ${#files[@]} > 1 )) && {
+        derror "Ambigous rules filename.  Matches: ${files[@]}"
+        return 1
+    }
+
+    echo "$files"
 }
 
 # udev rules always get installed in the same place, so