Hello community,
here is the log from the commit of package yast2-tune
checked in at Fri Apr 20 01:18:56 CEST 2007.
--------
--- yast2-tune/yast2-tune.changes 2007-03-23 13:34:53.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-tune/yast2-tune.changes 2007-04-19 08:05:18.362851000 +0200
@@ -1,0 +2,8 @@
+Wed Apr 18 17:14:37 CEST 2007 - lslezak@suse.cz
+
+- properly remove 'elevator' option from the bootloader config
+ when IO scheduler is set to 'not configured', do not write
+ bootloader config if there is no change (#261551)
+- 2.15.4
+
+-------------------------------------------------------------------
Old:
----
yast2-tune-2.15.3.tar.bz2
New:
----
yast2-tune-2.15.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-tune.spec ++++++
--- /var/tmp/diff_new_pack.L19584/_old 2007-04-20 01:18:43.000000000 +0200
+++ /var/tmp/diff_new_pack.L19584/_new 2007-04-20 01:18:43.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-tune (Version 2.15.3)
+# spec file for package yast2-tune (Version 2.15.4)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-tune
-Version: 2.15.3
+Version: 2.15.4
Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-tune-2.15.3.tar.bz2
+Source0: yast2-tune-2.15.4.tar.bz2
prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-bootloader yast2-devtools yast2-testsuite
# hwinfo/classnames.ycp
@@ -34,7 +34,7 @@
%prep
-%setup -n yast2-tune-2.15.3
+%setup -n yast2-tune-2.15.4
%build
%{prefix}/bin/y2tool y2autoconf
@@ -74,6 +74,11 @@
%doc %{prefix}/share/doc/packages/yast2-tune
%changelog
+* Wed Apr 18 2007 - lslezak@suse.cz
+- properly remove 'elevator' option from the bootloader config
+ when IO scheduler is set to 'not configured', do not write
+ bootloader config if there is no change (#261551)
+- 2.15.4
* Fri Mar 23 2007 - lslezak@suse.cz
- fixed version dependency in .spec
- 2.15.3
++++++ yast2-tune-2.15.3.tar.bz2 -> yast2-tune-2.15.4.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-tune-2.15.3/configure new/yast2-tune-2.15.4/configure
--- old/yast2-tune-2.15.3/configure 2007-03-23 13:28:56.000000000 +0100
+++ new/yast2-tune-2.15.4/configure 2007-04-19 07:54:21.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60 for yast2-tune 2.15.3.
+# Generated by GNU Autoconf 2.60 for yast2-tune 2.15.4.
#
# 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.15.3'
-PACKAGE_STRING='yast2-tune 2.15.3'
+PACKAGE_VERSION='2.15.4'
+PACKAGE_STRING='yast2-tune 2.15.4'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1183,7 +1183,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.15.3 to adapt to many kinds of systems.
+\`configure' configures yast2-tune 2.15.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1254,7 +1254,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-tune 2.15.3:";;
+ short | recursive ) echo "Configuration of yast2-tune 2.15.4:";;
esac
cat <<\_ACEOF
@@ -1332,7 +1332,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-tune configure 2.15.3
+yast2-tune configure 2.15.4
generated by GNU Autoconf 2.60
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1346,7 +1346,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.15.3, which was
+It was created by yast2-tune $as_me 2.15.4, which was
generated by GNU Autoconf 2.60. Invocation command line was
$ $0 $@
@@ -2147,7 +2147,7 @@
# Define the identity of the package.
PACKAGE='yast2-tune'
- VERSION='2.15.3'
+ VERSION='2.15.4'
cat >>confdefs.h <<_ACEOF
@@ -2374,7 +2374,7 @@
-VERSION="2.15.3"
+VERSION="2.15.4"
RPMNAME="yast2-tune"
MAINTAINER="Ladislav Slezak "
@@ -3278,7 +3278,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.15.3, which was
+This file was extended by yast2-tune $as_me 2.15.4, which was
generated by GNU Autoconf 2.60. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3321,7 +3321,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-tune config.status 2.15.3
+yast2-tune config.status 2.15.4
configured by $0, generated by GNU Autoconf 2.60,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-tune-2.15.3/configure.in new/yast2-tune-2.15.4/configure.in
--- old/yast2-tune-2.15.3/configure.in 2007-03-23 13:28:51.000000000 +0100
+++ new/yast2-tune-2.15.4/configure.in 2007-04-19 07:54:14.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-tune, 2.15.3, http://bugs.opensuse.org/, yast2-tune)
+AC_INIT(yast2-tune, 2.15.4, http://bugs.opensuse.org/, yast2-tune)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.15.3"
+VERSION="2.15.4"
RPMNAME="yast2-tune"
MAINTAINER="Ladislav Slezak "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-tune-2.15.3/hwinfo/src/system_settings_ui.ycp new/yast2-tune-2.15.4/hwinfo/src/system_settings_ui.ycp
--- old/yast2-tune-2.15.3/hwinfo/src/system_settings_ui.ycp 2006-10-20 13:08:29.000000000 +0200
+++ new/yast2-tune-2.15.4/hwinfo/src/system_settings_ui.ycp 2007-04-19 07:53:41.000000000 +0200
@@ -4,7 +4,7 @@
*
* Author: Lukas Ocilka
*
- * $Id: system_settings_ui.ycp 33530 2006-10-20 11:08:26Z lslezak $
+ * $Id: system_settings_ui.ycp 37552 2007-04-19 05:53:39Z lslezak $
*
* System Settings for PCI ID, I/O Scheduler, Serial Console, etc.
*/
@@ -91,11 +91,18 @@
Progress::NextStage();
progress_orig = Progress::set(false);
- // activate the current configuration
- SystemSettings::Activate();
+ if (SystemSettings::Modified())
+ {
+ // activate the current configuration
+ SystemSettings::Activate();
- // save the configuration
- SystemSettings::Write();
+ // save the configuration
+ SystemSettings::Write();
+ }
+ else
+ {
+ y2milestone("SystemSettings:: have not been modified");
+ }
Progress::set(progress_orig);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-tune-2.15.3/hwinfo/src/SystemSettings.ycp new/yast2-tune-2.15.4/hwinfo/src/SystemSettings.ycp
--- old/yast2-tune-2.15.3/hwinfo/src/SystemSettings.ycp 2006-10-20 14:58:28.000000000 +0200
+++ new/yast2-tune-2.15.4/hwinfo/src/SystemSettings.ycp 2007-04-19 07:53:41.000000000 +0200
@@ -4,7 +4,7 @@
*
* Author: Lukas Ocilka
*
- * $Id: SystemSettings.ycp 33530 2006-10-20 11:08:26Z lslezak $
+ * $Id: SystemSettings.ycp 37552 2007-04-19 05:53:39Z lslezak $
*
* This module manages the System and Kernel settings such as I/O Scheduler type,
* Serial Console, SysRq Keys...
@@ -23,11 +23,19 @@
string elevator = nil;
/* Internal Data */
+ boolean modified = false;
+
global list<string> GetPossibleElevatorValues () {
// here are listed all known values of the 'elevator' variable
return ["cfq","as","noop","deadline"];
}
+ global boolean Modified()
+ {
+ y2milestone("Modified: %1", modified);
+ return modified;
+ }
+
global define boolean Read () {
ENABLE_SYSRQ = ((string) SCR::Read(.sysconfig.sysctl.ENABLE_SYSRQ) == "yes");
y2milestone("SysRq enabled: %1", ENABLE_SYSRQ);
@@ -92,12 +100,11 @@
if (elevator != nil)
{
import "Bootloader";
-// FIXME: setting nil value doesn't remove the option
-// string new_elevator = (elevator == "") ? nil : elevator;
+ string new_elevator = (elevator == "") ? "false" : elevator;
- y2internal("Activating scheduler: %1", /*FIXME: new_*/elevator);
+ y2milestone("Activating scheduler: %1", new_elevator);
// set the scheduler
- Bootloader::setKernelParam(Bootloader::getDefaultSection(), "elevator", /*FIXME: new_*/elevator);
+ Bootloader::setKernelParam(Bootloader::getDefaultSection(), "elevator", new_elevator);
// TODO FIXME: set the scheduler for all disk devices,
// reboot is required to activate the new scheduler now
@@ -137,6 +144,11 @@
// empty string = use the default scheduler
if (contains(GetPossibleElevatorValues(), io_scheduler) || io_scheduler == "")
{
+ if (elevator != io_scheduler)
+ {
+ modified = true;
+ }
+
elevator = io_scheduler;
}
else
@@ -154,7 +166,16 @@
global define void SetSysRqKeysEnabled (boolean enable_sysrq) {
if (enable_sysrq != true && enable_sysrq != false)
+ {
y2warning("enable_sysrq should be 'true' or 'false'");
+ return;
+ }
+
+ if (ENABLE_SYSRQ != enable_sysrq)
+ {
+ modified = true;
+ }
+
ENABLE_SYSRQ = enable_sysrq;
y2milestone("SysRq was set to %1", ENABLE_SYSRQ);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-tune-2.15.3/VERSION new/yast2-tune-2.15.4/VERSION
--- old/yast2-tune-2.15.3/VERSION 2007-03-23 13:26:55.000000000 +0100
+++ new/yast2-tune-2.15.4/VERSION 2007-04-19 07:50:04.000000000 +0200
@@ -1 +1 @@
-2.15.3
+2.15.4
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org