[yast-commit] r40236 - in /trunk/storage: libstorage/src/Volume.cc package/yast2-storage.changes
Author: fehr Date: Mon Aug 13 17:35:51 2007 New Revision: 40236 URL: http://svn.opensuse.org/viewcvs/yast?rev=40236&view=rev Log: make sure also swap activated before YaST2 gets into fstab (#299550) Modified: trunk/storage/libstorage/src/Volume.cc trunk/storage/package/yast2-storage.changes Modified: trunk/storage/libstorage/src/Volume.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Volume.cc?rev=40236&r1=40235&r2=40236&view=diff ============================================================================== --- trunk/storage/libstorage/src/Volume.cc (original) +++ trunk/storage/libstorage/src/Volume.cc Mon Aug 13 17:35:51 2007 @@ -1016,7 +1016,8 @@ } else { - if( !orig_mp.empty() && !mp.empty() ) + if( !orig_mp.empty() && !mp.empty() && + (!cont->getStorage()->instsys()||mp!=orig_mp||mp!="swap") ) { // displayed text before action, %1$s is replaced by device name e.g. /dev/hda1 // %2$s is replaced by mount point e.g. /home @@ -1601,7 +1602,8 @@ bool Volume::needFstabUpdate() const { bool ret = !ignore_fstab && !(mp.empty() && orig_mp.empty()) && - (fstab_opt!=orig_fstab_opt || mount_by!=orig_mount_by || + ((cont->getStorage()->instsys()&&mp=="swap"&&mp==orig_mp) || + fstab_opt!=orig_fstab_opt || mount_by!=orig_mount_by || encryption!=orig_encryption); return( ret ); } @@ -2051,7 +2053,6 @@ int Volume::mount( const string& m, bool ro ) { - SystemCmd cmd; y2milestone( "device:%s mp:%s ro:%d", dev.c_str(), m.c_str(), ro ); string cmdline; @@ -2211,7 +2212,8 @@ l.push_back( new commitAction( FORMAT, cont->type(), formatText(false), this, true )); } - else if( mp != orig_mp ) + else if( mp != orig_mp || + (cont->getStorage()->instsys()&&mp=="swap") ) { l.push_back( new commitAction( MOUNT, cont->type(), mountText(false), this, false )); Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.changes?rev=40236&r1=40235&r2=40236&view=diff ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Mon Aug 13 17:35:51 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Aug 13 16:32:46 CEST 2007 - fehr@suse.de + +- make sure also swap activated before YaST2 gets into fstab (#299550) + +------------------------------------------------------------------- Thu Aug 9 16:03:01 CEST 2007 - fehr@suse.de - fix problems caused by using dmcrypt instead of losetup for -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org
participants (1)
-
fehr@svn.opensuse.org