Hello community,
here is the log from the commit of package yast2-installation
checked in at Fri Nov 23 14:38:21 CET 2007.
--------
--- yast2-installation/yast2-installation.changes 2007-10-30 17:28:05.000000000 +0100
+++ /mounts/work_src_done/NOARCH/yast2-installation/yast2-installation.changes 2007-11-23 13:42:52.000000000 +0100
@@ -1,0 +2,41 @@
+Fri Nov 23 13:36:54 CET 2007 - locilka@suse.cz
+
+- Using translations for inst_finish steps (#343783).
+- 2.16.4
+
+-------------------------------------------------------------------
+Tue Nov 20 11:08:23 CET 2007 - locilka@suse.cz
+
+- Shutting down all dhcpcd clients when reconfiguring network in
+ the first stage and when finishing the installation (#308577).
+- 'Copy 70-persistent-cd.rules' functionality has been moved here
+ from yast2-network (#328126).
+
+-------------------------------------------------------------------
+Mon Nov 19 15:35:10 CET 2007 - locilka@suse.cz
+
+- Fixed busy texts for restarting YaST vs. finishing the instal.
+- Unified used terminology (repositories) (FATE #302970).
+
+-------------------------------------------------------------------
+Tue Nov 13 13:54:13 CET 2007 - locilka@suse.cz
+
+- Script copy_files_finish.ycp cleaned up.
+
+-------------------------------------------------------------------
+Fri Nov 9 13:30:34 CET 2007 - locilka@suse.cz
+
+- Boot Installed System option has been removed (#327505).
+- Installation Mode dialog has been redesigned using
+ self-descriptive icons for all options.
+- Return value from inst_repair is evaluated, error is reported in
+ case of failure.
+- 2.16.3
+
+-------------------------------------------------------------------
+Fri Nov 2 16:31:06 CET 2007 - locilka@suse.cz
+
+- Adjusted RPM dependencies (Internet module has been moved from
+ yast2-network to yast2).
+
+-------------------------------------------------------------------
Old:
----
yast2-installation-2.16.2.tar.bz2
New:
----
yast2-installation-2.16.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.gj5160/_old 2007-11-23 14:35:39.000000000 +0100
+++ /var/tmp/diff_new_pack.gj5160/_new 2007-11-23 14:35:39.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-installation (Version 2.16.2)
+# spec file for package yast2-installation (Version 2.16.4)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,28 +11,30 @@
# norootforbuild
Name: yast2-installation
-Version: 2.16.2
+Version: 2.16.4
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-installation-2.16.2.tar.bz2
+Source0: yast2-installation-2.16.4.tar.bz2
Prefix: /usr
-BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-core-devel yast2-country yast2-devtools yast2-testsuite
+BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-core-devel yast2-devtools yast2-testsuite
# Mode::live_installation
BuildRequires: yast2 >= 2.15.38
Requires: autoyast2-installation
# Mode::live_installation
-Requires: yast2 >= 2.16.3
+# Internet::ShutdownAllLocalDHCPClients
+Requires: yast2 >= 2.16.12
# Required in in the first stage, after
# switching to the installed system, bugzilla #249679
Requires: yast2-bootloader
# Language::selection_skipped, bugzilla #223258
Requires: yast2-country >= 2.15.0
-Requires: yast2-network >= 2.15.37
# AddOnProduct::skip_add_ons
Requires: yast2-packager >= 2.15.75
# Only in inst-sys
+# Requires: yast2-runlevel
+# Requires: yast2-network
# Requires: yast2-add-on
# Requires: yast2-mouse
# Requires: yast2-storage
@@ -49,6 +51,7 @@
Conflicts: yast2-core <= 2.15.9
# tar-gzip some system files and untar-ungzip them after the installation (FATE #300421, #120103)
Requires: tar gzip
+Requires: coreutils
# for the first/second stage of installation
# currently not used
# bugzilla #208307
@@ -67,12 +70,12 @@
Summary: YaST2 - Installation Parts
%package devel-doc
-Version: 2.16.2
+Version: 2.16.4
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-installation-2.16.2.tar.bz2
+Source0: yast2-installation-2.16.4.tar.bz2
Prefix: /usr
Requires: yast2-installation >= 2.15.34
PreReq: %fillup_prereq
@@ -105,7 +108,7 @@
Lukas Ocilka
%prep
-%setup -n yast2-installation-2.16.2
+%setup -n yast2-installation-2.16.4
%build
%{prefix}/bin/y2tool y2autoconf
@@ -175,6 +178,29 @@
%exclude %{prefix}/share/doc/packages/yast2-installation/COPYING
%exclude %{prefix}/share/doc/packages/yast2-installation/README
%changelog
+* Fri Nov 23 2007 - locilka@suse.cz
+- Using translations for inst_finish steps (#343783).
+- 2.16.4
+* Tue Nov 20 2007 - locilka@suse.cz
+- Shutting down all dhcpcd clients when reconfiguring network in
+ the first stage and when finishing the installation (#308577).
+- 'Copy 70-persistent-cd.rules' functionality has been moved here
+ from yast2-network (#328126).
+* Mon Nov 19 2007 - locilka@suse.cz
+- Fixed busy texts for restarting YaST vs. finishing the instal.
+- Unified used terminology (repositories) (FATE #302970).
+* Tue Nov 13 2007 - locilka@suse.cz
+- Script copy_files_finish.ycp cleaned up.
+* Fri Nov 09 2007 - locilka@suse.cz
+- Boot Installed System option has been removed (#327505).
+- Installation Mode dialog has been redesigned using
+ self-descriptive icons for all options.
+- Return value from inst_repair is evaluated, error is reported in
+ case of failure.
+- 2.16.3
+* Fri Nov 02 2007 - locilka@suse.cz
+- Adjusted RPM dependencies (Internet module has been moved from
+ yast2-network to yast2).
* Tue Oct 30 2007 - locilka@suse.cz
- Modules Hotplug and HwStatus moved to yast2.rpm to remove
dependency of storage on installation.
++++++ yast2-installation-2.16.2.tar.bz2 -> yast2-installation-2.16.4.tar.bz2 ++++++
++++ 5203 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.2/configure.in new/yast2-installation-2.16.4/configure.in
--- old/yast2-installation-2.16.2/configure.in 2007-10-30 17:29:18.000000000 +0100
+++ new/yast2-installation-2.16.4/configure.in 2007-11-23 13:43:52.000000000 +0100
@@ -1,9 +1,9 @@
dnl configure.in for yast2-installation
dnl
-dnl -- This file is generated by y2autoconf 2.16.0 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.16.2 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-installation, 2.16.2, http://bugs.opensuse.org/, yast2-installation)
+AC_INIT(yast2-installation, 2.16.4, http://bugs.opensuse.org/, yast2-installation)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -14,10 +14,11 @@
AC_PREFIX_DEFAULT(/usr)
-AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
+dnl long filenames; we use GNU Make extensions and that's ok
+AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.16.2"
+VERSION="2.16.4"
RPMNAME="yast2-installation"
MAINTAINER="Lukas Ocilka "
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.2/Makefile.am new/yast2-installation-2.16.4/Makefile.am
--- old/yast2-installation-2.16.2/Makefile.am 2007-10-30 17:29:18.000000000 +0100
+++ new/yast2-installation-2.16.4/Makefile.am 2007-11-23 13:43:52.000000000 +0100
@@ -30,6 +30,7 @@
extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl))
+# less strict; prefer bzip2
AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip
# where devtools instal m4 snippets
# argh, executed literally
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.2/src/clients/copy_files_finish.ycp new/yast2-installation-2.16.4/src/clients/copy_files_finish.ycp
--- old/yast2-installation-2.16.2/src/clients/copy_files_finish.ycp 2007-06-13 15:50:39.000000000 +0200
+++ new/yast2-installation-2.16.4/src/clients/copy_files_finish.ycp 2007-11-20 12:39:41.000000000 +0100
@@ -8,7 +8,7 @@
* Authors:
* Jiri Srain
*
- * $Id: copy_files_finish.ycp 38430 2007-06-13 13:50:38Z locilka $
+ * $Id: copy_files_finish.ycp 42211 2007-11-20 11:39:40Z locilka $
*
*/
@@ -43,6 +43,73 @@
y2debug("func=%1", func);
y2debug("param=%1", param);
+void CopyAllWorkflowFiles () {
+ if (size (WorkflowManager::GetAllUsedControlFiles()) == 0) {
+ y2milestone ("No additional workflows");
+ return;
+ }
+
+ y2milestone ("Coping additional control files %1", WorkflowManager::GetAllUsedControlFiles());
+ list <string> workflows_list = [];
+
+ foreach (string one_filename, WorkflowManager::GetAllUsedControlFiles(), {
+ if (regexpmatch (one_filename, "/")) {
+ one_filename = regexpsub (one_filename, "^.*/(.*)", "\\1");
+ }
+
+ workflows_list = add (workflows_list, one_filename);
+ });
+
+ // They need to follow the exact order
+ SCR::Write (.target.ycp, Installation::destdir + Directory::etcdir + "/control_files/order.ycp",
+ workflows_list);
+
+ SCR::Execute (.target.bash, "/bin/mkdir -p " +
+ "'" + String::Quote (Installation::destdir) + Directory::etcdir + "/control_files'");
+
+ foreach (string file, WorkflowManager::GetAllUsedControlFiles(), {
+ SCR::Execute (.target.bash, "/bin/cp '" + String::Quote (file) + "' " +
+ "'" + String::Quote (Installation::destdir) + Directory::etcdir + "/control_files/'");
+ SCR::Execute (.target.bash, "/bin/chmod 0644 " +
+ "'" + String::Quote (Installation::destdir) + Directory::etcdir + "/control_files/" + String::Quote (file) + "'");
+ });
+
+ SCR::Execute (.target.bash, "/bin/chmod 0644 " +
+ "'" + String::Quote (Installation::destdir) + Directory::etcdir + "/control_files/order.ycp'");
+}
+
+// see bugzilla #328126
+void CopyHardwareUdevRules () {
+ string udev_rules_srcdir = "/etc/udev/rules.d/";
+ string udev_rules_destdir = sformat ("%1%2", Installation::destdir, udev_rules_srcdir);
+
+ if (! FileUtils::Exists (udev_rules_destdir)) {
+ y2milestone("%1 does not exist yet, creating it", udev_rules_destdir);
+ WFM::Execute (.local.bash, sformat ("mkdir -p '%1'", udev_rules_destdir));
+ }
+
+ // udev files that should be copied
+ list <string> files_to_copy = [ "70-persistent-cd.rules" ];
+
+ foreach (string one_file, files_to_copy, {
+ string one_file_from = sformat ("%1%2", udev_rules_srcdir, one_file);
+ string one_file_to = sformat ("%1%2", udev_rules_destdir, one_file);
+
+ if (! FileUtils::Exists (one_file_from)) {
+ y2error ("Cannot copy non-existent file: %1", one_file_from);
+ } else if (FileUtils::Exists (one_file_to)) {
+ y2milestone ("File %1 exists, skipping", one_file_to);
+ } else {
+ string cmd = sformat ("cp -a '%1' '%2'", String::Quote (one_file_from), String::Quote (udev_rules_destdir));
+ map cmd_out = (map) WFM::Execute (.local.bash_output, cmd);
+
+ if (cmd_out["exit"]:-1 != 0) {
+ y2error ("Command failed '%1': %2", cmd, cmd_out);
+ }
+ }
+ });
+}
+
if (func == "Info")
{
return (any)$[
@@ -60,14 +127,23 @@
AdjustModprobeBlacklist();
// copy hardware status to installed system
- SCR::Execute (.target.bash,"/bin/cp -a '/var/lib/hardware' " +
- "'" + String::Quote (Installation::destdir) + "/var/lib'");
+ y2milestone ("Copying hardware information");
+ WFM::Execute (.local.bash,
+ sformat (
+ "mkdir -p '%1/var/lib/'; /bin/cp -a '/var/lib/hardware' '%1/var/lib/'",
+ String::Quote (Installation::destdir)
+ )
+ );
// if VNC, copy setup data
- if (Linuxrc::vnc ())
- {
- WFM::Execute (.local.bash, "/bin/cp -a '/root/.vnc' " +
- "'" + String::Quote (Installation::destdir) + "/root'");
+ if (Linuxrc::vnc ()) {
+ y2milestone ("Copying VNC settings");
+ WFM::Execute (.local.bash,
+ sformat (
+ "/bin/cp -a '/root/.vnc' '%1/root/'",
+ String::Quote (Installation::destdir)
+ )
+ );
}
@@ -77,42 +153,18 @@
Linuxrc::SaveInstallInf (Installation::destdir);
// Copy control.xml so it can be read once again during continue mode
- SCR::Execute (.target.bash, "/bin/cp " + ProductControl::current_control_file + " " +
- "'" + String::Quote (Installation::destdir) + Directory::etcdir + "/control.xml'");
- SCR::Execute (.target.bash, "/bin/chmod 0644 " +
- "'" + String::Quote (Installation::destdir) + Directory::etcdir + "/control.xml'");
- // Copy also control files of add-on products
- string cf_dir = (string)SCR::Read (.target.tmpdir) + "/control_files";
+ y2milestone ("Copying YaST control file");
+ WFM::Execute (.local.bash,
+ sformat (
+ "/bin/cp '%1' '%2%3/control.xml' && /bin/chmod 0644 '%2%3/control.xml'",
+ String::Quote (ProductControl::current_control_file),
+ String::Quote (Installation::destdir),
+ String::Quote (Directory::etcdir)
+ )
+ );
// List of files used as additional workflow definitions
- if (size (WorkflowManager::GetAllUsedControlFiles()) > 0) {
- list <string> workflows_list = [];
-
- foreach (string one_filename, WorkflowManager::GetAllUsedControlFiles(), {
- if (regexpmatch (one_filename, "/")) {
- one_filename = regexpsub (one_filename, "^.*/(.*)", "\\1");
- }
-
- workflows_list = add (workflows_list, one_filename);
- });
-
- // They need to follow the exact order
- SCR::Write (.target.ycp, Installation::destdir + Directory::etcdir + "/control_files/order.ycp",
- workflows_list);
-
- SCR::Execute (.target.bash, "/bin/mkdir -p " +
- "'" + String::Quote (Installation::destdir) + Directory::etcdir + "/control_files'");
-
- foreach (string file, WorkflowManager::GetAllUsedControlFiles(), {
- SCR::Execute (.target.bash, "/bin/cp '" + String::Quote (file) + "' " +
- "'" + String::Quote (Installation::destdir) + Directory::etcdir + "/control_files/'");
- SCR::Execute (.target.bash, "/bin/chmod 0644 " +
- "'" + String::Quote (Installation::destdir) + Directory::etcdir + "/control_files/" + String::Quote (file) + "'");
- });
-
- SCR::Execute (.target.bash, "/bin/chmod 0644 " +
- "'" + String::Quote (Installation::destdir) + Directory::etcdir + "/control_files/order.ycp'");
- }
+ CopyAllWorkflowFiles();
// Copy files from inst-sys to the just installed system
// FATE #301937, items are defined in the control file
@@ -130,6 +182,10 @@
{
SCR::Execute (.target.bash, sformat("/bin/cp /info.txt %1", eula_txt));
}
+
+ // bugzila #328126
+ // Copy 70-persistent-cd.rules ... if not updating
+ if (! Mode::update()) CopyHardwareUdevRules();
}
else
{
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.2/src/clients/inst_congratulate.ycp new/yast2-installation-2.16.4/src/clients/inst_congratulate.ycp
--- old/yast2-installation-2.16.2/src/clients/inst_congratulate.ycp 2007-10-03 13:57:42.000000000 +0200
+++ new/yast2-installation-2.16.4/src/clients/inst_congratulate.ycp 2007-11-20 12:39:41.000000000 +0100
@@ -6,7 +6,7 @@
*
* Display a congratulation message for the user.
*
- * $Id: inst_congratulate.ycp 41200 2007-10-02 13:58:22Z ug $
+ * $Id: inst_congratulate.ycp 42211 2007-11-20 11:39:40Z locilka $
*/
{
@@ -150,6 +150,7 @@
Wizard::SetTitleIcon ("SuSEmenu");
Wizard::SetNextButton(`next, Label::FinishButton() );
+ Wizard::RestoreAbortButton();
Wizard::SetFocusToNextButton();
if( UI::WidgetExists(`id(`do_clone)) )
UI::ChangeWidget (`id(`do_clone), `Enabled, clone_enabled);
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.2/src/clients/inst_finish.ycp new/yast2-installation-2.16.4/src/clients/inst_finish.ycp
--- old/yast2-installation-2.16.2/src/clients/inst_finish.ycp 2007-09-11 11:08:58.000000000 +0200
+++ new/yast2-installation-2.16.4/src/clients/inst_finish.ycp 2007-11-23 13:43:34.000000000 +0100
@@ -6,7 +6,7 @@
* Arvin Schnell
* Jiri Srain
*
- * $Id: inst_finish.ycp 40844 2007-09-11 09:08:57Z locilka $
+ * $Id: inst_finish.ycp 42361 2007-11-23 12:43:34Z locilka $
*
* Writes:
* [target] /var/lib/YaST2/runme_at_boot run yast2 after initial boot
@@ -104,6 +104,29 @@
{
y2milestone ("Using inst_finish steps definition from control file");
stages = ProductControl::inst_finish;
+
+ // Inst-finish need to be translated (#343783)
+ string textdom = ProductControl::productControl["textdomain"]:"control";
+ list