diff options
author | Scott Ullrich <sullrich@sullrich-MacBookPro.geekgod.com> | 2009-05-15 20:48:48 -0400 |
---|---|---|
committer | Scott Ullrich <sullrich@sullrich-MacBookPro.geekgod.com> | 2009-05-15 20:48:48 -0400 |
commit | d5116ed509d535afa24b0ac1c2135a32e4f3f8a9 (patch) | |
tree | 78f747e992c72d63811418819eb92eb074f13cd0 /etc | |
parent | 745188c8860eacb92fbd518a872e38bb58a88d7e (diff) | |
download | pfsense-d5116ed509d535afa24b0ac1c2135a32e4f3f8a9.zip pfsense-d5116ed509d535afa24b0ac1c2135a32e4f3f8a9.tar.gz |
Prompt for recover before parsing config
Diffstat (limited to 'etc')
-rwxr-xr-x | etc/rc.bootup | 11 |
1 files changed, 5 insertions, 6 deletions
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(); |