From 31d8f4539b68b3e65b0d98bce0d564705ffa1992 Mon Sep 17 00:00:00 2001
From: Tom Grennan <tgrennan@vyatta.com>
Date: Mon, 21 Jan 2008 18:08:42 -0800
Subject: fix bug 2658

force udev rescan w/in vyatta-ofr init so that we can update
interface list in config file *after* filesystem is writable
---
 etc/init.d/vyatta-ofr | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/etc/init.d/vyatta-ofr b/etc/init.d/vyatta-ofr
index aab2023..6c4b475 100755
--- a/etc/init.d/vyatta-ofr
+++ b/etc/init.d/vyatta-ofr
@@ -103,10 +103,18 @@ load_bootfile ()
 
 start ()
 {
-    log_daemon_msg "Starting Vyatta Router"
+    log_daemon_msg "Mounting Vyatta Config"
     mount -o nosuid,nodev,mode=775 -t tmpfs none ${vyatta_configdir}
     chgrp ${GROUP} ${vyatta_configdir}
     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 $?
+    log_daemon_msg "Starting Vyatta Router"
     migrate_bootfile
     for s in ${subinit[@]} ; do
 	log_progress_msg $s
-- 
cgit v1.2.3