diff options
author | Scott Ullrich <sullrich@sullrich-MacBookPro.geekgod.com> | 2009-05-15 20:58:59 -0400 |
---|---|---|
committer | Scott Ullrich <sullrich@sullrich-MacBookPro.geekgod.com> | 2009-05-15 20:58:59 -0400 |
commit | c1da5030f3552a3c0afb3c157be696a20b34f753 (patch) | |
tree | 61bf209a70df71a66c4df087dee1d849e9368732 /etc | |
parent | 540bd3139adbb009f23e21d7b84bfed958f4a48a (diff) | |
download | pfsense-c1da5030f3552a3c0afb3c157be696a20b34f753.zip pfsense-c1da5030f3552a3c0afb3c157be696a20b34f753.tar.gz |
* Reboot after installation from recovery console
* Add ! drop to shell option and bypass bootup
Diffstat (limited to 'etc')
-rwxr-xr-x | etc/rc | 7 | ||||
-rwxr-xr-x | etc/rc.bootup | 7 |
2 files changed, 14 insertions, 0 deletions
@@ -299,6 +299,13 @@ rm -f /cf/conf/backup/backup.cache rm -f /root/lighttpd* /etc/rc.bootup +# If a shell was selected from recovery +# console then just drop to the shell now. +if [ -f "/tmp/donotbootup" ]; then + echo "\nDropping to recovery shell.\n\n" + exit 0 +fi + echo -n "Starting CRON... " cd /tmp && /usr/sbin/cron -s 2>/dev/null echo "done." diff --git a/etc/rc.bootup b/etc/rc.bootup index 7ccb955..0e28748 100755 --- a/etc/rc.bootup +++ b/etc/rc.bootup @@ -58,6 +58,13 @@ function rescue_detect_keypress() { system("env TERM=vt102 /scripts/lua_installer_rescue"); } elseif (in_array($key, array("i", "I"))) { system("env TERM=vt102 /scripts/lua_installer"); + if(file_exists("/tmp/install_complete")) { + system("/etc/rc.reboot"); + exit; + } + } elseif (in_array($key, array("!", "~"))) { + touch("/tmp/donotbootup"); + exit; } } |