Piotr Kliczewski has uploaded a new change for review. Change subject: core: removing CR char after encoding ......................................................................
core: removing CR char after encoding Change-Id: I2c11ec26e25cf39084a889ec475f400a8318e5eb Signed-off-by: pkliczewski <[email protected]> --- M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilder.java 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/01/34201/1 diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilder.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilder.java index e47cc77..2e80157 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilder.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilder.java @@ -542,7 +542,7 @@ // The sysprep file size isn't being verified for 3.0 clusters and below, so we maintain the same behavior here. VmPayload vmPayload = new VmPayload(); vmPayload.setDeviceType(VmDeviceType.FLOPPY); - vmPayload.getFiles().put(SYSPREP_FILE_NAME, Base64.encodeBase64String(sysPrepContent.getBytes())); + vmPayload.getFiles().put(SYSPREP_FILE_NAME, StringUtils.remove(Base64.encodeBase64String(sysPrepContent.getBytes()), '\r')); VmDevice vmDevice = new VmDevice(new VmDeviceId(Guid.newGuid(), vm.getId()), @@ -569,7 +569,7 @@ vmPayload.setDeviceType(VmDeviceType.CDROM); vmPayload.setVolumeId(CLOUD_INIT_VOL_ID); for (Map.Entry<String, byte[]> entry : cloudInitContent.entrySet()) { - vmPayload.getFiles().put(entry.getKey(), Base64.encodeBase64String(entry.getValue())); + vmPayload.getFiles().put(entry.getKey(), StringUtils.remove(Base64.encodeBase64String(entry.getValue()), '\r')); } VmDevice vmDevice = -- To view, visit http://gerrit.ovirt.org/34201 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2c11ec26e25cf39084a889ec475f400a8318e5eb Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Piotr Kliczewski <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
