rules: md - add mdadm 3 device naming

[elogind.git] / extras / rule_generator / write_cd_rules

diff --git a/extras/rule_generator/write_cd_rules b/extras/rule_generator/write_cd_rules
index bd951c51464615aef62bbf0654576d1b6247ba42..8de227661db449b0273883eb033446b8656090ea 100644 (file)
--- a/extras/rule_generator/write_cd_rules
+++ b/extras/rule_generator/write_cd_rules
@@ -11,12 +11,19 @@
 # under the terms of the GNU General Public License as published by the
 # Free Software Foundation version 2 of the License.
 
+# debug, if UDEV_LOG=<debug>
+if [ -n "$UDEV_LOG" ]; then
+       if [ "$UDEV_LOG" -ge 7 ]; then
+               set -x
+       fi
+fi
+
 RULES_FILE="/etc/udev/rules.d/70-persistent-cd.rules"
 
 . /lib/udev/rule_generator.functions
 
 find_next_available() {
-       raw_find_next_available "$(find_all_rules 'SYMLINK+=' $1)"
+       raw_find_next_available "$(find_all_rules 'SYMLINK+=' "$1")"
 }
 
 write_rule() {
@@ -28,10 +35,10 @@ write_rule() {
        if [ "$PRINT_HEADER" ]; then
                PRINT_HEADER=
                echo "# This file was automatically generated by the $0"
-               echo "# program, probably run by the cd-aliases-generator.rules rules file."
+               echo "# program, run by the cd-aliases-generator.rules rules file."
                echo "#"
-               echo "# You can modify it, as long as you keep each rule on a single line"
-               echo "# and set the \$GENERATED variable."
+               echo "# You can modify it, as long as you keep each rule on a single"
+               echo "# line, and set the \$GENERATED variable."
                echo ""
        fi
 
@@ -53,15 +60,7 @@ fi
 if [ "$1" ]; then
        METHOD="$1"
 else
-       case "$ID_BUS" in
-               usb|ieee1394)
-               METHOD='by-id'
-               ;;
-
-               *)
-               METHOD='by-path'
-               ;;
-       esac
+       METHOD='by-path'
 fi
 
 case "$METHOD" in