Retire cdrom platform support

1 files changed, 1 insertions, 47 deletions

diff --git a/src/etc/rc.bootup b/src/etc/rc.bootup
index 51b9215..134bb20 100755
--- a/src/etc/rc.bootup
+++ b/src/etc/rc.bootup
@@ -24,45 +24,6 @@
 
 require_once("pkg-utils.inc");
 
-function rescue_detect_keypress() {
-	// How long do you want the script to wait before moving on (in seconds)
-	$timeout=9;
-	echo "\n";
-	echo "[ Press R to enter recovery mode or ]\n";
-	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 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("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) {
-			break;
-		}
-	}
-	// If R or I was pressed do our logic here
-	if (in_array($key, array("r", "R"))) {
-		putenv("TERM=xterm");
-		echo "\n\nRecovery mode selected...\n";
-		passthru("/usr/bin/env TERM=xterm /bin/tcsh");
-	} else {
-		putenv("TERM=xterm");
-		echo "\n\nInstaller mode selected...\n";
-		passthru("/usr/bin/env TERM=xterm /bin/tcsh -c /scripts/lua_installer");
-	}
-
-	passthru("/etc/rc.reboot");
-	exit;
-}
-
 echo " done.\n";
 
 echo "Initializing...";
@@ -145,11 +106,6 @@ set_device_perms();
 unmute_kernel_msgs();
 echo "done.\n";
 
-// Display rescue configuration option
-if ($g['platform'] == "cdrom") {
-	rescue_detect_keypress();
-}
-
 echo "Loading configuration...";
 parse_config_bootup();
 echo "done.\n";
@@ -413,9 +369,7 @@ if (file_exists('/conf/needs_package_sync') &&
 }
 
 /* Detect installed binary pkgs that are not registered in the system */
-if ($g['platform'] != "cdrom") {
-	register_all_installed_packages();
-}
+register_all_installed_packages();
 
 /* Give syslogd a kick after everything else has been initialized, otherwise it can occasionally
    fail to route syslog messages properly on both IPv4 and IPv6 */