Author: fehr Date: Tue May 31 18:03:13 2011 New Revision: 64180

URL: http://svn.opensuse.org/viewcvs/yast?rev=64180&view=rev Log: fix bug in handlig rootprefix when creating subvolumes

Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Storage.cc branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Volume.cc

Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/storag... ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Storage.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Storage.cc Tue May 31 18:03:13 2011 @@ -1146,10 +1146,10 @@

string Storage::prependRoot(const string& mp) const { - if (mp == "swap") + if (mp == "swap" || rootprefix.empty() ) return mp;

- if (rootprefix != "" && mp == "/") + if (mp == "/") return rootprefix; else return rootprefix + mp;

Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Volume.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/storag... ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Volume.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Volume.cc Tue May 31 18:03:13 2011 @@ -711,7 +711,7 @@ { int ret = 0; needUmount=false; - m = getMount(); + m = getStorage()->prependRoot(getMount()); if( !isMounted() ) { if( getStorage()->mountTmp( this, m ) )