Author: fehr Date: Thu Aug 9 16:05:19 2007 New Revision: 40131 URL: http://svn.opensuse.org/viewcvs/yast?rev=40131&view=rev Log: - fix problems caused by using dmcrypt instead of losetup for encryption (#258222) Modified: trunk/storage/libstorage/src/SystemCmd.cc trunk/storage/libstorage/src/Volume.cc trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/modules/Storage.ycp Modified: trunk/storage/libstorage/src/SystemCmd.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/SystemCmd.cc?rev=40131&r1=40130&r2=40131&view=diff ============================================================================== --- trunk/storage/libstorage/src/SystemCmd.cc (original) +++ trunk/storage/libstorage/src/SystemCmd.cc Thu Aug 9 16:05:19 2007 @@ -148,6 +148,8 @@ */ Ret_i = -257; } + else + Ret_i = ret; y2milestone( "ret:%d ExceedTime:%d ExceedLines:%d", ret, ExceedTime, ExceedLines ); return( ret ); Modified: trunk/storage/libstorage/src/Volume.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Volume.cc?rev=40131&r1=40130&r2=40131&view=diff ============================================================================== --- trunk/storage/libstorage/src/Volume.cc (original) +++ trunk/storage/libstorage/src/Volume.cc Thu Aug 9 16:05:19 2007 @@ -1654,33 +1654,33 @@ updateFsData(); if( detected_fs!=FSUNKNOWN ) { - c.execute( "modprobe " + fs_names[detected_fs] ); - c.execute( "mount -oro -t " + fsTypeString(detected_fs) + " " + - use_dev + " " + mpname ); - bool ok = c.retcode()==0; + string cmd; + switch( detected_fs ) + { + case EXT2: + case EXT3: + cmd = "fsck.ext2 -n -f " + use_dev; + break; + case REISERFS: + cmd = "reiserfsck --yes --check -q " + use_dev; + break; + default: + cmd = "fsck -n -t " + fsTypeString(detected_fs) + + " " + use_dev; + break; + } + bool excTime, excLines; + c.executeRestricted( cmd, 15, 500, excTime, excLines ); + bool ok = c.retcode()==0 || (excTime && !excLines); + y2milestone( "ok:%d retcode:%d excTime:%d excLines:%d", + ok, c.retcode(), excTime, excLines ); if( ok ) { + c.execute( "modprobe " + fs_names[detected_fs] ); + c.execute( "mount -oro -t " + fsTypeString(detected_fs) + " " + + use_dev + " " + mpname ); + ok = c.retcode()==0; c.execute( "umount " + mpname ); - string cmd; - switch( detected_fs ) - { - case EXT2: - case EXT3: - cmd = "fsck.ext2 -n -f " + use_dev; - break; - case REISERFS: - cmd = "reiserfsck --yes --check -q " + use_dev; - break; - default: - cmd = "fsck -n -t " + fsTypeString(detected_fs) + - " " + use_dev; - break; - } - bool excTime, excLines; - c.executeRestricted( cmd, 15, 500, excTime, excLines ); - ok = c.retcode()==0 || (excTime && !excLines); - y2milestone( "ok:%d retcode:%d excTime:%d excLines:%d", - ok, c.retcode(), excTime, excLines ); } if( !ok ) { Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.changes?rev=40131&r1=40130&r2=40131&view=diff ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Thu Aug 9 16:05:19 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Aug 9 16:03:01 CEST 2007 - fehr@suse.de + +- fix problems caused by using dmcrypt instead of losetup for + encryption (#258222) + +------------------------------------------------------------------- Tue Aug 7 12:19:26 CEST 2007 - fehr@suse.de - install packages needed for formatting of filesystems (#297645) Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Storage.ycp?rev=40131&r1=40130&r2=40131&view=diff ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Thu Aug 9 16:05:19 2007 @@ -4823,10 +4823,9 @@ } else { - map curr = $[]; - curr = volumeMap( vinfo, curr ); - loop["loop_dev"] = curr["loop"]:""; - y2milestone( "PerformLosetup loop:%1", loop["loop_dev"]:"" ); + loop["loop_dev"] = "/dev/mapper/cr_" + + substring( device, findlastof( device, "/" )+1 ); + y2milestone( "PerformLosetup crdev:%1", loop["loop_dev"]:"" ); } SCR::Execute(.target.bash, "umount " + mdir ); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org