Hello community,
here is the log from the commit of package yast2-live-installer
checked in at Mon Jul 30 18:53:47 CEST 2007.
--------
--- yast2-live-installer/yast2-live-installer.changes 2007-07-17 17:32:48.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-live-installer/yast2-live-installer.changes 2007-07-30 17:42:58.130821000 +0200
@@ -1,0 +2,6 @@
+Mon Jul 30 17:27:29 CEST 2007 - jsrain@suse.cz
+
+- added simplified installation overview
+- 2.15.1
+
+-------------------------------------------------------------------
Old:
----
yast2-live-installer-2.15.0.tar.bz2
New:
----
yast2-live-installer-2.15.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-live-installer.spec ++++++
--- /var/tmp/diff_new_pack.q21525/_old 2007-07-30 18:52:53.000000000 +0200
+++ /var/tmp/diff_new_pack.q21525/_new 2007-07-30 18:52:53.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-live-installer (Version 2.15.0)
+# spec file for package yast2-live-installer (Version 2.15.1)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-live-installer
-Version: 2.15.0
+Version: 2.15.1
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-live-installer-2.15.0.tar.bz2
+Source0: yast2-live-installer-2.15.1.tar.bz2
prefix: /usr
Requires: yast2
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite
@@ -34,7 +34,7 @@
Jiri Srain
%prep
-%setup -n yast2-live-installer-2.15.0
+%setup -n yast2-live-installer-2.15.1
%build
%{prefix}/bin/y2tool y2autoconf
@@ -66,6 +66,9 @@
%doc %{prefix}/share/doc/packages/yast2-live-installer
%changelog
+* Mon Jul 30 2007 - jsrain@suse.cz
+- added simplified installation overview
+- 2.15.1
* Tue Jul 17 2007 - jsrain@suse.cz
- initial version
- 2.15.0
++++++ yast2-live-installer-2.15.0.tar.bz2 -> yast2-live-installer-2.15.1.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-live-installer-2.15.0/configure new/yast2-live-installer-2.15.1/configure
--- old/yast2-live-installer-2.15.0/configure 2007-07-17 17:31:10.000000000 +0200
+++ new/yast2-live-installer-2.15.1/configure 2007-07-30 17:40:43.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.0.
+# Generated by GNU Autoconf 2.60 for yast2-live-installer 2.15.1.
#
# 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.0'
-PACKAGE_STRING='yast2-live-installer 2.15.0'
+PACKAGE_VERSION='2.15.1'
+PACKAGE_STRING='yast2-live-installer 2.15.1'
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.0 to adapt to many kinds of systems.
+\`configure' configures yast2-live-installer 2.15.1 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.0:";;
+ short | recursive ) echo "Configuration of yast2-live-installer 2.15.1:";;
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.0
+yast2-live-installer configure 2.15.1
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.0, which was
+It was created by yast2-live-installer $as_me 2.15.1, 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.0'
+ VERSION='2.15.1'
cat >>confdefs.h <<_ACEOF
@@ -2374,7 +2374,7 @@
-VERSION="2.15.0"
+VERSION="2.15.1"
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.0, which was
+This file was extended by yast2-live-installer $as_me 2.15.1, 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.0
+yast2-live-installer config.status 2.15.1
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.0/configure.in new/yast2-live-installer-2.15.1/configure.in
--- old/yast2-live-installer-2.15.0/configure.in 2007-07-17 17:31:07.000000000 +0200
+++ new/yast2-live-installer-2.15.1/configure.in 2007-07-30 17:40:39.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-live-installer
dnl
-dnl -- This file is generated by y2autoconf 2.15.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.0, http://bugs.opensuse.org/, yast2-live-installer)
+AC_INIT(yast2-live-installer, 2.15.1, 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.0"
+VERSION="2.15.1"
RPMNAME="yast2-live-installer"
MAINTAINER="Jiri Srain "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-live-installer-2.15.0/live-installer.pot new/yast2-live-installer-2.15.1/live-installer.pot
--- old/yast2-live-installer-2.15.0/live-installer.pot 2007-06-29 14:41:32.000000000 +0200
+++ new/yast2-live-installer-2.15.1/live-installer.pot 2007-07-19 15:01:20.000000000 +0200
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-06-29 14:41+0200\n"
+"POT-Creation-Date: 2007-07-19 15:01+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-live-installer-2.15.0/src/control/live-install.xml new/yast2-live-installer-2.15.1/src/control/live-install.xml
--- old/yast2-live-installer-2.15.0/src/control/live-install.xml 2007-06-29 13:51:40.000000000 +0200
+++ new/yast2-live-installer-2.15.1/src/control/live-install.xml 2007-07-30 17:16:11.000000000 +0200
@@ -124,63 +124,6 @@
bootloader
</proposal>
- <proposal>
- <label>Network Configuration</label>
- <name>network</name>
- <stage>continue,normal</stage>
- yes
-
-
- <name>lan</name>
- 20
-
-
- <name>networkmanager</name>
- 5
-
-
- <name>ipv6</name>
- 15
-
-
- <name>dsl</name>
- 30
-
-
- <name>isdn</name>
- 40
-
-
- <name>modem</name>
- 50
-
-
- <name>remote</name>
- 60
-
-
- <name>firewall</name>
- 10
-
-
- <name>proxy</name>
- 70
-
-
- </proposal>
- <proposal>
- <label>Hardware Configuration</label>
- <name>hardware</name>
- <stage>continue</stage>
- yes
-
- x11
- printer
- sound
- tv
- bluetooth
-
- </proposal>
</proposals>
<!-- Stage: Initial, Mode: Installation -->
@@ -196,8 +139,17 @@
<stage>initial</stage>
<modules config:type="list">
<module>
- <label>Installation Summary</label>
- <name>inst_proposal</name>
+ <label>Welcome</label>
+ <name>inst_live_welcome</name>
+ </module>
+ <module>
+ <label>Installation Settings</label>
+ <name>inst_live_simple_proposal</name>
+ <proposal>initial</proposal>
+ </module>
+ <module>
+ <label>Installation Settings</label>
+ <name>inst_live_full_proposal</name>
<proposal>initial</proposal>
</module>
<module>
@@ -242,30 +194,27 @@
<name>inst_root</name>
</module>
<module>
- <label>Hostname</label>
- <name>inst_hostname</name>
- </module>
- <module>
- <label>Network</label>
- <name>inst_proposal</name>
- <proposal>network</proposal>
+ <label>Users</label>
+ <name>user</name>
</module>
<module>
<label>Network</label>
<name>inst_fam</name>
</module>
<module>
- <label>Network</label>
+ <label>Online Update</label>
<name>inst_ask_net_test</name>
</module>
<module>
- <label>Network</label>
+ <label>Online Update</label>
<name>inst_do_net_test</name>
</module>
+<!--
<module>
<label>Configure Software Management</label>
<name>inst_live_add_base_repo</name>
</module>
+-->
<module>
<label>Online Update</label>
<name>ask_online_update</name>
@@ -286,23 +235,6 @@
<name>inst_additional_repos</name>
</module>
-->
- <module>
- <label>Software Installation</label>
- <name>inst_live_sw_select</name>
- </module>
- <module>
- <label>Software Installation</label>
- <name>inst_rpmcopy</name>
- </module>
- <module>
- <label>Users</label>
- <name>auth</name>
- no
- </module>
- <module>
- <label>Users</label>
- <name>user</name>
- </module>
<module>
<label>Clean Up</label>
<name>suseconfig</name>
@@ -310,18 +242,10 @@
no
</module>
<module>
- <label>Release Notes</label>
- <name>release_notes</name>
- </module>
- <module>
- <label>Hardware Configuration</label>
- <name>proposal</name>
- <proposal>hardware</proposal>
+ <name>congratulate</name>
+ yes
+ yes
</module>
- <module>
- <label>Hardware Configuration</label>
- <name>save_hardware_status</name>
- </module>
</modules>
</workflow>
</workflows>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-live-installer-2.15.0/src/inst_live_full_proposal.ycp new/yast2-live-installer-2.15.1/src/inst_live_full_proposal.ycp
--- old/yast2-live-installer-2.15.0/src/inst_live_full_proposal.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-live-installer-2.15.1/src/inst_live_full_proposal.ycp 2007-07-30 14:25:25.000000000 +0200
@@ -0,0 +1,13 @@
+/**
+ *
+ */
+{
+
+import "LiveInstaller";
+
+if (LiveInstaller::run_full_proposal)
+ return (symbol) WFM::CallFunction ("inst_proposal", WFM::Args ());
+
+return `next;
+
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-live-installer-2.15.0/src/inst_live_simple_proposal.ycp new/yast2-live-installer-2.15.1/src/inst_live_simple_proposal.ycp
--- old/yast2-live-installer-2.15.0/src/inst_live_simple_proposal.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-live-installer-2.15.1/src/inst_live_simple_proposal.ycp 2007-07-30 17:20:44.000000000 +0200
@@ -0,0 +1,142 @@
+/**
+ *
+ */
+{
+
+import "BootCommon";
+import "GetInstArgs";
+import "Popup";
+import "Product";
+import "Wizard";
+import "LiveInstaller";
+import "Storage";
+import "HTML";
+
+textdomain "live-installer";
+
+Wizard::SetContents (
+ _("Installation settings"),
+ `Label (_("Analyzing the system")),
+ "",
+ false,
+ false
+);
+
+WFM::CallFunction ( "partitions_proposal",
+ [ "MakeProposal", $[
+ "force_reset" : false,
+ "language_changed" : false ]
+ ]
+);
+
+WFM::CallFunction ( "bootloader_proposal",
+ [ "MakeProposal", $[
+ "force_reset" : false,
+ "language_changed" : false ]
+ ]
+);
+
+// partitioning summary
+
+map tm = Storage::GetTargetMap ();
+integer used = 0;
+integer free = 0;
+
+list<string> disks = [];
+
+foreach (string disk, map data, tm, {
+ list