Author: lslezak
Date: Tue Sep 13 13:42:38 2011
New Revision: 65687
URL: http://svn.opensuse.org/viewcvs/yast?rev=65687&view=rev
Log:
code cleanup - removed unused serial console setting
Modified:
trunk/tune/hwinfo/src/SystemSettings.ycp
trunk/tune/hwinfo/src/system_settings.ycp
trunk/tune/hwinfo/src/system_settings_dialogs.ycp
trunk/tune/hwinfo/src/system_settings_ui.ycp
Modified: trunk/tune/hwinfo/src/SystemSettings.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/tune/hwinfo/src/SystemSettings.ycp?rev=65687&r1=65686&r2=65687&view=diff
==============================================================================
--- trunk/tune/hwinfo/src/SystemSettings.ycp (original)
+++ trunk/tune/hwinfo/src/SystemSettings.ycp Tue Sep 13 13:42:38 2011
@@ -7,7 +7,7 @@
* $Id$
*
* This module manages the System and Kernel settings such as I/O Scheduler type,
- * Serial Console, SysRq Keys...
+ * SysRq Keys...
*/
{
@@ -93,8 +93,6 @@
y2milestone("Global IO scheduler: %1", elevator);
- // FIXME: probe available serial line devices
-
return true;
}
@@ -152,7 +150,6 @@
Bootloader::Write();
}
- // FIXME: write serial console...
return true;
}
@@ -200,24 +197,4 @@
y2milestone("SysRq was set to %1", ENABLE_SYSRQ);
}
- /**
- * Default settings for serial console
- */
- map default_sc_settings = $[
- "enabled" : false,
- "baud_rate" : 9600,
- "serial_device" : "/dev/ttyS0",
- ];
-
- global define map GetSerialConsoleSettings () {
- return $[
- "enabled" : true,
- "baud_rate" : 9600,
- "serial_device" : "/dev/ttyS0",
- ];
- }
-
- global define void SetSerialDeviceConsoleSettings (map settings) {
- return nil;
- }
}
Modified: trunk/tune/hwinfo/src/system_settings.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/tune/hwinfo/src/system_settings.ycp?rev=65687&r1=65686&r2=65687&view=diff
==============================================================================
--- trunk/tune/hwinfo/src/system_settings.ycp (original)
+++ trunk/tune/hwinfo/src/system_settings.ycp Tue Sep 13 13:42:38 2011
@@ -7,7 +7,7 @@
*
* $Id$
*
- * System Settings for PCI ID, I/O Scheduler, Serial Console, etc.
+ * System Settings for PCI ID, I/O Scheduler, etc.
*/
{
Modified: trunk/tune/hwinfo/src/system_settings_dialogs.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/tune/hwinfo/src/system_settings_dialogs.ycp?rev=65687&r1=65686&r2=65687&view=diff
==============================================================================
--- trunk/tune/hwinfo/src/system_settings_dialogs.ycp (original)
+++ trunk/tune/hwinfo/src/system_settings_dialogs.ycp Tue Sep 13 13:42:38 2011
@@ -48,15 +48,11 @@
`VSpacing(0.3),
`Left( "elevator" ),
`VSpacing(1),
- `Left( "sysrq" ),
-// FIXME: temporary hack - disable serial console config
-// `VSpacing(1),
-// `Left ( "serial_console" ),
- `VStretch()
+ `Left( "sysrq" )
),
`HSpacing (1)
),
- "widget_names" : ["elevator", "sysrq", "serial_console"],
+ "widget_names" : ["elevator", "sysrq"],
],
];
@@ -126,46 +122,8 @@
<tt>/usr/src/linux/Documentation/sysrq.txt</tt> (package kernel-source).</p>
")
],
- // http://www.vanemery.com/Linux/Serial/serial-console.html
- // http://www.mikrotik.com/Documentation/manual_2.7/System/Serial.html
- // http://www.camiresearch.com/Data_Com_Basics/RS232_standard.html
-
- // http://www.tldp.org/HOWTO/Remote-Serial-Console-HOWTO/configure-boot-loader-...
- // http://www.tldp.org/HOWTO/Remote-Serial-Console-HOWTO/configure-boot-loader-...
-
- /*
- * LILO:
- * serial=[,<speed>[[<data>]]]
- * syntax ::= 0 | 1| ... | 3 (/dev/tty0 -> 0)
- * console=,<speed>
- *
- * GRUB
- * serial --unit=0 --speed=<speed> --word=8 --parity=[no|even|odd] --stop=1
- * terminal --timeout=0 [--dumb] serial console / terminal serial
- */
- "serial_console" : $[
- // FIXME: serial line has to have funkcionality defined more precisely
- "widget" : `custom,
- "custom_widget" : `Frame( _("Serial Console"),
- `VBox (
- `Left( `CheckBox (_("&Enable the Serial Console"))),
- `Left( `ComboBox (`opt(`editable), _("Serial Line &Baud Rate"), [
- "110", "300", "1200", "2400", "4800", "9600", "19200", "38400", "57600", "115200"
- ])),
- `Left( `ComboBox (`opt(`editable), _("Serial &Device"), [
- "/dev/ttyS0", "/dev/ttyS1"
- ]))
- )
- ),
- "handle" : HandleSerialConsoleSettings,
- "help" : _("<p><b><big>Serial Console</big></b><br>
-help for the Serial console settings</p>"),
- ],
];
-// FIXME: temporary hack - disable serial line configuration
- widget_descr = remove(widget_descr, "serial_console");
-
define symbol SystemSettingsDialog () {
list<string> tab_order = ["kernel_settings"];
Modified: trunk/tune/hwinfo/src/system_settings_ui.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/tune/hwinfo/src/system_settings_ui.ycp?rev=65687&r1=65686&r2=65687&view=diff
==============================================================================
--- trunk/tune/hwinfo/src/system_settings_ui.ycp (original)
+++ trunk/tune/hwinfo/src/system_settings_ui.ycp Tue Sep 13 13:42:38 2011
@@ -6,7 +6,7 @@
*
* $Id$
*
- * System Settings for PCI ID, I/O Scheduler, Serial Console, etc.
+ * System Settings for PCI ID, I/O Scheduler, etc.
*/
{
@@ -147,10 +147,5 @@
}
}
- define symbol HandleSerialConsoleSettings (string key, map event) {
- y2milestone("Key: %1, Event: %2", key, event);
- return nil;
- }
-
}
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
