chiark / gitweb /
rule_generator: fix netif NAME= value extraction regex
authorKay Sievers <kay.sievers@vrfy.org>
Thu, 23 Oct 2008 13:44:34 +0000 (15:44 +0200)
committerKay Sievers <kay.sievers@vrfy.org>
Thu, 23 Oct 2008 13:44:34 +0000 (15:44 +0200)
  $ sed -n -r \
    -e 's/^#.*//' \
    -e 's/[[:space:],]NAME="(eth[0-9]*)"[[:space:]]*(,.*|\\|)$/\1/p' \
    /dev/null /etc/udev/rules.d/70-persistent-net.rules
  SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", ATTR{address}=="00:16:41:e2:8d:c7", ATTR{type}=="1", KERNEL=="eth*",eth4

  $ sed -n -r \
    -e 's/^#.*//' \
    -e 's/.*[[:space:],]NAME="(eth[0-9]*)".*/\1/p' \
    /dev/null /etc/udev/rules.d/70-persistent-net.rules
  eth4

extras/rule_generator/rule_generator.functions
extras/rule_generator/write_cd_rules
extras/rule_generator/write_net_rules

index aaf66a6..b972091 100644 (file)
@@ -92,8 +92,7 @@ find_all_rules() {
        local linkre="$2"
        local match="$3"
 
        local linkre="$2"
        local match="$3"
 
-       local search='[[:space:],]'"$key"'"('"$linkre"')"[[:space:]]*(,.*|\\|)$'
-
+       local search='.*[[:space:],]'"$key"'"('"$linkre"')".*'
        echo $(sed -n -r -e 's/^#.*//' -e "${match}s/${search}/\1/p" \
                $RO_RULES_FILE \
                $([ -e $RULES_FILE ] && echo $RULES_FILE) \
        echo $(sed -n -r -e 's/^#.*//' -e "${match}s/${search}/\1/p" \
                $RO_RULES_FILE \
                $([ -e $RULES_FILE ] && echo $RULES_FILE) \
index d74b201..8de2276 100644 (file)
 # under the terms of the GNU General Public License as published by the
 # Free Software Foundation version 2 of the License.
 
 # 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
 RULES_FILE="/etc/udev/rules.d/70-persistent-cd.rules"
 
 . /lib/udev/rule_generator.functions
@@ -28,10 +35,10 @@ write_rule() {
        if [ "$PRINT_HEADER" ]; then
                PRINT_HEADER=
                echo "# This file was automatically generated by the $0"
        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 "#"
-               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
 
                echo ""
        fi
 
index d1086f0..cb34675 100644 (file)
 #   INTERFACE_NAME        requested name supplied by external tool
 #   INTERFACE_NEW         new interface name returned by rule writer
 
 #   INTERFACE_NAME        requested name supplied by external tool
 #   INTERFACE_NEW         new interface name returned by rule writer
 
+# 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-net.rules'
 
 . /lib/udev/rule_generator.functions
 RULES_FILE='/etc/udev/rules.d/70-persistent-net.rules'
 
 . /lib/udev/rule_generator.functions
@@ -48,9 +55,10 @@ write_rule() {
        if [ "$PRINT_HEADER" ]; then
                PRINT_HEADER=
                echo "# This file was automatically generated by the $0"
        if [ "$PRINT_HEADER" ]; then
                PRINT_HEADER=
                echo "# This file was automatically generated by the $0"
-               echo "# program run by the persistent-net-generator.rules rules file."
+               echo "# program, run by the persistent-net-generator.rules rules file."
                echo "#"
                echo "#"
-               echo "# You can modify it, as long as you keep each rule on a single line."
+               echo "# You can modify it, as long as you keep each rule on a single"
+               echo "# line, and change only the value of the NAME= key."
        fi
 
        echo ""
        fi
 
        echo ""