Remove obsolete console menu option that was a remnant of the livecd which was removed some time ago.

3 files changed, 1 insertions, 100 deletions

diff --git a/src/etc/pfSense.obsoletedfiles b/src/etc/pfSense.obsoletedfiles
index cb649d5..6e8a386 100644
--- a/src/etc/pfSense.obsoletedfiles
+++ b/src/etc/pfSense.obsoletedfiles
@@ -135,6 +135,7 @@
 /etc/rc.parse-isc-dhcpd
 /etc/rc.restore_full_backup
 /etc/rc.sendmail
+/etc/rc.initial.store_config_to_removable_device
 /etc/rrdtool.core
 /etc/ttys_wrap
 /etc/usbd.conf
diff --git a/src/etc/rc.initial b/src/etc/rc.initial
index ef90e28..e7b598a 100755
--- a/src/etc/rc.initial
+++ b/src/etc/rc.initial
@@ -78,13 +78,6 @@ else
 	sshd_option="14) Enable Secure Shell (sshd)";
 fi
 
-for i in /var/db/pfi/capable_*; do
-	if [ -f $i -a ! -L /cf/conf ]; then
-		option98="98) Move configuration file to removable device"
-		break
-	fi
-done
-
 # display a cheap menu
 echo ""
 echo " 0) Logout (SSH only)                  9) pfTop"
@@ -96,7 +89,6 @@ echo " 5) Reboot system                     ${sshd_option}"
 echo " 6) Halt system                       15) Restore recent configuration"
 echo " 7) Ping host                         16) Restart PHP-FPM"
 echo " 8) Shell"
-echo " ${option98} "
 
 echo
 read -p "Enter an option: " opmode
@@ -155,11 +147,6 @@ case ${opmode} in
 16)
 	/etc/rc.php-fpm_restart
 	;;
-98)
-	if [ ! -f /tmp/config_moved ]; then
-		/etc/rc.initial.store_config_to_removable_device
-	fi
-	;;
 100)
 	if grep "$WORD" "$CONFIG"; then
 		links "https://localhost"
diff --git a/src/etc/rc.initial.store_config_to_removable_device b/src/etc/rc.initial.store_config_to_removable_device
deleted file mode 100755
index 7f9ec24..0000000
--- a/src/etc/rc.initial.store_config_to_removable_device
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/usr/local/bin/php-cgi -f
-<?php
-/*
- * rc.initial.store_config_to_removable_device
- *
- * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate)
- * All rights reserved.
- *
- * originally part of m0n0wall (http://m0n0.ch/wall)
- * Copyright (c) 2003-2004 Manuel Kasper <mk@neon1.net>.
- * All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/* parse the configuration and include all functions used below */
-require_once("config.inc");
-require_once("functions.inc");
-require_once("util.inc");
-
-$fp = fopen('php://stdin', 'r');
-
-do {
-	$dirs = array();
-	$dirs = return_dir_as_array("/var/db/pfi/");
-	if (!is_array($dirs)) {
-		echo "\nNo capable storage devices detected.\n";
-		fclose($fp);
-		return;
-	}
-	echo "\nDevices capable of config.xml storage:\n";
-	foreach ($dirs as $dir) {
-		preg_match_all("/capable\_(.*)/", $dir, $match_array);
-		echo $match_array[1][0] . " ";
-	}
-	echo "\n\n";
-	echo "Enter the device that you wish the";
-	echo "\n";
-	echo "{$g['product_name']} configuration file to reside on: ";
-	$move_config_to_device = chop(fgets($fp));
-	if ($move_config_to_device == "") {
-		fclose($fp);
-		return 0;
-	}
-} while (!$move_config_to_device);
-
-mwexec("/bin/mkdir -p /tmp/mnt/cf");
-
-$status = mwexec("/sbin/mount -w -t msdosfs /dev/{$move_config_to_device} /tmp/mnt/cf");
-if (!$status) {
-	echo "Error while mounting {$move_config_to_device}.\n";
-	fclose($fp);
-	return;
-}
-
-echo "\n\nProcessing: ";
-$lockkey = lock('config');
-echo "moving...";
-mwexec("mkdir -p /tmp/mnt/cf/conf/");
-mwexec("/bin/mv /cf/conf/config.xml /tmp/mnt/cf/conf/");
-echo "removing old...";
-echo " nullfs... ";
-system("/sbin/umount /cf/conf");
-system("/sbin/umount /conf");
-mwexec("/bin/rm -rf /conf/*.*");
-/* use nullfs to mount */
-system("/sbin/mount_nullfs /tmp/mnt/cf/conf /conf");
-system("/sbin/mount_nullfs /tmp/mnt/cf /cf");
-echo "linking...";
-mwexec("/bin/rm -rf /var/db/pfi");
-unlock($lockkey);
-echo "done.\n";
-echo "\nYour configuration has been moved to {$move_config_to_device}\n";
-touch("/tmp/config_moved");
-fclose($fp);
-?>