From: Harald Hoyer <harald@redhat.com>
Date: Tue, 10 Aug 2010 14:48:37 +0000 (+0200)
Subject: rule_generator/write_net_rules: prevent interface to be named "eth"
X-Git-Tag: 174~381
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=ef5304bc8ddda1917143e96bc3addeb5a09588c6

rule_generator/write_net_rules: prevent interface to be named "eth"

find_next_available() would return "eth" instead of "eth0"
---

diff --git a/extras/rule_generator/write_net_rules b/extras/rule_generator/write_net_rules
index 644fbcecb..437979241 100644
--- a/extras/rule_generator/write_net_rules
+++ b/extras/rule_generator/write_net_rules
@@ -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]*")"
+		# prevent INTERFACE from being "eth" instead of "eth0"
+		[ "$INTERFACE" = "${INTERFACE%%[ \[\]0-9]*}" ] && INTERFACE=${INTERFACE}0
 		echo "INTERFACE_NEW=$INTERFACE"
 	fi
 fi