chiark / gitweb /
rule_generator/write_net_rules: prevent interface to be named "eth"
authorHarald Hoyer <harald@redhat.com>
Tue, 10 Aug 2010 14:48:37 +0000 (16:48 +0200)
committerHarald Hoyer <harald@redhat.com>
Tue, 10 Aug 2010 14:48:37 +0000 (16:48 +0200)
find_next_available() would return "eth" instead of "eth0"

extras/rule_generator/write_net_rules

index 644fbce..4379792 100644 (file)
@@ -128,6 +128,8 @@ else
        # if a rule using the current name already exists, find a new name
        if interface_name_taken; then
                INTERFACE="$basename$(find_next_available "$basename[0-9]*")"
        # if a rule using the current name already exists, find a new name
        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
                echo "INTERFACE_NEW=$INTERFACE"
        fi
 fi