Hello community,
here is the log from the commit of package yast2-runlevel
checked in at Thu Oct 16 02:16:55 CEST 2008.
--------
--- yast2-runlevel/yast2-runlevel.changes 2008-10-13 14:19:55.000000000 +0200
+++ /d/STABLE/yast2-runlevel/yast2-runlevel.changes 2008-10-15 13:22:33.000000000 +0200
@@ -1,0 +2,7 @@
+Wed Oct 15 13:19:17 CEST 2008 - locilka@suse.cz
+
+- Ignoring /etc/insserv.conf entries that do not begin with '$'.
+ They are not a real dependencies (bnc #435182).
+- 2.17.3
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-runlevel-2.17.2.tar.bz2
New:
----
yast2-runlevel-2.17.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-runlevel.spec ++++++
--- /var/tmp/diff_new_pack.ym9487/_old 2008-10-16 02:16:23.000000000 +0200
+++ /var/tmp/diff_new_pack.ym9487/_new 2008-10-16 02:16:23.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-runlevel (Version 2.17.2)
+# spec file for package yast2-runlevel (Version 2.17.3)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-runlevel
-Version: 2.17.2
+Version: 2.17.3
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-runlevel-2.17.2.tar.bz2
+Source0: yast2-runlevel-2.17.3.tar.bz2
Prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite
Requires: yast2
@@ -49,7 +49,7 @@
Lukas Ocilka
%prep
-%setup -n yast2-runlevel-2.17.2
+%setup -n yast2-runlevel-2.17.3
%build
%{prefix}/bin/y2tool y2autoconf
@@ -91,6 +91,10 @@
/usr/share/YaST2/schema/autoyast/rnc/runlevels.rnc
%doc %{prefix}/share/doc/packages/yast2-runlevel
%changelog
+* Wed Oct 15 2008 locilka@suse.cz
+- Ignoring /etc/insserv.conf entries that do not begin with '$'.
+ They are not a real dependencies (bnc #435182).
+- 2.17.3
* Mon Oct 13 2008 locilka@suse.cz
- Proposing default runlevel 3 if installed via serial console
(bnc #433707)
++++++ yast2-runlevel-2.17.2.tar.bz2 -> yast2-runlevel-2.17.3.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-runlevel-2.17.2/configure new/yast2-runlevel-2.17.3/configure
--- old/yast2-runlevel-2.17.2/configure 2008-10-13 14:20:50.000000000 +0200
+++ new/yast2-runlevel-2.17.3/configure 2008-10-15 16:02:17.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-runlevel 2.17.2.
+# Generated by GNU Autoconf 2.61 for yast2-runlevel 2.17.3.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-runlevel'
PACKAGE_TARNAME='yast2-runlevel'
-PACKAGE_VERSION='2.17.2'
-PACKAGE_STRING='yast2-runlevel 2.17.2'
+PACKAGE_VERSION='2.17.3'
+PACKAGE_STRING='yast2-runlevel 2.17.3'
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-runlevel 2.17.2 to adapt to many kinds of systems.
+\`configure' configures yast2-runlevel 2.17.3 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-runlevel 2.17.2:";;
+ short | recursive ) echo "Configuration of yast2-runlevel 2.17.3:";;
esac
cat <<\_ACEOF
@@ -1348,7 +1348,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-runlevel configure 2.17.2
+yast2-runlevel configure 2.17.3
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-runlevel $as_me 2.17.2, which was
+It was created by yast2-runlevel $as_me 2.17.3, 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-runlevel'
- VERSION='2.17.2'
+ VERSION='2.17.3'
cat >>confdefs.h <<_ACEOF
@@ -2411,7 +2411,7 @@
-VERSION="2.17.2"
+VERSION="2.17.3"
RPMNAME="yast2-runlevel"
MAINTAINER="Lukas Ocilka "
@@ -3399,7 +3399,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-runlevel $as_me 2.17.2, which was
+This file was extended by yast2-runlevel $as_me 2.17.3, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3442,7 +3442,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-runlevel config.status 2.17.2
+yast2-runlevel config.status 2.17.3
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-runlevel-2.17.2/configure.in new/yast2-runlevel-2.17.3/configure.in
--- old/yast2-runlevel-2.17.2/configure.in 2008-10-13 14:20:47.000000000 +0200
+++ new/yast2-runlevel-2.17.3/configure.in 2008-10-15 16:02:10.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-runlevel, 2.17.2, http://bugs.opensuse.org/, yast2-runlevel)
+AC_INIT(yast2-runlevel, 2.17.3, http://bugs.opensuse.org/, yast2-runlevel)
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.17.2"
+VERSION="2.17.3"
RPMNAME="yast2-runlevel"
MAINTAINER="Lukas Ocilka "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-runlevel-2.17.2/src/RunlevelEd.ycp new/yast2-runlevel-2.17.3/src/RunlevelEd.ycp
--- old/yast2-runlevel-2.17.2/src/RunlevelEd.ycp 2008-07-15 17:50:26.000000000 +0200
+++ new/yast2-runlevel-2.17.3/src/RunlevelEd.ycp 2008-10-15 14:07:57.000000000 +0200
@@ -11,7 +11,7 @@
* Petr Blahos
* Martin Lazar
*
- * $Id: RunlevelEd.ycp 49116 2008-07-15 15:50:25Z locilka $
+ * $Id: RunlevelEd.ycp 52237 2008-10-15 12:07:55Z locilka $
*/
{
@@ -205,6 +205,18 @@
Progress::NextStep ();
system_requires = (map) SCR::Read (.init.insserv_conf);
+
+ // bnc #435182
+ // new key: <interactive>
+ system_requires = filter (string key, list<string> val, system_requires, {
+ if (regexpmatch (key, "\\$.+")) {
+ return true;
+ } else {
+ y2warning ("Ignoring requirement: %1", key);
+ return false;
+ }
+ });
+
Progress::NextStep ();
map details = (map) SCR::Read (.init.scripts.runlevels);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-runlevel-2.17.2/src/ui.ycp new/yast2-runlevel-2.17.3/src/ui.ycp
--- old/yast2-runlevel-2.17.2/src/ui.ycp 2008-07-10 16:30:26.000000000 +0200
+++ new/yast2-runlevel-2.17.3/src/ui.ycp 2008-10-15 14:07:57.000000000 +0200
@@ -13,7 +13,7 @@
* Petr Blahos
* Martin Lazar
*
- * $Id: ui.ycp 48971 2008-07-10 14:30:25Z locilka $
+ * $Id: ui.ycp 52237 2008-10-15 12:07:55Z locilka $
*
* Runlevel editor user interface functions.
*/
@@ -1177,6 +1177,7 @@
}
current_service = (string) UI::QueryWidget (`id (`table), `CurrentItem);
+ y2milestone ("Current service: %1", current_service);
if (`abort == ret)
{
@@ -1418,15 +1419,16 @@
}
break;
}
- else if (`table == ret)
+ else if (ret == `table)
{
service = RunlevelEd::services[current_service]:$[];
updateDescription (service);
}
else if (ret == `disable)
- { //FIXME...
- y2milestone ("%1", ret);
+ {
+ y2milestone ("Current service: %1 / %2", current_service, ret);
boolean really = true;
+
if (contains (["xdm", "earlyxdm"], current_service)) {
// yes-no popup. the user wants to stop xdm
if (!Popup::YesNo ( _("This may kill your X session.\n\nProceed?"))) {
@@ -1434,12 +1436,13 @@
really = false;
}
}
+
if (really)
SimpleSetServiceDep (current_service, false);
}
else if (`enable == ret)
- { //FIXME...
- y2milestone ("%1", ret);
+ {
+ y2milestone ("Current service: %1 / %2", current_service, ret);
SimpleSetServiceDep (current_service, true);
}
}
@@ -1447,7 +1450,7 @@
return (symbol) ret;
}
-
+
// Autoyast UI
/**
* Help text for auto-complex-screen
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-runlevel-2.17.2/VERSION new/yast2-runlevel-2.17.3/VERSION
--- old/yast2-runlevel-2.17.2/VERSION 2008-10-13 14:18:13.000000000 +0200
+++ new/yast2-runlevel-2.17.3/VERSION 2008-10-15 13:19:12.000000000 +0200
@@ -1 +1 @@
-2.17.2
+2.17.3
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org