Hello community,
here is the log from the commit of package autoyast2 for openSUSE:Factory checked in at 2012-05-03 10:54:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/autoyast2 (Old)
and /work/SRC/openSUSE:Factory/.autoyast2.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "autoyast2", Maintainer is "ug@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/autoyast2/autoyast2.changes 2012-02-02 17:56:37.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.autoyast2.new/autoyast2.changes 2012-05-03 10:54:16.000000000 +0200
@@ -1,0 +2,28 @@
+Tue Apr 24 13:04:03 CEST 2012 - ug@suse.de
+
+- added postpartitioning-scripts to rnc file
+ (bnc#752896)
+- 2.22.1
+
+-------------------------------------------------------------------
+Mon Apr 16 16:55:42 CEST 2012 - ug@suse.de
+
+- setting disklabel to gpt did not work (bnc#757324)
+
+-------------------------------------------------------------------
+Tue Apr 10 16:26:08 CEST 2012 - ug@suse.de
+
+- license to gpl v2
+
+-------------------------------------------------------------------
+Thu Mar 29 13:56:04 CEST 2012 - jsuchome@suse.cz
+
+- merged proofread texts
+
+-------------------------------------------------------------------
+Thu Mar 1 13:47:17 CET 2012 - ug@suse.de
+
+- autoyast init-scripts got a parameter "2" because of a bug
+ in /etc/init.d/autoyast (bnc#749214)
+
+-------------------------------------------------------------------
Old:
----
autoyast2-2.22.0.tar.bz2
New:
----
autoyast2-2.22.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ autoyast2.spec ++++++
--- /var/tmp/diff_new_pack.OSiPfD/_old 2012-05-03 10:54:17.000000000 +0200
+++ /var/tmp/diff_new_pack.OSiPfD/_new 2012-05-03 10:54:17.000000000 +0200
@@ -19,14 +19,14 @@
Name: autoyast2
-Version: 2.22.0
+Version: 2.22.1
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: autoyast2-%{version}.tar.bz2
Group: System/YaST
-License: GPL-2.0+
+License: GPL-2.0
BuildRequires: daps docbook-xsl-stylesheets libxslt perl-XML-Writer pkg-config python-xml sgml-skel update-desktop-files xorg-x11-libs yast2-bootloader yast2-country yast2-devtools yast2-mouse yast2-slp yast2-testsuite yast2-transfer
# API for Disabled Modules (ProductControl)
BuildRequires: yast2 >= 2.16.36
@@ -63,7 +63,7 @@
installation sources.
%package installation
-Version: 2.22.0
+Version: 2.22.1
Summary: YaST2 - Auto Installation Modules
++++++ autoyast2-2.22.0.tar.bz2 -> autoyast2-2.22.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.22.0/VERSION new/autoyast2-2.22.1/VERSION
--- old/autoyast2-2.22.0/VERSION 2012-02-01 16:28:01.000000000 +0100
+++ new/autoyast2-2.22.1/VERSION 2012-04-25 14:12:08.000000000 +0200
@@ -1 +1 @@
-2.22.0
+2.22.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.22.0/configure new/autoyast2-2.22.1/configure
--- old/autoyast2-2.22.0/configure 2012-02-02 12:05:24.000000000 +0100
+++ new/autoyast2-2.22.1/configure 2012-04-25 14:12:30.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for autoyast2 2.22.0.
+# Generated by GNU Autoconf 2.68 for autoyast2 2.22.1.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -559,8 +559,8 @@
# Identity of this package.
PACKAGE_NAME='autoyast2'
PACKAGE_TARNAME='autoyast2'
-PACKAGE_VERSION='2.22.0'
-PACKAGE_STRING='autoyast2 2.22.0'
+PACKAGE_VERSION='2.22.1'
+PACKAGE_STRING='autoyast2 2.22.1'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
PACKAGE_URL=''
@@ -1237,7 +1237,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 autoyast2 2.22.0 to adapt to many kinds of systems.
+\`configure' configures autoyast2 2.22.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1308,7 +1308,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of autoyast2 2.22.0:";;
+ short | recursive ) echo "Configuration of autoyast2 2.22.1:";;
esac
cat <<\_ACEOF
@@ -1388,7 +1388,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-autoyast2 configure 2.22.0
+autoyast2 configure 2.22.1
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1405,7 +1405,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by autoyast2 $as_me 2.22.0, which was
+It was created by autoyast2 $as_me 2.22.1, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2335,7 +2335,7 @@
# Define the identity of the package.
PACKAGE='autoyast2'
- VERSION='2.22.0'
+ VERSION='2.22.1'
cat >>confdefs.h <<_ACEOF
@@ -2457,7 +2457,7 @@
-VERSION="2.22.0"
+VERSION="2.22.1"
RPMNAME="autoyast2"
MAINTAINER="Uwe Gansert "
@@ -3498,7 +3498,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by autoyast2 $as_me 2.22.0, which was
+This file was extended by autoyast2 $as_me 2.22.1, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3551,7 +3551,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-autoyast2 config.status 2.22.0
+autoyast2 config.status 2.22.1
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.22.0/configure.in new/autoyast2-2.22.1/configure.in
--- old/autoyast2-2.22.0/configure.in 2012-02-02 12:05:22.000000000 +0100
+++ new/autoyast2-2.22.1/configure.in 2012-04-25 14:12:28.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.21.6 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(autoyast2, 2.22.0, http://bugs.opensuse.org/, autoyast2)
+AC_INIT(autoyast2, 2.22.1, http://bugs.opensuse.org/, autoyast2)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.22.0"
+VERSION="2.22.1"
RPMNAME="autoyast2"
MAINTAINER="Uwe Gansert "
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.22.0/scripts/autoyast new/autoyast2-2.22.1/scripts/autoyast
--- old/autoyast2-2.22.0/scripts/autoyast 2008-08-15 11:51:19.000000000 +0200
+++ new/autoyast2-2.22.1/scripts/autoyast 2012-03-01 13:47:14.000000000 +0100
@@ -80,7 +80,7 @@
for script in `find $INITSCRIPT_DIR -type f |sort`; do
echo -n "Executing AutoYaST script: $script"
BASENAME=`basename $script`
- sh -x $script 2&> $LOG_DIR/$BASENAME.log
+ sh -x $script 2> $LOG_DIR/$BASENAME.log
mv $script $SCRIPT_DIR
rc_status -v
done
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.22.0/src/clients/autoyast.ycp new/autoyast2-2.22.1/src/clients/autoyast.ycp
--- old/autoyast2-2.22.0/src/clients/autoyast.ycp 2008-10-08 17:39:21.000000000 +0200
+++ new/autoyast2-2.22.1/src/clients/autoyast.ycp 2012-04-10 16:26:27.000000000 +0200
@@ -3,7 +3,7 @@
* Summary: Main file for client call
* Authors: Anas Nashif
*
- * $Id: autoyast.ycp 51883 2008-10-06 15:57:54Z lslezak $
+ * $Id: autoyast.ycp 67750 2012-03-29 11:56:40Z jsuchome $
*/
{
textdomain "autoinst";
@@ -79,7 +79,7 @@
map cmdline = $[
"id" : "autoyast2",
- "help" : _("autoyast"),
+ "help" : _("AutoYaST"),
"guihandler" : AutoSequence,
"actions" : $[
"file" : $[ "handler":openFile, "help":"file operations" ],
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.22.0/src/clients/ayast_setup.ycp new/autoyast2-2.22.1/src/clients/ayast_setup.ycp
--- old/autoyast2-2.22.0/src/clients/ayast_setup.ycp 2010-03-02 10:11:08.000000000 +0100
+++ new/autoyast2-2.22.1/src/clients/ayast_setup.ycp 2012-04-10 16:26:27.000000000 +0200
@@ -11,7 +11,7 @@
0.5: * support for the new "keep install network"
feature of 10.3
* Version: 0.5
- * $Id: ayast_setup.ycp 61083 2010-03-02 09:11:08Z ug $
+ * $Id: ayast_setup.ycp 67750 2012-03-29 11:56:40Z jsuchome $
this client can be called from a running system,
to do the autoyast configuration.
@@ -78,7 +78,7 @@
boolean openFile( map options ) {
if ( options["filename"]:nil == nil ) {
- CommandLine::Error(_("Path to autoyast profile must be set"));
+ CommandLine::Error(_("Path to AutoYaST profile must be set."));
return false;
}
if( options["dopackages"]:"yes" == "no" )
@@ -99,18 +99,18 @@
map cmdline = $[
"id" : "ayast_setup",
- "help" : _("Client for autoyast configuration on the running system"),
+ "help" : _("Client for AutoYaST configuration on the running system"),
"guihandler": GUI,
"actions" : $[
"setup" : $[
"handler" : openFile,
- "help" : _("Configure the system using given autoyast profile"),
+ "help" : _("Configure the system using given AutoYaST profile"),
"example" : "setup filename=/path/to/profile dopackages=no" ]
],
"options" : $[
"filename": $[
"type" : "string",
- "help" : _("Path to autoyast profile")
+ "help" : _("Path to AutoYaST profile")
],
"dopackages": $[
"type" : "enum",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.22.0/src/clients/inst_autoconfigure.ycp new/autoyast2-2.22.1/src/clients/inst_autoconfigure.ycp
--- old/autoyast2-2.22.0/src/clients/inst_autoconfigure.ycp 2011-11-23 12:08:04.000000000 +0100
+++ new/autoyast2-2.22.1/src/clients/inst_autoconfigure.ycp 2012-04-10 16:26:27.000000000 +0200
@@ -5,7 +5,7 @@
* Summary: This module finishes auto-installation and configures
* the system as described in the profile file.
*
- * $Id: inst_autoconfigure.ycp 66903 2011-11-23 11:08:02Z ug $
+ * $Id: inst_autoconfigure.ycp 67750 2012-03-29 11:56:40Z jsuchome $
*/
{
@@ -59,7 +59,7 @@
if( process["name"]:"" == resource ) {
if( haskey( process, "sleep" ) ) {
if( process["sleep","feedback"]:false == true )
- Popup::ShowFeedback( "", sformat( _("processing resource %1"), resource));
+ Popup::ShowFeedback( "", sformat( _("Processing resource %1"), resource));
sleep( 1000*process["sleep","time"]:0 );
if( process["sleep","feedback"]:false == true )
Popup::ClearFeedback();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.22.0/src/dialogs/PartitionDialog.ycp new/autoyast2-2.22.1/src/dialogs/PartitionDialog.ycp
--- old/autoyast2-2.22.0/src/dialogs/PartitionDialog.ycp 2009-06-26 12:40:31.000000000 +0200
+++ new/autoyast2-2.22.1/src/dialogs/PartitionDialog.ycp 2012-04-10 16:26:27.000000000 +0200
@@ -126,7 +126,7 @@
stripes = (integer) UI::QueryWidget( `id(`numberStripes), `Value );
stripesize = (integer) UI::QueryWidget( `id(`stripesize), `Value );
if( "" == lvName ) {
- Popup::Warning( _("Please provide a logical volume name.") );
+ Popup::Warning( _("Provide a logical volume name.") );
}
} else {
UI::ChangeWidget( `id(`striping), `Enabled, false );
@@ -180,7 +180,9 @@
(boolean) UI::QueryWidget(`id(`resizePartition),`Value));
if( `keep == (symbol) UI::QueryWidget(`id(`cbFileSystem), `Value ) ){
if( ! reUse && lvmGroup == "" ){ /* for PV's its ok to have no fs */
- Popup::Warning( _("You selected to create the partition but you did not select a valid file system.\nPlease select a valid filesystem to continue.") );
+ Popup::Warning( _("You selected to create the partition, but you did not select a valid file
+system. Select a valid filesystem to continue.
+") );
}
part = AutoinstPartition::set( part, "format", false);
part = AutoinstPartition::set( part, "filesystem",`Empty);
@@ -460,7 +462,7 @@
UI::ChangeWidget(`id(`size), `Enabled, false);
}
else{
- Popup::Error(_("Size \"auto\" is only valid if mount point \"/boot\" or \"swap\" is selected"));
+ Popup::Error(_("Size \"auto\" is only valid if mount point \"/boot\" or \"swap\" is selected."));
UI::ChangeWidget(`id(`size), `Enabled, true);
UI::ChangeWidget(`id(`unit), `Value, `GB );
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.22.0/src/dialogs/general_dialogs.ycp new/autoyast2-2.22.1/src/dialogs/general_dialogs.ycp
--- old/autoyast2-2.22.0/src/dialogs/general_dialogs.ycp 2011-08-30 15:43:47.000000000 +0200
+++ new/autoyast2-2.22.1/src/dialogs/general_dialogs.ycp 2012-04-10 16:26:27.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: General Settings
* Author: Anas Nashif
*
- * $Id: general_dialogs.ycp 65450 2011-08-30 13:43:47Z ug $
+ * $Id: general_dialogs.ycp 67750 2012-03-29 11:56:40Z jsuchome $
*/
{
textdomain "autoinst";
@@ -53,7 +53,7 @@
`Left(`CheckBox(`id(`confirm), _("Con&firm installation?"), confirm)),
`Left(`CheckBox(`id(`second_stage), _("AutoYaST Second Stage"), second_stage)),
`Left(`CheckBox(`id(`halt), _("Turn Off the Machine after the First Stage"), halt)),
- `Left(`CheckBox(`id(`halt_second), _("Turn Off the Machine after the Second Stage"), halt_second)),
+ `Left(`CheckBox(`id(`halt_second), _("Turn off the Machine after the Second Stage"), halt_second)),
`Left(`CheckBox(`id(`reboot_second), _("Reboot the Machine after the Second Stage"), reboot_second)),
`Left(`Label( _("Signature Handling") )),
`Left(`CheckBox(`id(`accept_unsigned_file), _("Accept &Unsigned Files"), accept_unsigned_file)),
@@ -342,8 +342,8 @@
`MinSize( 10, 5, `SelectionBox( `id(`dialogs), `opt(`notify,`immediate), _("Title"), dialogs ) ),
`HBox(
`PushButton( `id( `deleteDialog ), `opt( `default, `hstretch ), _("Delete Dialog") ),
- `PushButton( `id( `dialogUp ), `opt( `default, `hstretch ), _("Dialog Up") ),
- `PushButton( `id( `dialogDown ), `opt( `default, `hstretch ), _("Dialog Down") )
+ `PushButton( `id( `dialogUp ), `opt( `default, `hstretch ), _("Dialog up") ),
+ `PushButton( `id( `dialogDown ), `opt( `default, `hstretch ), _("Dialog down") )
),
`Label( _("Questions in dialog") ),
`MinSize( 10,5,
@@ -356,8 +356,8 @@
`PushButton( `id( `addQuestion ), `opt( `default, `hstretch ), _("Add Question") ),
`PushButton( `id( `editQuestion ), `opt( `default, `hstretch ), _("Edit Question") ),
`PushButton( `id( `deleteQuestion ), `opt( `default, `hstretch ), _("Delete Question") ),
- `PushButton( `id( `questionUp ), `opt( `default, `hstretch ), _("Question Up") ),
- `PushButton( `id( `questionDown ), `opt( `default, `hstretch ), _("Question Down") )
+ `PushButton( `id( `questionUp ), `opt( `default, `hstretch ), _("Question up") ),
+ `PushButton( `id( `questionDown ), `opt( `default, `hstretch ), _("Question down") )
)
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.22.0/src/dialogs/helps.ycp new/autoyast2-2.22.1/src/dialogs/helps.ycp
--- old/autoyast2-2.22.0/src/dialogs/helps.ycp 2007-05-21 12:26:37.000000000 +0200
+++ new/autoyast2-2.22.1/src/dialogs/helps.ycp 2012-04-10 16:26:27.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Help texts of all the dialogs
* Authors: anas nashif
*
- * $Id: helps.ycp 18801 2004-08-25 15:58:32Z nashif $
+ * $Id: helps.ycp 67750 2012-03-29 11:56:40Z jsuchome $
*/
{
@@ -63,7 +63,7 @@
+ _("<p><b>Advanced Options</b></p>")
- + _("By default, AutoYaST2 will create an extended partition and adds all new partitions as logical devices. It is possible, however, to instruct AutoYaST2 to create a certain partition as a primary partition or as extended partition. Additionally, it is possible to specify the size of a partition using sectors rather than size in MBytes.")
+ + _("By default, AutoYaST will create an extended partition and adds all new partitions as logical devices. It is possible, however, to instruct AutoYaST to create a certain partition as a primary partition or as extended partition. Additionally, it is possible to specify the size of a partition using sectors rather than size in MBytes.")
+ _("These options and other advanced options cannot be configured using this
interface. Instead, add them manually to the control file.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.22.0/src/modules/AutoinstPartPlan.ycp new/autoyast2-2.22.1/src/modules/AutoinstPartPlan.ycp
--- old/autoyast2-2.22.0/src/modules/AutoinstPartPlan.ycp 2011-02-01 14:01:52.000000000 +0100
+++ new/autoyast2-2.22.1/src/modules/AutoinstPartPlan.ycp 2012-04-10 16:26:27.000000000 +0200
@@ -292,7 +292,7 @@
* the next instructions taints result
*/
if( ! found ){
- Popup::Error(sformat( _("Volume group '%1' must have at least one physical volume. Please provide one."), volGroupName) );
+ Popup::Error(sformat( _("Volume group '%1' must have at least one physical volume. Provide one."), volGroupName) );
}
sane = found;
});
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.22.0/src/modules/AutoinstStorage.ycp new/autoyast2-2.22.1/src/modules/AutoinstStorage.ycp
--- old/autoyast2-2.22.0/src/modules/AutoinstStorage.ycp 2012-01-05 11:42:05.000000000 +0100
+++ new/autoyast2-2.22.1/src/modules/AutoinstStorage.ycp 2012-04-16 16:56:58.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Storage
* Authors: Anas Nashif
*
- * $Id: AutoinstStorage.ycp 67107 2012-01-05 10:42:04Z ug $
+ * $Id: AutoinstStorage.ycp 67940 2012-04-16 14:56:57Z ug $
*/
{
module "AutoinstStorage";
@@ -786,6 +786,8 @@
if ( Storage::IsRealDisk( data) &&
data["initialize"]:false == true) {
initial_target_map[device,"delete"] = true;
+ if( haskey( data, "disklabel" ))
+ initial_target_map[device,"disklabel"] = data["disklabel"]:"msdos";
Storage::SetTargetMap(initial_target_map);
}
});
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.22.0/src/modules/Profile.ycp new/autoyast2-2.22.1/src/modules/Profile.ycp
--- old/autoyast2-2.22.0/src/modules/Profile.ycp 2010-03-26 09:57:53.000000000 +0100
+++ new/autoyast2-2.22.1/src/modules/Profile.ycp 2012-04-10 16:26:27.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Profile handling
* Authors: Anas Nashif
*
- * $Id: Profile.ycp 61506 2010-03-26 08:57:51Z ug $
+ * $Id: Profile.ycp 67750 2012-03-29 11:56:40Z jsuchome $
*/
{
module "Profile";
@@ -345,7 +345,7 @@
do {
UI::OpenDialog(
`VBox(
- `Label(_("Encrypted AutoYaST profile. Please enter the password twice")),
+ `Label(_("Encrypted AutoYaST profile. Enter the password twice.")),
`Password(`id(`password), ""),
`Password(`id(`password2), ""),
`PushButton(`id(`ok), Label::OKButton())
@@ -395,7 +395,7 @@
sectionFiles = add(sectionFiles, sectionName, sectionFileName);
}
else{
- y2error(sformat(_("Couldn't write section %1 to file %2"), sectionName, sectionFileName));
+ y2error(sformat(_("Could not write section %1 to file %2."), sectionName, sectionFileName));
}
});
return sectionFiles;
@@ -552,7 +552,7 @@
while( out["stdout"]:"" == "" ) {
UI::OpenDialog(
`VBox(
- `Label(_("Encrypted AutoYaST profile. Please enter the correct password.")),
+ `Label(_("Encrypted AutoYaST profile. Enter the correct password.")),
`Password(`id(`password), ""),
`PushButton(`id(`ok), Label::OKButton())
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.22.0/src/modules/ProfileLocation.ycp new/autoyast2-2.22.1/src/modules/ProfileLocation.ycp
--- old/autoyast2-2.22.0/src/modules/ProfileLocation.ycp 2010-01-14 15:25:09.000000000 +0100
+++ new/autoyast2-2.22.1/src/modules/ProfileLocation.ycp 2012-04-10 16:26:27.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Process Auto-Installation Location
* Author: Anas Nashif
*
- * $Id: ProfileLocation.ycp 60367 2010-01-14 14:25:09Z ug $
+ * $Id: ProfileLocation.ycp 67750 2012-03-29 11:56:40Z jsuchome $
*/
{
module "ProfileLocation";
@@ -126,7 +126,7 @@
y2milestone("encrypted profile found");
UI::OpenDialog(
`VBox(
- `Label( _("Encrypted AutoYaST profile. Please enter the correct password.") ),
+ `Label( _("Encrypted AutoYaST profile. Enter the correct password.") ),
`Password(`id(`password), ""),
`PushButton(`id(`ok), _("&OK") )
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.22.0/src/schema/general.rnc new/autoyast2-2.22.1/src/schema/general.rnc
--- old/autoyast2-2.22.0/src/schema/general.rnc 2010-04-27 10:37:20.000000000 +0200
+++ new/autoyast2-2.22.1/src/schema/general.rnc 2012-04-24 13:31:18.000000000 +0200
@@ -3,7 +3,14 @@
namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
general = element general {
- mode? &
+ element mode {
+ element confirm { BOOLEAN }? &
+ element halt { BOOLEAN }? &
+ element second_stage { BOOLEAN }? &
+ element final_halt { BOOLEAN }? &
+ element final_reboot { BOOLEAN }? &
+ element forceboot { BOOLEAN }?
+ }
mouse? &
ask-list? &
signature-handling? &
@@ -53,7 +60,6 @@
ask_title = element title { text }
ask_type = element type { ( "symbol" | "integer" | "boolean" | "string" ) }
ask_password = element password { BOOLEAN }
-ask_path = element path { text }
ask_stage = element stage { "cont" | "initial" }
ask_selection = element selection { LIST, ask_selection_entry+ }
ask_selection_entry = element entry { ask_entry_value & ask_entry_label }
@@ -87,10 +93,6 @@
element rerun_on_error { BOOLEAN }?
}
-mode =
- element mode {
- confirm? & halt? & second_stage? & final_halt? & final_reboot? & forceboot?
- }
confirm =
element confirm { BOOLEAN }
final_halt =
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.22.0/src/schema/scripts.rnc new/autoyast2-2.22.1/src/schema/scripts.rnc
--- old/autoyast2-2.22.0/src/schema/scripts.rnc 2010-03-25 13:47:47.000000000 +0100
+++ new/autoyast2-2.22.1/src/schema/scripts.rnc 2012-04-24 13:44:48.000000000 +0200
@@ -7,7 +7,8 @@
chroot-scripts? &
post-scripts? &
pre-scripts? &
- init-scripts?
+ init-scripts? &
+ postpartitioning-scripts?
}
chroot-scripts =
@@ -18,7 +19,7 @@
post-scripts =
element post-scripts {
LIST,
- autoinstall-script+
+ autoinstall-post-script+
}
pre-scripts =
element pre-scripts {
@@ -30,6 +31,12 @@
LIST,
autoinstall-init-script+
}
+postpartitioning-scripts =
+element postpartitioning-scripts {
+ LIST,
+ autoinstall-script+
+}
+
# script is overloaded
autoinstall-script = element script {
@@ -42,6 +49,17 @@
element notification { text }?
}
+autoinstall-post-script = element script {
+ filename? &
+ interpreter? &
+ element location { text }? &
+ source? &
+ debug? &
+ feedback? &
+ element notification { text }? &
+ element network_needed { BOOLEAN }
+}
+
autoinstall-init-script = element script {
filename? &
element location { text }? &
@@ -67,3 +85,4 @@
filename = element filename { text }
interpreter = element interpreter { text }
source = element source { text }
+network_needed = element network_needed { BOOLEAN }
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org