Move rc.linkup operations to check_reload_status to avoid race conditions.

2 files changed, 14 insertions, 4 deletions

diff --git a/etc/devd.conf b/etc/devd.conf
index 47d7759..847f6f5 100644
--- a/etc/devd.conf
+++ b/etc/devd.conf
@@ -15,12 +15,12 @@ options {
 notify 0 {
     match "type"            "LINK_UP";
 	media-type              "ethernet";
-    action "/bin/echo -n '$subsystem ' >>/tmp/rc.linkup";
+    action "/bin/echo -n '$subsystem start ' >>/tmp/rc.linkup";
 };
 notify 0 {
     match "type"            "LINK_DOWN";
 	media-type              "ethernet";
-    action "/bin/echo -n '$subsystem ' >>/tmp/rc.linkup";
+    action "/bin/echo -n '$subsystem stop ' >>/tmp/rc.linkup";
 };
 
 # When a USB keyboard arrives, attach it as the console keyboard.
diff --git a/etc/rc.bootup b/etc/rc.bootup
index 7f86de5..189a00b 100755
--- a/etc/rc.bootup
+++ b/etc/rc.bootup
@@ -48,6 +48,10 @@
 	require_once("config.inc");
 	
 	require_once("functions.inc");
+	
+	/* get system memory amount */
+	$memory = get_memory();
+	$avail = $memory[0];
 
 	/* start devd (dhclient now uses it */
 	echo "Starting device manager (devd)... ";
@@ -180,8 +184,14 @@
 	//unmute_kernel_msgs();
 	echo "done.\n";
 
-	/* start web server */
-	system_webgui_start();
+	if($avail > 0 and $avail < 65) {
+		echo "System has less than 64 megabytes of ram.  Delaying webConfigurator startup...\n";
+		/* start webConfigurator up on final pass */
+		touch("/tmp/restart_webgui");
+	} else {
+		/* start web server */
+		system_webgui_start();
+	}
 
 	/* start OpenVPN server & clients */
         ovpn_configure(false);