Hello community, here is the log from the commit of package libstorage for openSUSE:Factory checked in at 2013-11-23 08:14:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2013-11-17 20:19:48.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libstorage.new/libstorage.changes 2013-11-23 08:14:19.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Nov 20 11:35:01 CET 2013 - [email protected] + +- fixed writing of fstab for installation on NFS (bnc#848038) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libstorage-2.25.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.3/bindings/python/libstorage.py new/libstorage-2.25.3/bindings/python/libstorage.py --- old/libstorage-2.25.3/bindings/python/libstorage.py 2013-11-09 11:37:05.000000000 +0100 +++ new/libstorage-2.25.3/bindings/python/libstorage.py 2013-11-20 11:38:01.000000000 +0100 @@ -1690,10 +1690,6 @@ StorageInterface_swigregister(StorageInterface) -def getPresentDisks(): - return _libstorage.getPresentDisks() -getPresentDisks = _libstorage.getPresentDisks - def initDefaultLogger(*args): return _libstorage.initDefaultLogger(*args) initDefaultLogger = _libstorage.initDefaultLogger diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.3/storage/Storage.cc new/libstorage-2.25.3/storage/Storage.cc --- old/libstorage-2.25.3/storage/Storage.cc 2013-11-09 11:35:59.000000000 +0100 +++ new/libstorage-2.25.3/storage/Storage.cc 2013-11-19 17:57:39.000000000 +0100 @@ -855,20 +855,6 @@ } } -list<string> getPresentDisks() - { - list<string> ret; - list< pair< string, Disk::SysfsInfo > > dlist; - Storage::getDiskList( dlist ); - list< pair< string, Disk::SysfsInfo > >::const_iterator i = dlist.begin(); - while( i!=dlist.end() ) - { - ret.push_back( "/dev/"+Disk::sysfsToDev(i->first) ); - ++i; - } - y2mil( "ret:" << ret ); - return( ret ); - } void Storage::detectFsData(const VolIterator& begin, const VolIterator& end, SystemInfo& systeminfo) @@ -6931,8 +6917,11 @@ string path = root()+"/etc/fstab"; unlink( path.c_str() ); } + int ret = fstab->changeRootPrefix( root()+"/etc" ); - if( ret!=0 ) + if (ret == 0) + ret = fstab->flush(); + if (ret != 0) y2err("changeRootPrefix returns " << ret); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.3/storage/Storage.h new/libstorage-2.25.3/storage/Storage.h --- old/libstorage-2.25.3/storage/Storage.h 2013-11-06 16:03:48.000000000 +0100 +++ new/libstorage-2.25.3/storage/Storage.h 2013-11-15 01:42:51.000000000 +0100 @@ -584,8 +584,8 @@ static void clean_tmpdir(); static bool getDiskList( list< pair< string, Disk::SysfsInfo > >& dlist ); - void getDiskList( bool (* CheckFnc)( const Disk& ), - std::list<Disk*>& dl ); + void getDiskList( bool (* CheckFnc)( const Disk& ), list<Disk*>& dl ); + void changeDeviceName( const string& old, const string& nw ); int commit(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.3/storage/StorageInterface.h new/libstorage-2.25.3/storage/StorageInterface.h --- old/libstorage-2.25.3/storage/StorageInterface.h 2013-11-09 11:35:59.000000000 +0100 +++ new/libstorage-2.25.3/storage/StorageInterface.h 2013-11-15 01:37:08.000000000 +0100 @@ -2760,13 +2760,6 @@ /** - * Lightweight function to get existing disks without full probing - * - * @return list of device names of present disk devices - */ - list<string> getPresentDisks(); - - /** * Initializes default logging with explicit log dir. */ void initDefaultLogger( const string& logdir ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.3/storage/Utils.cc new/libstorage-2.25.3/storage/Utils.cc --- old/libstorage-2.25.3/storage/Utils.cc 2013-11-09 11:35:59.000000000 +0100 +++ new/libstorage-2.25.3/storage/Utils.cc 2013-11-15 01:50:13.000000000 +0100 @@ -22,6 +22,7 @@ #include <string> +#include "storage/Storage.h" #include "storage/SystemInfo.h" @@ -30,6 +31,22 @@ using namespace std; + list<string> + getPresentDisks() + { + list<string> ret; + + list<pair<string, Disk::SysfsInfo>> dlist; + Storage::getDiskList(dlist); + + for (list<pair<string, Disk::SysfsInfo>>::const_iterator it = dlist.begin(); it != dlist.end(); ++it) + ret.push_back("/dev/" + Disk::sysfsToDev(it->first)); + + y2mil("ret:" << ret); + return ret; + } + + map<string, string> DmraidToMdadm() { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.3/storage/Utils.h new/libstorage-2.25.3/storage/Utils.h --- old/libstorage-2.25.3/storage/Utils.h 2013-11-09 11:35:59.000000000 +0100 +++ new/libstorage-2.25.3/storage/Utils.h 2013-11-15 01:37:37.000000000 +0100 @@ -33,6 +33,15 @@ namespace storage { + + /** + * Lightweight function to get existing disks without full probing. + * + * @return list of device names of present disk devices + */ + list<string> getPresentDisks(); + + /** * Lightweight function to get mapping from dmraid names to mdadm uuids. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.3/storage/gen_md5sum.cc new/libstorage-2.25.3/storage/gen_md5sum.cc --- old/libstorage-2.25.3/storage/gen_md5sum.cc 2013-11-10 12:42:42.000000000 +0100 +++ new/libstorage-2.25.3/storage/gen_md5sum.cc 2013-11-19 18:02:38.000000000 +0100 @@ -1,5 +1,5 @@ -#define SOURCES_MD5SUM "dfd7e8326b5a90f2c14c312ad82aa6de" -#define SOURCES_MD5_DATE " Sun 10 Nov 12:42:42 CET 2013 " +#define SOURCES_MD5SUM "04d6109bf1b08268c2ca1909655cc8ad" +#define SOURCES_MD5_DATE " Tue 19 Nov 18:02:38 CET 2013 " namespace storage { const char* GetSourceMd5() { return SOURCES_MD5SUM; } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
