From bea2dd6d5fd711653565ec212d0dd62a44b7f043 Mon Sep 17 00:00:00 2001 From: jim-p Date: Fri, 22 Jan 2016 11:59:33 -0500 Subject: Only the serial enable/disable and primary console selectors should be hidden for this test, the serial speed selector must still be available. --- src/usr/local/www/system_advanced_admin.php | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'src/usr/local/www') diff --git a/src/usr/local/www/system_advanced_admin.php b/src/usr/local/www/system_advanced_admin.php index 73f981f..8087224 100644 --- a/src/usr/local/www/system_advanced_admin.php +++ b/src/usr/local/www/system_advanced_admin.php @@ -508,10 +508,10 @@ $section->addInput(new Form_Input( ))->setHelp('Note: Leave this blank for the default of 22.'); -if (!$g['enableserial_force'] && ($g['platform'] == $g['product_name'] || $g['platform'] == "cdrom")) { - $form->add($section); - $section = new Form_Section('Serial Communications'); +$form->add($section); +$section = new Form_Section('Serial Communications'); +if (!$g['enableserial_force'] && ($g['platform'] == $g['product_name'] || $g['platform'] == "cdrom")) { $section->addInput(new Form_Checkbox( 'enableserial', 'Serial Terminal', @@ -521,14 +521,16 @@ if (!$g['enableserial_force'] && ($g['platform'] == $g['product_name'] || $g['pl 'the serial port. You can still access the console menu from the internal video '. 'card/keyboard. A null modem serial cable or adapter is required to use the '. 'serial console.'); +} - $section->addInput(new Form_Select( - 'serialspeed', - 'Serial Speed', - $pconfig['serialspeed'], - array_combine(array(115200, 57600, 38400, 19200, 14400, 9600), array(115200, 57600, 38400, 19200, 14400, 9600)) - ))->setHelp('Allows selection of different speeds for the serial console port.'); +$section->addInput(new Form_Select( + 'serialspeed', + 'Serial Speed', + $pconfig['serialspeed'], + array_combine(array(115200, 57600, 38400, 19200, 14400, 9600), array(115200, 57600, 38400, 19200, 14400, 9600)) +))->setHelp('Allows selection of different speeds for the serial console port.'); +if (!$g['enableserial_force'] && ($g['platform'] == $g['product_name'] || $g['platform'] == "cdrom")) { $section->addInput(new Form_Select( 'primaryconsole', 'Primary Console', -- cgit v1.1