Hello community, here is the log from the commit of package yast2-storage for openSUSE:Factory checked in at 2013-01-14 22:39:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-storage (Old) and /work/SRC/openSUSE:Factory/.yast2-storage.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-storage", Maintainer is "aschn...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-storage/yast2-storage.changes 2012-12-21 10:39:38.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-storage.new/yast2-storage.changes 2013-01-14 22:39:20.000000000 +0100 @@ -1,0 +2,16 @@ +Mon Jan 14 15:35:53 CET 2013 - f...@suse.de + +- version 2.23.4 +- fix problem with reuse of efi boot partition (bnc#781689) + +------------------------------------------------------------------- +Wed Jan 09 14:24:39 CET 2013 - aschn...@suse.de + +- disallow to activate quota for btrfs (bnc#797499) + +------------------------------------------------------------------- +Tue Jan 08 10:45:50 CET 2013 - aschn...@suse.de + +- install cryptsetup-mkinitrd along with cryptsetup (bnc#796167) + +------------------------------------------------------------------- Old: ---- yast2-storage-2.23.3.tar.bz2 New: ---- yast2-storage-2.23.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-storage.spec ++++++ --- /var/tmp/diff_new_pack.O0BwXV/_old 2013-01-14 22:39:21.000000000 +0100 +++ /var/tmp/diff_new_pack.O0BwXV/_new 2013-01-14 22:39:21.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package yast2-storage # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: yast2-storage -Version: 2.23.3 +Version: 2.23.4 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-storage-2.23.3.tar.bz2 -> yast2-storage-2.23.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.23.3/VERSION new/yast2-storage-2.23.4/VERSION --- old/yast2-storage-2.23.3/VERSION 2012-12-20 13:02:23.000000000 +0100 +++ new/yast2-storage-2.23.4/VERSION 2013-01-14 15:36:59.000000000 +0100 @@ -1 +1 @@ -2.23.3 +2.23.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.23.3/storage/src/include/custom_part_lib.ycp new/yast2-storage-2.23.4/storage/src/include/custom_part_lib.ycp --- old/yast2-storage-2.23.3/storage/src/include/custom_part_lib.ycp 2012-12-19 19:45:30.000000000 +0100 +++ new/yast2-storage-2.23.4/storage/src/include/custom_part_lib.ycp 2013-01-14 11:20:54.000000000 +0100 @@ -812,7 +812,7 @@ new["label"] = ""; new["ori_label"] = ""; if( !Stage::initial() ) - Package::InstallAll( ["cryptsetup", "pam_mount"] ); + Package::InstallAll( ["cryptsetup", "cryptsetup-mkinitrd", "pam_mount"] ); } } if( ret == `fs_options ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.23.3/storage/src/modules/FileSystems.ycp new/yast2-storage-2.23.4/storage/src/modules/FileSystems.ycp --- old/yast2-storage-2.23.3/storage/src/modules/FileSystems.ycp 2012-11-07 16:02:12.000000000 +0100 +++ new/yast2-storage-2.23.4/storage/src/modules/FileSystems.ycp 2013-01-14 11:20:54.000000000 +0100 @@ -1594,7 +1594,7 @@ global boolean CanDoQuota(map part) { - const list<symbol> quota_fs = [ `ext2, `ext3, `ext4, `btrfs, `reiser, `xfs ]; + const list<symbol> quota_fs = [ `ext2, `ext3, `ext4, `reiser, `xfs ]; return contains(quota_fs, part["used_fs"]:`unknown); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.23.3/storage/src/modules/Storage.ycp new/yast2-storage-2.23.4/storage/src/modules/Storage.ycp --- old/yast2-storage-2.23.3/storage/src/modules/Storage.ycp 2012-12-20 11:45:18.000000000 +0100 +++ new/yast2-storage-2.23.4/storage/src/modules/Storage.ycp 2013-01-14 11:20:54.000000000 +0100 @@ -4567,6 +4567,12 @@ return( ret ); } +/** + * Tries to umount given device if mounted + * + * @param string device to umount + * @return boolean if successful + */ global boolean TryUnaccessSwap( string device ) { boolean ret = isempty(DeviceMounted(device)); @@ -5252,31 +5258,28 @@ if (need_lvm) { - pl = add(pl, "lvm2"); + pl = (list<string>) union( pl, ["lvm2"] ); } //nfs-client needs to be marked for installation if we have //some NFS shares. It will pull in portmapper package(#436897) if (need_nfs) { - pl = add(pl, "nfs-client"); - pl = add(pl, "yast2-nfs-client"); + pl = (list<string>) union( pl, ["nfs-client", "yast2-nfs-client"] ); } if( need_quota ) { - pl = add( pl, "quota" ); + pl = (list<string>) union( pl, ["quota"] ); } if( need_crypt ) { - pl = add( pl, "cryptsetup" ); - pl = add( pl, "pam_mount" ); + pl = (list<string>) union( pl, ["cryptsetup", "cryptsetup-mkinitrd", "pam_mount"] ); } map part = GetEntryForMountpoint("/"); if (part["used_fs"]:`unknown == `btrfs) { - pl = add(pl, "snapper"); - pl = add(pl, "yast2-snapper"); + pl = (list<string>) union( pl, ["snapper", "yast2-snapper"] ); } y2milestone("AddPackageList ret %1", pl); @@ -6098,12 +6101,11 @@ }; -global void AddHwPackage( string name ) +global void AddHwPackages( list<string> names ) { - y2milestone( "AddHwPackage name %1 list:%2", name, hw_packages ); - if( find( string s, hw_packages, ``(s==name)) == nil ) - hw_packages = add( hw_packages, name ); - y2milestone( "AddHwPackage list:%1", hw_packages ); + y2milestone( "AddHwPackages names:%1 list:%2", names, hw_packages ); + hw_packages = (list<string>) union(hw_packages, names); + y2milestone( "AddHwPackages list:%1", hw_packages ); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.23.3/storage/src/modules/StorageControllers.ycp new/yast2-storage-2.23.4/storage/src/modules/StorageControllers.ycp --- old/yast2-storage-2.23.3/storage/src/modules/StorageControllers.ycp 2012-09-17 15:46:05.000000000 +0200 +++ new/yast2-storage-2.23.4/storage/src/modules/StorageControllers.ycp 2013-01-14 11:20:54.000000000 +0100 @@ -297,12 +297,9 @@ map controller = controllers[cindex]:$[]; y2milestone( "Initialize controller %1", controller ); - if( size(controller["requires"]:[])>0 ) + if( !isempty(controller["requires"]:[]) ) { - foreach( string s, controller["requires"]:[], - ``{ - Storage::AddHwPackage( s ); - }); + Storage::AddHwPackages( controller["requires"]:[] ); } cindex = cindex + 1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.23.3/storage/src/modules/StorageProposal.ycp new/yast2-storage-2.23.4/storage/src/modules/StorageProposal.ycp --- old/yast2-storage-2.23.3/storage/src/modules/StorageProposal.ycp 2012-11-15 17:26:32.000000000 +0100 +++ new/yast2-storage-2.23.4/storage/src/modules/StorageProposal.ycp 2013-01-14 15:34:47.000000000 +0100 @@ -3261,7 +3261,7 @@ special_boot_proposal_prepare( disk["partitions"]:[] ); boolean have_home = false; boolean have_root = false; - boolean have_boot = (!(Partitions::EfiBoot() || Arch::ia64()) || mode!=`free) && size(p)>0; + boolean have_boot = (mode!=`free||Partitions::EfiBoot()) && size(p)>0; if( have_boot ) disk["partitions"] = p; map r = can_swap_reuse( s, disk["partitions"]:[], target ); -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org