[yast-commit] r57305 - in /trunk/storage/libstorage/src: Storage.cc Volume.cc

Author: aschnell Date: Mon May 25 14:15:50 2009 New Revision: 57305 URL: http://svn.opensuse.org/viewcvs/yast?rev=57305&view=rev Log: - tmpdir cleanup Modified: trunk/storage/libstorage/src/Storage.cc trunk/storage/libstorage/src/Volume.cc Modified: trunk/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.cc... ============================================================================== --- trunk/storage/libstorage/src/Storage.cc (original) +++ trunk/storage/libstorage/src/Storage.cc Mon May 25 14:15:50 2009 @@ -5384,7 +5384,7 @@ if( !vol->isMounted() ) { removeDmTableTo( *vol ); - string mdir = tmpDir() + "/tmp_mp"; + string mdir = tmpDir() + "/tmp-free-mp"; unlink( mdir.c_str() ); rmdir( mdir.c_str() ); string save_opt; Modified: trunk/storage/libstorage/src/Volume.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Volume.cc?... ============================================================================== --- trunk/storage/libstorage/src/Volume.cc (original) +++ trunk/storage/libstorage/src/Volume.cc Mon May 25 14:15:50 2009 @@ -1266,7 +1266,7 @@ string mpoint = orig_mp; if( !isMounted() ) { - mpoint = cont->getStorage()->tmpDir()+"/mp"; + mpoint = cont->getStorage()->tmpDir() + "/tmp-xfs-mp"; mkdir( mpoint.c_str(), 0700 ); ret = mount( mpoint ); needrmdir = true; @@ -1655,7 +1655,7 @@ static EncryptType try_order[] = { ENC_LUKS, ENC_TWOFISH_OLD, ENC_TWOFISH256_OLD, ENC_TWOFISH }; string fname = cont->getStorage()->tmpDir()+"/pwdf"; - string mpname = cont->getStorage()->tmpDir()+"/mp"; + string mpname = cont->getStorage()->tmpDir() + "/tmp-enc-mp"; SystemCmd c; y2mil("device:" << dev); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org
participants (1)
-
aschnell@svn.opensuse.org