diff options
author | sullrich <sullrich@pfsense.org> | 2009-12-02 15:37:22 -0500 |
---|---|---|
committer | sullrich <sullrich@pfsense.org> | 2009-12-02 15:37:47 -0500 |
commit | 7ef2b26090d642aec398f18e8b5c61093ffa6341 (patch) | |
tree | 3ba380c706b6b8b46e66f460da3ced31e6300f38 | |
parent | 6e5eadf8c9b718903e82cb4653f784f94c4aacd1 (diff) | |
download | pfsense-7ef2b26090d642aec398f18e8b5c61093ffa6341.zip pfsense-7ef2b26090d642aec398f18e8b5c61093ffa6341.tar.gz |
Unbreak console lockout on bootup and in gitsync (pfSsh.php) Resolves #195
-rw-r--r-- | etc/phpshellsessions/gitsync | 8 | ||||
-rwxr-xr-x | etc/rc.bootup | 7 |
2 files changed, 13 insertions, 2 deletions
diff --git a/etc/phpshellsessions/gitsync b/etc/phpshellsessions/gitsync index 6262034..34f9a63 100644 --- a/etc/phpshellsessions/gitsync +++ b/etc/phpshellsessions/gitsync @@ -208,6 +208,14 @@ function post_cvssync_commands() { echo "\n"; } + /* lock down console if necessary */ + echo "Locking down the console if needed...\n"; + if(isset($config['system']['disableconsolemenu'])) { + auto_login(false); + } else { + auto_login(true); + } + echo "===> Signaling PHP and Lighty restart..."; $fd = fopen("/tmp/restart_lighty", "w"); fwrite($fd, "#!/bin/sh\n"); diff --git a/etc/rc.bootup b/etc/rc.bootup index b60daab..ba08aad 100755 --- a/etc/rc.bootup +++ b/etc/rc.bootup @@ -307,8 +307,11 @@ services_snmpd_configure(); system_set_harddisk_standby(); /* lock down console if necessary */ -if(isset($config['system']['disableconsolemenu'])) - touch("/var/etc/console_lockdown"); +if(isset($config['system']['disableconsolemenu'])) { + auto_login(false); +} else { + auto_login(true); +} /* Run a filter configure now that most all services have started */ filter_configure_sync(); |