From 909f09598d60863634a36972823d19d5ec5a6d1e Mon Sep 17 00:00:00 2001
From: Tom Grennan <tgrennan@vyatta.com>
Date: Wed, 23 Jan 2008 15:40:40 -0800
Subject: Revert "fix bug 2658"

This reverts commit b45bba4286e83f8babcd70eef908f2ea2f8fff3c.
---
 scripts/vyatta_net_name | 22 ++++++----------------
 1 file 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
-- 
cgit v1.2.3