diff options
| author | Tom Grennan <tgrennan@vyatta.com> | 2008-01-23 15:40:40 -0800 |
|---|---|---|
| committer | Tom Grennan <tgrennan@vyatta.com> | 2008-01-23 15:40:40 -0800 |
| commit | 909f09598d60863634a36972823d19d5ec5a6d1e (patch) | |
| tree | 16fa309e92eab561f3bf26a49fcdf9fd820ce455 | |
| parent | 16031470e620e2310935795cd110eceec7995712 (diff) | |
| download | vyatta-cfg-system-909f09598d60863634a36972823d19d5ec5a6d1e.tar.gz vyatta-cfg-system-909f09598d60863634a36972823d19d5ec5a6d1e.zip | |
Revert "fix bug 2658"
This reverts commit b45bba4286e83f8babcd70eef908f2ea2f8fff3c.
| -rwxr-xr-x | scripts/vyatta_net_name | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/scripts/vyatta_net_name b/scripts/vyatta_net_name index a7e7be8e..e048800e 100755 --- a/scripts/vyatta_net_name +++ b/scripts/vyatta_net_name @@ -106,15 +106,10 @@ for name_hwid in ${cfg_net_hwid[@]} ; do [[ $ethn -gt $last_ethn ]] && \ last_ethn=$ethn if [ "$hwid" == "$attr_address" ] ; then - echo $name # we mod the config file interface sub-clock in case it is missing - if [[ "$BOOTFILE" != *test_* ]] && touch $BOOTFILE &> /dev/null ; then - ${vyatta_sbindir}/${cmd}_bootfile_eth_hwid \ - $BOOTFILE \ - $name \ - $attr_address \ - 2>&1 | logger - fi + [[ "$BOOTFILE" != *test_* ]] && \ + ${vyatta_sbindir}/mod_bootfile_eth_hwid $BOOTFILE $name $attr_address + echo $name exit 0 fi [ "$name" == "$kname" ] && \ @@ -146,15 +141,10 @@ else cmd=add fi -echo $name +[[ "$BOOTFILE" != *test_* ]] && \ + ${vyatta_sbindir}/${cmd}_bootfile_eth_hwid $BOOTFILE $name $attr_address -if [[ "$BOOTFILE" != *test_* ]] && touch $BOOTFILE &> /dev/null ; then - ${vyatta_sbindir}/${cmd}_bootfile_eth_hwid \ - $BOOTFILE \ - $name \ - $attr_address \ - 2>&1 | logger -fi +echo $name # Local Variables: # mode: shell-script |