Author: kmachalkova
Date: Tue Nov 24 16:19:03 2009
New Revision: 59739
URL: http://svn.opensuse.org/viewcvs/yast?rev=59739&view=rev
Log:
Cumulative patch with SLE11 SP1 features:
FaTE#307555, FaTE#306167
Added:
trunk/installation/agents/cfg_boot.scr
Modified:
trunk/installation/control/control.SLED.xml
trunk/installation/control/control.SLES.xml
trunk/installation/control/control.openSUSE.xml
trunk/installation/control/control.rnc
trunk/installation/package/yast2-installation.changes
trunk/installation/src/clients/inst_release_notes.ycp
trunk/installation/src/inst_finish/save_config_finish.ycp
trunk/installation/yast2-installation.spec.in
Added: trunk/installation/agents/cfg_boot.scr
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/agents/cfg_boot.scr?rev=59739&view=auto
==============================================================================
--- trunk/installation/agents/cfg_boot.scr (added)
+++ trunk/installation/agents/cfg_boot.scr Tue Nov 24 16:19:03 2009
@@ -0,0 +1,15 @@
+/**
+ * File:
+ * cfg_boot.scr
+ * Summary:
+ * SCR Agent for reading/writing /etc/sysconfig/boot
+ * using the sysconfig-agent
+ *
+ * Read/Sets the values defined in <tt>/etc/sysconfig/boot</tt>
+ * in an easy manner.
+ */
+.sysconfig.boot
+
+`ag_ini(
+ `SysConfigFile("/etc/sysconfig/boot")
+)
Modified: trunk/installation/control/control.SLED.xml
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.SLED.xml?rev=59739&r1=59738&r2=59739&view=diff
==============================================================================
--- trunk/installation/control/control.SLED.xml (original)
+++ trunk/installation/control/control.SLED.xml Tue Nov 24 16:19:03 2009
@@ -17,6 +17,8 @@
<!-- FATE #303875, see /etc/sysconfig/network/dhcp:WRITE_HOSTNAME_TO_HOSTS -->
true
+ <!-- FATE #307555, see /etc/sysconfig/boot:RUN_PARALLEL -->
+ true
95
true
Modified: trunk/installation/control/control.SLES.xml
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.SLES.xml?rev=59739&r1=59738&r2=59739&view=diff
==============================================================================
--- trunk/installation/control/control.SLES.xml (original)
+++ trunk/installation/control/control.SLES.xml Tue Nov 24 16:19:03 2009
@@ -17,6 +17,8 @@
<!-- FATE #303875, see /etc/sysconfig/network/dhcp:WRITE_HOSTNAME_TO_HOSTS -->
false
+ <!-- FATE #307555, see /etc/sysconfig/boot:RUN_PARALLEL -->
+ false
95
true
Modified: trunk/installation/control/control.openSUSE.xml
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.openSUSE.xml?rev=59739&r1=59738&r2=59739&view=diff
==============================================================================
--- trunk/installation/control/control.openSUSE.xml (original)
+++ trunk/installation/control/control.openSUSE.xml Tue Nov 24 16:19:03 2009
@@ -17,6 +17,8 @@
<!-- FATE #303875, see /etc/sysconfig/network/dhcp:WRITE_HOSTNAME_TO_HOSTS -->
true
+ <!-- FATE #307555, see /etc/sysconfig/boot:RUN_PARALLEL -->
+ true
95
true
Modified: trunk/installation/control/control.rnc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.rnc?rev=59739&r1=59738&r2=59739&view=diff
==============================================================================
--- trunk/installation/control/control.rnc (original)
+++ trunk/installation/control/control.rnc Tue Nov 24 16:19:03 2009
@@ -46,6 +46,7 @@
| firewall_enable_ssh
| firewall_enable_ssh
| write_hostname_to_hosts
+ | run_init_scripts_in_parallel
| inform_about_suboptimal_distribution
| skip_language_dialog
| enable_clone
@@ -100,6 +101,7 @@
enable_firewall = element enable_firewall { BOOLEAN }
firewall_enable_ssh = element firewall_enable_ssh { BOOLEAN }
write_hostname_to_hosts = element write_hostname_to_hosts { BOOLEAN }
+run_init_scripts_in_parallel = element run_init_scripts_in_parallel { BOOLEAN }
inform_about_suboptimal_distribution = element inform_about_suboptimal_distribution { BOOLEAN }
skip_language_dialog = element skip_language_dialog { BOOLEAN }
enable_clone = element enable_clone { BOOLEAN }
Modified: trunk/installation/package/yast2-installation.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=59739&r1=59738&r2=59739&view=diff
==============================================================================
--- trunk/installation/package/yast2-installation.changes (original)
+++ trunk/installation/package/yast2-installation.changes Tue Nov 24 16:19:03 2009
@@ -1,4 +1,14 @@
-------------------------------------------------------------------
+Tue Nov 24 16:13:31 CET 2009 - kmachalkova@suse.cz
+
+Cumulative patch with SLE11 SP1 features:
+- In TUI (ncurses), use plain text (.txt) file with release notes,
+ if found (FaTE#306167)
+- Set /etc/sysconfig/boot:RUN_PARALLEL according to corresponding
+ value in control file (FaTE#307555)
+- 2.19.0
+
+-------------------------------------------------------------------
Thu Nov 19 16:51:55 CET 2009 - locilka@suse.cz
- Added control file configuration option require_registration
Modified: trunk/installation/src/clients/inst_release_notes.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_release_notes.ycp?rev=59739&r1=59738&r2=59739&view=diff
==============================================================================
--- trunk/installation/src/clients/inst_release_notes.ycp (original)
+++ trunk/installation/src/clients/inst_release_notes.ycp Tue Nov 24 16:19:03 2009
@@ -182,8 +182,9 @@
`ComboBox (`id (`lang), `opt (`notify), _("&Language"), [])
)
),
- `RichText (`id (`relnotescontent), "")
- )
+ `ReplacePoint(`id(`content_rp),
+ `RichText (`id (`relnotescontent), "")
+ )
),
`HWeight( 20,`Empty() )
)
@@ -243,12 +244,31 @@
if (UI::WidgetExists(`productsel) && (size(relnotesproducts) < 2))
UI::ChangeWidget (`id(`productsel), `Enabled, false);
+ boolean UsePlainText ( string file ) {
+ boolean ret = UI::TextMode() && FileUtils::Exists(file);
+ if (ret)
+ y2milestone("Found .txt file with release notes, will use it for TUI.");
+ return ret;
+ }
+
void RedrawRelnotesLang (string use_file) {
- string contents = (string) SCR::Read (.target.string, use_file);
+ string text_file = regexpsub(use_file, "^(.*)\.rtf$", "\\1") + ".txt";
+ boolean plain_text = UsePlainText( text_file );
+
+ string contents = (string) SCR::Read (.target.string,
+ plain_text ? text_file : use_file );
+
if (contents == nil || contents == "") {
y2error ("Wrong relnotesfile: %1", use_file);
} else {
- UI::ChangeWidget (`id(`relnotescontent), `Value, contents);
+ if (plain_text) {
+ UI::ReplaceWidget( `id(`content_rp),
+ `RichText(`id(`relnotescontent),`opt(`plainText), contents) );
+ }
+ else {
+ UI::ReplaceWidget( `id(`content_rp),
+ `RichText(`id(`relnotescontent), contents ) );
+ }
}
}
Modified: trunk/installation/src/inst_finish/save_config_finish.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/inst_finish/save_config_finish.ycp?rev=59739&r1=59738&r2=59739&view=diff
==============================================================================
--- trunk/installation/src/inst_finish/save_config_finish.ycp (original)
+++ trunk/installation/src/inst_finish/save_config_finish.ycp Tue Nov 24 16:19:03 2009
@@ -141,11 +141,20 @@
contains (Product::flags, "usercwd") ? "yes" : "no");
SCR::Write (.sysconfig.suseconfig, nil);
- // FIXME text freeze: progress (update count in Info too)
+ Progress::NextStep ();
+ // progress step title
+ Progress::Title (_("Saving security settings..."));
SCR::Write (.sysconfig.security.CHECK_SIGNATURES,
SignatureCheckDialogs::CheckSignatures ());
SCR::Write (.sysconfig.security, nil);
+ Progress::NextStep ();
+ // progress step title
+ Progress::Title (_("Saving boot scripts settings..."));
+ boolean run_in_parallel = ProductFeatures::GetBooleanFeature( "globals", "run_init_scripts_in_parallel");
+ SCR::Write (.sysconfig.boot.RUN_PARALLEL, run_in_parallel ? "yes" : "no" );
+ SCR::Write (.sysconfig.boot, nil);
+
// save supportconfig
if(SCR::Read(.target.size,"/etc/install.inf") > 0) {
string url = (string)SCR::Read(.etc.install_inf.supporturl);
Modified: trunk/installation/yast2-installation.spec.in
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/yast2-installation.spec.in?rev=59739&r1=59738&r2=59739&view=diff
==============================================================================
--- trunk/installation/yast2-installation.spec.in (original)
+++ trunk/installation/yast2-installation.spec.in Tue Nov 24 16:19:03 2009
@@ -138,6 +138,7 @@
# agents
@scrconfdir@/etc_passwd.scr
+@scrconfdir@/cfg_boot.scr
@scrconfdir@/cfg_windowmanager.scr
@scrconfdir@/cfg_fam.scr
@scrconfdir@/etc_install_inf.scr
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
