Author: locilka
Date: Thu Jul 10 16:30:25 2008
New Revision: 48971
URL: http://svn.opensuse.org/viewcvs/yast?rev=48971&view=rev
Log:
- Adding runlevel 4 as another possible runlevel to select: both
on a running system and during installation (FATE #303798).
- 2.17.0
Modified:
trunk/runlevel/VERSION
trunk/runlevel/package/yast2-runlevel.changes
trunk/runlevel/src/RunlevelEd.ycp
trunk/runlevel/src/runlevel_auto.ycp
trunk/runlevel/src/runlevel_proposal.ycp
trunk/runlevel/src/ui.ycp
Modified: trunk/runlevel/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/runlevel/VERSION?rev=48971&r1=48970&r2=48971&view=diff
==============================================================================
--- trunk/runlevel/VERSION (original)
+++ trunk/runlevel/VERSION Thu Jul 10 16:30:25 2008
@@ -1 +1 @@
-2.16.5
+2.17.0
Modified: trunk/runlevel/package/yast2-runlevel.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/runlevel/package/yast2-runlevel.changes?rev=48971&r1=48970&r2=48971&view=diff
==============================================================================
--- trunk/runlevel/package/yast2-runlevel.changes (original)
+++ trunk/runlevel/package/yast2-runlevel.changes Thu Jul 10 16:30:25 2008
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+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).
+- 2.17.0
+
+-------------------------------------------------------------------
Thu Jun 12 10:53:00 CEST 2008 - locilka@suse.cz
- [Cancel] [Back] [Finish] (bnc #398502)
Modified: trunk/runlevel/src/RunlevelEd.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/runlevel/src/RunlevelEd.ycp?rev=48971&r1=48970&r2=48971&view=diff
==============================================================================
--- trunk/runlevel/src/RunlevelEd.ycp (original)
+++ trunk/runlevel/src/RunlevelEd.ycp Thu Jul 10 16:30:25 2008
@@ -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
Modified: trunk/runlevel/src/runlevel_auto.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/runlevel/src/runlevel_auto.ycp?rev=48971&r1=48970&r2=48971&view=diff
==============================================================================
--- trunk/runlevel/src/runlevel_auto.ycp (original)
+++ trunk/runlevel/src/runlevel_auto.ycp Thu Jul 10 16:30:25 2008
@@ -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", ];
}
//..
Modified: trunk/runlevel/src/runlevel_proposal.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/runlevel/src/runlevel_proposal.ycp?rev=48971&r1=48970&r2=48971&view=diff
==============================================================================
--- trunk/runlevel/src/runlevel_proposal.ycp (original)
+++ trunk/runlevel/src/runlevel_proposal.ycp Thu Jul 10 16:30:25 2008
@@ -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>");
Modified: trunk/runlevel/src/ui.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/runlevel/src/ui.ycp?rev=48971&r1=48970&r2=48971&view=diff
==============================================================================
--- trunk/runlevel/src/ui.ycp (original)
+++ trunk/runlevel/src/ui.ycp Thu Jul 10 16:30:25 2008
@@ -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));
@@ -1340,7 +1342,7 @@
)
);
// 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 ();
@@ -1587,7 +1589,7 @@
)
);
// 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 ();
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
