Hello community,
here is the log from the commit of package yast2-tune
checked in at Thu Jun 5 18:06:11 CEST 2008.
--------
--- yast2-tune/yast2-tune.changes 2008-05-16 22:03:45.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-tune/yast2-tune.changes 2008-06-05 15:01:51.817537000 +0200
@@ -1,0 +2,7 @@
+Thu Jun 5 14:47:21 CEST 2008 - lslezak@suse.cz
+
+- do not write ENABLE_SYSRQ 'nil' value (do not remove the
+ variable from sysconfig/sysctl file) (bnc#397101)
+- 2.16.2
+
+-------------------------------------------------------------------
Old:
----
yast2-tune-2.16.1.tar.bz2
New:
----
yast2-tune-2.16.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-tune.spec ++++++
--- /var/tmp/diff_new_pack.Z19545/_old 2008-06-05 18:05:30.000000000 +0200
+++ /var/tmp/diff_new_pack.Z19545/_new 2008-06-05 18:05:30.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-tune (Version 2.16.1)
+# spec file for package yast2-tune (Version 2.16.2)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,12 +12,12 @@
Name: yast2-tune
-Version: 2.16.1
-Release: 24
+Version: 2.16.2
+Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-tune-2.16.1.tar.bz2
+Source0: yast2-tune-2.16.2.tar.bz2
Prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-bootloader yast2-devtools yast2-testsuite
# hwinfo/classnames.ycp
@@ -35,7 +35,7 @@
%prep
-%setup -n yast2-tune-2.16.1
+%setup -n yast2-tune-2.16.2
%build
%{prefix}/bin/y2tool y2autoconf
@@ -74,6 +74,10 @@
/usr/share/YaST2/scrconf/*.scr
%doc %{prefix}/share/doc/packages/yast2-tune
%changelog
+* Thu Jun 05 2008 lslezak@suse.cz
+- do not write ENABLE_SYSRQ 'nil' value (do not remove the
+ variable from sysconfig/sysctl file) (bnc#397101)
+- 2.16.2
* Fri May 16 2008 jsrain@suse.cz
- added categories Settings and System into desktop file
(bnc #382778)
++++++ yast2-tune-2.16.1.tar.bz2 -> yast2-tune-2.16.2.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-tune-2.16.1/configure new/yast2-tune-2.16.2/configure
--- old/yast2-tune-2.16.1/configure 2008-05-16 22:35:17.000000000 +0200
+++ new/yast2-tune-2.16.2/configure 2008-06-05 14:52:33.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for yast2-tune 2.16.1.
+# Generated by GNU Autoconf 2.61 for yast2-tune 2.16.2.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-tune'
PACKAGE_TARNAME='yast2-tune'
-PACKAGE_VERSION='2.16.1'
-PACKAGE_STRING='yast2-tune 2.16.1'
+PACKAGE_VERSION='2.16.2'
+PACKAGE_STRING='yast2-tune 2.16.2'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1199,7 +1199,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.16.1 to adapt to many kinds of systems.
+\`configure' configures yast2-tune 2.16.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1270,7 +1270,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-tune 2.16.1:";;
+ short | recursive ) echo "Configuration of yast2-tune 2.16.2:";;
esac
cat <<\_ACEOF
@@ -1348,7 +1348,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-tune configure 2.16.1
+yast2-tune configure 2.16.2
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1362,7 +1362,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.16.1, which was
+It was created by yast2-tune $as_me 2.16.2, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2183,7 +2183,7 @@
# Define the identity of the package.
PACKAGE='yast2-tune'
- VERSION='2.16.1'
+ VERSION='2.16.2'
cat >>confdefs.h <<_ACEOF
@@ -2411,7 +2411,7 @@
-VERSION="2.16.1"
+VERSION="2.16.2"
RPMNAME="yast2-tune"
MAINTAINER="Ladislav Slezak "
@@ -3322,7 +3322,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.16.1, which was
+This file was extended by yast2-tune $as_me 2.16.2, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3365,7 +3365,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-tune config.status 2.16.1
+yast2-tune config.status 2.16.2
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-tune-2.16.1/configure.in new/yast2-tune-2.16.2/configure.in
--- old/yast2-tune-2.16.1/configure.in 2008-05-16 22:35:14.000000000 +0200
+++ new/yast2-tune-2.16.2/configure.in 2008-06-05 14:52:27.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-tune
dnl
-dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.16.8 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-tune, 2.16.1, http://bugs.opensuse.org/, yast2-tune)
+AC_INIT(yast2-tune, 2.16.2, 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.16.1"
+VERSION="2.16.2"
RPMNAME="yast2-tune"
MAINTAINER="Ladislav Slezak "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-tune-2.16.1/hwinfo/src/SystemSettings.ycp new/yast2-tune-2.16.2/hwinfo/src/SystemSettings.ycp
--- old/yast2-tune-2.16.1/hwinfo/src/SystemSettings.ycp 2007-04-19 07:53:39.000000000 +0200
+++ new/yast2-tune-2.16.2/hwinfo/src/SystemSettings.ycp 2008-06-05 14:52:17.000000000 +0200
@@ -4,7 +4,7 @@
*
* Author: Lukas Ocilka
*
- * $Id: SystemSettings.ycp 37552 2007-04-19 05:53:39Z lslezak $
+ * $Id: SystemSettings.ycp 48097 2008-06-05 12:52:16Z lslezak $
*
* This module manages the System and Kernel settings such as I/O Scheduler type,
* Serial Console, SysRq Keys...
@@ -18,7 +18,7 @@
import "Mode";
/* Internal Data */
- boolean ENABLE_SYSRQ = nil;
+ string ENABLE_SYSRQ = nil;
string elevator = nil;
/* Internal Data */
@@ -37,14 +37,17 @@
}
global define boolean Read () {
- ENABLE_SYSRQ = ((string) SCR::Read(.sysconfig.sysctl.ENABLE_SYSRQ) == "yes");
+ ENABLE_SYSRQ = (string) SCR::Read(.sysconfig.sysctl.ENABLE_SYSRQ);
y2milestone("SysRq enabled: %1", ENABLE_SYSRQ);
- boolean current_sysrq = (string)SCR::Read(.target.string, "/proc/sys/kernel/sysrq") == "1\n";
+ string current_sysrq = (string)SCR::Read(.target.string, "/proc/sys/kernel/sysrq");
+
+ // read just the first line
+ current_sysrq = splitstring(current_sysrq, "\n")[0]:"";
if (current_sysrq != ENABLE_SYSRQ)
{
- y2warning("SysRq mismatch: sysconfig value: %1, current: %2", ENABLE_SYSRQ, current_sysrq);
+ y2warning("SysRq mismatch: sysconfig value: '%1', current: '%2'", ENABLE_SYSRQ, current_sysrq);
}
/*
@@ -92,10 +95,30 @@
global boolean Activate()
{
// activate the SysRq setting
- string proc_value = (ENABLE_SYSRQ) ? "1" : "0";
- y2milestone("Activating SysRq config: %1", proc_value);
+ string proc_value = "";
- SCR::Execute(.target.bash, sformat("echo '%1' > /proc/sys/kernel/sysrq", proc_value));
+ if (ENABLE_SYSRQ == "yes")
+ {
+ proc_value = "1";
+ }
+ else if (ENABLE_SYSRQ == "no")
+ {
+ proc_value = "0";
+ }
+ else if (regexpmatch(ENABLE_SYSRQ, "^[0-9]*$"))
+ {
+ proc_value = 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));
+ }
if (elevator != nil)
{
@@ -116,9 +139,17 @@
global define boolean Write () {
// writing SysRq settings
- y2milestone("ENABLE_SYSRQ: %1", ENABLE_SYSRQ);
- SCR::Write(.sysconfig.sysctl.ENABLE_SYSRQ, (ENABLE_SYSRQ ? "yes":"no"));
- SCR::Write(.sysconfig.sysctl, nil);
+ if (ENABLE_SYSRQ == "yes" || ENABLE_SYSRQ == "no" || 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);
+ }
+ 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");
@@ -158,8 +189,8 @@
}
global define boolean GetSysRqKeysEnabled () {
- if (ENABLE_SYSRQ == true || ENABLE_SYSRQ == false)
- return ENABLE_SYSRQ;
+ if (ENABLE_SYSRQ == "yes")
+ return true;
else
return false;
}
@@ -171,12 +202,14 @@
return;
}
- if (ENABLE_SYSRQ != enable_sysrq)
+ string enable_sysrq_string = enable_sysrq ? "yes" : "no";
+
+ if (ENABLE_SYSRQ != enable_sysrq_string)
{
modified = true;
}
- ENABLE_SYSRQ = enable_sysrq;
+ ENABLE_SYSRQ = enable_sysrq_string;
y2milestone("SysRq was set to %1", ENABLE_SYSRQ);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-tune-2.16.1/VERSION new/yast2-tune-2.16.2/VERSION
--- old/yast2-tune-2.16.1/VERSION 2008-04-03 09:13:38.000000000 +0200
+++ new/yast2-tune-2.16.2/VERSION 2008-06-05 14:51:51.000000000 +0200
@@ -1 +1 @@
-2.16.1
+2.16.2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
