Hello community, here is the log from the commit of package autoyast2 for openSUSE:Factory checked in at 2012-08-07 21:50:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/autoyast2 (Old) and /work/SRC/openSUSE:Factory/.autoyast2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "autoyast2", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/autoyast2/autoyast2.changes 2012-07-22 15:07:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.autoyast2.new/autoyast2.changes 2012-08-07 21:50:37.000000000 +0200 @@ -1,0 +2,12 @@ +Tue Aug 7 14:07:30 CEST 2012 - [email protected] + +- fixed fetching of init-scripts from the network +- 2.22.5 + +------------------------------------------------------------------- +Thu Jul 26 16:00:37 CEST 2012 - [email protected] + +- added support for handling subvolumes under btrfs +- update documentation about keys "subvolumes" and "device_order" + +------------------------------------------------------------------- Old: ---- autoyast2-2.22.4.tar.bz2 New: ---- autoyast2-2.22.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ autoyast2.spec ++++++ --- /var/tmp/diff_new_pack.bZUm8m/_old 2012-08-07 21:50:38.000000000 +0200 +++ /var/tmp/diff_new_pack.bZUm8m/_new 2012-08-07 21:50:38.000000000 +0200 @@ -17,7 +17,7 @@ Name: autoyast2 -Version: 2.22.4 +Version: 2.22.5 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -83,7 +83,7 @@ installation sources. %package installation -Version: 2.22.4 +Version: 2.22.5 Release: 0 Summary: YaST2 - Auto Installation Modules Group: System/YaST ++++++ autoyast2-2.22.4.tar.bz2 -> autoyast2-2.22.5.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.22.4/VERSION new/autoyast2-2.22.5/VERSION --- old/autoyast2-2.22.4/VERSION 2012-07-17 12:11:56.000000000 +0200 +++ new/autoyast2-2.22.5/VERSION 2012-08-07 14:23:54.000000000 +0200 @@ -1 +1 @@ -2.22.4 +2.22.5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.22.4/configure new/autoyast2-2.22.5/configure --- old/autoyast2-2.22.4/configure 2012-07-17 12:22:40.000000000 +0200 +++ new/autoyast2-2.22.5/configure 2012-08-07 14:24:19.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.4. +# Generated by GNU Autoconf 2.68 for autoyast2 2.22.5. # # 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.4' -PACKAGE_STRING='autoyast2 2.22.4' +PACKAGE_VERSION='2.22.5' +PACKAGE_STRING='autoyast2 2.22.5' 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.4 to adapt to many kinds of systems. +\`configure' configures autoyast2 2.22.5 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.4:";; + short | recursive ) echo "Configuration of autoyast2 2.22.5:";; 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.4 +autoyast2 configure 2.22.5 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.4, which was +It was created by autoyast2 $as_me 2.22.5, 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.4' + VERSION='2.22.5' cat >>confdefs.h <<_ACEOF @@ -2457,7 +2457,7 @@ -VERSION="2.22.4" +VERSION="2.22.5" RPMNAME="autoyast2" MAINTAINER="Uwe Gansert <[email protected]>" @@ -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.4, which was +This file was extended by autoyast2 $as_me 2.22.5, 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.4 +autoyast2 config.status 2.22.5 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.4/configure.in new/autoyast2-2.22.5/configure.in --- old/autoyast2-2.22.4/configure.in 2012-07-17 12:22:38.000000000 +0200 +++ new/autoyast2-2.22.5/configure.in 2012-08-07 14:24:17.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.4, http://bugs.opensuse.org/, autoyast2) +AC_INIT(autoyast2, 2.22.5, 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.4" +VERSION="2.22.5" RPMNAME="autoyast2" MAINTAINER="Uwe Gansert <[email protected]>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.22.4/doc/xml/PartitioningSection.xml new/autoyast2-2.22.5/doc/xml/PartitioningSection.xml --- old/autoyast2-2.22.4/doc/xml/PartitioningSection.xml 2012-07-17 12:17:43.000000000 +0200 +++ new/autoyast2-2.22.5/doc/xml/PartitioningSection.xml 2012-07-26 16:29:15.000000000 +0200 @@ -378,6 +378,27 @@ <entry>See "label" and "uuid" documentation above. The default depends on YaST and is id in most cases. It was device in the past.</entry> </row> <row> + <entry>subvolumes</entry> + <entry> + <para> + List of subvolumes to create for a filesystem of type btrfs. This key only make sense for filesystems of type btrfs. If there is a default subvolume used for the distribution (like e.g. "@" in SLES11 SP2) the name of +this default subvolume is automatically prepended to the names in this list. + </para> + <screen><subvolumes config:type="list"> + <path>tmp</path> + <path>opt</path> + <path>srv</path> + <path>var/crash</path> + <path>var/lock</path> + <path>var/run</path> + <path>var/tmp</path> + <path>var/spool</path> + ... +</subvolumes></screen> + </entry> + <entry>this key is available since openSUSE 12.3 and SLES11 SP3</entry> + </row> + <row> <entry>lv_name</entry> <entry> <para> @@ -538,12 +559,13 @@ this list contains the optional order of the physical devices </para> <screen><device_order config:type="list"> -<device>/dev/sdb2</device> -<device>/dev/sda1</device> -... + <device>/dev/sdb2</device> + <device>/dev/sda1</device> + ... </device_order></screen> </entry> <entry>this is optional and the default is alphabetical order</entry> + <entry>this key is available since openSUSE 12.2 and SLES11 SP3</entry> </row> </tbody> </tgroup> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.22.4/doc/xml/ay_bigfile.xml new/autoyast2-2.22.5/doc/xml/ay_bigfile.xml --- old/autoyast2-2.22.4/doc/xml/ay_bigfile.xml 2012-07-17 12:23:26.000000000 +0200 +++ new/autoyast2-2.22.5/doc/xml/ay_bigfile.xml 2012-08-07 14:24:29.000000000 +0200 @@ -2159,6 +2159,31 @@ </row> <row> <entry> + <para>subvolumes</para> + </entry> + <entry> + <para> + List of subvolumes to create for a filesystem of type btrfs. This key only make sense for filesystems of type btrfs. If there is a default subvolume used for the distribution (like e.g. "@" in SLES11 SP2) the name of +this default subvolume is automatically prepended to the names in this list. + </para> + <screen><subvolumes config:type="list"> + <path>tmp</path> + <path>opt</path> + <path>srv</path> + <path>var/crash</path> + <path>var/lock</path> + <path>var/run</path> + <path>var/tmp</path> + <path>var/spool</path> + ... +</subvolumes></screen> + </entry> + <entry> + <para>this key is available since openSUSE 12.3 and SLES11 SP3</para> + </entry> + </row> + <row> + <entry> <para>lv_name</para> </entry> <entry> @@ -2373,14 +2398,17 @@ this list contains the optional order of the physical devices </para> <screen><device_order config:type="list"> -<device>/dev/sdb2</device> -<device>/dev/sda1</device> -... + <device>/dev/sdb2</device> + <device>/dev/sda1</device> + ... </device_order></screen> </entry> <entry> <para>this is optional and the default is alphabetical order</para> </entry> + <entry> + <para>this key is available since openSUSE 12.2 and SLES11 SP3</para> + </entry> </row> </tbody> </tgroup> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.22.4/doc/xml/ay_bigfile_docbook.xml new/autoyast2-2.22.5/doc/xml/ay_bigfile_docbook.xml --- old/autoyast2-2.22.4/doc/xml/ay_bigfile_docbook.xml 2012-07-17 12:23:26.000000000 +0200 +++ new/autoyast2-2.22.5/doc/xml/ay_bigfile_docbook.xml 2012-08-07 14:24:29.000000000 +0200 @@ -1982,6 +1982,27 @@ <entry>See "label" and "uuid" documentation above. The default depends on YaST and is id in most cases. It was device in the past.</entry> </row> <row> + <entry>subvolumes</entry> + <entry> + <para> + List of subvolumes to create for a filesystem of type btrfs. This key only make sense for filesystems of type btrfs. If there is a default subvolume used for the distribution (like e.g. "@" in SLES11 SP2) the name of +this default subvolume is automatically prepended to the names in this list. + </para> + <screen><subvolumes config:type="list"> + <path>tmp</path> + <path>opt</path> + <path>srv</path> + <path>var/crash</path> + <path>var/lock</path> + <path>var/run</path> + <path>var/tmp</path> + <path>var/spool</path> + ... +</subvolumes></screen> + </entry> + <entry>this key is available since openSUSE 12.3 and SLES11 SP3</entry> + </row> + <row> <entry>lv_name</entry> <entry> <para> @@ -2142,12 +2163,13 @@ this list contains the optional order of the physical devices </para> <screen><device_order config:type="list"> -<device>/dev/sdb2</device> -<device>/dev/sda1</device> -... + <device>/dev/sdb2</device> + <device>/dev/sda1</device> + ... </device_order></screen> </entry> <entry>this is optional and the default is alphabetical order</entry> + <entry>this key is available since openSUSE 12.2 and SLES11 SP3</entry> </row> </tbody> </tgroup> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.22.4/src/clients/autoinst_scripts2_finish.ycp new/autoyast2-2.22.5/src/clients/autoinst_scripts2_finish.ycp --- old/autoyast2-2.22.4/src/clients/autoinst_scripts2_finish.ycp 2012-07-04 17:40:29.000000000 +0200 +++ new/autoyast2-2.22.5/src/clients/autoinst_scripts2_finish.ycp 2012-08-07 11:34:56.000000000 +0200 @@ -18,6 +18,7 @@ import "AutoinstScripts"; import "AutoInstall"; +import "Service"; any ret = nil; string func = ""; @@ -46,8 +47,8 @@ else if (func == "Write") { AutoinstScripts::Write("chroot-scripts", true); - // systemd requires the init script to be written in 1st stage - AutoinstScripts::Write("init-scripts", false); + // systemd requires the init script to be activated in 1st stage + Service::Enable("autoyast"); AutoInstall::PXELocalBoot(); } else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.22.4/src/clients/inst_autoconfigure.ycp new/autoyast2-2.22.5/src/clients/inst_autoconfigure.ycp --- old/autoyast2-2.22.4/src/clients/inst_autoconfigure.ycp 2012-07-04 17:40:29.000000000 +0200 +++ new/autoyast2-2.22.5/src/clients/inst_autoconfigure.ycp 2012-08-07 11:36:10.000000000 +0200 @@ -243,8 +243,7 @@ logStep( _("Executing Post-Scripts")); AutoinstScripts::Write("post-scripts", false); - // moved to 1st stage to fix issue with systemd - //AutoinstScripts::Write("init-scripts", false); + AutoinstScripts::Write("init-scripts", false); // Just in case, remove this file to avoid reconfiguring... SCR::Execute(.target.remove, "/var/lib/YaST2/runme_at_boot"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.22.4/src/include/autopart.ycp new/autoyast2-2.22.5/src/include/autopart.ycp --- old/autoyast2-2.22.4/src/include/autopart.ycp 2012-07-04 17:40:29.000000000 +0200 +++ new/autoyast2-2.22.5/src/include/autopart.ycp 2012-07-26 16:29:15.000000000 +0200 @@ -27,6 +27,33 @@ integer cur_weight = -10000; map cur_gap = $[]; +global map AddSubvolData( map st_map, map xml_map ) + { + map ret = st_map; + if( ret["used_fs"]:`unknown == `btrfs ) + { + y2milestone( "AddSubvolData st:%1", st_map ); + y2milestone( "AddSubvolData xml:%1", xml_map ); + if( haskey( xml_map, "subvolumes" )) + { + string sv_prep = ""; + if( FileSystems::default_subvol!="" ) + sv_prep = FileSystems::default_subvol + "/"; + ret["subvol"] = maplist( string s, xml_map["subvolumes"]:[], + { + if( !isempty(sv_prep) && substring( s, 0, size(sv_prep))!=sv_prep ) + s = sv_prep+s; + return( $[ "name" : s, "create" : true ] ); + }); + } + if( haskey( ret, "subvolumes" )) + ret = remove( ret, "subvolumes" ); + y2milestone( "AddSubvolData ret:%1", ret ); + } + return( ret ); + } + + list GetNoneLinuxPartitions(string device) { list ret = []; @@ -430,7 +457,7 @@ p["used_fs"] = solution["partitions",pindex,"filesystem"]:p["detected_fs"]:Partitions::DefaultFs(); else p["used_fs"] = solution["partitions",pindex,"filesystem"]:Partitions::DefaultFs(); - + p = AddSubvolData( p, solution["partitions",pindex]:$[] ); value = solution["partitions",pindex,"fstopt"]:""; if( size(value)>0 ) { @@ -570,6 +597,7 @@ { part["fstopt"] = FileSystems::DefaultFstabOptions( part ); } + part = AddSubvolData( part, solution["partitions",pindex]:$[] ); mapvalue = solution["partitions",pindex,"fs_options"]:$[]; if( size(mapvalue)>0 ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.22.4/src/modules/AutoinstLVM.ycp new/autoyast2-2.22.5/src/modules/AutoinstLVM.ycp --- old/autoyast2-2.22.4/src/modules/AutoinstLVM.ycp 2012-07-04 17:40:29.000000000 +0200 +++ new/autoyast2-2.22.5/src/modules/AutoinstLVM.ycp 2012-07-26 16:29:15.000000000 +0200 @@ -351,6 +351,7 @@ targetMap = lvret["targets"]:targetMap; } else if ( lv["create"]:true ) { lv["used_fs"] = lv["filesystem"]:Partitions::DefaultFs(); + lv = AutoinstStorage::AddSubvolData( lv, lv ); lv["create"] = true; lv["format"] = lv["format"]:true; lv["device"] = "/dev/" + current_vg + "/" + lv["name"]:""; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.22.4/src/modules/AutoinstPartPlan.ycp new/autoyast2-2.22.5/src/modules/AutoinstPartPlan.ycp --- old/autoyast2-2.22.4/src/modules/AutoinstPartPlan.ycp 2012-07-04 17:40:29.000000000 +0200 +++ new/autoyast2-2.22.5/src/modules/AutoinstPartPlan.ycp 2012-07-26 16:29:15.000000000 +0200 @@ -23,6 +23,7 @@ import "StorageDevices"; import "Storage"; import "Partitions"; + import "FileSystems"; import "Arch"; /** @@ -460,6 +461,18 @@ new_pe["format"] = new_pe["format"]:pe["format"]:true; } + // Subvolumes + // Save possibly existing subvolumes + if( !isempty(pe["subvol"]:[])) + { + string defsub = ""; + if( !isempty(FileSystems::default_subvol) ) + defsub = FileSystems::default_subvol + "/"; + new_pe["subvolumes"] = maplist( map p, (list<map>)pe["subvol"]:[], + ``({return( substring(p["name"]:"",size(defsub)));})); + new_pe["subvolumes"] = filter( string s, new_pe["subvolumes"]:[], ``(!isempty(s))); + } + // if the filesystem is unknown, we have detected_fs and no longer used_fs // don't know why yast2-storage is having two keys for that. // maybe it would be even okay to look only for "detected_fs" to set format to false @@ -487,6 +500,7 @@ raid_options["persistent_superblock"] = pe["persistent_superblock"]:false; raid_options["raid_type"] = pe["raid_type"]:"raid0"; + raid_options["device_order"] = pe["devices"]:[]; new_pe["raid_options"] = raid_options; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.22.4/src/modules/AutoinstPartition.ycp new/autoyast2-2.22.5/src/modules/AutoinstPartition.ycp --- old/autoyast2-2.22.4/src/modules/AutoinstPartition.ycp 2012-07-04 17:40:29.000000000 +0200 +++ new/autoyast2-2.22.5/src/modules/AutoinstPartition.ycp 2012-07-26 16:29:15.000000000 +0200 @@ -47,7 +47,8 @@ "lvm_group" : "", "raid_name" : "", "raid_type" : "", - "raid_options" : $[] + "raid_options" : $[], + "subvolumes" : [] ]; define map<symbol,map> allfs = $[]; @@ -206,6 +207,10 @@ newPart = set( newPart, "filesystem", part["filesystem"]:`Empty ); newPart = set( newPart, "format", true); } + if( !isempty( part["subvolumes"]:[] )) + newPart["subvolumes"] = part["subvolumes"]:[]; + else + newPart = remove( newPart, "subvolumes" ); newPart = set( newPart, "loop_fs", part["loop_fs"]:false ); newPart = set( newPart, "partition_id", part["partition_id"]:131 ); if( haskey( part, "partition_nr" ) ) @@ -235,9 +240,10 @@ newPart = set( newPart, "raid_name", part["raid_name"]:"" ); newPart = set( newPart, "raid_type", part["raid_type"]:"raid0" ); } - if( haskey( part, "raid_options" ) ) { + if( haskey( part, "raid_options" ) ) newPart = set( newPart, "raid_options", part["raid_options"]:$[] ); - } + else + newPart = remove( newPart, "raid_options" ); return newPart; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.22.4/src/modules/AutoinstRAID.ycp new/autoyast2-2.22.5/src/modules/AutoinstRAID.ycp --- old/autoyast2-2.22.4/src/modules/AutoinstRAID.ycp 2012-07-04 17:40:29.000000000 +0200 +++ new/autoyast2-2.22.5/src/modules/AutoinstRAID.ycp 2012-07-26 16:29:15.000000000 +0200 @@ -236,6 +236,7 @@ { md["used_fs"] = md["filesystem"]:`ext2; } + md = AutoinstStorage::AddSubvolData( md, md ); md["type"] = `sw_raid; if (haskey(md, "raid_options")) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.22.4/src/modules/AutoinstScripts.ycp new/autoyast2-2.22.5/src/modules/AutoinstScripts.ycp --- old/autoyast2-2.22.4/src/modules/AutoinstScripts.ycp 2012-07-04 17:40:29.000000000 +0200 +++ new/autoyast2-2.22.5/src/modules/AutoinstScripts.ycp 2012-08-07 11:40:47.000000000 +0200 @@ -15,7 +15,6 @@ import "AutoinstConfig"; import "Summary"; import "URL"; - import "Service"; import "Popup"; import "Label"; import "Report"; @@ -698,7 +697,8 @@ } else { SCR::Write(.target.string, scriptPath, s["source"]:"echo Empty script!"); } - Service::Enable("autoyast"); + // moved to 1st stage because of systemd + //Service::Enable("autoyast"); } else if (type == "chroot-scripts") { -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
