Author: fehr Date: Thu Jun 9 15:33:27 2011 New Revision: 64291 URL: http://svn.opensuse.org/viewcvs/yast?rev=64291&view=rev Log: - 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 Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/modules/FileSystems.ycp trunk/storage/storage/src/modules/Storage.ycp trunk/storage/yast2-storage.spec.in Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.changes?rev=64291&r1=64290&r2=64291&view=diff ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Thu Jun 9 15:33:27 2011 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Thu Jun 9 14:56:02 CEST 2011 - fehr@suse.de + +- 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 - fehr@suse.de - support new btrfs_increase_percentage from control.xml Modified: trunk/storage/storage/src/modules/FileSystems.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/FileSystems.ycp?rev=64291&r1=64290&r2=64291&view=diff ============================================================================== --- trunk/storage/storage/src/modules/FileSystems.ycp (original) +++ trunk/storage/storage/src/modules/FileSystems.ycp Thu Jun 9 15:33:27 2011 @@ -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"; Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Storage.ycp?rev=64291&r1=64290&r2=64291&view=diff ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Thu Jun 9 15:33:27 2011 @@ -4250,9 +4250,12 @@ global define map AddSubvolRoot( map part ) { - list<string> def_subvol = [ "opt", "srv", "var/spool", "var/log" ]; + 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":s ]; }); + { return $[ "create":true, "name":sv_prepend+s ]; }); y2milestone( "AddSubvolRoot part:%1", part ); return( part ); } Modified: trunk/storage/yast2-storage.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/yast2-storage.spec.in?rev=64291&r1=64290&r2=64291&view=diff ============================================================================== --- trunk/storage/yast2-storage.spec.in (original) +++ trunk/storage/yast2-storage.spec.in Thu Jun 9 15:33:27 2011 @@ -5,7 +5,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-testsuite >= 2.19.0 yast2-perl-bindings Requires: yast2-perl-bindings perl = %{perl_version} Requires: yast2-core >= 2.18.3 yast2 >= 2.19.4 yast2-libyui >= 2.18.7 -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org