Hello community,
here is the log from the commit of package yast2-live-installer
checked in at Fri Aug 24 00:08:09 CEST 2007.
--------
--- yast2-live-installer/yast2-live-installer.changes 2007-08-14 10:49:40.000000000 +0200
+++ /mounts/work_src_done/NOARCH/yast2-live-installer/yast2-live-installer.changes 2007-08-22 17:21:09.467050000 +0200
@@ -1,0 +2,6 @@
+Wed Aug 22 17:06:42 CEST 2007 - jsrain@suse.cz
+
+- fixed race condition (unfortunate kill of 'dd') (#302551)
+- 2.15.7
+
+-------------------------------------------------------------------
Old:
----
yast2-live-installer-2.15.6.tar.bz2
New:
----
yast2-live-installer-2.15.7.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-live-installer.spec ++++++
--- /var/tmp/diff_new_pack.YU3270/_old 2007-08-24 00:07:29.000000000 +0200
+++ /var/tmp/diff_new_pack.YU3270/_new 2007-08-24 00:07:29.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-live-installer (Version 2.15.6)
+# spec file for package yast2-live-installer (Version 2.15.7)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,17 +11,17 @@
# norootforbuild
Name: yast2-live-installer
-Version: 2.15.6
+Version: 2.15.7
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-live-installer-2.15.6.tar.bz2
+Source0: yast2-live-installer-2.15.7.tar.bz2
prefix: /usr
Requires: yast2
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite
BuildArchitectures: noarch
-Summary: YaST2 - Installation from live media
+Summary: YaST2 - Installation from Live Media
%description
This package contains the YaST component to deploy a live media to the
@@ -34,7 +34,7 @@
Jiri Srain
%prep
-%setup -n yast2-live-installer-2.15.6
+%setup -n yast2-live-installer-2.15.7
%build
%{prefix}/bin/y2tool y2autoconf
@@ -66,6 +66,9 @@
%doc %{prefix}/share/doc/packages/yast2-live-installer
%changelog
+* Wed Aug 22 2007 - jsrain@suse.cz
+- fixed race condition (unfortunate kill of 'dd') (#302551)
+- 2.15.7
* Tue Aug 14 2007 - jsuchome@suse.cz
- added text to .desktop file, correct icon name
- 2.15.6
++++++ yast2-live-installer-2.15.6.tar.bz2 -> yast2-live-installer-2.15.7.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-live-installer-2.15.6/configure new/yast2-live-installer-2.15.7/configure
--- old/yast2-live-installer-2.15.6/configure 2007-08-09 14:30:20.000000000 +0200
+++ new/yast2-live-installer-2.15.7/configure 2007-08-22 17:24:09.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60 for yast2-live-installer 2.15.3.
+# Generated by GNU Autoconf 2.60 for yast2-live-installer 2.15.7.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -559,8 +559,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-live-installer'
PACKAGE_TARNAME='yast2-live-installer'
-PACKAGE_VERSION='2.15.3'
-PACKAGE_STRING='yast2-live-installer 2.15.3'
+PACKAGE_VERSION='2.15.7'
+PACKAGE_STRING='yast2-live-installer 2.15.7'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1183,7 +1183,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-live-installer 2.15.3 to adapt to many kinds of systems.
+\`configure' configures yast2-live-installer 2.15.7 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1254,7 +1254,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-live-installer 2.15.3:";;
+ short | recursive ) echo "Configuration of yast2-live-installer 2.15.7:";;
esac
cat <<\_ACEOF
@@ -1332,7 +1332,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-live-installer configure 2.15.3
+yast2-live-installer configure 2.15.7
generated by GNU Autoconf 2.60
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1346,7 +1346,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-live-installer $as_me 2.15.3, which was
+It was created by yast2-live-installer $as_me 2.15.7, which was
generated by GNU Autoconf 2.60. Invocation command line was
$ $0 $@
@@ -2147,7 +2147,7 @@
# Define the identity of the package.
PACKAGE='yast2-live-installer'
- VERSION='2.15.3'
+ VERSION='2.15.7'
cat >>confdefs.h <<_ACEOF
@@ -2374,7 +2374,7 @@
-VERSION="2.15.3"
+VERSION="2.15.7"
RPMNAME="yast2-live-installer"
MAINTAINER="Jiri Srain "
@@ -3356,7 +3356,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-live-installer $as_me 2.15.3, which was
+This file was extended by yast2-live-installer $as_me 2.15.7, which was
generated by GNU Autoconf 2.60. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3399,7 +3399,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-live-installer config.status 2.15.3
+yast2-live-installer config.status 2.15.7
configured by $0, generated by GNU Autoconf 2.60,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-live-installer-2.15.6/configure.in new/yast2-live-installer-2.15.7/configure.in
--- old/yast2-live-installer-2.15.6/configure.in 2007-08-09 14:30:15.000000000 +0200
+++ new/yast2-live-installer-2.15.7/configure.in 2007-08-22 17:24:06.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-live-installer
dnl
-dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.15.1 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-live-installer, 2.15.3, http://bugs.opensuse.org/, yast2-live-installer)
+AC_INIT(yast2-live-installer, 2.15.7, http://bugs.opensuse.org/, yast2-live-installer)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.15.3"
+VERSION="2.15.7"
RPMNAME="yast2-live-installer"
MAINTAINER="Jiri Srain "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-live-installer-2.15.6/live-installer.pot new/yast2-live-installer-2.15.7/live-installer.pot
--- old/yast2-live-installer-2.15.6/live-installer.pot 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-live-installer-2.15.7/live-installer.pot 2007-08-10 13:43:22.000000000 +0200
@@ -0,0 +1,255 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR SuSE Linux Products GmbH, Nuernberg
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR , YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-08-10 13:43+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: LANGUAGE \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: src/control/live-install.glade:70
+msgid ""
+"\n"
+"<p><b>Congratulations!</b></p>\n"
+"<p>The installation of openSUSE on your machine is complete.\n"
+"After clicking <b>Finish</b>, you can log in to the system.</p>\n"
+"<p>Visit us at %1.</p>\n"
+"<p>Have a lot of fun!<br>Your openSUSE Development Team</p>\n"
+"\t"
+msgstr ""
+
+#: src/control/live-install.glade:82
+msgid "Copy files to installed system\""
+msgstr ""
+
+#: src/control/live-install.glade:89
+msgid "Save configuration"
+msgstr ""
+
+#: src/control/live-install.glade:96
+msgid "Install boot manager\""
+msgstr ""
+
+#: src/control/live-install.glade:102
+msgid "Prepare system for initial boot\""
+msgstr ""
+
+#: src/control/live-install.glade:117
+msgid "Live Installation Settings"
+msgstr ""
+
+#: src/control/live-install.glade:140
+msgid "Installation"
+msgstr ""
+
+#: src/control/live-install.glade:145
+msgid "Welcome"
+msgstr ""
+
+#: src/control/live-install.glade:149 src/control/live-install.glade:154
+msgid "Installation Settings"
+msgstr ""
+
+#: src/control/live-install.glade:159 src/control/live-install.glade:165
+#: src/control/live-install.glade:169 src/control/live-install.glade:173
+#: src/control/live-install.glade:179
+msgid "Perform Installation"
+msgstr ""
+
+#: src/control/live-install.glade:191
+msgid "Configuration"
+msgstr ""
+
+#: src/control/live-install.glade:196
+msgid "root Password"
+msgstr ""
+
+#: src/control/live-install.glade:200
+msgid "Users"
+msgstr ""
+
+#: src/control/live-install.glade:204
+msgid "Network"
+msgstr ""
+
+#: src/control/live-install.glade:208 src/control/live-install.glade:218
+#: src/control/live-install.glade:224 src/control/live-install.glade:228
+msgid "Online Update"
+msgstr ""
+
+#: src/inst_live_add_base_repo.ycp:25 src/inst_live_sw_select.ycp:16
+msgid "Software Installation"
+msgstr ""
+
+#: src/inst_live_doit.ycp:140
+#, ycp-format
+msgid "Copying %1..."
+msgstr ""
+
+#. Headline for last dialog of base installation: Install LILO etc.
+#: src/inst_live_doit.ycp:175
+msgid "Copying the Live Image to Hard Disk"
+msgstr ""
+
+#: src/inst_live_doit.ycp:178
+msgid "Evaluate filesystems to copy"
+msgstr ""
+
+#: src/inst_live_doit.ycp:178
+msgid "Copy root filesystem"
+msgstr ""
+
+#: src/inst_live_doit.ycp:178
+msgid "Copy additional filesystems"
+msgstr ""
+
+#: src/inst_live_doit.ycp:186
+msgid "Evaluating filesystems to copy..."
+msgstr ""
+
+#: src/inst_live_doit.ycp:189
+msgid "Copying root filesystem..."
+msgstr ""
+
+#: src/inst_live_doit.ycp:198
+msgid "Finished."
+msgstr ""
+
+#. dialog caption
+#: src/inst_live_simple_proposal.ycp:22 src/inst_live_simple_proposal.ycp:155
+msgid "Installation settings"
+msgstr ""
+
+#. label
+#: src/inst_live_simple_proposal.ycp:24
+msgid "Analyzing the system..."
+msgstr ""
+
+#: src/inst_live_simple_proposal.ycp:84
+#, ycp-format
+msgid "Use %1%% of disk %2 for Linux"
+msgstr ""
+
+#: src/inst_live_simple_proposal.ycp:88
+#, ycp-format
+msgid "Do not use disk %1"
+msgstr ""
+
+#: src/inst_live_simple_proposal.ycp:92
+msgid "Partitioning"
+msgstr ""
+
+#: src/inst_live_simple_proposal.ycp:109
+msgid "System start-up"
+msgstr ""
+
+#: src/inst_live_simple_proposal.ycp:111
+msgid "Ask whether to boot Linux or existing system"
+msgstr ""
+
+#: src/inst_live_simple_proposal.ycp:112
+msgid "Boot only Linux"
+msgstr ""
+
+#: src/inst_live_simple_proposal.ycp:113
+#, ycp-format
+msgid "System start time-out: %1 seconds"
+msgstr ""
+
+#: src/inst_live_simple_proposal.ycp:119
+msgid "Keyboard"
+msgstr ""
+
+#: src/inst_live_simple_proposal.ycp:126
+msgid "Time Zone"
+msgstr ""
+
+#: src/inst_live_simple_proposal.ycp:136
+msgid "Change Installation Settings"
+msgstr ""
+
+#. help text 1/3
+#: src/inst_live_simple_proposal.ycp:141
+msgid ""
+"<p>\n"
+"Use <b>Accept</b> to perform a new installation with the values displayed.</p>"
+msgstr ""
+
+#. help text 2/3
+#: src/inst_live_simple_proposal.ycp:144
+msgid ""
+"<p>\n"
+"Change the values by clicking on the respective headline\n"
+"or by using the <b>Change Installation Settings</b> button.</p>"
+msgstr ""
+
+#. help text 3/3
+#: src/inst_live_simple_proposal.ycp:148
+msgid ""
+"<p>\n"
+"Your hard disk has not been modified in any way, so you can still safely abort.\n"
+"</p>"
+msgstr ""
+
+#. help text 1/1
+#: src/inst_live_welcome.ycp:14
+msgid ""
+"<p>Welcome to the &product; installation.\n"
+"Push <b>Next</p> to run the installation wizard.</p>"
+msgstr ""
+
+#. dialog caption, %1 is product name (typically openSUSE)
+#: src/inst_live_welcome.ycp:19
+#, ycp-format
+msgid "Welcome to %1 installation"
+msgstr ""
+
+#. wellcome label, %1 is product name
+#: src/inst_live_welcome.ycp:21
+#, ycp-format
+msgid ""
+"Your %1 will be installed quickly\n"
+"and easily in a few steps.\n"
+"You will only have to answer some questions."
+msgstr ""
+
+#. TRANSLATORS: error message - the module does not provide command line interface
+#: src/live-installer.ycp:27
+msgid "There is no user interface available for this module."
+msgstr ""
+
+#. progress step title
+#: src/live_copy_files_finish.ycp:51
+msgid "Copying files to installed system..."
+msgstr ""
+
+#. progress step title
+#: src/live_runme_at_boot_finish.ycp:45
+msgid "Writing YaST Configuration..."
+msgstr ""
+
+#. FIXME doesn't belong here
+#: src/live_runme_at_boot_finish.ycp:66
+msgid ""
+"Reboot the computer without the Live CD in the drive\n"
+"to continue the installation."
+msgstr ""
+
+#. progress step title
+#: src/live_save_config_finish.ycp:48
+msgid "Saving keyboard configuration..."
+msgstr ""
+
+#. progress step title
+#: src/live_save_config_finish.ycp:52
+msgid "Saving time zone..."
+msgstr ""
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-live-installer-2.15.6/src/control/live-install.xml new/yast2-live-installer-2.15.7/src/control/live-install.xml
--- old/yast2-live-installer-2.15.6/src/control/live-install.xml 2007-08-09 14:30:11.000000000 +0200
+++ new/yast2-live-installer-2.15.7/src/control/live-install.xml 2007-08-22 17:11:29.000000000 +0200
@@ -145,6 +145,10 @@
<label>Welcome</label>
<name>inst_live_welcome</name>
</module>
+ <module>
+ <label>License Agreement</label>
+ <name>inst_license</name>
+ </module>
<module>
<label>Installation Settings</label>
<name>inst_live_simple_proposal</name>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-live-installer-2.15.6/src/inst_live_doit.ycp new/yast2-live-installer-2.15.7/src/inst_live_doit.ycp
--- old/yast2-live-installer-2.15.6/src/inst_live_doit.ycp 2007-08-09 14:30:11.000000000 +0200
+++ new/yast2-live-installer-2.15.7/src/inst_live_doit.ycp 2007-08-22 16:57:10.000000000 +0200
@@ -31,11 +31,17 @@
if (total_mb == 0)
total_mb = 1024*1024*1024; // should be big enough
- string tmp_pipe = (string)SCR::Read (.target.tmpdir) + "/system_clone_fifo";
+ string tmp_pipe1 = (string)SCR::Read (.target.tmpdir) + "/system_clone_fifo_1";
+ string tmp_pipe2 = (string)SCR::Read (.target.tmpdir) + "/system_clone_fifo_2";
// FIXME this does not copy pipes in filesystem (usually not an issue)
cmd = sformat (
- "mkfifo %3 ; tar -C %1 -cSf - --one-file-system . | dd bs=1048576 of=%3 & echo $! >&2 ; tar -C %2 -xSf %3",
- from, to, tmp_pipe);
+ "mkfifo %3 ;
+ mkfifo %4 ;
+ tar -C %1 -cSf %3 --one-file-system . &
+ dd bs=1048576 if=%3 of=%4 >&2 &
+ jobs -l >&2;
+ tar -C %2 -xSf %4",
+ from, to, tmp_pipe1, tmp_pipe2);
y2milestone ("Executing %1", cmd);
SCR::Execute(.background.run_output_err, cmd);
string pid = "";
@@ -50,13 +56,17 @@
pid = lines[0]:"";
lines[0] = nil;
lines = filter (string l, lines, { return l != nil; });
- if (! regexpmatch (pid, "^[0-9]+$"))
+ if (! regexpmatch (pid, sformat ("dd bs=1048576 if=%1 of=%2", tmp_pipe1, tmp_pipe2)))
pid = "";
else
+ {
+ pid = regexpsub (pid, "([0-9]+) [^ 0-9]+ +dd", "\\1");
y2milestone ("DD's pid: %1", pid);
+ // sleep in order not to kill -USR1 to dd too early, otherwise it finishes
+ sleep (5000);
+ }
}
foreach (string l, lines, {
-y2internal ("Line: %1", l);
if (regexpmatch (l, "^[0-9]+ "))
done = regexpsub (l, "^([0-9]+) ", "\\1");
});
@@ -64,18 +74,21 @@
}
if (pid != "")
{
- SCR::Execute (.target.bash, sformat ("/bin/kill -USR1 %1", pid));
+ cmd = sformat ("/bin/kill -USR1 %1", pid);
+ y2milestone ("Executing %1", cmd);
+ SCR::Execute (.target.bash, cmd);
}
sleep (100);
if (done != nil)
{
integer progress = progress_start + (progress_finish - progress_start) * tointeger (done) / total_mb / 1024 / 1024;
Progress::Step (progress);
- y2milestone ("Setting progress to %1", progress);
+ y2debug ("Setting progress to %1", progress);
}
}
y2milestone ("Result: %1", SCR::Read (.background.status));
- SCR::Execute (.target.remove, tmp_pipe);
+ SCR::Execute (.target.remove, tmp_pipe1);
+ SCR::Execute (.target.remove, tmp_pipe2);
cmd = sformat ("chown --reference=%1 %2; chmod --reference=%1 %2",
from, to);
y2milestone ("Executing %1", cmd);
@@ -133,6 +146,11 @@
* @return boolean true on success
*/
boolean CopySymlinkedImage (map symlinks, integer progress_start) {
+ if (size (symlinks) == 0)
+ {
+ y2milestone ("No symlinked image");
+ return true;
+ }
integer index = 0;
integer progress_step = (100-progress_start) * index / size (symlinks);
foreach (string link, string target, symlinks, {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-live-installer-2.15.6/VERSION new/yast2-live-installer-2.15.7/VERSION
--- old/yast2-live-installer-2.15.6/VERSION 2007-08-14 09:26:45.000000000 +0200
+++ new/yast2-live-installer-2.15.7/VERSION 2007-08-22 17:11:35.000000000 +0200
@@ -1 +1 @@
-2.15.6
+2.15.7
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org