Author: fehr Date: Tue Sep 4 16:57:47 2007 New Revision: 40753 URL: http://svn.opensuse.org/viewcvs/yast?rev=40753&view=rev Log: - fix problem with resizing encrypted volumes (#307219) - fix missing initialisation of tmpcrypt (#307219) - fix possible usage of nonzero passno for encrypted fstab entries (#296409) Modified: trunk/storage/libstorage/src/EtcFstab.h trunk/storage/libstorage/src/Volume.cc trunk/storage/package/yast2-storage.changes Modified: trunk/storage/libstorage/src/EtcFstab.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/EtcFstab.h?rev=40753&r1=40752&r2=40753&view=diff ============================================================================== --- trunk/storage/libstorage/src/EtcFstab.h (original) +++ trunk/storage/libstorage/src/EtcFstab.h Tue Sep 4 16:57:47 2007 @@ -16,7 +16,8 @@ struct FstabEntry { - FstabEntry() { freq=passno=0; crypto=cryptt=loop=noauto=dmcrypt=false; + FstabEntry() { freq=passno=0; + crypto=cryptt=loop=noauto=dmcrypt=tmpcrypt=false; encr=storage::ENC_NONE; mount_by=storage::MOUNTBY_DEVICE; } FstabEntry& operator=( const FstabChange& rhs ); friend std::ostream& operator<< (std::ostream& s, const FstabEntry &v ); Modified: trunk/storage/libstorage/src/Volume.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Volume.cc?rev=40753&r1=40752&r2=40753&view=diff ============================================================================== --- trunk/storage/libstorage/src/Volume.cc (original) +++ trunk/storage/libstorage/src/Volume.cc Tue Sep 4 16:57:47 2007 @@ -1168,11 +1168,17 @@ int Volume::resizeFs() { + SystemCmd c; + string cmd; int ret = 0; + if( encryption!=ENC_NONE && !dmcrypt_dev.empty() ) + { + cmd = "cryptsetup resize "; + cmd += dmcrypt_dev.substr(dmcrypt_dev.rfind( '/' )+1); + c.execute( cmd ); + } if( !format && !ignore_fs ) { - string cmd; - SystemCmd c; switch( fs ) { case SWAP: @@ -2396,7 +2402,7 @@ { changed = true; che.fs = fs_names[fs]; - if( fs==SWAP || fs==NFS ) + if( fs==SWAP || fs==NFS || encryption!=ENC_NONE ) che.freq = che.passno = 0; else { Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.changes?rev=40753&r1=40752&r2=40753&view=diff ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Tue Sep 4 16:57:47 2007 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Tue Sep 4 16:55:55 CEST 2007 - fehr@suse.de + +- fix problem with resizing encrypted volumes (#307219) +- fix missing initialisation of tmpcrypt (#307219) +- fix possible usage of nonzero passno for encrypted fstab entries + (#296409) + +------------------------------------------------------------------- Mon Sep 3 11:34:26 CEST 2007 - fehr@suse.de - call insserv or insser -r for boot.{md,lvm,dmraid} as needed (#303857) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org