Hello community, here is the log from the commit of package autoyast2 for openSUSE:Factory checked in at Fri May 8 14:47:20 CEST 2009. -------- --- autoyast2/autoyast2.changes 2009-04-02 15:58:12.000000000 +0200 +++ /mounts/work_src_done/STABLE/autoyast2/autoyast2.changes 2009-05-05 12:50:37.000000000 +0200 @@ -1,0 +2,31 @@ +Tue May 5 10:30:43 CEST 2009 - ug@suse.de + +- keep_install_network docu added (thanx Bubli and Michal) +- 2.18.3 + +------------------------------------------------------------------- +Mon May 4 11:54:16 CEST 2009 - ug@suse.de + +- don't log passwords from "ask" fixed (bnc#492746) + +------------------------------------------------------------------- +Tue Apr 14 15:32:36 CEST 2009 - ug@suse.de + +- reuse old partition_id when create=false + +------------------------------------------------------------------- +Wed Apr 8 14:22:54 CEST 2009 - ug@suse.de + +- don't log the answers of ask dialogs via milestone + +------------------------------------------------------------------- +Wed Apr 8 12:12:22 CEST 2009 - ug@suse.de + +- classes and rules RNC files fixed + +------------------------------------------------------------------- +Fri Apr 3 13:08:47 CEST 2009 - ug@suse.de + +- postpartitioning script invented + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- autoyast2-2.18.2.tar.bz2 New: ---- autoyast2-2.18.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ autoyast2.spec ++++++ --- /var/tmp/diff_new_pack.nz5868/_old 2009-05-08 14:46:58.000000000 +0200 +++ /var/tmp/diff_new_pack.nz5868/_new 2009-05-08 14:46:58.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package autoyast2 (Version 2.18.2) +# spec file for package autoyast2 (Version 2.18.3) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,12 +20,12 @@ Url: http://www.suse.de/~ug Name: autoyast2 -Version: 2.18.2 +Version: 2.18.3 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: autoyast2-2.18.2.tar.bz2 +Source0: autoyast2-2.18.3.tar.bz2 Prefix: /usr BuildRequires: docbook-xsl-stylesheets java2-devel-packages libxslt perl-XML-Writer pkg-config 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) @@ -63,7 +63,7 @@ %package installation License: GPL v2 or later -Version: 2.18.2 +Version: 2.18.3 Release: 1 Summary: YaST2 - Auto Installation Modules Group: System/YaST @@ -87,7 +87,7 @@ Anas Nashif %prep -%setup -n autoyast2-2.18.2 +%setup -n autoyast2-2.18.3 %build %{prefix}/bin/y2tool y2autoconf @@ -239,6 +239,19 @@ %dir /var/lib/autoinstall %dir /var/lib/autoinstall/autoconf %changelog +* Tue May 05 2009 ug@suse.de +- keep_install_network docu added (thanx Bubli and Michal) +- 2.18.3 +* Mon May 04 2009 ug@suse.de +- don't log passwords from "ask" fixed (bnc#492746) +* Tue Apr 14 2009 ug@suse.de +- reuse old partition_id when create=false +* Wed Apr 08 2009 ug@suse.de +- don't log the answers of ask dialogs via milestone +* Wed Apr 08 2009 ug@suse.de +- classes and rules RNC files fixed +* Fri Apr 03 2009 ug@suse.de +- postpartitioning script invented * Wed Apr 01 2009 ug@suse.de - storage lib compatibility with "used_by" - 2.18.2 ++++++ autoyast2-2.18.2.tar.bz2 -> autoyast2-2.18.3.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.18.2/configure new/autoyast2-2.18.3/configure --- old/autoyast2-2.18.2/configure 2009-04-02 15:57:42.000000000 +0200 +++ new/autoyast2-2.18.3/configure 2009-05-05 12:39:23.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for autoyast2 2.18.2. +# Generated by GNU Autoconf 2.63 for autoyast2 2.18.3. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -596,8 +596,8 @@ # Identity of this package. PACKAGE_NAME='autoyast2' PACKAGE_TARNAME='autoyast2' -PACKAGE_VERSION='2.18.2' -PACKAGE_STRING='autoyast2 2.18.2' +PACKAGE_VERSION='2.18.3' +PACKAGE_STRING='autoyast2 2.18.3' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1282,7 +1282,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.18.2 to adapt to many kinds of systems. +\`configure' configures autoyast2 2.18.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1353,7 +1353,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of autoyast2 2.18.2:";; + short | recursive ) echo "Configuration of autoyast2 2.18.3:";; esac cat <<\_ACEOF @@ -1433,7 +1433,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -autoyast2 configure 2.18.2 +autoyast2 configure 2.18.3 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1447,7 +1447,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.18.2, which was +It was created by autoyast2 $as_me 2.18.3, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2294,7 +2294,7 @@ # Define the identity of the package. PACKAGE='autoyast2' - VERSION='2.18.2' + VERSION='2.18.3' cat >>confdefs.h <<_ACEOF @@ -2518,7 +2518,7 @@ -VERSION="2.18.2" +VERSION="2.18.3" RPMNAME="autoyast2" MAINTAINER="Uwe Gansert <ug@suse.de>" @@ -3577,7 +3577,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.18.2, which was +This file was extended by autoyast2 $as_me 2.18.3, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3627,7 +3627,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -autoyast2 config.status 2.18.2 +autoyast2 config.status 2.18.3 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.18.2/configure.in new/autoyast2-2.18.3/configure.in --- old/autoyast2-2.18.2/configure.in 2009-04-02 15:57:37.000000000 +0200 +++ new/autoyast2-2.18.3/configure.in 2009-05-05 12:39:17.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(autoyast2, 2.18.2, http://bugs.opensuse.org/, autoyast2) +AC_INIT(autoyast2, 2.18.3, 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.18.2" +VERSION="2.18.3" RPMNAME="autoyast2" MAINTAINER="Uwe Gansert <ug@suse.de>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.18.2/doc/CreateProfileDetails.xml new/autoyast2-2.18.3/doc/CreateProfileDetails.xml --- old/autoyast2-2.18.2/doc/CreateProfileDetails.xml 2009-03-26 15:25:26.000000000 +0100 +++ new/autoyast2-2.18.3/doc/CreateProfileDetails.xml 2009-05-05 10:42:29.000000000 +0200 @@ -1730,6 +1730,17 @@ configure and setup Ethernet Controllers and Token-Ring Controllers. </para> <para> + In the networking section, when this option is set to true (default is false, this option is available since openSUSE 11.2 but not SLES11): + <screen> + <keep_install_network config:type="boolean">true</keep_install_network> + </screen> + YaST will keep network settings created during installation (via Linuxrc) + and/or merge it with network settings from the AutoYaST profile (if these are defined). + AutoYaST settings have higher priority than already present configuration files. + YaST will write ifcfg-* files from profile without removing old ones. + If there is none (or empty) dns and routing section, YaST will keep already present values. Otherwise settings from the profile will be applied. + </para> + <para> To configure network settings and activate networking automatically, one global resource is used to store the whole network configuration. </para> @@ -2051,12 +2062,13 @@ installation. </para> <para> - In the auto-installation process, four types of scripts can be executed and they + In the auto-installation process, five types of scripts can be executed and they will be described here in order of "appearance" during the installation. </para> <para> <itemizedlist> <listitem><emphasis>pre-scripts</emphasis> (very early, before anything else really happened)</listitem> + <listitem><emphasis>postpartitioning-scripts</emphasis> (after partitioning and mounting to /mnt but before RPM installation - since openSUSE 11.2)</listitem> <listitem><emphasis>chroot-scripts</emphasis> (after the package installation, before the first boot)</listitem> <listitem><emphasis>post-scripts</emphasis> (during the first boot of the installed system, no services running)</listitem> <listitem><emphasis>init-scripts</emphasis> (during the first boot of the installed system, all servies up and running)</listitem> @@ -2153,6 +2165,85 @@ </table> </para> </section> + + <section id="postpartitioning-install.scripts"> + <title>Postpartitioning Scripts</title> + <note> + <para>Available starting from openSUSE 11.2 only (not SLES11).</para> + </note> + <para> + Executed after &yast2; did the partitioning and wrote the fstab. The empty system is mounted to /mnt already. + This type of script is available since openSUSE 11.2 (not SLES11). + </para> + <para> + The following elements must be between the <postpartitioning-scripts config:type="list"><script> ... </script></postpartitioning-sripts> tags + </para> + <para> + <table frame='top'> + <title>postpartitioning script XML representation</title> + <tgroup cols="3"> + <thead> + <row> + <entry>Element</entry> + <entry>Description</entry> + <entry>Comment</entry> + </row> + </thead> + <tbody> + <row> + <entry>location</entry> + <entry>you can define a location from where the script gets fetched. + Locations can be the same like for the profile (http,ftp,nfs,...). + <para><screen><location>http://10.10.0.1/myScript.sh</location></screen></para></entry> + <entry>either <location> or <source> must be defined</entry> + </row> + <row> + <entry>source</entry> + <entry>the script itself. The source code of the script if you want so. Encapsulated in a CDATA tag. If you don't want + to put the whole shell script into the XML profile, look at the location parameter. + + <para><screen><source> +<![CDATA[ +echo "Testing postpart script" > /mnt/postpart_test.txt +]]> +</source></screen></para></entry> + <entry>Either <location> or <source> must be defined</entry> + </row> + <row> + <entry>interpreter</entry> + <entry>the interpreter that must be used for the script. Supported options are shell and perl. + <para><screen><interpreter>perl</interpreter></screen></para></entry> + <entry>optional (default is shell)</entry> + </row> + <row> + <entry>filename</entry> + <entry>the filename of the script. It will be stored in a temporary directory under /tmp/... + <para><screen><filename>myScript5.sh</filename></screen></para></entry> + <entry>optional. The default is the type of the script (pre-scripts) in this case</entry> + </row> + <row> + <entry>feedback</entry> + <entry>if this boolean is true, stdout and stderr of the script will be shown in a popup that the + user has to confirm via ok-button. If stdout and stderr are empty, no popup is shown and so + no confirmation is needed. + <para><screen><feedback config:type="boolean">true</feedback></screen></para></entry> + <entry>optional. The default is false. This option was invented with SL 10.1 / SLES10</entry> + </row> + <row> + <entry>debug</entry> + <entry>if this is true, every single line of a shell script is logged. Perl scripts are run with warnings + turned on. + <para><screen><debug config:type="boolean">true</debug></screen></para></entry> + <entry>optional. The default is true. This option was invented with SL 10.1 / SLES10</entry> + </row> + </tbody> + </tgroup> + </table> + </para> + </section> + + + <section id="chroot.scripts"> <title>Chroot environment scripts</title> <para>Chroot scripts are executed before the machine reboots for the first time. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.18.2/doc/examples/example.scripts.xml new/autoyast2-2.18.3/doc/examples/example.scripts.xml --- old/autoyast2-2.18.2/doc/examples/example.scripts.xml 2007-05-21 12:26:33.000000000 +0200 +++ new/autoyast2-2.18.3/doc/examples/example.scripts.xml 2009-04-03 13:07:25.000000000 +0200 @@ -68,5 +68,18 @@ </source> </script> </pre-scripts> + <postpartitioning-scripts config:type="list"> + <script> + <filename>postpart.sh</filename> + <interpreter>shell</interpreter> + <debug config:type="boolean">false</debug> + <feedback config:type="boolean">true</feedback> + <source><![CDATA[ +touch /mnt/testfile +echo Hi +]]> + </source> + </script> + </postpartitioning-scripts> </scripts> </profile> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.18.2/src/clients/ayast_setup.ycp new/autoyast2-2.18.3/src/clients/ayast_setup.ycp --- old/autoyast2-2.18.2/src/clients/ayast_setup.ycp 2009-01-09 14:48:55.000000000 +0100 +++ new/autoyast2-2.18.3/src/clients/ayast_setup.ycp 2009-05-04 14:29:04.000000000 +0200 @@ -11,7 +11,7 @@ 0.5: * support for the new "keep install network" feature of 10.3 * Version: 0.5 - * $Id$ + * $Id: ayast_setup.ycp 57028 2009-04-29 10:58:09Z lslezak $ this client can be called from a running system, to do the autoyast configuration. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.18.2/src/clients/clone_system.ycp new/autoyast2-2.18.3/src/clients/clone_system.ycp --- old/autoyast2-2.18.2/src/clients/clone_system.ycp 2007-05-21 12:26:34.000000000 +0200 +++ new/autoyast2-2.18.3/src/clients/clone_system.ycp 2009-05-04 14:29:04.000000000 +0200 @@ -6,7 +6,7 @@ * system. * * Changes: * initial - just do a simple clone - * $Id$ + * $Id: clone_system.ycp 57028 2009-04-29 10:58:09Z lslezak $ */ { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.18.2/src/clients/inst_autoconfigure.ycp new/autoyast2-2.18.3/src/clients/inst_autoconfigure.ycp --- old/autoyast2-2.18.2/src/clients/inst_autoconfigure.ycp 2008-10-28 17:29:17.000000000 +0100 +++ new/autoyast2-2.18.3/src/clients/inst_autoconfigure.ycp 2009-05-04 11:54:37.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 52637 2008-10-28 16:29:45Z ug $ + * $Id: inst_autoconfigure.ycp 57049 2009-05-04 09:54:36Z ug $ */ { @@ -161,7 +161,12 @@ result[res] = Profile::current[res]:[]; i = i + 1; }); - y2milestone("Calling auto client with: %1", result); + if( d["X-SuSE-YaST-AutoLogResource"]:"true" == "true" ) { + y2milestone("Calling auto client with: %1", result); + } else { + y2milestone("logging for resource %1 turned off",resource); + y2debug("Calling auto client with: %1", result); + } if (size(result) > 0 ) logStep( sformat (_("Configuring %1"), p)); else @@ -174,7 +179,12 @@ } else if (d["X-SuSE-YaST-AutoInstDataType"]:"map" == "map") { - y2milestone("Calling auto client with: %1", eval(Profile::current[resource]:$[])); + if( d["X-SuSE-YaST-AutoLogResource"]:"true" == "true" ) { + y2milestone("Calling auto client with: %1", eval(Profile::current[resource]:$[])); + } else { + y2milestone("logging for resource %1 turned off",resource); + y2debug("Calling auto client with: %1", eval(Profile::current[resource]:$[])); + } if (size(Profile::current[resource]:$[]) > 0 ) logStep( sformat (_("Configuring %1"), p)); else @@ -190,8 +200,12 @@ logStep( sformat (_("Configuring %1"), p)); else logStep( sformat (_("Not Configuring %1"), p)); - - y2milestone("Calling auto client with: %1", eval(Profile::current[resource]:[])); + if( d["X-SuSE-YaST-AutoLogResource"]:"true" == "true" ) { + y2milestone("Calling auto client with: %1", eval(Profile::current[resource]:$[])); + } else { + y2milestone("logging for resource %1 turned off",resource); + y2debug("Calling auto client with: %1", eval(Profile::current[resource]:$[])); + } //Call::Function(module_auto, ["Import", eval(Profile::current[resource]:[]) ]); processWait( resource, "pre-modules" ); Call::Function(module_auto, ["Write"]); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.18.2/src/clients/inst_autoimage.ycp new/autoyast2-2.18.3/src/clients/inst_autoimage.ycp --- old/autoyast2-2.18.2/src/clients/inst_autoimage.ycp 2007-05-21 12:26:34.000000000 +0200 +++ new/autoyast2-2.18.3/src/clients/inst_autoimage.ycp 2009-04-03 13:09:24.000000000 +0200 @@ -4,7 +4,7 @@ * Author: Anas Nashif <nashif@suse.de> * Summary: Imaging * - * $Id: inst_autoimage.ycp 33269 2006-10-09 08:22:24Z ug $ + * $Id: inst_autoimage.ycp 56615 2009-04-03 11:08:57Z ug $ */ { @@ -16,6 +16,9 @@ import "Report"; import "AutoinstImage"; import "AutoinstSoftware"; +import "AutoinstScripts"; + +AutoinstScripts::Write("postpartitioning-scripts", false); if (!AutoinstSoftware::imaging) return `auto; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.18.2/src/dialogs/ask.ycp new/autoyast2-2.18.3/src/dialogs/ask.ycp --- old/autoyast2-2.18.2/src/dialogs/ask.ycp 2009-01-26 14:29:59.000000000 +0100 +++ new/autoyast2-2.18.3/src/dialogs/ask.ycp 2009-05-04 14:29:04.000000000 +0200 @@ -5,7 +5,7 @@ * Summary: ask for some values in the profile * * Changes: - * $Id$ + * $Id: ask.ycp 57028 2009-04-29 10:58:09Z lslezak $ */ { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.18.2/src/include/autopart.ycp new/autoyast2-2.18.3/src/include/autopart.ycp --- old/autoyast2-2.18.2/src/include/autopart.ycp 2009-03-31 14:54:22.000000000 +0200 +++ new/autoyast2-2.18.3/src/include/autopart.ycp 2009-05-04 14:29:04.000000000 +0200 @@ -1,7 +1,7 @@ /* -$Id: autopart.ycp 56495 2009-03-31 12:54:01Z ug $ +$Id: autopart.ycp 57051 2009-05-04 12:25:37Z aschnell $ */ { textdomain "autoinst"; @@ -37,7 +37,7 @@ !p["format"]:false && !Partitions::IsLinuxPartition(p["fsid"]:0)) ); - l = filter(map p, l, ``(!contains( [`xfs, `ext2, `ext3, `jfs, `reiser], + l = filter(map p, l, ``(!contains( [`xfs, `ext2, `ext3, `ext4, `jfs, `reiser], p["used_fs"]:`unknown))); l = filter(map p, l, ``(!FileSystems::IsSystemMp( p["mount"]:"", false ))); @@ -402,7 +402,8 @@ integer index = 0; integer pindex = e["added",0,0]:0; string mount = solution["partitions",pindex,"mount"]:""; - integer fsid = Partitions::fsid_native; +// integer fsid = Partitions::fsid_native; + integer fsid = disk["partitions",pindex,"fsid"]:Partitions::fsid_native; if( mount == "swap" ) { fsid = Partitions::fsid_swap; @@ -421,7 +422,7 @@ p["region"] = solution["partitions",pindex,"region"]:[]; } p["mount"] = mount; - if (e["reuse"]:false) + if (e["reuse"]:false) p["used_fs"] = solution["partitions",pindex,"filesystem"]:p["detected_fs"]:`ext3; else p["used_fs"] = solution["partitions",pindex,"filesystem"]:`ext3; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.18.2/src/modules/AutoinstScripts.ycp new/autoyast2-2.18.3/src/modules/AutoinstScripts.ycp --- old/autoyast2-2.18.2/src/modules/AutoinstScripts.ycp 2008-09-08 13:15:07.000000000 +0200 +++ new/autoyast2-2.18.3/src/modules/AutoinstScripts.ycp 2009-04-03 13:26:53.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Custom scripts * Authors: Anas Nashif <nashif@suse.de> * - * $Id: AutoinstScripts.ycp 50794 2008-09-08 11:16:42Z ug $ + * $Id: AutoinstScripts.ycp 56616 2009-04-03 11:26:27Z ug $ */ { @@ -33,6 +33,10 @@ /* Init scripts */ global list<map> init = []; + /* postpart scripts */ + global list<map> postpart = []; + + /* Merged scripts */ global list<map> merged = []; @@ -89,6 +93,12 @@ return p; }) ); + result = (list<map>)union(result, maplist (map p, postpart, + ``{ + p = add(p,"type","postpartitioning-scripts"); + return p; + }) + ); return result; } @@ -115,6 +125,7 @@ post = []; chroot = []; init = []; + postpart = []; y2milestone("Merged %1", merged); // split @@ -127,6 +138,8 @@ init = add(init,s); else if (s["type"]:"" == "chroot-scripts") chroot = add(chroot,s); + else if (s["type"]:"" == "postpartitioning-scripts") + postpart = add(postpart,s); }); @@ -168,6 +181,16 @@ "debug":p["debug"]:true ]); }); + list<map> expostpart = maplist (map p, postpart, ``{ + return ($["filename":p["filename"]:"", + "interpreter": p["interpreter"]:"", + "source":p["source"]:"", + "location":p["location"]:"", + "feedback":p["feedback"]:false, + "debug":p["debug"]:true + ]); + }); + map<string, list> result = $[]; if (size(expre) > 0 ) result["pre-scripts"] = expre; @@ -177,6 +200,8 @@ result["chroot-scripts"] = exchroot; if (size(exinit) > 0 ) result["init-scripts"] = exinit; + if (size(expostpart) > 0 ) + result["postpartitioning-scripts"] = expostpart; return result; @@ -220,11 +245,13 @@ init = s["init-scripts"]:[]; post = s["post-scripts"]:[]; chroot = s["chroot-scripts"]:[]; + postpart = s["postpartitioning-scripts"]:[]; pre = Resolve_relurl(pre); init = Resolve_relurl(init); post = Resolve_relurl(post); chroot = Resolve_relurl(chroot); + postpart = Resolve_relurl(postpart); merged = mergeScripts(); y2debug("merged: %1", merged); @@ -290,6 +317,19 @@ { summary = Summary::AddLine(summary, Summary::NotConfigured()); } + summary = Summary::AddHeader(summary, _("Postpartitioning Scripts")); + if (size( postpart ) > 0 ) + { + summary = Summary::OpenList(summary); + foreach(map script, postpart, ``{ + summary = Summary::AddListItem(summary, script["filename"]:"" ); + }); + summary = Summary::CloseList(summary); + } + else + { + summary = Summary::AddLine(summary, Summary::NotConfigured()); + } return summary; } @@ -388,6 +428,10 @@ { return _("Chroot"); } + else if (type == "postpartitioning-scripts") + { + return _("Postpartitioning"); + } return _("Unknown"); } @@ -549,6 +593,10 @@ { scripts = filter(map s, post, ``(s["network_needed"]:false)); } + else if (type == "postpartitioning-scripts" ) + { + scripts = postpart; + } else { y2error("Unsupported script type"); @@ -559,7 +607,7 @@ string tmpdirString = ""; string current_logdir = ""; - if (type == "pre-scripts") + if (type == "pre-scripts" || type == "postpartitioning-scripts") { tmpdirString = sformat("%1/%2", AutoinstConfig::tmpDir, type); SCR::Execute (.target.mkdir, tmpdirString); @@ -600,12 +648,12 @@ } string scriptPath = ""; - if (type == "pre-scripts") + if ( type == "pre-scripts" || type == "postpartitioning-scripts" ) { // y2milestone("doing /sbin/udevcontrol stop_exec_queue now to prevent trouble if one is doing partitioning in a pre-script"); // SCR::Execute( .target.bash, "/sbin/udevcontrol stop_exec_queue" ); scriptPath = sformat("%1/%2/%3", AutoinstConfig::tmpDir, type, scriptName); - y2milestone("Writing pre script into %1", scriptPath); + y2milestone("Writing %1 script into %2", type, scriptPath); if (s["location"]:"" != "") { y2debug("getting script: %1", s["location"]:"" ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.18.2/src/modules/Profile.ycp new/autoyast2-2.18.3/src/modules/Profile.ycp --- old/autoyast2-2.18.2/src/modules/Profile.ycp 2009-02-25 17:16:34.000000000 +0100 +++ new/autoyast2-2.18.3/src/modules/Profile.ycp 2009-04-08 14:23:27.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Profile handling * Authors: Anas Nashif <nashif@suse.de> * - * $Id: Profile.ycp 55752 2009-02-25 16:16:34Z ug $ + * $Id: Profile.ycp 56688 2009-04-08 12:22:51Z ug $ */ { module "Profile"; @@ -611,7 +611,7 @@ m[i] = setLValue( tmp, v, m[i]:[] ); } } else { - y2milestone("setting %1 to %2",i,v); + y2debug("setting %1 to %2",i,v); m[i] = v; } return m; @@ -627,7 +627,7 @@ m[i] = setLValue( tmp, v, m[i]:[] ); } } else { - y2milestone("setting %1 to %2",i,v); + y2debug("setting %1 to %2",i,v); m[i] = v; } return m; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.18.2/src/modules/Y2ModuleConfig.ycp new/autoyast2-2.18.3/src/modules/Y2ModuleConfig.ycp --- old/autoyast2-2.18.2/src/modules/Y2ModuleConfig.ycp 2009-02-06 14:23:17.000000000 +0100 +++ new/autoyast2-2.18.3/src/modules/Y2ModuleConfig.ycp 2009-05-04 11:54:37.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Read data from desktop files * Author: Anas Nashif <nashif@suse.de> * - * $Id: Y2ModuleConfig.ycp 55301 2009-02-06 13:23:16Z ug $ + * $Id: Y2ModuleConfig.ycp 57049 2009-05-04 09:54:36Z ug $ */ { @@ -52,7 +52,8 @@ "X-SuSE-YaST-AutoInstDataType", "X-SuSE-YaST-AutoInstClonable", "X-SuSE-YaST-AutoInstRequires", - "X-SuSE-DocTeamID" + "X-SuSE-DocTeamID", + "X-SuSE-YaST-AutoLogResource" ]; Desktop::Read(Values); map<string,map> configurations = Desktop::Modules; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.18.2/src/schema/classes-use.rnc new/autoyast2-2.18.3/src/schema/classes-use.rnc --- old/autoyast2-2.18.2/src/schema/classes-use.rnc 2007-05-21 12:26:33.000000000 +0200 +++ new/autoyast2-2.18.3/src/schema/classes-use.rnc 2009-04-08 12:10:50.000000000 +0200 @@ -15,7 +15,11 @@ class = element class { class_name & - configuration + configuration & + element dont_merge { + LIST, + element element { text }* + }? } class_name = diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.18.2/src/schema/rules.rnc new/autoyast2-2.18.3/src/schema/rules.rnc --- old/autoyast2-2.18.2/src/schema/rules.rnc 2007-05-21 12:26:33.000000000 +0200 +++ new/autoyast2-2.18.3/src/schema/rules.rnc 2009-04-08 12:09:51.000000000 +0200 @@ -89,6 +89,10 @@ result = element result { profile & + element dont_merge { + LIST, + element element { text }* + }? & continue? } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.18.2/VERSION new/autoyast2-2.18.3/VERSION --- old/autoyast2-2.18.2/VERSION 2009-04-02 15:47:20.000000000 +0200 +++ new/autoyast2-2.18.3/VERSION 2009-05-05 12:39:14.000000000 +0200 @@ -1 +1 @@ -2.18.2 +2.18.3 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org