Hello community, here is the log from the commit of package autoyast2 for openSUSE:Factory checked in at Tue Apr 27 15:03:46 CEST 2010. -------- --- autoyast2/autoyast2.changes 2010-03-26 14:10:58.000000000 +0100 +++ autoyast2/autoyast2.changes 2010-04-27 11:25:30.000000000 +0200 @@ -1,0 +2,18 @@ +Tue Apr 27 10:52:49 CEST 2010 - ug@suse.de + +- partition_alignment added to general section + bnc#597723 +- 2.19.6 + +------------------------------------------------------------------- +Mon Apr 26 11:12:05 CEST 2010 - ug@suse.de + +- added "rerun" to scripts documentation + +------------------------------------------------------------------- +Thu Apr 8 11:53:53 CEST 2010 - ug@suse.de + +- reuse of a physical device for an LVM fixed + (bnc#591601) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- autoyast2-2.19.5.tar.bz2 New: ---- autoyast2-2.19.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ autoyast2.spec ++++++ --- /var/tmp/diff_new_pack.yAkCV0/_old 2010-04-27 15:03:01.000000000 +0200 +++ /var/tmp/diff_new_pack.yAkCV0/_new 2010-04-27 15:03:01.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package autoyast2 (Version 2.19.5) +# spec file for package autoyast2 (Version 2.19.6) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,11 +19,11 @@ Name: autoyast2 -Version: 2.19.5 +Version: 2.19.6 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: autoyast2-2.19.5.tar.bz2 +Source0: autoyast2-2.19.6.tar.bz2 Prefix: /usr @@ -40,7 +40,7 @@ Requires: yast2-core yast2-xml libxslt Requires: autoyast2-installation = %{version} Requires: yast2-schema yast2 yast2-country yast2-storage -Requires: yast2-storage >= 2.19.2 +Requires: yast2-storage >= 2.19.13 Provides: yast2-module-autoinst yast2-config-autoinst Obsoletes: yast2-module-autoinst yast2-config-autoinst @@ -65,7 +65,7 @@ %package installation License: GPLv2+ -Version: 2.19.5 +Version: 2.19.6 Release: 1 Summary: YaST2 - Auto Installation Modules Group: System/YaST @@ -82,7 +82,7 @@ generated with the autoyast2 package. %prep -%setup -n autoyast2-2.19.5 +%setup -n autoyast2-2.19.6 %build %{prefix}/bin/y2tool y2autoconf ++++++ autoyast2-2.19.5.tar.bz2 -> autoyast2-2.19.6.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.19.5/VERSION new/autoyast2-2.19.6/VERSION --- old/autoyast2-2.19.5/VERSION 2010-03-26 14:09:00.000000000 +0100 +++ new/autoyast2-2.19.6/VERSION 2010-04-27 11:19:46.000000000 +0200 @@ -1 +1 @@ -2.19.5 +2.19.6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.19.5/configure new/autoyast2-2.19.6/configure --- old/autoyast2-2.19.5/configure 2010-03-26 14:09:22.000000000 +0100 +++ new/autoyast2-2.19.6/configure 2010-04-27 11:21:18.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.19.5. +# Generated by GNU Autoconf 2.63 for autoyast2 2.19.6. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -596,8 +596,8 @@ # Identity of this package. PACKAGE_NAME='autoyast2' PACKAGE_TARNAME='autoyast2' -PACKAGE_VERSION='2.19.5' -PACKAGE_STRING='autoyast2 2.19.5' +PACKAGE_VERSION='2.19.6' +PACKAGE_STRING='autoyast2 2.19.6' 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.19.5 to adapt to many kinds of systems. +\`configure' configures autoyast2 2.19.6 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.19.5:";; + short | recursive ) echo "Configuration of autoyast2 2.19.6:";; 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.19.5 +autoyast2 configure 2.19.6 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.19.5, which was +It was created by autoyast2 $as_me 2.19.6, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2427,7 +2427,7 @@ # Define the identity of the package. PACKAGE='autoyast2' - VERSION='2.19.5' + VERSION='2.19.6' cat >>confdefs.h <<_ACEOF @@ -2549,7 +2549,7 @@ -VERSION="2.19.5" +VERSION="2.19.6" RPMNAME="autoyast2" MAINTAINER="Uwe Gansert <ug@suse.de>" @@ -3609,7 +3609,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.19.5, which was +This file was extended by autoyast2 $as_me 2.19.6, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3659,7 +3659,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -autoyast2 config.status 2.19.5 +autoyast2 config.status 2.19.6 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.19.5/configure.in new/autoyast2-2.19.6/configure.in --- old/autoyast2-2.19.5/configure.in 2010-03-26 14:09:18.000000000 +0100 +++ new/autoyast2-2.19.6/configure.in 2010-04-27 11:21:15.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(autoyast2, 2.19.5, http://bugs.opensuse.org/, autoyast2) +AC_INIT(autoyast2, 2.19.6, 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.19.5" +VERSION="2.19.6" RPMNAME="autoyast2" MAINTAINER="Uwe Gansert <ug@suse.de>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.19.5/doc/Makefile.am new/autoyast2-2.19.6/doc/Makefile.am --- old/autoyast2-2.19.5/doc/Makefile.am 2009-06-05 13:37:27.000000000 +0200 +++ new/autoyast2-2.19.6/doc/Makefile.am 2010-04-08 11:58:45.000000000 +0200 @@ -1,7 +1,7 @@ # # Makefile.am for y2c_autoinst/doc # -# $Id: Makefile.am 39469 2007-07-17 13:02:41Z ug $ +# $Id: Makefile.am 61610 2010-04-08 09:58:44Z ug $ # SUBDIRS = autodocs images entities bin components examples xsl @@ -55,10 +55,13 @@ # @XSLTPROC@ --xinclude @STYLESHEET_HTML@ \ # $< +#autoyast.fo: autoyast.xml +# XML_CATALOG_FILES=@XML_CATALOG@ \ +# @XSLTPROC@ @XSLTPROC_FLAGS@ --xinclude \ +# -o $@ @STYLESHEET_PDF@ $< + autoyast.fo: autoyast.xml - XML_CATALOG_FILES=@XML_CATALOG@ \ - @XSLTPROC@ @XSLTPROC_FLAGS@ --xinclude \ - -o $@ @STYLESHEET_PDF@ $< + saxon -o autoyast.fo autoyast.xml @STYLESHEET_PDF@ autoyast.pdf: autoyast.fo fop -q $< $@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.19.5/doc/Makefile.in new/autoyast2-2.19.6/doc/Makefile.in --- old/autoyast2-2.19.5/doc/Makefile.in 2010-03-26 14:09:22.000000000 +0100 +++ new/autoyast2-2.19.6/doc/Makefile.in 2010-04-27 11:21:18.000000000 +0200 @@ -18,7 +18,7 @@ # # Makefile.am for y2c_autoinst/doc # -# $Id: Makefile.am 39469 2007-07-17 13:02:41Z ug $ +# $Id: Makefile.am 61610 2010-04-08 09:58:44Z ug $ # VPATH = @srcdir@ @@ -647,10 +647,13 @@ # @XSLTPROC@ --xinclude @STYLESHEET_HTML@ \ # $< +#autoyast.fo: autoyast.xml +# XML_CATALOG_FILES=@XML_CATALOG@ \ +# @XSLTPROC@ @XSLTPROC_FLAGS@ --xinclude \ +# -o $@ @STYLESHEET_PDF@ $< + autoyast.fo: autoyast.xml - XML_CATALOG_FILES=@XML_CATALOG@ \ - @XSLTPROC@ @XSLTPROC_FLAGS@ --xinclude \ - -o $@ @STYLESHEET_PDF@ $< + saxon -o autoyast.fo autoyast.xml @STYLESHEET_PDF@ autoyast.pdf: autoyast.fo fop -q $< $@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.19.5/doc/ScriptsSection.xml new/autoyast2-2.19.6/doc/ScriptsSection.xml --- old/autoyast2-2.19.5/doc/ScriptsSection.xml 2010-03-26 13:13:26.000000000 +0100 +++ new/autoyast2-2.19.6/doc/ScriptsSection.xml 2010-04-26 11:11:15.000000000 +0200 @@ -137,6 +137,12 @@ <para><screen><notification>Please wait while script is running ...</notification></screen></para></entry> <entry>optional. If not configured, no notification popup will be shown. This option was invented with openSUSE 11.3 (not SLES11)</entry> </row> + <row> + <entry>rerun</entry> + <entry>a script is only run once. So even if you use ayast_setup to run a XML file multiple times, the script is only run once. You can change that with this boolean. + <para><screen><rerun config:type="boolean">true</rerun></screen></para></entry> + <entry>optional. The default is false which makes scripts only run one time</entry> + </row> </tbody> </tgroup> </table> @@ -225,6 +231,12 @@ <para><screen><notification>Please wait while script is running ...</notification></screen></para></entry> <entry>optional. If not configured, no notification popup will be shown. This option was invented with openSUSE 11.3 (not SLES11)</entry> </row> + <row> + <entry>rerun</entry> + <entry>a script is only run once. So even if you use ayast_setup to run a XML file multiple times, the script is only run once. You can change that with this boolean. + <para><screen><rerun config:type="boolean">true</rerun></screen></para></entry> + <entry>optional. The default is false which makes scripts only run one time</entry> + </row> </tbody> </tgroup> </table> @@ -322,6 +334,12 @@ <para><screen><notification>Please wait while script is running ...</notification></screen></para></entry> <entry>optional. If not configured, no notification popup will be shown. This option was invented with openSUSE 11.3 (not SLES11)</entry> </row> + <row> + <entry>rerun</entry> + <entry>a script is only run once. So even if you use ayast_setup to run a XML file multiple times, the script is only run once. You can change that with this boolean. + <para><screen><rerun config:type="boolean">true</rerun></screen></para></entry> + <entry>optional. The default is false which makes scripts only run one time</entry> + </row> </tbody> </tgroup> </table> @@ -420,6 +438,12 @@ <para><screen><notification>Please wait while script is running ...</notification></screen></para></entry> <entry>optional. If not configured, no notification popup will be shown. This option was invented with openSUSE 11.3 (not SLES11)</entry> </row> + <row> + <entry>rerun</entry> + <entry>a script is only run once. So even if you use ayast_setup to run a XML file multiple times, the script is only run once. You can change that with this boolean. + <para><screen><rerun config:type="boolean">true</rerun></screen></para></entry> + <entry>optional. The default is false which makes scripts only run one time</entry> + </row> </tbody> </tgroup> </table> @@ -479,6 +503,12 @@ <para><screen><filename>mynitScript5.sh</filename></screen></para></entry> <entry>optional. The default is the type of the script (init-scripts) in this case</entry> </row> + <row> + <entry>rerun</entry> + <entry>a script is only run once. So even if you use ayast_setup to run a XML file multiple times, the script is only run once. You can change that with this boolean. + <para><screen><rerun config:type="boolean">true</rerun></screen></para></entry> + <entry>optional. The default is false which makes scripts only run one time</entry> + </row> </tbody> </tgroup> </table> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.19.5/doc/examples/example.generalOptions.xml new/autoyast2-2.19.6/doc/examples/example.generalOptions.xml --- old/autoyast2-2.19.5/doc/examples/example.generalOptions.xml 2009-03-11 17:13:00.000000000 +0100 +++ new/autoyast2-2.19.6/doc/examples/example.generalOptions.xml 2010-04-27 10:48:24.000000000 +0200 @@ -53,6 +53,20 @@ </post-modules> </wait> + <!-- the storage section was invented with openSUSE 11.3 (not SLES11 SP1) --> + <storage> + <!-- + partition_alignment: + + `align_optimal - That's the default. Partitions are aligned like the kernel suggests. + This can lead to problem with some machines/bioses that are unable to boot with that + alignment + `align_cylinder - that's the alignment like it was in pre-openSUSE 11.3 time for years. Partitions + always start on a cylinder boundary + --> + <partition_alignment config:type="symbol">align_cylinder</partition_alignment> + </storage> + </general> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.19.5/src/modules/AutoinstGeneral.ycp new/autoyast2-2.19.6/src/modules/AutoinstGeneral.ycp --- old/autoyast2-2.19.5/src/modules/AutoinstGeneral.ycp 2009-11-18 13:23:31.000000000 +0100 +++ new/autoyast2-2.19.6/src/modules/AutoinstGeneral.ycp 2010-04-27 11:21:11.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Configuration of general settings for autoyast * Authors: Anas Nashif (nashif@suse.de) * - * $Id: AutoinstGeneral.ycp 59585 2009-11-18 12:23:31Z ug $ + * $Id: AutoinstGeneral.ycp 61884 2010-04-27 09:21:10Z ug $ */ { @@ -24,6 +24,7 @@ import "Profile"; import "Pkg"; import "ProductFeatures"; + import "Storage"; // All shared data are in yast2.rpm to break cyclic dependencies import "AutoinstData"; @@ -47,6 +48,8 @@ // global list<string> proposals = ["bootloader_proposal", "software_proposal", "country_simple_proposal", "timezone_proposal", "users_proposal", "runlevel_proposal", "hwinfo_proposal", "mouse_proposal", "deploying_proposal"]; global list<string> proposals = []; + global map storage = $[]; + /* default value of settings modified */ global boolean modified = false; @@ -145,7 +148,8 @@ mode = settings["mode"]:$[]; signature_handling = settings["signature-handling"]:$[]; askList = settings["ask-list"]:[]; - proposals = settings["proposals"]:[]; + proposals = settings["proposals"]:[]; + storage = settings["storage"]:$[]; return true; } @@ -159,21 +163,12 @@ { map general = $[]; - /* - general["language"] = language ; - if (haskey(keyboard, "keyboard_values") || Keyboard::ExpertSettingsChanged ) - { - keyboard["keyboard_values"] = Keyboard::GetExpertValues(); - } - - general["keyboard"] = keyboard; - general["clock"] = Clock; - */ general["mouse"] = AutoinstData::mouse; general["mode"] = mode; general["signature-handling"] = signature_handling; general["ask-list"] = askList; - general["proposals"] = proposals; + general["proposals"] = proposals; + general["storage"] = storage; return general; } @@ -227,7 +222,15 @@ ProductFeatures::SetBooleanFeature( "globals", "kexec_reboot", !mode["forceboot"]:false ); AutoinstConfig::Halt = mode["halt"]:false; AutoinstConfig::RebootMsg = mode["rebootmsg"]:false; - AutoinstConfig::setProposalList( proposals ); + AutoinstConfig::setProposalList( proposals ); + + // see bug #597723. Some machines can't boot with the new alignment that parted uses + // `align_cylinder == old behavior + // `align_optimal == new behavior + if( haskey( storage, "partition_alignment" ) ) { + Storage::SetPartitionAlignment( storage["partition_alignment"]:`align_optimal ); + y2milestone("alignment set to %1", storage["partition_alignment"]:`align_optimal); + } // // mouse @@ -270,6 +273,9 @@ if (Profile::current["general"]:$[] != $[]) Import(Profile::current["general"]:$[]); SetSignatureHandling(); + + // FIXME: seriously FIXME! We need a real Read() function + storage["partition_alignment"] = Storage::GetPartitionAlignment(); } return; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.19.5/src/modules/AutoinstLVM.ycp new/autoyast2-2.19.6/src/modules/AutoinstLVM.ycp --- old/autoyast2-2.19.5/src/modules/AutoinstLVM.ycp 2010-01-07 12:10:44.000000000 +0100 +++ new/autoyast2-2.19.6/src/modules/AutoinstLVM.ycp 2010-04-08 11:55:32.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: LVM * Authors: Anas Nashif <nashif@suse.de> * - * $Id: AutoinstLVM.ycp 60237 2010-01-05 16:07:41Z aschnell $ + * $Id: AutoinstLVM.ycp 61609 2010-04-08 09:55:31Z ug $ */ { @@ -77,7 +77,7 @@ /* look for VGs to reuse */ foreach ( string k, map v, AutoinstStorage::AutoTargetMap, ``{ foreach ( map p, v["partitions"]:[], ``{ - if( haskey( p, "lvm_group" ) && p["create"]:true == false ) { + if( haskey( p, "lvm_group" ) && p["create"]:true == false && p["format"]:true == false ) { keepLVM[p["lvm_group"]:"x"] = []; if( !contains( ExistingVGs, p["lvm_group"]:"x" ) ) Report::Error( sformat( _("Cannot reuse volume group %1. The volume group does not exist."), p["lvm_group"]:"x" ) ); @@ -225,8 +225,9 @@ map atm = AutoinstStorage::AutoTargetMap; integer smallest_physical = 0; foreach(map pv, new_pvs, ``{ + boolean to_add = false; if (pv["create"]:false) { - boolean to_add = true; + to_add = true; // exclude partitions that are NOT supposed to be in the LVM foreach( map atm_vol, atm[pv["maindev"]:"","partitions"]:[], ``{ if( pv["nr"]:0 == atm_vol["partition_nr"]:-1 ) { @@ -236,13 +237,25 @@ } } }); - if( to_add ) { - y2milestone("addPhysicalVolume %1 , %2",pv["device"]:"", current_vg ); - if( smallest_physical == 0 || pv["size_k"]:0 < smallest_physical ) - smallest_physical = pv["size_k"]:0; - addPhysicalVolume(targetMap, pv["device"]:"", current_vg ); - } + } else { + to_add = false; + // exclude partitions that are NOT supposed to be in the LVM + foreach( map atm_vol, atm[pv["maindev"]:"","partitions"]:[], ``{ + if( pv["nr"]:0 == atm_vol["partition_nr"]:-1 ) { + if( atm_vol["lvm_group"]:"" == current_vg ) { + y2milestone("add %1",atm_vol); + to_add = true; + } + } + }); } + if( to_add ) { + y2milestone("addPhysicalVolume %1 , %2",pv["device"]:"", current_vg ); + if( smallest_physical == 0 || pv["size_k"]:0 < smallest_physical ) + smallest_physical = pv["size_k"]:0; + addPhysicalVolume(targetMap, pv["device"]:"", current_vg ); + } + }); // calculating the "max" for logical volume map<string, map> tmp_tm = Storage::GetTargetMap(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.19.5/src/schema/general.rnc new/autoyast2-2.19.6/src/schema/general.rnc --- old/autoyast2-2.19.5/src/schema/general.rnc 2009-07-06 15:10:59.000000000 +0200 +++ new/autoyast2-2.19.6/src/schema/general.rnc 2010-04-27 10:37:20.000000000 +0200 @@ -11,6 +11,9 @@ LIST, element proposal { text }* }? & + element storage { + element partition_alignment { SYMBOL }? + }? & element wait { element pre-modules { LIST, ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org