Hello community, here is the log from the commit of package yast2-storage for openSUSE:Factory checked in at Fri Jun 10 09:31:38 CEST 2011.
-------- --- yast2-storage/yast2-storage.changes 2011-05-26 16:37:30.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-storage/yast2-storage.changes 2011-06-09 15:49:34.000000000 +0200 @@ -1,0 +2,24 @@ +Thu Jun 9 14:56:02 CEST 2011 - [email protected] + +- add functionality to have everything in a default btrfs subvol + (additions to fate#306587) +- add /tmp, /var/run and /var/tmp to default subvol list +- version 2.21.2 + +------------------------------------------------------------------- +Wed Jun 1 18:35:46 CEST 2011 - [email protected] + +- support new btrfs_increase_percentage from control.xml +- change default subvol list to /opt, /srv, /var/log and /var/spool + +------------------------------------------------------------------- +Wed Jun 01 13:57:34 CEST 2011 - [email protected] + +- install snapper when root is on btrfs + +------------------------------------------------------------------- +Mon May 30 18:32:40 CEST 2011 - [email protected] + +- add default subvol list to root fs + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-storage-2.21.1.tar.bz2 New: ---- yast2-storage-2.21.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-storage.spec ++++++ --- /var/tmp/diff_new_pack.8fYQvv/_old 2011-06-10 09:29:55.000000000 +0200 +++ /var/tmp/diff_new_pack.8fYQvv/_new 2011-06-10 09:29:55.000000000 +0200 @@ -19,11 +19,11 @@ Name: yast2-storage -Version: 2.21.1 +Version: 2.21.2 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-storage-2.21.1.tar.bz2 +Source0: yast2-storage-2.21.2.tar.bz2 Prefix: /usr @@ -31,7 +31,7 @@ License: GPL v2 or later BuildRequires: blocxx-devel boost-devel gcc-c++ libxcrypt-devel openssl-devel sablot swig BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files -BuildRequires: libstorage-devel >= 2.20.4 yast2 >= 2.19.4 yast2-core-devel >= 2.18.1 yast2-devtools +BuildRequires: libstorage-devel >= 2.21.3 yast2 >= 2.19.4 yast2-core-devel >= 2.18.1 yast2-devtools BuildRequires: yast2-perl-bindings yast2-testsuite >= 2.19.0 Requires: yast2-perl-bindings perl = %{perl_version} Requires: yast2-core >= 2.18.3 yast2 >= 2.19.4 yast2-libyui >= 2.18.7 @@ -55,7 +55,7 @@ devices during installation and on an installed system. %prep -%setup -n yast2-storage-2.21.1 +%setup -n yast2-storage-2.21.2 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-storage-2.21.1.tar.bz2 -> yast2-storage-2.21.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.21.1/VERSION new/yast2-storage-2.21.2/VERSION --- old/yast2-storage-2.21.1/VERSION 2011-05-25 18:11:40.000000000 +0200 +++ new/yast2-storage-2.21.2/VERSION 2011-06-09 15:33:39.000000000 +0200 @@ -1 +1 @@ -2.21.1 +2.21.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.21.1/configure new/yast2-storage-2.21.2/configure --- old/yast2-storage-2.21.1/configure 2011-05-26 16:35:28.000000000 +0200 +++ new/yast2-storage-2.21.2/configure 2011-03-31 12:49:28.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for yast2-storage 2.21.1. +# Generated by GNU Autoconf 2.68 for yast2-storage 2.21.0. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -709,8 +709,8 @@ # Identity of this package. PACKAGE_NAME='yast2-storage' PACKAGE_TARNAME='yast2-storage' -PACKAGE_VERSION='2.21.1' -PACKAGE_STRING='yast2-storage 2.21.1' +PACKAGE_VERSION='2.21.0' +PACKAGE_STRING='yast2-storage 2.21.0' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -1495,7 +1495,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-storage 2.21.1 to adapt to many kinds of systems. +\`configure' configures yast2-storage 2.21.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1566,7 +1566,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-storage 2.21.1:";; + short | recursive ) echo "Configuration of yast2-storage 2.21.0:";; esac cat <<\_ACEOF @@ -1680,7 +1680,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-storage configure 2.21.1 +yast2-storage configure 2.21.0 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2133,7 +2133,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-storage $as_me 2.21.1, which was +It was created by yast2-storage $as_me 2.21.0, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -3063,7 +3063,7 @@ # Define the identity of the package. PACKAGE='yast2-storage' - VERSION='2.21.1' + VERSION='2.21.0' cat >>confdefs.h <<_ACEOF @@ -3185,7 +3185,7 @@ -VERSION="2.21.1" +VERSION="2.21.0" RPMNAME="yast2-storage" MAINTAINER="Arvin Schnell <[email protected]>" @@ -16097,7 +16097,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-storage $as_me 2.21.1, which was +This file was extended by yast2-storage $as_me 2.21.0, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16163,7 +16163,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -yast2-storage config.status 2.21.1 +yast2-storage config.status 2.21.0 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/yast2-storage-2.21.1/configure.in new/yast2-storage-2.21.2/configure.in --- old/yast2-storage-2.21.1/configure.in 2011-05-26 16:35:19.000000000 +0200 +++ new/yast2-storage-2.21.2/configure.in 2011-03-31 12:49: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(yast2-storage, 2.21.1, http://bugs.opensuse.org/, yast2-storage) +AC_INIT(yast2-storage, 2.21.0, http://bugs.opensuse.org/, yast2-storage) 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.21.1" +VERSION="2.21.0" RPMNAME="yast2-storage" MAINTAINER="Arvin Schnell <[email protected]>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.21.1/storage/doc/config.xml.description new/yast2-storage-2.21.2/storage/doc/config.xml.description --- old/yast2-storage-2.21.1/storage/doc/config.xml.description 2010-09-20 10:35:12.000000000 +0200 +++ new/yast2-storage-2.21.2/storage/doc/config.xml.description 2011-06-01 18:36:29.000000000 +0200 @@ -48,3 +48,9 @@ be created. The proposal will not suggest to create a larger filesystem than this limit. This value is only used if proposal_lvm is true. + +btrfs_increase_percentage: + If filesystem for propsal is btrfs size requirements are increased by + this percentage. This is because to the usage of snapshots makes only + sense if there is a certain amount of free space available. + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.21.1/storage/src/include/custom_part_dialogs.ycp new/yast2-storage-2.21.2/storage/src/include/custom_part_dialogs.ycp --- old/yast2-storage-2.21.1/storage/src/include/custom_part_dialogs.ycp 2011-05-07 14:13:46.000000000 +0200 +++ new/yast2-storage-2.21.2/storage/src/include/custom_part_dialogs.ycp 2011-05-30 19:10:07.000000000 +0200 @@ -16,7 +16,7 @@ * ************************************************************* - $Id: custom_part_dialogs.ycp 63848 2011-04-21 09:17:08Z fehr $ + $Id: custom_part_dialogs.ycp 64156 2011-05-30 17:10:07Z fehr $ */ { @@ -1266,7 +1266,13 @@ list<string> SubvolNames( map<string,any> data ) { list<string> items = maplist( map p, - filter( map s, data["subvol"]:[], ``(!s["delete"]:false)), + filter( map s, data["subvol"]:[], + { + if( data["format"]:false ) + return( s["create"]:false ); + else + return( !s["delete"]:false ); + }), {return p["name"]:"";}); y2milestone( "items:%1", items ); return( items ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.21.1/storage/src/include/ep-dialogs.ycp new/yast2-storage-2.21.2/storage/src/include/ep-dialogs.ycp --- old/yast2-storage-2.21.1/storage/src/include/ep-dialogs.ycp 2011-05-07 14:13:46.000000000 +0200 +++ new/yast2-storage-2.21.2/storage/src/include/ep-dialogs.ycp 2011-05-30 19:08:59.000000000 +0200 @@ -449,6 +449,18 @@ if (!data["format"]:false) data = filter(string key, any value, data, { return key != "fs_options"; }); + if( data["mount"]:""=="/" && data["used_fs"]:`unknown==`btrfs && + data["format"]:false ) + { + y2milestone( "before AddSubvolRoot subvol:%1", data["subvol"]:[] ); + list<map> lsc = filter( map s, data["subvol"]:[], ``(s["create"]:false)); + y2milestone( "before AddSubvolRoot list:%1", lsc ); + if( size(lsc)==0 ) + { + data = (map<string,any>)Storage::AddSubvolRoot( data ); + y2milestone( "after AddSubvolRoot subvol:%1", data["subvol"]:[] ); + } + } if (contains([`primary, `extended, `logical], data["type"]:`unknown)) if (data["fsid"]:0 != orig_data["fsid"]:0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.21.1/storage/src/modules/FileSystems.ycp new/yast2-storage-2.21.2/storage/src/modules/FileSystems.ycp --- old/yast2-storage-2.21.1/storage/src/modules/FileSystems.ycp 2011-05-26 16:35:04.000000000 +0200 +++ new/yast2-storage-2.21.2/storage/src/modules/FileSystems.ycp 2011-06-09 15:33:28.000000000 +0200 @@ -8,7 +8,7 @@ * These module contains the supported filesystems and their settings. * * - * $Id: FileSystems.ycp 64117 2011-05-26 14:15:30Z fehr $ + * $Id: FileSystems.ycp 64291 2011-06-09 13:33:27Z fehr $ */ { module "FileSystems"; @@ -68,6 +68,7 @@ global list<string> crypt_m_points() { return [ "/", Partitions::BootMount(), "/usr" ]; } global const list<string> swap_m_points = [ "swap" ]; global const list<string> tmp_m_points = [ "/tmp", "/var/tmp" ]; + global string default_subvol = "A"; list<string> suggest_m_points = []; list<string> suggest_tmp_points = []; @@ -994,6 +995,18 @@ global void InitSlib(any value) { sint = value; + if( sint!=nil ) + { + string ret = LibStorage::StorageInterface::getDefaultSubvolName(sint); + y2milestone( "InitSlib libstorage default_subvol:\"%1\"", ret ); + ret = "@"; + //ret = ""; + LibStorage::StorageInterface::setDefaultSubvolName(sint,ret); + ret = LibStorage::StorageInterface::getDefaultSubvolName(sint); + default_subvol = ret; + y2milestone( "InitSlib used default_subvol:\"%1\"", default_subvol ); + } + } @@ -1289,6 +1302,10 @@ { fst_default = "acl,user_xattr"; } + else if( part["format"]:false && fsys == `btrfs && default_subvol!="" ) + { + fst_default = "subvol=" + default_subvol; + } else if( !Arch::ia64() && contains( [`vfat, `ntfs], fsys ) ) { fst_default = "users,gid=users"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.21.1/storage/src/modules/Storage.ycp new/yast2-storage-2.21.2/storage/src/modules/Storage.ycp --- old/yast2-storage-2.21.1/storage/src/modules/Storage.ycp 2011-05-26 16:35:04.000000000 +0200 +++ new/yast2-storage-2.21.2/storage/src/modules/Storage.ycp 2011-06-09 15:33:28.000000000 +0200 @@ -19,7 +19,7 @@ * wurde versucht "intelligent" zu gestallten und ist im einzelen bei den * entspechenden Funktionen n�her erkl�rt. * - * $Id: Storage.ycp 64119 2011-05-26 14:20:50Z fehr $ + * $Id: Storage.ycp 64291 2011-06-09 13:33:27Z fehr $ */ { module "Storage"; @@ -514,6 +514,8 @@ global define void SetTargetMap( map<string,map> target ); global define map<string,map> SetPartitionData( map<string,map> target, string device, string key, any value ); +global define map<string,map> DelPartitionData( map<string,map> target, string device, + string key ); define list<map> GetDiskPartitionTg( string device, map<string,map> tg ) @@ -1804,13 +1806,26 @@ filter( map p, tg["/dev/btrfs","partitions"]:[], ``(size(p["devices"]:[])>1)); y2milestone( "HandleBtrfsSimpleVolumes simple %1", simple ); - list<string> keys = [ "subvol", "uuid", "format", "fstype", "inactive", "mount", "mountby", "used_fs" ]; + list<string> keys = [ "subvol", "uuid", "format", "inactive", "mount", "mountby", "used_fs" ]; foreach( map p, simple, { - y2milestone( "HandleBtrfsSimpleVolumes before %1", GetPartition( tg, p["device"]:"" )); + map mp = GetPartition( tg, p["device"]:"" ); + y2milestone( "HandleBtrfsSimpleVolumes before %1", mp ); foreach( string k, keys, { - tg = SetPartitionData( tg, p["device"]:"", k, p[k]:(any)"" ); + if( p[k]:nil!=nil ) + { + y2milestone( "HandleBtrfsSimpleVolumes set key %1", k ); + tg = SetPartitionData( tg, p["device"]:"", k, p[k]:nil ); + } + else + { + if( haskey( mp, k )); + { + y2milestone( "HandleBtrfsSimpleVolumes remove key %1", k ); + tg = DelPartitionData( tg, p["device"]:"", k ); + } + } }); y2milestone( "HandleBtrfsSimpleVolumes after %1", GetPartition( tg, p["device"]:"" )); }); @@ -4233,6 +4248,18 @@ } +global define map AddSubvolRoot( map part ) + { + list<string> def_subvol = [ "tmp", "opt", "srv", "var/spool", "var/log", "var/run", "var/tmp" ]; + string sv_prepend = ""; + if( FileSystems::default_subvol!="" ) + sv_prepend = FileSystems::default_subvol + "/"; + part["subvol"] = maplist( string s, def_subvol, + { return $[ "create":true, "name":sv_prepend+s ]; }); + y2milestone( "AddSubvolRoot part:%1", part ); + return( part ); + } + global define map SetVolOptions( map p, string mnt, symbol fs, string fs_opts, string fstab_opts, string label ) { @@ -4281,9 +4308,7 @@ } if( ret["format"]:false && ret["used_fs"]:`unknown==`btrfs && mnt=="/" ) { - list<string> def_subvol = [ "tmp", "var/tmp", "var/run" ]; - ret["subvol"] = maplist( string s, def_subvol, - { return $[ "create" :true, "name" :s ]; }); + ret = AddSubvolRoot( ret ); } if( size(fstab_opts)>0 ) ret["fstopt"] = fstab_opts; @@ -4960,6 +4985,9 @@ } +global map GetEntryForMountpoint(string mp); + + global list<string> AddPackageList() { list<string> pl = hw_packages; @@ -5007,6 +5035,13 @@ pl = add( pl, "pam_mount" ); } + map part = GetEntryForMountpoint("/"); + if (part["used_fs"]:`unknown == `btrfs) + { + pl = add(pl, "snapper"); + pl = add(pl, "yast2-snaper"); + } + y2milestone("AddPackageList ret %1", pl); return pl; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.21.1/storage/src/modules/StorageClients.ycp new/yast2-storage-2.21.2/storage/src/modules/StorageClients.ycp --- old/yast2-storage-2.21.1/storage/src/modules/StorageClients.ycp 2010-09-20 10:35:15.000000000 +0200 +++ new/yast2-storage-2.21.2/storage/src/modules/StorageClients.ycp 2011-06-06 12:30:36.000000000 +0200 @@ -86,8 +86,8 @@ global boolean CommitErrorPopup(integer error, string last_action, string extended_message) { - y2milestone("CommitErrorPopup error%1 last_action%2 extended_message:%3", error, - last_action, extended_message); + y2milestone("CommitErrorPopup error:%1 last_action:%2 extended_message:%3", + error, last_action, extended_message); string text = _("Failure occurred during following action:") + "\n" + last_action + "\n\n"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.21.1/storage/src/modules/StorageProposal.ycp new/yast2-storage-2.21.2/storage/src/modules/StorageProposal.ycp --- old/yast2-storage-2.21.1/storage/src/modules/StorageProposal.ycp 2011-05-07 14:13:46.000000000 +0200 +++ new/yast2-storage-2.21.2/storage/src/modules/StorageProposal.ycp 2011-06-01 18:36:29.000000000 +0200 @@ -170,11 +170,31 @@ btmp = ProductFeatures::GetBooleanFeature("partitioning", "proposal_lvm"); cfg_xml["prop_lvm"] = btmp ? true : false; + itmp = ProductFeatures::GetIntegerFeature("partitioning", "btrfs_increase_percentage"); + cfg_xml["btrfs_increase_percentage"] = itmp; + if (cfg_xml["btrfs_increase_percentage"]:0 == nil || cfg_xml["btrfs_increase_percentage"]:0 < 0) + cfg_xml["btrfs_increase_percentage"] = 100; + SetProposalDefault(false); y2milestone("GetControlCfg cfg_xml:%1", cfg_xml); } + map<string, any> ret = cfg_xml; + y2milestone("GetControlCfg GetProposalBtrfs:%1", GetProposalBtrfs()); + if( GetProposalBtrfs() ) + { + y2milestone( "GetControlCfg before:%1", ret ); + list<string> keys = [ "home_limit", "root_max", "root_base", "home_max", "vm_want" ]; + foreach( string k, keys, + { + if( haskey( ret, k ) ) + ret[k] = ret[k]:0 + ret[k]:0*100/cfg_xml["btrfs_increase_percentage"]:0; + else + y2warning( "GetControlCfg no key:%1", k ); + }); + y2milestone( "GetControlCfg after :%1", ret ); + } - return cfg_xml; + return ret; } global string GetProposalVM() ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
