From d5116ed509d535afa24b0ac1c2135a32e4f3f8a9 Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@sullrich-MacBookPro.geekgod.com>
Date: Fri, 15 May 2009 20:48:48 -0400
Subject: Prompt for recover before parsing config

---
 etc/rc.bootup | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'etc/rc.bootup')

diff --git a/etc/rc.bootup b/etc/rc.bootup
index a946832..43a67fd 100755
--- a/etc/rc.bootup
+++ b/etc/rc.bootup
@@ -54,8 +54,7 @@ function rescue_detect_keypress() {
 	// If r was pressed do our logic here
 	if (in_array($key, array("r", "R"))) {
 	  system("env TERM=vt102 /scripts/lua_installer_rescue");
-	}
-	if (in_array($key, array("i", "I"))) {
+	} elseif (in_array($key, array("i", "I"))) {
 	  system("env TERM=vt102 /scripts/lua_installer");
 	}
 }
@@ -99,14 +98,14 @@ set_device_perms();
 unmute_kernel_msgs();
 echo "done.\n";
 
-echo "Loading configuration...";
-parse_config_bootup();
-echo "done.\n";
-
 // Display rescue configuration option
 if($g['platform'] == "cdrom") 
 		rescue_detect_keypress();
 
+echo "Loading configuration...";
+parse_config_bootup();
+echo "done.\n";
+
 $lan_if = $config['interfaces']['lan']['if'];
 $wan_if = get_real_interface();
 
-- 
cgit v1.1