From 85b14c8232b1e59ce9bb42bb69935f2349823b96 Mon Sep 17 00:00:00 2001
From: Tom Grennan <tgrennan@vyatta.com>
Date: Tue, 22 Jan 2008 16:07:27 -0800
Subject: only rescan interfaces if vyatta udev script is installed

---
 etc/init.d/vyatta-ofr | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/etc/init.d/vyatta-ofr b/etc/init.d/vyatta-ofr
index 5950651..21fcc36 100755
--- a/etc/init.d/vyatta-ofr
+++ b/etc/init.d/vyatta-ofr
@@ -108,13 +108,12 @@ start ()
 	chgrp ${GROUP} ${vyatta_configdir}
     log_action_end_msg $?
     init_bootfile
-    log_end_msg $?
-    log_daemon_msg "Rescan Network Interfaces"
-    ( udevtrigger --verbose --subsystem-match=net && udevsettle ) | \
-	while read itf ; do
-	    log_progress_msg ${itf##*/}
-	done
-    log_end_msg $?
+    if [ -e /lib/udev/vyatta_net_name ] ; then
+	log_daemon_msg "Rescan Network Interfaces"
+	( udevtrigger --verbose --subsystem-match=net && udevsettle ) | \
+	    while read itf ; do log_progress_msg ${itf##*/} ; done
+	log_end_msg $?
+    fi
     log_daemon_msg "Starting Vyatta Router"
     migrate_bootfile
     for s in ${subinit[@]} ; do
-- 
cgit v1.2.3