Hello community, here is the log from the commit of package libstorage for openSUSE:12.1 checked in at 2011-11-02 11:59:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1/libstorage (Old) and /work/SRC/openSUSE:12.1/.libstorage.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libstorage", Maintainer is "ASchnell@suse.com" Changes: -------- --- /work/SRC/openSUSE:12.1/libstorage/libstorage.changes 2011-10-28 17:10:48.000000000 +0200 +++ /work/SRC/openSUSE:12.1/.libstorage.new/libstorage.changes 2011-11-02 11:59:16.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Oct 31 18:38:21 CET 2011 - fehr@suse.de + +- 2.21.13 +- improve detection of /home partition (bnc#727362) + +------------------------------------------------------------------- Old: ---- libstorage-2.21.12.tar.bz2 New: ---- libstorage-2.21.13.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libstorage.spec ++++++ --- /var/tmp/diff_new_pack.r3Krny/_old 2011-11-02 11:59:16.000000000 +0100 +++ /var/tmp/diff_new_pack.r3Krny/_new 2011-11-02 11:59:16.000000000 +0100 @@ -19,7 +19,7 @@ Name: libstorage -Version: 2.21.12 +Version: 2.21.13 Release: 0 License: GPL Group: System/Libraries ++++++ libstorage-2.21.12.tar.bz2 -> libstorage-2.21.13.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.21.12/VERSION new/libstorage-2.21.13/VERSION --- old/libstorage-2.21.12/VERSION 2011-10-27 13:35:05.000000000 +0200 +++ new/libstorage-2.21.13/VERSION 2011-10-31 18:46:39.000000000 +0100 @@ -1 +1 @@ -2.21.12 +2.21.13 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.21.12/storage/FreeInfo.cc new/libstorage-2.21.13/storage/FreeInfo.cc --- old/libstorage-2.21.12/storage/FreeInfo.cc 2010-07-29 15:47:00.000000000 +0200 +++ new/libstorage-2.21.13/storage/FreeInfo.cc 2011-10-31 18:18:22.000000000 +0100 @@ -123,7 +123,7 @@ const list<string> dirs = glob(mp + "/*", GLOB_NOSORT | GLOB_ONLYDIR); for (list<string>::const_iterator dir = dirs.begin(); dir != dirs.end(); ++dir) { - if (*dir != "root" && checkDir(*dir)) + if ( !boost::ends_with(*dir,"/root") && checkDir(*dir)) { for (unsigned int i = 0; i < lengthof(files); ++i) { @@ -230,6 +230,28 @@ content_info.homes = numHomes(mp); + if( content_info.homes==0 && !vol.getLabel().empty() ) + { + string lab = boost::to_lower_copy(vol.getLabel()); + y2mil( "label:" << vol.getLabel() << " lab:" << lab ); + if( boost::starts_with( lab, "home" )) + content_info.homes = 1; + } + if( content_info.homes==0 && + (vol.getFs()==EXT2 || vol.getFs()==EXT3 || vol.getFs()==EXT4 )) + { + SystemCmd c( "/sbin/tune2fs -l " + vol.mountDevice() + " | grep '^Last mounted on:'" ); + if( c.retcode()==0 && c.numLines()>0 ) + { + string line = c.getLine(0); + line = line.substr( line.find( ':' )+1 ); + y2mil( "line:" << c.getLine(0) << " lin:" << line ); + line = extractNthWord( 0, line ); + y2mil( "dir:" << line ); + if( line == "/home" ) + content_info.homes = 1; + } + } y2mil("device:" << vol.device() << " " << content_info); return content_info; } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org