summaryrefslogtreecommitdiffstats
path: root/usr
diff options
context:
space:
mode:
authorErmal <eri@pfsense.org>2014-04-14 08:09:19 +0000
committerErmal <eri@pfsense.org>2014-04-14 08:09:19 +0000
commitf03ed3505dbd11cf0196b87fe9234b1c3d858fd4 (patch)
tree2021f208dd06cfb57a2a4258721a0e8075a30448 /usr
parentbb8f3ce11564041abd8db4fc21c87afa5c27bce9 (diff)
downloadpfsense-f03ed3505dbd11cf0196b87fe9234b1c3d858fd4.zip
pfsense-f03ed3505dbd11cf0196b87fe9234b1c3d858fd4.tar.gz
Nowdays there is no real difference between the kernels apart the ZFS support. So do not keep a distinction anymore
Diffstat (limited to 'usr')
-rw-r--r--usr/local/www/system_firmware.php24
1 files changed, 1 insertions, 23 deletions
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 />
OpenPOWER on IntegriCloud