lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-20 03:16:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

rc: adjust install mode selection

Browse Source
This commit is contained in:
Franco Fichtner 2016-06-06 07:35:52 +02:00
parent ae7f000835
commit 17f656da41
3 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/etc/inc/config.console.inc
View File

@ -28,7 +28,7 @@
POSSIBILITY OF SUCH DAMAGE.
*/
function timeout($timer = 9)
function timeout($timer = 7)
{
while (!isset($key)) {
if ($timer >= 9) { echo chr(8) . chr(8) . ($timer==9 ? chr(32) : null) . "{$timer}"; }
@ -64,7 +64,7 @@ function set_networking_interfaces_ports($probe = false)
if ($probe) {
echo PHP_EOL . gettext('Press any key to start the manual interface assignment: ');
$key = timeout(7);
$key = timeout();
if (!isset($key)) {
$interactive = false;
}

2
src/etc/inc/services.inc
View File

@ -2383,7 +2383,7 @@ function configure_cron()
$autocron[] = generate_cron_job('/usr/local/etc/rc.dyndns.update', '11', '1');
/* every now and then */
$autocron[] = generate_cron_job('/usr/local/sbin/ping_hosts.sh', '*/4');
$autocron[] = generate_cron_job('/usr/local/sbin/ping_hosts.sh', '*/4');
if (!empty($config['system']['rrdbackup'])) {
$autocron[] = generate_cron_job('/usr/local/etc/rc.backup_rrd', '0', '*/' . $config['system']['rrdbackup']);

39
src/etc/rc.bootup
View File

@ -71,46 +71,45 @@ function is_interface_mismatch()
return $do_assign;
}
function rescue_detect_keypress()
{
$timeout = 9;
$timer = 7;
echo "\n";
echo "(I)nstaller will be invoked by default.\n\n";
echo "(C)ontinue with LiveCD bootup instead.\n\n";
echo "(R)ecovery mode escapes to a root shell.\n\n";
echo "Timeout before auto boot continues (seconds): {$timeout}";
echo "Timeout before auto boot continues (seconds): ";
$key = null;
exec("/bin/stty erase " . chr(8));
while (!in_array($key, array("c", "C", "r","R", "i", "I"))) {
echo chr(8) . "{$timeout}";
`/bin/stty -icanon min 0 time 25`;
$key = trim(`KEY=\`dd count=1 2>/dev/null\`; echo \$KEY`);
`/bin/stty icanon`;
// Decrement our timeout value
$timeout--;
// If we have reached 0 exit and continue on
if ($timeout == 0) {
while (!isset($key) || !in_array($key, array('c', 'C', 'r', 'R', 'i', 'I'))) {
if ($timer >= 9) { echo chr(8) . chr(8) . ($timer==9 ? chr(32) : null) . "{$timer}"; }
else { echo chr(8). "{$timer}"; }
shell_exec('/bin/stty -icanon min 0 time 25');
$key = shell_exec('/bin/dd count=1 status=none');
shell_exec('/bin/stty icanon');
if ($key == '') {
unset($key);
}
$timer--;
if ($timer == 0) {
break;
}
}
echo "\n\n";
if (in_array($key, array("r", "R"))) {
if (in_array($key, array('r', 'R'))) {
echo "Recovery shell selected...\n\n";
touch("/tmp/donotbootup");
touch('/tmp/donotbootup');
exit;
} elseif (in_array($key, array("c", "C"))) {
} elseif (in_array($key, array('c', 'C'))) {
/* nothing */
} else {
echo "Installer mode selected...\n";
passthru("/usr/local/etc/rc.installer");
if (file_exists("/tmp/install_complete")) {
passthru("/usr/local/etc/rc.reboot");
passthru('/usr/local/etc/rc.installer');
if (file_exists('/tmp/install_complete')) {
passthru('/usr/local/etc/rc.reboot');
exit;
}
}