summaryrefslogtreecommitdiff
path: root/scripts/vyatta_net_name
diff options
context:
space:
mode:
authorTom Grennan <tgrennan@vyatta.com>2008-01-21 18:34:55 -0800
committerTom Grennan <tgrennan@vyatta.com>2008-01-21 18:34:55 -0800
commitb45bba4286e83f8babcd70eef908f2ea2f8fff3c (patch)
tree32745608b62276304ba6c5fb476aed73ce9347e1 /scripts/vyatta_net_name
parent45366fefe00d4e9c5d91d6906a7623bfd5daa39b (diff)
downloadvyatta-cfg-system-b45bba4286e83f8babcd70eef908f2ea2f8fff3c.tar.gz
vyatta-cfg-system-b45bba4286e83f8babcd70eef908f2ea2f8fff3c.zip
fix bug 2658
silently write test BOOTFILE before trying too add/mod itf
Diffstat (limited to 'scripts/vyatta_net_name')
-rwxr-xr-xscripts/vyatta_net_name22
1 files changed, 16 insertions, 6 deletions
diff --git a/scripts/vyatta_net_name b/scripts/vyatta_net_name
index e048800e..a7e7be8e 100755
--- a/scripts/vyatta_net_name
+++ b/scripts/vyatta_net_name
@@ -106,10 +106,15 @@ for name_hwid in ${cfg_net_hwid[@]} ; do
[[ $ethn -gt $last_ethn ]] && \
last_ethn=$ethn
if [ "$hwid" == "$attr_address" ] ; then
- # we mod the config file interface sub-clock in case it is missing
- [[ "$BOOTFILE" != *test_* ]] && \
- ${vyatta_sbindir}/mod_bootfile_eth_hwid $BOOTFILE $name $attr_address
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
exit 0
fi
[ "$name" == "$kname" ] && \
@@ -141,11 +146,16 @@ else
cmd=add
fi
-[[ "$BOOTFILE" != *test_* ]] && \
- ${vyatta_sbindir}/${cmd}_bootfile_eth_hwid $BOOTFILE $name $attr_address
-
echo $name
+if [[ "$BOOTFILE" != *test_* ]] && touch $BOOTFILE &> /dev/null ; then
+ ${vyatta_sbindir}/${cmd}_bootfile_eth_hwid \
+ $BOOTFILE \
+ $name \
+ $attr_address \
+ 2>&1 | logger
+fi
+
# Local Variables:
# mode: shell-script
# sh-indentation: 4