Hello community, here is the log from the commit of package libstorage for openSUSE:Factory checked in at 2014-09-10 17:02:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libstorage (Old) and /work/SRC/openSUSE:Factory/.libstorage.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libstorage" Changes: -------- --- /work/SRC/openSUSE:Factory/libstorage/libstorage.changes 2014-09-07 11:08:35.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libstorage.new/libstorage.changes 2014-09-10 17:02:20.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Sep 09 12:06:28 CEST 2014 - aschnell@suse.de + +- disallow shrinking of btrfs filesystems (bnc#894832) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libstorage-2.25.14.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.14/storage/Storage.cc new/libstorage-2.25.14/storage/Storage.cc --- old/libstorage-2.25.14/storage/Storage.cc 2014-08-15 09:08:55.000000000 +0200 +++ new/libstorage-2.25.14/storage/Storage.cc 2014-09-09 17:23:28.000000000 +0200 @@ -5636,7 +5636,9 @@ static FsCapabilitiesX ext4Caps (true, true, true, false, true, true, true, 16, 32*1024); - static FsCapabilitiesX btrfsCaps (true, true, true, true, true, true, + // btrfs can be shrunk but it is not possible to know the minimal possible + // size in advance (see bnc #894832), thus not allowed here + static FsCapabilitiesX btrfsCaps (true, true, false, false, true, true, true, 256, 256*1024); static FsCapabilitiesX xfsCaps (true, true, false, false, true, true, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.14/storage/SystemInfo/CmdDasdview.cc new/libstorage-2.25.14/storage/SystemInfo/CmdDasdview.cc --- old/libstorage-2.25.14/storage/SystemInfo/CmdDasdview.cc 2014-03-06 17:30:22.000000000 +0100 +++ new/libstorage-2.25.14/storage/SystemInfo/CmdDasdview.cc 2014-09-08 17:43:23.000000000 +0200 @@ -127,7 +127,7 @@ std::ostream& operator<<(std::ostream& s, const Dasdview& dasdview) { - s << "device: " << dasdview.device << " geometry:" << dasdview.geometry + s << "device:" << dasdview.device << " geometry:" << dasdview.geometry << " dasd_format:" << toString(dasdview.dasd_format) << " dasd_type:" << toString(dasdview.dasd_type); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.14/storage/Volume.cc new/libstorage-2.25.14/storage/Volume.cc --- old/libstorage-2.25.14/storage/Volume.cc 2014-07-29 13:55:45.000000000 +0200 +++ new/libstorage-2.25.14/storage/Volume.cc 2014-09-09 12:28:47.000000000 +0200 @@ -1755,9 +1755,9 @@ { cmd = BTRFSBIN " filesystem resize "; if( needShrink() ) - cmd += " -" + decString(orig_size_k-size_k) + "K"; + cmd += decString(size_k) + "K"; else - cmd += " max"; + cmd += "max"; cmd += " " + quote(tmp_mount.mount_point); c.execute( cmd ); if( c.retcode()!=0 ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.14/storage/gen_md5sum.cc new/libstorage-2.25.14/storage/gen_md5sum.cc --- old/libstorage-2.25.14/storage/gen_md5sum.cc 2014-09-05 10:46:52.000000000 +0200 +++ new/libstorage-2.25.14/storage/gen_md5sum.cc 2014-09-09 17:23:36.000000000 +0200 @@ -1,5 +1,5 @@ -#define SOURCES_MD5SUM "df650078fdf78940c0c6128a225b2f0c" -#define SOURCES_MD5_DATE " Fri 5 Sep 10:46:52 CEST 2014 " +#define SOURCES_MD5SUM "9fbc6cde91f471eef5a92b261a690292" +#define SOURCES_MD5_DATE " Tue 9 Sep 17:23:36 CEST 2014 " namespace storage { const char* GetSourceMd5() { return SOURCES_MD5SUM; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.14/testsuite/single.out/dasdview.out new/libstorage-2.25.14/testsuite/single.out/dasdview.out --- old/libstorage-2.25.14/testsuite/single.out/dasdview.out 2014-02-03 10:49:03.000000000 +0100 +++ new/libstorage-2.25.14/testsuite/single.out/dasdview.out 2014-09-08 17:43:23.000000000 +0200 @@ -1,6 +1,6 @@ parse1 -device: /dev/dasda geometry:[10017,15,12,4096] dasd_format:CDL dasd_type:ECKD +device:/dev/dasda geometry:[10017,15,12,4096] dasd_format:CDL dasd_type:ECKD parse2 -device: /dev/dasdb geometry:[3339,15,0,512] dasd_format:NONE dasd_type:ECKD +device:/dev/dasdb geometry:[3339,15,0,512] dasd_format:NONE dasd_type:ECKD parse3 -device: /dev/dasdc geometry:[777,16,128,512] dasd_format:LDL dasd_type:FBA +device:/dev/dasdc geometry:[777,16,128,512] dasd_format:LDL dasd_type:FBA -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org