Hello community,
here is the log from the commit of package yast2-tune for openSUSE:Factory
checked in at Thu Sep 15 14:19:12 CEST 2011.
--------
--- yast2-tune/yast2-tune.changes 2011-08-08 14:10:08.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-tune/yast2-tune.changes 2011-09-13
13:46:22.000000000 +0200
@@ -1,0 +2,7 @@
+Tue Sep 13 11:27:41 UTC 2011 - lsle...@suse.cz
+
+- read SYSRQ setting from /etc/sysctl.conf instead of obsoleted
+ /etc/sysconfig/sysctl file (bnc#714406)
+- 2.21.1
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-tune-2.21.0.tar.bz2
New:
----
yast2-tune-2.21.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-tune.spec ++++++
--- /var/tmp/diff_new_pack.k7i85S/_old 2011-09-15 14:19:06.000000000 +0200
+++ /var/tmp/diff_new_pack.k7i85S/_new 2011-09-15 14:19:06.000000000 +0200
@@ -19,11 +19,11 @@
Name: yast2-tune
-Version: 2.21.0
+Version: 2.21.1
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-tune-2.21.0.tar.bz2
+Source0: yast2-tune-2.21.1.tar.bz2
Prefix: /usr
@@ -45,7 +45,7 @@
This package contains the YaST2 component for hardware configuration.
%prep
-%setup -n yast2-tune-2.21.0
+%setup -n yast2-tune-2.21.1
%build
%{prefix}/bin/y2tool y2autoconf
@@ -95,4 +95,5 @@
/usr/share/YaST2/modules/*.ybc
/usr/share/YaST2/scrconf/*.scr
%doc %{prefix}/share/doc/packages/yast2-tune
+
%changelog
++++++ yast2-tune-2.21.0.tar.bz2 -> yast2-tune-2.21.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-tune-2.21.0/VERSION
new/yast2-tune-2.21.1/VERSION
--- old/yast2-tune-2.21.0/VERSION 2011-08-08 14:00:46.000000000 +0200
+++ new/yast2-tune-2.21.1/VERSION 2011-09-13 13:42:20.000000000 +0200
@@ -1 +1 @@
-2.21.0
+2.21.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-tune-2.21.0/configure
new/yast2-tune-2.21.1/configure
--- old/yast2-tune-2.21.0/configure 2011-08-08 14:09:47.000000000 +0200
+++ new/yast2-tune-2.21.1/configure 2011-09-13 13:43:51.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for yast2-tune 2.21.0.
+# Generated by GNU Autoconf 2.68 for yast2-tune 2.21.1.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -559,8 +559,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-tune'
PACKAGE_TARNAME='yast2-tune'
-PACKAGE_VERSION='2.21.0'
-PACKAGE_STRING='yast2-tune 2.21.0'
+PACKAGE_VERSION='2.21.1'
+PACKAGE_STRING='yast2-tune 2.21.1'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
PACKAGE_URL=''
@@ -1231,7 +1231,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-tune 2.21.0 to adapt to many kinds of systems.
+\`configure' configures yast2-tune 2.21.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1302,7 +1302,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-tune 2.21.0:";;
+ short | recursive ) echo "Configuration of yast2-tune 2.21.1:";;
esac
cat <<\_ACEOF
@@ -1382,7 +1382,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-tune configure 2.21.0
+yast2-tune configure 2.21.1
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1399,7 +1399,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-tune $as_me 2.21.0, which was
+It was created by yast2-tune $as_me 2.21.1, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2329,7 +2329,7 @@
# Define the identity of the package.
PACKAGE='yast2-tune'
- VERSION='2.21.0'
+ VERSION='2.21.1'
cat >>confdefs.h <<_ACEOF
@@ -2451,7 +2451,7 @@
-VERSION="2.21.0"
+VERSION="2.21.1"
RPMNAME="yast2-tune"
MAINTAINER="Ladislav Slezak <lsle...@suse.cz>"
@@ -3394,7 +3394,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-tune $as_me 2.21.0, which was
+This file was extended by yast2-tune $as_me 2.21.1, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3447,7 +3447,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-yast2-tune config.status 2.21.0
+yast2-tune config.status 2.21.1
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-tune-2.21.0/configure.in
new/yast2-tune-2.21.1/configure.in
--- old/yast2-tune-2.21.0/configure.in 2011-08-08 14:09:45.000000000 +0200
+++ new/yast2-tune-2.21.1/configure.in 2011-09-13 13:43:49.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-tune, 2.21.0, http://bugs.opensuse.org/, yast2-tune)
+AC_INIT(yast2-tune, 2.21.1, http://bugs.opensuse.org/, yast2-tune)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.21.0"
+VERSION="2.21.1"
RPMNAME="yast2-tune"
MAINTAINER="Ladislav Slezak <lsle...@suse.cz>"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-tune-2.21.0/hwinfo/src/SystemSettings.ycp
new/yast2-tune-2.21.1/hwinfo/src/SystemSettings.ycp
--- old/yast2-tune-2.21.0/hwinfo/src/SystemSettings.ycp 2008-10-03
13:06:10.000000000 +0200
+++ new/yast2-tune-2.21.1/hwinfo/src/SystemSettings.ycp 2011-09-13
13:42:03.000000000 +0200
@@ -4,10 +4,10 @@
*
* Author: Lukas Ocilka <loci...@suse.cz>
*
- * $Id: SystemSettings.ycp 51831 2008-10-03 11:06:09Z lslezak $
+ * $Id: SystemSettings.ycp 65687 2011-09-13 11:42:38Z lslezak $
*
* This module manages the System and Kernel settings such as I/O Scheduler
type,
- * Serial Console, SysRq Keys...
+ * SysRq Keys...
*/
{
@@ -27,7 +27,7 @@
global list<string> GetPossibleElevatorValues () {
// here are listed all known values of the 'elevator' variable
- return ["cfq","as","noop","deadline"];
+ return ["cfq","noop","deadline"];
}
global boolean Modified()
@@ -37,7 +37,7 @@
}
global define boolean Read () {
- ENABLE_SYSRQ = (string) SCR::Read(.sysconfig.sysctl.ENABLE_SYSRQ);
+ ENABLE_SYSRQ = (string) SCR::Read(.etc.sysctl_conf."kernel.sysrq");
y2milestone("SysRq enabled: %1", ENABLE_SYSRQ);
string current_sysrq = (string)SCR::Read(.target.string,
"/proc/sys/kernel/sysrq");
@@ -45,11 +45,17 @@
// read just the first line
current_sysrq = splitstring(current_sysrq, "\n")[0]:"";
- if (current_sysrq != ENABLE_SYSRQ)
+ if (ENABLE_SYSRQ != nil && current_sysrq != ENABLE_SYSRQ)
{
y2warning("SysRq mismatch: sysconfig value: '%1', current: '%2'",
ENABLE_SYSRQ, current_sysrq);
}
+ // display the current value if it not configured
+ if (ENABLE_SYSRQ == nil)
+ {
+ ENABLE_SYSRQ = current_sysrq;
+ }
+
/*
* I have to admit that this is very ugly but it is here
* to avoid of the very long starting time of the yast module
@@ -87,37 +93,19 @@
y2milestone("Global IO scheduler: %1", elevator);
- // FIXME: probe available serial line devices
-
return true;
}
global boolean Activate()
{
- // activate the SysRq setting
- string proc_value = "";
-
- if (ENABLE_SYSRQ == "yes")
- {
- proc_value = "1";
- }
- else if (ENABLE_SYSRQ == "no")
- {
- proc_value = "0";
- }
- else if (regexpmatch(ENABLE_SYSRQ, "^[0-9]*$"))
+ if (ENABLE_SYSRQ != nil && regexpmatch(ENABLE_SYSRQ, "^[0-9]+$"))
{
- proc_value = ENABLE_SYSRQ;
+ y2milestone("Activating SysRq config: %1", ENABLE_SYSRQ);
+ SCR::Execute(.target.bash, sformat("echo '%1' >
/proc/sys/kernel/sysrq", ENABLE_SYSRQ));
}
else
{
- y2warning("Unknown ENABLE_SYSRQ value: %1, not activating",
ENABLE_SYSRQ);
- }
-
- if (proc_value != "")
- {
- y2milestone("Activating SysRq config: %1", proc_value);
- SCR::Execute(.target.bash, sformat("echo '%1' >
/proc/sys/kernel/sysrq", proc_value));
+ y2warning("Not activating invalid ENABLE_SYSRQ value: %1",
ENABLE_SYSRQ);
}
if (elevator != nil)
@@ -139,20 +127,20 @@
global define boolean Write () {
// writing SysRq settings
- if (ENABLE_SYSRQ != nil && (ENABLE_SYSRQ == "yes" || ENABLE_SYSRQ ==
"no" || regexpmatch(ENABLE_SYSRQ, "^[0-9]*$")))
+ if (ENABLE_SYSRQ != nil && regexpmatch(ENABLE_SYSRQ, "^[0-9]+$"))
{
// save the SysRq setting
y2milestone("Saving ENABLE_SYSRQ: %1", ENABLE_SYSRQ);
- SCR::Write(.sysconfig.sysctl.ENABLE_SYSRQ, ENABLE_SYSRQ);
- SCR::Write(.sysconfig.sysctl, nil);
+ SCR::Write(.etc.sysctl_conf."kernel.sysrq", ENABLE_SYSRQ);
+ SCR::Write(.etc.sysctl_conf, nil);
}
else
{
y2warning("Not writing invalid ENABLE_SYSRQ value: %1",
ENABLE_SYSRQ);
}
- // enable boot.proc service which sets the value after boot
- Service::Enable("boot.proc");
+ // enable boot.sysctl service which sets the value after boot
+ Service::Enable("boot.sysctl");
// the bootloader configuration is written at the end of the first stage
if (Mode::normal())
@@ -162,7 +150,6 @@
Bootloader::Write();
}
- // FIXME: write serial console...
return true;
}
@@ -189,20 +176,17 @@
}
global define boolean GetSysRqKeysEnabled () {
- if (ENABLE_SYSRQ == "yes")
- return true;
- else
- return false;
+ return (ENABLE_SYSRQ != nil && ENABLE_SYSRQ != "0");
}
global define void SetSysRqKeysEnabled (boolean enable_sysrq) {
- if (enable_sysrq != true && enable_sysrq != false)
+ if (enable_sysrq == nil)
{
y2warning("enable_sysrq should be 'true' or 'false'");
return;
}
- string enable_sysrq_string = enable_sysrq ? "yes" : "no";
+ string enable_sysrq_string = enable_sysrq ? "1" : "0";
if (ENABLE_SYSRQ != enable_sysrq_string)
{
@@ -213,24 +197,4 @@
y2milestone("SysRq was set to %1", ENABLE_SYSRQ);
}
- /**
- * Default settings for serial console
- */
- map <string, any> default_sc_settings = $[
- "enabled" : false,
- "baud_rate" : 9600,
- "serial_device" : "/dev/ttyS0",
- ];
-
- global define map <string, any> GetSerialConsoleSettings () {
- return $[
- "enabled" : true,
- "baud_rate" : 9600,
- "serial_device" : "/dev/ttyS0",
- ];
- }
-
- global define void SetSerialDeviceConsoleSettings (map <string, any>
settings) {
- return nil;
- }
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-tune-2.21.0/hwinfo/src/system_settings.ycp
new/yast2-tune-2.21.1/hwinfo/src/system_settings.ycp
--- old/yast2-tune-2.21.0/hwinfo/src/system_settings.ycp 2007-05-18
12:48:38.000000000 +0200
+++ new/yast2-tune-2.21.1/hwinfo/src/system_settings.ycp 2011-09-13
13:42:03.000000000 +0200
@@ -5,9 +5,9 @@
* Author: Lukas Ocilka <loci...@suse.cz>
* Ladislav Slezak <lsle...@suse.cz>
*
- * $Id: system_settings.ycp 27936 2006-02-13 20:01:14Z olh $
+ * $Id: system_settings.ycp 65687 2011-09-13 11:42:38Z lslezak $
*
- * System Settings for PCI ID, I/O Scheduler, Serial Console, etc.
+ * System Settings for PCI ID, I/O Scheduler, etc.
*/
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-tune-2.21.0/hwinfo/src/system_settings_dialogs.ycp
new/yast2-tune-2.21.1/hwinfo/src/system_settings_dialogs.ycp
--- old/yast2-tune-2.21.0/hwinfo/src/system_settings_dialogs.ycp
2011-01-25 10:34:23.000000000 +0100
+++ new/yast2-tune-2.21.1/hwinfo/src/system_settings_dialogs.ycp
2011-09-13 13:42:03.000000000 +0200
@@ -9,7 +9,7 @@
* Authors:
* Lukas Ocilka <loci...@suse.cz>
*
- * $Id: system_settings_dialogs.ycp 63263 2011-01-25 09:34:22Z lslezak $
+ * $Id: system_settings_dialogs.ycp 65687 2011-09-13 11:42:38Z lslezak $
*
*/
@@ -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-lilo.html
- //
http://www.tldp.org/HOWTO/Remote-Serial-Console-HOWTO/configure-boot-loader-grub.html
-
- /*
- * LILO:
- * serial=<serial_port>[,<speed>[<parity n|e|o>[<data>]]]
- * syntax <serial_port> ::= 0 | 1| ... | 3 (/dev/tty0 -> 0)
- * console=<serial device (ttyS0)>,<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"];
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-tune-2.21.0/hwinfo/src/system_settings_ui.ycp
new/yast2-tune-2.21.1/hwinfo/src/system_settings_ui.ycp
--- old/yast2-tune-2.21.0/hwinfo/src/system_settings_ui.ycp 2008-10-06
18:14:04.000000000 +0200
+++ new/yast2-tune-2.21.1/hwinfo/src/system_settings_ui.ycp 2011-09-13
13:42:03.000000000 +0200
@@ -4,9 +4,9 @@
*
* Author: Lukas Ocilka <loci...@suse.cz>
*
- * $Id: system_settings_ui.ycp 40702 2007-09-03 12:18:32Z locilka $
+ * $Id: system_settings_ui.ycp 65687 2011-09-13 11:42:38Z lslezak $
*
- * 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;
- }
-
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
