Remove option C from cdrom boot menu and disable LiveCD option

1 files changed, 6 insertions, 11 deletions

diff --git a/etc/rc.bootup b/etc/rc.bootup
index 2dc449f..fd77ce8 100755
--- a/etc/rc.bootup
+++ b/etc/rc.bootup
@@ -39,13 +39,11 @@ function rescue_detect_keypress() {
 	echo "[  press I to launch the installer  ]\n\n";
 	echo "(R)ecovery mode can assist by rescuing config.xml\n";
 	echo "from a broken hard disk installation, etc.\n\n";
-	echo "(I)nstaller may be invoked now if you do \n";
-	echo "not wish to boot into the liveCD environment at this time.\n\n";
-	echo "(C) continues the LiveCD bootup without further pause.\n\n";
+	echo "(I)nstaller will be invoked\n\n";
 	echo "Timeout before auto boot continues (seconds): {$timeout}";
 	$key = null;
 	exec("/bin/stty erase " . chr(8));
-	while (!in_array($key, array("c", "C", "r", "R", "i", "I"))) {
+	while (!in_array($key, array("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`);
@@ -62,17 +60,14 @@ function rescue_detect_keypress() {
 		putenv("TERM=cons25");
 		echo "\n\nRecovery mode selected...\n";
 		passthru("/usr/bin/env TERM=cons25 /bin/tcsh -c /scripts/lua_installer_rescue");
-	} elseif (in_array($key, array("i", "I"))) {
+	} else {
 		putenv("TERM=cons25");
 		echo "\n\nInstaller mode selected...\n";
 		passthru("/usr/bin/env TERM=cons25 /bin/tcsh -c /scripts/lua_installer");
-		if (file_exists("/tmp/install_complete")) {
-			passthru("/etc/rc.reboot");
-			exit;
-		}
-	} else {
-		echo "\n\n";
 	}
+
+	passthru("/etc/rc.reboot");
+	exit;
 }
 
 echo " done.\n";