summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xscripts/vyatta_net_name2
1 files changed, 2 insertions, 0 deletions
diff --git a/scripts/vyatta_net_name b/scripts/vyatta_net_name
index ff8b9bf5..54f91f04 100755
--- a/scripts/vyatta_net_name
+++ b/scripts/vyatta_net_name
@@ -78,12 +78,14 @@ declare -a cfg_net_hwid=( $( sed -ne '
/^interfaces {/,/^}/ {
/^ *ethernet eth[0-9]* {/,/^ $/ {
/^ *ethernet/ {
+ s/\r//
s/.* eth\([0-9]\+\) {$/ eth\1=/
# hold interface name
h
}
/^.*hw-id:\?/ {
# translate field name
+ s/\r//
s/.*hw-id:\? *//
# tolower hex mac address
y/ABCDEF/abcdef/