From 7082f5c70f29502de722dcbfe06d4a13e2954795 Mon Sep 17 00:00:00 2001
From: An-Cheng Huang <ancheng@vyatta.com>
Date: Mon, 11 Feb 2008 18:41:52 -0800
Subject: fix for bug 2547: don't require/output ':' after "hw-id".

---
 scripts/vyatta_net_name | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'scripts/vyatta_net_name')

diff --git a/scripts/vyatta_net_name b/scripts/vyatta_net_name
index 9820d00f..61792340 100755
--- a/scripts/vyatta_net_name
+++ b/scripts/vyatta_net_name
@@ -71,7 +71,7 @@ shopt -s extglob nullglob
 # ...
 #     ethernet eth# {
 #     ...
-#	 hw-id: XX:XX:XX:XX:XX:XX
+#	 hw-id XX:XX:XX:XX:XX:XX
 #     ...
 #     }
 # }
@@ -86,9 +86,9 @@ declare -a cfg_net_hwid=( $( sed -ne '
 # hold interface name
 		h
 	    }
-	    /^.*hw-id:/ {
+	    /^.*hw-id:\?/ {
 # translate field name
-		s/.*hw-id: *//
+		s/.*hw-id:\? *//
 # tolower hex mac address
 		y/ABCDEF/abcdef/
 # exchange hold and pattern space
-- 
cgit v1.2.3