diff options
| author | Robert Bays <rbays@lenny.vyatta.com> | 2008-01-15 20:59:06 -0800 |
|---|---|---|
| committer | Robert Bays <rbays@lenny.vyatta.com> | 2008-01-15 20:59:06 -0800 |
| commit | 4c31892eb4adc926a4301a2831ded92daa75c991 (patch) | |
| tree | fca5ce549aa2bb22fb64c98d014d8679dd7e9517 | |
| parent | ef9307c050109e974a4994d3b644873401904005 (diff) | |
| download | vyatta-cfg-system-4c31892eb4adc926a4301a2831ded92daa75c991.tar.gz vyatta-cfg-system-4c31892eb4adc926a4301a2831ded92daa75c991.zip | |
fix for bug 2534 and prep for larson's vif link detect fixes
| -rwxr-xr-x | scripts/add_bootfile_eth_hwid | 1 | ||||
| -rwxr-xr-x | scripts/mod_bootfile_eth_hwid | 1 | ||||
| -rwxr-xr-x | scripts/vyatta_net_name | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/scripts/add_bootfile_eth_hwid b/scripts/add_bootfile_eth_hwid index 2a9cc69c..a315a103 100755 --- a/scripts/add_bootfile_eth_hwid +++ b/scripts/add_bootfile_eth_hwid @@ -25,6 +25,5 @@ sed -i '/^interfaces {$/,/^}$/ { /^}$/i\ ethernet '"$eth"' {\ hw-id: '"$hwid"'\ - link-detect\ } }' $bootfile diff --git a/scripts/mod_bootfile_eth_hwid b/scripts/mod_bootfile_eth_hwid index b913d121..51b2c022 100755 --- a/scripts/mod_bootfile_eth_hwid +++ b/scripts/mod_bootfile_eth_hwid @@ -27,7 +27,6 @@ sed -i '/^interfaces {$/,/^}$/ { /\n }$/ { /hw-id: / s/\(hw-id:\) [0-9a-fA-F:]\+/\1 '"$hwid"'/ /hw-id: /! s/}$/ hw-id: '"$hwid"'\n }/ - /link-detect/! s/}$/ link-detect\n }/ b } N diff --git a/scripts/vyatta_net_name b/scripts/vyatta_net_name index 43c71c1d..e048800e 100755 --- a/scripts/vyatta_net_name +++ b/scripts/vyatta_net_name @@ -107,7 +107,6 @@ for name_hwid in ${cfg_net_hwid[@]} ; do last_ethn=$ethn if [ "$hwid" == "$attr_address" ] ; then # we mod the config file interface sub-clock in case it is missing - # "link-detect" [[ "$BOOTFILE" != *test_* ]] && \ ${vyatta_sbindir}/mod_bootfile_eth_hwid $BOOTFILE $name $attr_address echo $name |