summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorrbalocca <rbalocca@vyatta.com>2008-11-05 14:28:53 -0800
committerrbalocca <rbalocca@vyatta.com>2008-11-05 14:28:53 -0800
commitde1b7e9f71704b538b5e3b2454681cdadb7a0513 (patch)
tree00560d8bcca35cba6a22845f1e94be8e4c30b8e8 /scripts
parent07b1c95171167979e43e1505093442669195e540 (diff)
downloadvyatta-cfg-system-de1b7e9f71704b538b5e3b2454681cdadb7a0513.tar.gz
vyatta-cfg-system-de1b7e9f71704b538b5e3b2454681cdadb7a0513.zip
Fix for bug http://bugzilla.vyatta.com/show_bug.cgi?id=2426
Diffstat (limited to 'scripts')
-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/