Author: aschnell Date: Fri Aug 8 16:36:43 2008 New Revision: 49878 URL: http://svn.opensuse.org/viewcvs/yast?rev=49878&view=rev Log: - fixed error number - shell quoting Modified: trunk/storage/libstorage/src/StorageInterface.h trunk/storage/libstorage/src/Volume.cc Modified: trunk/storage/libstorage/src/StorageInterface.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/StorageInterface.h?rev=49878&r1=49877&r2=49878&view=diff ============================================================================== --- trunk/storage/libstorage/src/StorageInterface.h (original) +++ trunk/storage/libstorage/src/StorageInterface.h Fri Aug 8 16:36:43 2008 @@ -522,6 +522,7 @@ VOLUME_FORMAT_NFS_IMPOSSIBLE = -3037, VOLUME_CRYPT_NFS_IMPOSSIBLE = -3038, VOLUME_REMOUNT_FAILED = -3039, + VOLUME_TUNEREISERFS_FAILED = -3040, LVM_CREATE_PV_FAILED = -4000, LVM_PV_ALREADY_CONTAINED = -4001, Modified: trunk/storage/libstorage/src/Volume.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Volume.cc?rev=49878&r1=49877&r2=49878&view=diff ============================================================================== --- trunk/storage/libstorage/src/Volume.cc (original) +++ trunk/storage/libstorage/src/Volume.cc Fri Aug 8 16:36:43 2008 @@ -830,7 +830,7 @@ string cmd = "/sbin/reiserfstune " + tunefs_opt + " " + quote(mountDevice()); SystemCmd c( cmd ); if( c.retcode()!=0 ) - ret = VOLUME_TUNE2FS_FAILED; + ret = VOLUME_TUNEREISERFS_FAILED; } } if( ret==0 ) @@ -1263,7 +1263,7 @@ } if( ret==0 ) { - cmd = "xfs_growfs " + mpoint; + cmd = "xfs_growfs " + quote(mpoint); c.execute( cmd ); if( c.retcode()!=0 ) { @@ -1461,7 +1461,7 @@ int ret = 0; if( loop_dev.empty() ) { - SystemCmd c(LOSETUPBIN " -a" ); + SystemCmd c(LOSETUPBIN " -a"); ret = getFreeLoop( c ); } y2milestone( "ret:%d", ret ); @@ -1472,7 +1472,7 @@ { string cmd = LOSETUPBIN " " + quote(loop_dev) + " "; const Loop* l = static_cast(this); - cmd += l->lfileRealPath(); + cmd += quote(l->lfileRealPath()); y2milestone( "cmd:%s", cmd.c_str() ); return( cmd ); } @@ -1530,35 +1530,35 @@ case ENC_LUKS: cmd += " --key-file " + pwdf; cmd += " luksOpen "; - cmd += is_loop?loop_dev:dev; + cmd += quote(is_loop?loop_dev:dev); cmd += ' '; - cmd += table; + cmd += quote(table); break; case ENC_TWOFISH: cmd += " --hash sha512 --cipher twofish"; cmd += " create "; - cmd += table; + cmd += quote(table); cmd += ' '; - cmd += is_loop?loop_dev:dev; + cmd += quote(is_loop?loop_dev:dev); cmd += " < " + pwdf; break; case ENC_TWOFISH_OLD: cmd += " --hash ripemd160:20 --cipher twofish-cbc-null --key-size 192"; cmd += " create "; - cmd += table; + cmd += quote(table); cmd += ' '; - cmd += is_loop?loop_dev:dev; + cmd += quote(is_loop?loop_dev:dev); cmd += " < " + pwdf; break; case ENC_TWOFISH256_OLD: cmd += " --hash sha512 --cipher twofish-cbc-null --key-size 256"; cmd += " create "; - cmd += table; + cmd += quote(table); cmd += ' '; - cmd += is_loop?loop_dev:dev; + cmd += quote(is_loop?loop_dev:dev); cmd += " < " + pwdf; break; @@ -1883,7 +1883,7 @@ if( cmd.retcode()!=0 ) ret = VOLUME_CRYPTFORMAT_FAILED; if( ret==0 && mp=="swap" ) - cmd.execute( "mkswap " + dmcrypt_dev ); + cmd.execute("mkswap " + quote(dmcrypt_dev)); } } if( ret==0 && (!isTmpCryptMp(mp)||!crypt_pwd.empty()) ) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org