Author: aschnell Date: Fri Aug 22 16:47:11 2008 New Revision: 50339 URL: http://svn.opensuse.org/viewcvs/yast?rev=50339&view=rev Log: - renamed error code Modified: trunk/storage/libstorage/src/Storage.cc trunk/storage/libstorage/src/StorageInterface.h Modified: trunk/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.cc?rev=50339&r1=50338&r2=50339&view=diff ============================================================================== --- trunk/storage/libstorage/src/Storage.cc (original) +++ trunk/storage/libstorage/src/Storage.cc Fri Aug 22 16:47:11 2008 @@ -5780,13 +5780,13 @@ startK = min(startK, sizeK); cmd = DDBIN " if=" + source + " of=" + quote(device) + " bs=1k count=" + decString(startK); if (c.execute(cmd) != 0) - ret = VOLUME_FORMAT_DD_FAILED; + ret = STORAGE_ZERO_DEVICE_FAILED; endK = min(endK, sizeK); cmd = DDBIN " if=" + source + " of=" + quote(device) + " seek=" + decString(sizeK - endK) + " bs=1k count=" + decString(endK); if (c.execute(cmd) != 0) - ret = VOLUME_FORMAT_DD_FAILED; + ret = STORAGE_ZERO_DEVICE_FAILED; y2mil("ret:" << ret); return ret; Modified: trunk/storage/libstorage/src/StorageInterface.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/StorageInterface.h?rev=50339&r1=50338&r2=50339&view=diff ============================================================================== --- trunk/storage/libstorage/src/StorageInterface.h (original) +++ trunk/storage/libstorage/src/StorageInterface.h Fri Aug 22 16:47:11 2008 @@ -513,12 +513,12 @@ STORAGE_DMRAID_CO_NOT_FOUND = -2028, STORAGE_RESIZE_INVALID_CONTAINER = -2029, STORAGE_DMMULTIPATH_CO_NOT_FOUND = -2030, + STORAGE_ZERO_DEVICE_FAILED = -2031, VOLUME_COMMIT_UNKNOWN_STAGE = -3000, VOLUME_FSTAB_EMPTY_MOUNT = -3001, VOLUME_UMOUNT_FAILED = -3002, VOLUME_MOUNT_FAILED = -3003, - VOLUME_FORMAT_DD_FAILED = -3004, VOLUME_FORMAT_UNKNOWN_FS = -3005, VOLUME_FORMAT_FS_UNDETECTED = -3006, VOLUME_FORMAT_FS_TOO_SMALL = -3007, -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org