Hello community,
here is the log from the commit of package yast2-runlevel
checked in at Fri Jul 11 14:28:33 CEST 2008.
--------
--- yast2-runlevel/yast2-runlevel.changes 2008-05-16 21:58:58.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-runlevel/yast2-runlevel.changes 2008-07-10 16:34:04.000000000 +0200
@@ -1,0 +2,15 @@
+Thu Jul 10 16:28:52 CEST 2008 - locilka@suse.cz
+
+- Adding runlevel 4 as another possible runlevel to select: both
+ on a running system and during installation (FATE #303798).
+- Adapted testsuites.
+- 2.17.0
+
+-------------------------------------------------------------------
+Thu Jun 12 10:53:00 CEST 2008 - locilka@suse.cz
+
+- [Cancel] [Back] [Finish] (bnc #398502)
+- Special treatment for special service restart: xdm and earlyxdm
+ (bnc #399608)
+
+-------------------------------------------------------------------
Old:
----
yast2-runlevel-2.16.5.tar.bz2
New:
----
yast2-runlevel-2.17.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-runlevel.spec ++++++
--- /var/tmp/diff_new_pack.t24596/_old 2008-07-11 14:28:26.000000000 +0200
+++ /var/tmp/diff_new_pack.t24596/_new 2008-07-11 14:28:26.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-runlevel (Version 2.16.5)
+# spec file for package yast2-runlevel (Version 2.17.0)
#
# 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-runlevel
-Version: 2.16.5
-Release: 8
+Version: 2.17.0
+Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-runlevel-2.16.5.tar.bz2
+Source0: yast2-runlevel-2.17.0.tar.bz2
Prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite
Requires: yast2
@@ -42,7 +42,7 @@
Lukas Ocilka
%prep
-%setup -n yast2-runlevel-2.16.5
+%setup -n yast2-runlevel-2.17.0
%build
%{prefix}/bin/y2tool y2autoconf
@@ -84,6 +84,15 @@
/usr/share/YaST2/schema/autoyast/rnc/runlevels.rnc
%doc %{prefix}/share/doc/packages/yast2-runlevel
%changelog
+* Thu Jul 10 2008 locilka@suse.cz
+- Adding runlevel 4 as another possible runlevel to select: both
+ on a running system and during installation (FATE #303798).
+- Adapted testsuites.
+- 2.17.0
+* Thu Jun 12 2008 locilka@suse.cz
+- [Cancel] [Back] [Finish] (bnc #398502)
+- Special treatment for special service restart: xdm and earlyxdm
+ (bnc #399608)
* Fri May 16 2008 jsrain@suse.cz
- added categories Settings and System into desktop file
(bnc #382778)
++++++ yast2-runlevel-2.16.5.tar.bz2 -> yast2-runlevel-2.17.0.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-runlevel-2.16.5/src/runlevel_auto.ycp new/yast2-runlevel-2.17.0/src/runlevel_auto.ycp
--- old/yast2-runlevel-2.16.5/src/runlevel_auto.ycp 2005-05-09 09:15:56.000000000 +0200
+++ new/yast2-runlevel-2.17.0/src/runlevel_auto.ycp 2008-07-10 16:30:26.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Client for autoinstallation
* Authors: nashif@suse.de
*
- * $Id: runlevel_auto.ycp 23327 2005-05-09 07:15:56Z mlazar $
+ * $Id: runlevel_auto.ycp 48971 2008-07-10 14:30:25Z locilka $
*
* This is a client for autoinstallation. It takes its arguments,
* goes through the configuration and return the setting.
@@ -73,7 +73,7 @@
RunlevelEd::runlevels = (list<string>) SCR::Read (.init.scripts.runlevel_list);
if (0 == size (RunlevelEd::runlevels))
{
- RunlevelEd::runlevels = ["0", "1", "2", "3", "5", "6", "S", ];
+ RunlevelEd::runlevels = ["0", "1", "2", "3", "4", "5", "6", "S", ];
}
//..
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-runlevel-2.16.5/src/RunlevelEd.ycp new/yast2-runlevel-2.17.0/src/RunlevelEd.ycp
--- old/yast2-runlevel-2.16.5/src/RunlevelEd.ycp 2006-10-10 11:39:23.000000000 +0200
+++ new/yast2-runlevel-2.17.0/src/RunlevelEd.ycp 2008-07-10 16:30:26.000000000 +0200
@@ -11,7 +11,7 @@
* Petr Blahos
* Martin Lazar
*
- * $Id: RunlevelEd.ycp 33299 2006-10-10 09:39:23Z locilka $
+ * $Id: RunlevelEd.ycp 48971 2008-07-10 14:30:25Z locilka $
*/
{
@@ -152,8 +152,14 @@
runlevels= (list<string>) SCR::Read (.init.scripts.runlevel_list);
if (0 == size (runlevels))
{
- runlevels = ["0", "1", "2", "3", "5", "6", "S", ];
+ runlevels = ["0", "1", "2", "3", "4", "5", "6", "S", ];
}
+
+ if (! contains (runlevels, "4")) {
+ y2milestone ("Adding runlevel 4");
+ runlevels = sort (add (runlevels, "4"));
+ }
+
Progress::NextStep ();
current = (string) SCR::Read (.init.scripts.current_runlevel);
@@ -456,6 +462,16 @@
if (default_runlevel != default_orig)
SCR::Write (.init.scripts.default_runlevel, default_runlevel);
+
+ if (default_runlevel == "4") {
+ // If not in use, the whole runlevel is commented out!
+ y2milestone ("Runlevel 4 in use!");
+ SCR::Execute (.target.bash, "sed --in-place 's/^\\(#\\)\\(l4:4:wait:\\/etc\\/init.d\\/rc 4\\)/\\2/' /etc/inittab");
+ } else {
+ y2milestone ("Runlevel %1 in use...", default_runlevel);
+ SCR::Execute (.target.bash, "sed --in-place 's/^\\(l4:4:wait:\\/etc\\/init.d\\/rc 4\\)/#\\1/' /etc/inittab");
+ }
+
Progress::NextStep ();
map failed = (map)filter (string k, map v, services, ``{
@@ -579,7 +595,7 @@
runlevels = (list<string>) SCR::Read (.init.scripts.runlevel_list);
if (0 == size (runlevels))
{
- runlevels = ["0", "1", "2", "3", "5", "6", "S", ];
+ runlevels = ["0", "1", "2", "3", "4", "5", "6", "S", ];
}
//..
@@ -914,16 +930,21 @@
global list getDefaultPicker (symbol mode) ``{
list items = [];
list<string> rls = RunlevelEd::runlevels;
+
if (mode == `auto)
{
+ if (! contains (rls, "4")) rls = sort (add (rls, "4"));
rls = prepend (rls, "");
}
else if (mode == `proposal)
{
// We could read the list from SCR (#37071) but
// inittab in the inst-sys is pre-lsb so we have to override it
- rls = ["2", "3", "5"];
+ //
+ // "4" added because of FATE #303798
+ rls = ["2", "3", "4", "5"];
}
+ y2milestone ("Mode %1 items %2", mode, rls);
foreach (string i, rls, ``{
// which ones to avoid: #36110
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-runlevel-2.16.5/src/runlevel_proposal.ycp new/yast2-runlevel-2.17.0/src/runlevel_proposal.ycp
--- old/yast2-runlevel-2.16.5/src/runlevel_proposal.ycp 2008-05-05 14:33:00.000000000 +0200
+++ new/yast2-runlevel-2.17.0/src/runlevel_proposal.ycp 2008-07-10 16:30:26.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Default runlevel proposal
* Authors: Michal Svec
*
- * $Id: runlevel_proposal.ycp 47268 2008-05-05 12:33:00Z locilka $
+ * $Id: runlevel_proposal.ycp 48971 2008-07-10 14:30:25Z locilka $
*/
{
@@ -125,17 +125,21 @@
the default.</p>") +
// help for runlevel - installation proposal, part 4
+ _("<p>Runlevel <b>4</b> is an expert user mode. Don't use it unless you really
+need it.</p>") +
+
+ // help for runlevel - installation proposal, part 5
_("<p>Runlevel <b>3</b> allows both local and remote logins and enables the
network and any configured network services. This setting does not start the
graphical login manager, so graphical user interfaces cannot be used
immediately.</p>") +
- // help for runlevel - installation proposal, part 5
+ // help for runlevel - installation proposal, part 6
_("<p>Runlevel <b>5</b> is the most common default runlevel for workstations. In
addition to the network, it starts the X display manager, which allows
graphical logins. It also starts any other configured services.</p>") +
- // help for runlevel - installation proposal, part 6
+ // help for runlevel - installation proposal, part 7
_("<p>If you are not sure what to select, runlevel <b>5</b> is generally a good
choice for workstations. Runlevel <b>3</b> is often used on servers that do
not have a monitor and should not use graphical interfaces.</p>");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-runlevel-2.16.5/src/ui.ycp new/yast2-runlevel-2.17.0/src/ui.ycp
--- old/yast2-runlevel-2.16.5/src/ui.ycp 2007-07-12 09:46:15.000000000 +0200
+++ new/yast2-runlevel-2.17.0/src/ui.ycp 2008-07-10 16:30:26.000000000 +0200
@@ -13,7 +13,7 @@
* Petr Blahos
* Martin Lazar
*
- * $Id: ui.ycp 39335 2007-07-12 07:46:15Z locilka $
+ * $Id: ui.ycp 48971 2008-07-10 14:30:25Z locilka $
*
* Runlevel editor user interface functions.
*/
@@ -1149,7 +1149,9 @@
while (`next != ret && `back != ret && `abort != ret && `simple != ret)
{
- if (ret != nil) y2milestone("RET: %1", ret);
+ if (ret != nil && ret != `table)
+ y2milestone("RET: %1", ret);
+
// Kludge, because a `Table still does not have a shortcut.
// #16116
UI::SetFocus (`id (`table));
@@ -1254,7 +1256,7 @@
else if (`start == ret || `stop == ret)
{
boolean really = true;
- if (`stop == ret && "xdm" == current_service)
+ if (`stop == ret && 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?")))
@@ -1340,7 +1342,8 @@
)
);
// dialog caption.
- Wizard::SetContentsButtons (_("System Services (Runlevel): Services"), contents, help_text, Label::BackButton(), Label::FinishButton());
+ Wizard::SetContentsButtons (_("System Services (Runlevel): Services"), contents, help_text, Label::BackButton(), Label::OKButton());
+ Wizard::SetAbortButton (`abort, Label::CancelButton());
Wizard::DisableBackButton ();
UI::ChangeWidget (`id (`table), `CurrentItem, current_service);
@@ -1420,10 +1423,19 @@
service = RunlevelEd::services[current_service]:$[];
updateDescription (service);
}
- else if (`disable == ret)
+ else if (ret == `disable)
{ //FIXME...
y2milestone ("%1", ret);
- SimpleSetServiceDep (current_service, false);
+ 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?"))) {
+ y2warning ("User decided to stop '%1' despite the warning", current_service);
+ really = false;
+ }
+ }
+ if (really)
+ SimpleSetServiceDep (current_service, false);
}
else if (`enable == ret)
{ //FIXME...
@@ -1577,7 +1589,8 @@
)
);
// dialog caption.
- Wizard::SetContentsButtons (_("System Services (Runlevel): Details"), contents, getHelpAuto (), Label::BackButton(), Label::FinishButton());
+ Wizard::SetContentsButtons (_("System Services (Runlevel): Details"), contents, getHelpAuto (), Label::BackButton(), Label::OKButton());
+ Wizard::SetAbortButton (`abort, Label::CancelButton());
Wizard::DisableBackButton ();
UI::ChangeWidget (`id (`table), `CurrentItem, current_service);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-runlevel-2.16.5/testsuite/tests/getDefaultPicker.out new/yast2-runlevel-2.17.0/testsuite/tests/getDefaultPicker.out
--- old/yast2-runlevel-2.16.5/testsuite/tests/getDefaultPicker.out 2005-01-21 10:29:49.000000000 +0100
+++ new/yast2-runlevel-2.17.0/testsuite/tests/getDefaultPicker.out 2008-07-10 16:32:59.000000000 +0200
@@ -1,3 +1,3 @@
Dump [`item (`id ("2"), "2: Local multiuser without remote network", false), `item (`id ("3"), "3: Full multiuser with network", true), `item (`id ("4"), "4: User defined", false), `item (`id ("5"), "5: Full multiuser with network and display manager", false)]
Dump [`item (`id ("2"), "2: Local multiuser without remote network", true), `item (`id ("7"), "7", false), `item (`id ("8"), "8", false)]
-Dump [`item (`id (""), "Unchanged", false), `item (`id ("2"), "2: Local multiuser without remote network", false), `item (`id ("7"), "7", false), `item (`id ("8"), "8", false)]
+Dump [`item (`id (""), "Unchanged", false), `item (`id ("2"), "2: Local multiuser without remote network", false), `item (`id ("4"), "4: User defined", false), `item (`id ("7"), "7", false), `item (`id ("8"), "8", false)]
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-runlevel-2.16.5/testsuite/tests/saveServices.out new/yast2-runlevel-2.17.0/testsuite/tests/saveServices.out
--- old/yast2-runlevel-2.16.5/testsuite/tests/saveServices.out 2004-03-08 15:33:10.000000000 +0100
+++ new/yast2-runlevel-2.17.0/testsuite/tests/saveServices.out 2008-07-10 16:33:17.000000000 +0200
@@ -1,5 +1,8 @@
+Execute .target.bash "sed --in-place 's/^\\(l4:4:wait:\\/etc\\/init.d\\/rc 4\\)/#\\1/' /etc/inittab" 0
Return true
+Execute .target.bash "sed --in-place 's/^\\(l4:4:wait:\\/etc\\/init.d\\/rc 4\\)/#\\1/' /etc/inittab" 0
Return true
+Execute .target.bash "sed --in-place 's/^\\(l4:4:wait:\\/etc\\/init.d\\/rc 4\\)/#\\1/' /etc/inittab" 0
Read .init.scripts.exists "a" true
Execute .target.bash_output "/sbin/insserv -rf /etc/init.d/a" $["exit":0, "stderr":"", "stdout":""]
Execute .target.bash_output "/sbin/insserv -f /etc/init.d/a,start=1,2,3" $["exit":0, "stderr":"", "stdout":""]
@@ -7,6 +10,7 @@
Execute .target.bash_output "/sbin/insserv -rf /etc/init.d/b" $["exit":0, "stderr":"", "stdout":""]
Execute .target.bash_output "/sbin/insserv -f /etc/init.d/b,start=1,2,3" $["exit":0, "stderr":"", "stdout":""]
Return true
+Execute .target.bash "sed --in-place 's/^\\(l4:4:wait:\\/etc\\/init.d\\/rc 4\\)/#\\1/' /etc/inittab" 0
Read .init.scripts.exists "a" true
Execute .target.bash_output "/sbin/insserv -rf /etc/init.d/a" $["exit":0, "stderr":"", "stdout":""]
Execute .target.bash_output "/sbin/insserv -f /etc/init.d/a,start=1,2,3" $["exit":0, "stderr":"", "stdout":""]
@@ -14,6 +18,7 @@
Execute .target.bash_output "/sbin/insserv -rf /etc/init.d/b" $["exit":0, "stderr":"", "stdout":""]
Execute .target.bash_output "/sbin/insserv -f /etc/init.d/b,start=1,2,3" $["exit":0, "stderr":"", "stdout":""]
Return true
+Execute .target.bash "sed --in-place 's/^\\(l4:4:wait:\\/etc\\/init.d\\/rc 4\\)/#\\1/' /etc/inittab" 0
Read .init.scripts.exists "a" true
Execute .target.bash_output "/sbin/insserv -rf /etc/init.d/a" $["exit":0, "stderr":"", "stdout":""]
Execute .target.bash_output "/sbin/insserv -f /etc/init.d/a,start=1,2,3" $["exit":0, "stderr":"", "stdout":""]
@@ -21,12 +26,15 @@
Execute .target.bash_output "/sbin/insserv -rf /etc/init.d/b" $["exit":0, "stderr":"", "stdout":""]
Execute .target.bash_output "/sbin/insserv -f /etc/init.d/b,start=1,2,3" $["exit":0, "stderr":"", "stdout":""]
Return true
+Execute .target.bash "sed --in-place 's/^\\(l4:4:wait:\\/etc\\/init.d\\/rc 4\\)/#\\1/' /etc/inittab" 0
Read .init.scripts.exists "a" true
Execute .target.bash_output "/sbin/insserv -rf /etc/init.d/a" $["exit":0, "stderr":"", "stdout":""]
Read .init.scripts.exists "b" true
Execute .target.bash_output "/sbin/insserv -rf /etc/init.d/b" $["exit":0, "stderr":"", "stdout":""]
Return true
+Execute .target.bash "sed --in-place 's/^\\(l4:4:wait:\\/etc\\/init.d\\/rc 4\\)/#\\1/' /etc/inittab" 0
Return true
+Execute .target.bash "sed --in-place 's/^\\(l4:4:wait:\\/etc\\/init.d\\/rc 4\\)/#\\1/' /etc/inittab" 0
Read .init.scripts.exists "nfsserver" true
Execute .target.bash_output "/sbin/insserv -rf /etc/init.d/nfsserver" $["exit":0, "stderr":"", "stdout":""]
Execute .target.bash_output "/sbin/insserv -f /etc/init.d/nfsserver,start=1" $["exit":0, "stderr":"", "stdout":""]
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-runlevel-2.16.5/VERSION new/yast2-runlevel-2.17.0/VERSION
--- old/yast2-runlevel-2.16.5/VERSION 2008-05-05 14:33:00.000000000 +0200
+++ new/yast2-runlevel-2.17.0/VERSION 2008-07-10 16:28:48.000000000 +0200
@@ -1 +1 @@
-2.16.5
+2.17.0
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org