summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xetc/rc6
-rwxr-xr-xetc/rc.bootup4
-rw-r--r--etc/ttys2
3 files changed, 11 insertions, 1 deletions
diff --git a/etc/rc b/etc/rc
index 1b705a3..d99066f 100755
--- a/etc/rc
+++ b/etc/rc
@@ -212,4 +212,10 @@ rm -rf /usr/local/pkg/pf/CVS
echo "Bootup complete"
+# if console is not locked, spawn rc.initial.
+if [ ! -f /var/etc/console_lockdown ]; then
+ /bin/sh /etc/rc.initial
+fi
+
+# console is locked, lets exit and let the login shell take over.
exit 0
diff --git a/etc/rc.bootup b/etc/rc.bootup
index 84dc9a6..054c208 100755
--- a/etc/rc.bootup
+++ b/etc/rc.bootup
@@ -232,6 +232,10 @@
/* power down hard drive if needed/set */
system_set_harddisk_standby();
+ /* lock down console if necessary */
+ if(isset($config['system']['disableconsolemenu']))
+ touch("/var/etc/console_lockdown");
+
/* done */
unlink("{$g['varrun_path']}/booting");
$g['booting'] = FALSE;
diff --git a/etc/ttys b/etc/ttys
index d35b8ff..0cbd0d2 100644
--- a/etc/ttys
+++ b/etc/ttys
@@ -1,4 +1,4 @@
#
# name getty type status comments
#
-console "/bin/sh /etc/rc.initial" cons25 on secure \ No newline at end of file
+console "/usr/libexec/getty Pc" cons25 on secure \ No newline at end of file
OpenPOWER on IntegriCloud