Hello community,
here is the log from the commit of package yast2-installation
checked in at Sat Mar 15 23:29:25 CET 2008.
--------
--- yast2-installation/yast2-installation.changes 2008-03-05 18:55:10.000000000 +0100
+++ /mounts/work_src_done/NOARCH/yast2-installation/yast2-installation.changes 2008-03-15 03:06:22.000000000 +0100
@@ -1,0 +2,35 @@
+Fri Mar 14 15:02:27 CET 2008 - locilka@suse.cz
+
+- Added possibility to run automatic configuration instead of the
+ whole second stage installation (fate #303396).
+- Adjusted RPM dependencies.
+- Creating and removing the file runme_at_boot is currently handled
+ by YaST (YCP) installation scripts.
+- Added new client inst_rpmcopy_secondstage that calls inst_rpmcopy
+ because of DisabledModules disabling both first and second stage
+ occurency of that script.
+- Changed control file to call the new script in second stage.
+- 2.16.23
+
+-------------------------------------------------------------------
+Mon Mar 10 11:25:57 CET 2008 - locilka@suse.cz
+
+- Disabling the window menu in IceWM preferences to make the
+ inst-sys 600 kB smaller (*.mo files). Thanks to mmarek.
+
+-------------------------------------------------------------------
+Fri Mar 7 11:35:29 CET 2008 - jsuchome@suse.cz
+
+- control.openSUSE.xml: country_simple is for keyboard and language,
+ not for timezone
+- added 1st stage step for root password dialog (fate#302980)
+- 2.16.22
+
+-------------------------------------------------------------------
+Thu Mar 06 10:57:42 CET 2008 - aschnell@suse.de
+
+- call rcnetwork with option onboot during start of second stage
+ (bnc #363423)
+- 2.16.21
+
+-------------------------------------------------------------------
Old:
----
yast2-installation-2.16.20.tar.bz2
New:
----
yast2-installation-2.16.23.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.VQ1115/_old 2008-03-15 23:29:10.000000000 +0100
+++ /var/tmp/diff_new_pack.VQ1115/_new 2008-03-15 23:29:10.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-installation (Version 2.16.20)
+# spec file for package yast2-installation (Version 2.16.23)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,19 +12,19 @@
Name: yast2-installation
-Version: 2.16.20
+Version: 2.16.23
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-installation-2.16.20.tar.bz2
+Source0: yast2-installation-2.16.23.tar.bz2
Prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-core-devel yast2-devtools yast2-testsuite
# URL::MakeParamsFromMap and URL::MakeMapFromParams
BuildRequires: yast2 >= 2.16.25
Requires: autoyast2-installation
# Installation::run_update_file
-Requires: yast2 >= 2.16.27
+Requires: yast2 >= 2.16.36
# Required in in the first stage, after
# switching to the installed system, bugzilla #249679
Requires: yast2-bootloader
@@ -104,7 +104,7 @@
Lukas Ocilka
%prep
-%setup -n yast2-installation-2.16.20
+%setup -n yast2-installation-2.16.23
%build
%{prefix}/bin/y2tool y2autoconf
@@ -170,6 +170,29 @@
%exclude %{prefix}/share/doc/packages/yast2-installation/COPYING
%exclude %{prefix}/share/doc/packages/yast2-installation/README
%changelog
+* Fri Mar 14 2008 locilka@suse.cz
+- Added possibility to run automatic configuration instead of the
+ whole second stage installation (fate #303396).
+- Adjusted RPM dependencies.
+- Creating and removing the file runme_at_boot is currently handled
+ by YaST (YCP) installation scripts.
+- Added new client inst_rpmcopy_secondstage that calls inst_rpmcopy
+ because of DisabledModules disabling both first and second stage
+ occurency of that script.
+- Changed control file to call the new script in second stage.
+- 2.16.23
+* Mon Mar 10 2008 locilka@suse.cz
+- Disabling the window menu in IceWM preferences to make the
+ inst-sys 600 kB smaller (*.mo files). Thanks to mmarek.
+* Fri Mar 07 2008 jsuchome@suse.cz
+- control.openSUSE.xml: country_simple is for keyboard and language,
+ not for timezone
+- added 1st stage step for root password dialog (fate#302980)
+- 2.16.22
+* Thu Mar 06 2008 aschnell@suse.de
+- call rcnetwork with option onboot during start of second stage
+ (bnc #363423)
+- 2.16.21
* Wed Mar 05 2008 locilka@suse.cz
- Remember (first stage) and restore (second stage) DisabledModules
(bnc #364066).
++++++ yast2-installation-2.16.20.tar.bz2 -> yast2-installation-2.16.23.tar.bz2 ++++++
++++ 3437 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.16.20/control/control.xml new/yast2-installation-2.16.23/control/control.xml
--- old/yast2-installation-2.16.20/control/control.xml 2008-01-14 13:47:38.000000000 +0100
+++ new/yast2-installation-2.16.23/control/control.xml 2008-03-14 16:01:48.000000000 +0100
@@ -505,7 +505,7 @@
<modules config:type="list">
<module>
<label>Perform Update</label>
- <name>rpmcopy</name>
+ <name>rpmcopy_secondstage</name>
</module>
<module>
<heading>yes</heading>
@@ -577,7 +577,7 @@
</module>
<module>
<label>Perform Installation</label>
- <name>rpmcopy</name>
+ <name>rpmcopy_secondstage</name>
no
no
</module>
@@ -732,7 +732,7 @@
</module>
<module>
<label>Perform Installation</label>
- <name>rpmcopy</name>
+ <name>rpmcopy_secondstage</name>
</module>
<module>
<heading>yes</heading>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.16.20/src/clients/automatic_configuration_finish.ycp new/yast2-installation-2.16.23/src/clients/automatic_configuration_finish.ycp
--- old/yast2-installation-2.16.20/src/clients/automatic_configuration_finish.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-installation-2.16.23/src/clients/automatic_configuration_finish.ycp 2008-03-15 03:03:15.000000000 +0100
@@ -0,0 +1,100 @@
+/**
+ * File: clients/automatic_configuration_finish.ycp
+ * Package: installation
+ * Summary: Automatic configuration instead of the second stage (Preview)
+ * Authors: Lukas Ocilka
+ * ThanksTo: Martin Vidner
+ * Ladislav Slezak
+ *
+ * $Id:$
+ *
+ * @see http://visnov.blogspot.com/2008/02/getting-rid-of-2nd-stage-of.html
+ */
+
+{
+ import "Report";
+ import "FileUtils";
+ import "Installation";
+ import "ProductControl";
+
+ textdomain "installation";
+
+ any ret = nil;
+ string func = "";
+ map param = $[];
+
+ /* Check arguments */
+ if(size(WFM::Args()) > 0 && is (WFM::Args (0), string)) {
+ func = (string) WFM::Args (0);
+ if (size (WFM::Args()) > 1 && is (WFM::Args (1), map))
+ param = (map) WFM::Args (1);
+ }
+ y2milestone ("starting automatic_configuration_finish");
+ y2debug("func=%1", func);
+ y2debug("param=%1", param);
+
+ // functions -->
+
+ string zypp_lock_file = "/var/run/zypp.pid";
+
+ void RemoveZyppLockIfExists () {
+ // a bit cruel, remove the zypp log if exists
+ if (FileUtils::Exists (zypp_lock_file)) {
+ y2milestone ("Removing zypp lock %1", zypp_lock_file);
+ SCR::Execute (.target.remove, zypp_lock_file);
+ }
+ }
+
+ void Write () {
+ // Just to be sure...
+ Pkg::SourceFinishAll();
+ Pkg::TargetFinish();
+
+ RemoveZyppLockIfExists();
+ // FIXME: should be done somehow else and somewhere else...?
+ if (! FileUtils::Exists ("/mnt/etc/install.inf")) {
+ y2milestone ("Copying install.inf");
+ WFM::Execute (.local.bash, "cp /etc/install.inf /mnt/etc/install.inf");
+ }
+
+ y2milestone ("~~~ MAGIC! -----------------------------------------------------------------");
+
+ integer old_SCR = WFM::SCRGetDefault();
+ integer new_SCR = WFM::SCROpen ("chroot="+Installation::destdir+":scr", false);
+ WFM::SCRSetDefault (new_SCR);
+
+ RemoveZyppLockIfExists();
+ y2milestone ("Running autoconf - a separate YaST process");
+ // FIXME: solve Y2DEBUG somehow
+ string cmd = "/usr/lib/YaST2/bin/y2base /usr/share/YaST2/clients/inst_automatic_configuration.ycp UI";
+ // FIXME: use process agent
+ // and use lome logging to file and `tail -F` from here
+ map cmd_ret = (map) SCR::Execute (.target.bash_output, cmd);
+ y2milestone ("Command '%1' returned %2", cmd, cmd_ret);
+
+ WFM::SCRClose (new_SCR);
+ WFM::SCRSetDefault (old_SCR);
+
+ y2milestone ("~~~ MAGIC! -----------------------------------------------------------------");
+ }
+
+ // <-- functions
+
+ // main()
+ if (func == "Info") {
+ ret = (any) $[
+ "steps" : 1,
+ // progress step title
+ "title" : _("Writing automatic configuration..."),
+ // only when requested
+ "when" : (ProductControl::GetUseAutomaticConfiguration() == true ? [ `installation ] : []),
+ ];
+ } else if (func == "Write") {
+ Write();
+ } else {
+ y2error ("unknown function: %1", func);
+ ret = nil;
+ }
+
+ return ret;
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.16.20/src/clients/inst_automatic_configuration.ycp new/yast2-installation-2.16.23/src/clients/inst_automatic_configuration.ycp
--- old/yast2-installation-2.16.20/src/clients/inst_automatic_configuration.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-installation-2.16.23/src/clients/inst_automatic_configuration.ycp 2008-03-13 18:39:38.000000000 +0100
@@ -0,0 +1,130 @@
+/**
+ * File: clients/inst_automatic_configuration.ycp
+ * Package: installation
+ * Summary: Automatic configuration instead of the second stage (Preview)
+ * Authors: Lukas Ocilka
+ *
+ * $Id:$
+ *
+ * @see http://visnov.blogspot.com/2008/02/getting-rid-of-2nd-stage-of.html
+ */
+
+{
+ import "Mode";
+ import "Stage";
+ import "FileUtils";
+ import "Directory";
+
+ textdomain "installation";
+
+ y2milestone ("automatic_configuration started");
+
+ Mode::SetMode ("installation");
+ Stage::Set ("continue");
+
+ list