summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2015-07-30 18:48:25 -0300
committerRenato Botelho <renato@netgate.com>2015-07-30 18:48:57 -0300
commit996f5a5b64ee835b7abf37f8aa05c531a43bd1be (patch)
tree1f532a52747931b91ea48369a93b8a92bae76896
parent9d454891c5ae390d9251b288d6430b8ace37fa9b (diff)
downloadpfsense-996f5a5b64ee835b7abf37f8aa05c531a43bd1be.zip
pfsense-996f5a5b64ee835b7abf37f8aa05c531a43bd1be.tar.gz
Remove an undocumented and hidden option called 'RecoveryConsoleShell'
-rwxr-xr-xetc/rc7
-rwxr-xr-xetc/rc.bootup6
-rwxr-xr-xetc/rc.initial10
3 files changed, 0 insertions, 23 deletions
diff --git a/etc/rc b/etc/rc
index 4e7b368..a593520 100755
--- a/etc/rc
+++ b/etc/rc
@@ -404,13 +404,6 @@ if [ -f $varrunpath/booting ]; then
/bin/rm $varrunpath/booting
fi
-# If a shell was selected from recovery
-# console then just drop to the shell now.
-if [ -f "/tmp/donotbootup" ]; then
- echo "Dropping to recovery shell."
- 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 9e2729d..332e629 100755
--- a/etc/rc.bootup
+++ b/etc/rc.bootup
@@ -70,12 +70,6 @@ function rescue_detect_keypress() {
passthru("/etc/rc.reboot");
exit;
}
- } elseif (in_array($key, array("!", "~"))) {
- putenv("TERM=cons25");
- echo "\n\nRecovery shell selected...\n";
- echo "\n";
- touch("/tmp/donotbootup");
- exit;
} else {
echo "\n\n";
}
diff --git a/etc/rc.initial b/etc/rc.initial
index 45b781c..2d9fa98 100755
--- a/etc/rc.initial
+++ b/etc/rc.initial
@@ -13,16 +13,6 @@
#trap : 3
#trap : 4
-# If recovery console shell option has been specified
-if [ -f "/tmp/donotbootup" ]; then
- /usr/bin/env prompt="%B[%n@%m]%b%/(%h)||RecoveryConsoleShell: " /bin/tcsh
- rm "/tmp/donotbootup"
- echo "Rebooting in 5 seconds... CTRL-C to abort..."
- sleep 5
- /etc/rc.reboot
- exit
-fi
-
if [ -f /etc/rc.local ]; then
RCLOCALPWD=`ps awux | grep rc.local | grep -v grep | awk '{ print $2 }'`
if [ "$RCLOCALPWD" = "" ]; then
OpenPOWER on IntegriCloud