diff options
-rwxr-xr-x | etc/rc.initial.firmware_update | 29 | ||||
-rw-r--r-- | usr/local/www/system_firmware.php | 24 |
2 files changed, 1 insertions, 52 deletions
diff --git a/etc/rc.initial.firmware_update b/etc/rc.initial.firmware_update index fef4296..6011622 100755 --- a/etc/rc.initial.firmware_update +++ b/etc/rc.initial.firmware_update @@ -143,34 +143,6 @@ switch ($command) { } } -function check_for_kernel_file() { - global $fp; - $platform = file_get_contents("/etc/platform"); - $platform = str_replace("\n", "", $platform); - $platform = str_replace("\r", "", $platform); - if($platform == "embedded" or $platform == "wrap" or $platform == "nanobsd") { - exec("echo wrap > /boot/kernel/pfsense_kernel.txt"); - echo "\n"; - return; - } - if(!file_exists("/boot/kernel/pfsense_kernel.txt")) { - echo "\nPlease select which kernel you would like to use:\n"; - echo "\n1. Standard Kernel"; - echo "\n2. Embedded kernel (no video or keyboard)"; - echo "\nPlease enter a number [1-2]: "; - $selection = strtoupper(chop(fgets($fp))); - switch ($selection) { - case "1": - exec("echo SMP > /boot/kernel/pfsense_kernel.txt"); - break; - case "2": - exec("echo wrap > /boot/kernel/pfsense_kernel.txt"); - break; - } - echo "\n"; - } -} - function do_upgrade($path, $type) { global $g, $fp; @@ -198,7 +170,6 @@ function do_upgrade($path, $type) { } } mark_subsystem_dirty('firmwarelock'); - check_for_kernel_file(); echo "\nOne moment please...\nInvoking firmware upgrade..."; if($type == "bdiff") mwexec_bg("/etc/rc.firmware delta_update $path"); diff --git a/usr/local/www/system_firmware.php b/usr/local/www/system_firmware.php index 65b556d..37fdf93 100644 --- a/usr/local/www/system_firmware.php +++ b/usr/local/www/system_firmware.php @@ -48,16 +48,10 @@ $nocsrf = true; require_once("globals.inc"); require_once("functions.inc"); require_once("guiconfig.inc"); +require_once("xmlrpc_client.inc"); $curcfg = $config['system']['firmware']; -$kerneltypes = array( - 'SMP' => gettext("Standard Kernel"), - 'wrap' => gettext("Embedded Kernel"), -); - -require_once("xmlrpc_client.inc"); - /* Allow additional execution time 0 = no limit. */ ini_set('max_execution_time', '9999'); ini_set('max_input_time', '9999'); @@ -121,9 +115,6 @@ if(is_subsystem_dirty('firmwarelock')) { if($_POST['backupbeforeupgrade']) touch("/tmp/perform_full_backup.txt"); -if ($_POST['kerneltype'] && in_array($_POST['kerneltype'], array_keys($kerneltypes))) - file_put_contents("/boot/kernel/pfsense_kernel.txt", $_POST['kerneltype']); - /* Handle manual upgrade */ if ($_POST && !is_subsystem_dirty('firmwarelock')) { @@ -286,19 +277,6 @@ if(stristr($_FILES['ulfile']['name'],"nanobsd")) <strong><?=gettext("Firmware image file ($type):");?> </strong> <input name="ulfile" type="file" class="formfld" /> <br /> - <?php - if(!file_exists("/boot/kernel/pfsense_kernel.txt")) { - if($g['platform'] == "pfSense") { - echo gettext("Please select kernel type") , ": "; - echo "<select name='kerneltype'>"; - foreach($kerneltypes as $kerntype => $kerndescr) { - echo "<option value='{$kerntype}'>{$kerndescr}</option>"; - } - echo "</select>"; - echo "<br />"; - } - } - ?> <?php if ($g['hidebackupbeforeupgrade'] === false): ?> <input type="checkbox" name='backupbeforeupgrade' id='backupbeforeupgrade' /> <?=gettext("Perform full backup prior to upgrade");?> <br /> |