Merge branch 'docs/udev.xml' of git://github.com/mfwitten/udev

[elogind.git] / extras / rule_generator / write_net_rules

diff --git a/extras/rule_generator/write_net_rules b/extras/rule_generator/write_net_rules
index b25ecfd8069e7671b68c27540dbfd99643dec1b3..437979241fbf0b920aeb809af12a7508f331b953 100644 (file)
--- a/extras/rule_generator/write_net_rules
+++ b/extras/rule_generator/write_net_rules
@@ -1,12 +1,5 @@
 #!/bin/sh -e
-#
-# Copyright (C) 2006 Marco d'Itri <md@Linux.IT>
-# Copyright (C) 2007 Kay Sievers <kay.sievers@vrfy.org>
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation version 2 of the License.
-#
+
 # This script is run to create persistent network device naming rules
 # based on properties of the device.
 # If the interface needs to be renamed, INTERFACE_NEW=<name> will be printed
@@ -15,12 +8,36 @@
 # variables used to communicate:
 #   MATCHADDR             MAC address used for the match
 #   MATCHID               bus_id used for the match
+#   MATCHDEVID            dev_id used for the match
 #   MATCHDRV              driver name used for the match
 #   MATCHIFTYPE           interface type match
 #   COMMENT               comment to add to the generated rule
 #   INTERFACE_NAME        requested name supplied by external tool
 #   INTERFACE_NEW         new interface name returned by rule writer
 
+# Copyright (C) 2006 Marco d'Itri <md@Linux.IT>
+# Copyright (C) 2007 Kay Sievers <kay.sievers@vrfy.org>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# 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
@@ -47,9 +64,10 @@ write_rule() {
        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 "# 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 ""
@@ -78,6 +96,10 @@ if [ "$MATCHDRV" ]; then
        match="$match, DRIVERS==\"$MATCHDRV\""
 fi
 
+if [ "$MATCHDEVID" ]; then
+       match="$match, ATTR{dev_id}==\"$MATCHDEVID\""
+fi
+
 if [ "$MATCHID" ]; then
        match="$match, KERNELS==\"$MATCHID\""
 fi
@@ -88,9 +110,13 @@ fi
 
 if [ -z "$match" ]; then
        echo "missing valid match" >&2
+       unlock_rules_file
        exit 1
 fi
 
+basename=${INTERFACE%%[0-9]*}
+match="$match, KERNEL==\"$basename*\""
+
 if [ "$INTERFACE_NAME" ]; then
        # external tools may request a custom name
        COMMENT="$COMMENT (custom name provided by external tool)"
@@ -100,9 +126,10 @@ if [ "$INTERFACE_NAME" ]; then
        fi
 else
        # if a rule using the current name already exists, find a new name
-       basename=${INTERFACE%%[0-9]*}
        if interface_name_taken; then
                INTERFACE="$basename$(find_next_available "$basename[0-9]*")"
+               # prevent INTERFACE from being "eth" instead of "eth0"
+               [ "$INTERFACE" = "${INTERFACE%%[ \[\]0-9]*}" ] && INTERFACE=${INTERFACE}0
                echo "INTERFACE_NEW=$INTERFACE"
        fi
 fi