Author: aschnell Date: Fri Apr 4 16:56:03 2008 New Revision: 46115 URL: http://svn.opensuse.org/viewcvs/yast?rev=46115&view=rev Log: - check for empty tunefs_opt Modified: trunk/storage/libstorage/src/Volume.cc Modified: trunk/storage/libstorage/src/Volume.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Volume.cc?rev=46115&r1=46114&r2=46115&view=diff ============================================================================== --- trunk/storage/libstorage/src/Volume.cc (original) +++ trunk/storage/libstorage/src/Volume.cc Fri Apr 4 16:56:03 2008 @@ -800,21 +800,24 @@ } if( ret==0 && fs==EXT3 ) { - string cmd = "/sbin/tune2fs " + tunefs_opt + " " + mountDevice(); - SystemCmd c( cmd ); - if( c.retcode()!=0 ) - ret = VOLUME_TUNE2FS_FAILED; + if (!tunefs_opt.empty()) + { + string cmd = "/sbin/tune2fs " + tunefs_opt + " " + mountDevice(); + SystemCmd c( cmd ); + if( c.retcode()!=0 ) + ret = VOLUME_TUNE2FS_FAILED; + } if( ret==0 && mp=="/" && (fstab_opt.find( "data=writeback" )!=string::npos || fstab_opt.find( "data=journal" )!=string::npos) ) { - cmd = "/sbin/tune2fs -o "; + string cmd = "/sbin/tune2fs -o "; if( fstab_opt.find( "data=writeback" )!=string::npos ) cmd += "journal_data_writeback "; else cmd += "journal_data "; cmd += mountDevice(); - c.execute( cmd ); + SystemCmd c( cmd ); if( c.retcode()!=0 ) ret = VOLUME_TUNE2FS_FAILED; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org