Hello community, here is the log from the commit of package libstorage for openSUSE:Factory checked in at 2014-06-02 07:00:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-05-18 06:49:20.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libstorage.new/libstorage.changes 2014-06-02 07:00:04.000000000 +0200 @@ -1,0 +2,12 @@ +Mon May 26 15:23:49 CEST 2014 - aschnell@suse.de + +- fixed fstab handling of multiple swap devices (bnc#879890) + +------------------------------------------------------------------- +Tue May 20 09:29:07 CEST 2014 - aschnell@suse.de + +- create version 5 superblock with mkfs.xfs to have bigger ACLs + (see fate#317042) +- 2.25.13 + +------------------------------------------------------------------- Old: ---- libstorage-2.25.12.tar.bz2 New: ---- libstorage-2.25.13.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libstorage.spec ++++++ --- /var/tmp/diff_new_pack.wV6n27/_old 2014-06-02 07:00:05.000000000 +0200 +++ /var/tmp/diff_new_pack.wV6n27/_new 2014-06-02 07:00:05.000000000 +0200 @@ -17,7 +17,7 @@ Name: libstorage -Version: 2.25.12 +Version: 2.25.13 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: libstorage-%{version}.tar.bz2 ++++++ libstorage-2.25.12.tar.bz2 -> libstorage-2.25.13.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.12/VERSION new/libstorage-2.25.13/VERSION --- old/libstorage-2.25.12/VERSION 2014-04-14 10:23:54.000000000 +0200 +++ new/libstorage-2.25.13/VERSION 2014-05-21 11:56:21.000000000 +0200 @@ -1 +1 @@ -2.25.12 +2.25.13 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.12/storage/EtcFstab.cc new/libstorage-2.25.13/storage/EtcFstab.cc --- old/libstorage-2.25.12/storage/EtcFstab.cc 2014-01-22 10:39:57.000000000 +0100 +++ new/libstorage-2.25.13/storage/EtcFstab.cc 2014-05-26 15:27:46.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) [2004-2013] Novell, Inc. + * Copyright (c) [2004-2014] Novell, Inc. * * All Rights Reserved. * @@ -429,8 +429,9 @@ } -AsciiFile* EtcFstab::findFile( const FstabEntry& e, AsciiFile*& fstab, - AsciiFile*& cryptotab, int& lineno ) const + AsciiFile* + EtcFstab::findFile(const FstabEntry& e, AsciiFile*& fstab, AsciiFile*& cryptotab, + int& lineno) const { y2mil("dentry:" << e.dentry << " mount:" << e.mount << " fstab:" << fstab << " cryptotab:" << cryptotab); @@ -451,13 +452,18 @@ reg = "^[ \t]*" + boost::replace_all_copy(fstabEncode(e.dentry), "\\", "\\\\") + "[ \t]"; } + if (e.mount != "swap") + { reg = "[ \t]+" + boost::replace_all_copy(fstabEncode(e.mount), "\\", "\\\\") + "[ \t]"; + } + lineno = ret->find_if_idx(regex_matches(reg)); y2mil("fstab:" << fstab << " cryptotab:" << cryptotab << " lineno:" << lineno); - return( ret ); + return ret; } + int EtcFstab::findPrefix( const AsciiFile& tab, const string& mount ) const { bool crypto = tab.name().find( "/cryptotab" )!=string::npos; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.12/storage/Volume.cc new/libstorage-2.25.13/storage/Volume.cc --- old/libstorage-2.25.12/storage/Volume.cc 2014-05-15 21:09:21.000000000 +0200 +++ new/libstorage-2.25.13/storage/Volume.cc 2014-05-20 10:05:41.000000000 +0200 @@ -1087,7 +1087,8 @@ break; case XFS: cmd = MKFSXFSBIN; - params = "-q -f"; + // crc is used to get version 5 superblock + params = "-q -f -m crc=1"; break; case SWAP: cmd = MKSWAPBIN; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.12/storage/gen_md5sum.cc new/libstorage-2.25.13/storage/gen_md5sum.cc --- old/libstorage-2.25.12/storage/gen_md5sum.cc 2014-05-15 21:10:47.000000000 +0200 +++ new/libstorage-2.25.13/storage/gen_md5sum.cc 2014-05-26 15:27:50.000000000 +0200 @@ -1,5 +1,5 @@ -#define SOURCES_MD5SUM "0c2682b270a53ccf31ebb4ec8a7a7075" -#define SOURCES_MD5_DATE " Thu May 15 21:10:47 CEST 2014 " +#define SOURCES_MD5SUM "45fc7a300b4020cabf6da6d5c17dd976" +#define SOURCES_MD5_DATE " Mon 26 May 15:27:50 CEST 2014 " namespace storage { const char* GetSourceMd5() { return SOURCES_MD5SUM; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.12/testsuite/fstab-add.cc new/libstorage-2.25.13/testsuite/fstab-add.cc --- old/libstorage-2.25.12/testsuite/fstab-add.cc 2014-01-22 10:39:57.000000000 +0100 +++ new/libstorage-2.25.13/testsuite/fstab-add.cc 2014-05-26 15:27:46.000000000 +0200 @@ -139,6 +139,39 @@ } +void +test6() +{ + cout << "test6" << endl; + + setup_system("empty"); + + EtcFstab fstab("tmp/etc"); + + FstabChange entry1; + entry1.device = "/dev/sda1"; + entry1.dentry = "UUID=1234"; + entry1.mount = "swap"; + entry1.fs = "swap"; + entry1.opts = { ("defaults") }; + + FstabChange entry2; + entry2.device = "/dev/sdb1"; + entry2.dentry = "UUID=5678"; + entry2.mount = "swap"; + entry2.fs = "swap"; + entry2.opts = { ("defaults") }; + + fstab.addEntry(entry1); + fstab.addEntry(entry2); + fstab.flush(); + + print_fstab(); + + cout << endl; +} + + int main() { @@ -149,4 +182,5 @@ test3(); test4(); test5(); + test6(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.12/testsuite/fstab-remove.cc new/libstorage-2.25.13/testsuite/fstab-remove.cc --- old/libstorage-2.25.12/testsuite/fstab-remove.cc 2014-01-22 10:39:57.000000000 +0100 +++ new/libstorage-2.25.13/testsuite/fstab-remove.cc 2014-05-26 15:27:46.000000000 +0200 @@ -126,6 +126,33 @@ } +void +test6() +{ + cout << "test6" << endl; + + setup_system("empty"); + + write_fstab({ "UUID=1234 swap swap defaults 0 0", + "UUID=5678 swap swap defaults 0 0" }); + + EtcFstab fstab("tmp/etc"); + fstab.setDevice("/dev/sda1", {}, "1234", "", {}, ""); + fstab.setDevice("/dev/sdb1", {}, "5678", "", {}, ""); + + FstabKey key1("/dev/sda1", "swap"); + FstabKey key2("/dev/sdb1", "swap"); + + fstab.removeEntry(key1); + fstab.removeEntry(key2); + fstab.flush(); + + print_fstab(); + + cout << endl; +} + + int main() { @@ -136,4 +163,5 @@ test3(); test4(); test5(); + test6(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.12/testsuite/single.out/fstab-add.out new/libstorage-2.25.13/testsuite/single.out/fstab-add.out --- old/libstorage-2.25.12/testsuite/single.out/fstab-add.out 2014-01-22 10:39:57.000000000 +0100 +++ new/libstorage-2.25.13/testsuite/single.out/fstab-add.out 2014-05-26 15:27:46.000000000 +0200 @@ -29,3 +29,9 @@ UUID=1234 /test1 ext4 defaults 0 0 end of fstab +test6 +begin of fstab +UUID=1234 swap swap defaults 0 0 +UUID=5678 swap swap defaults 0 0 +end of fstab + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.12/testsuite/single.out/fstab-remove.out new/libstorage-2.25.13/testsuite/single.out/fstab-remove.out --- old/libstorage-2.25.12/testsuite/single.out/fstab-remove.out 2014-01-22 10:39:57.000000000 +0100 +++ new/libstorage-2.25.13/testsuite/single.out/fstab-remove.out 2014-05-26 15:27:46.000000000 +0200 @@ -22,3 +22,7 @@ begin of fstab end of fstab +test6 +begin of fstab +end of fstab + -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org