Ravi Nori has uploaded a new change for review. Change subject: tools : Update format of SpiceSecureChannels to "channel" from "schannel" ......................................................................
tools : Update format of SpiceSecureChannels to "channel" from "schannel" Update format of SpiceSecureChannels to "channel" from "schannel". "schannel" (like smain, sinputs etc) is a leftover from qspice 0.3.x from RHEL 5 days, since at least spice 0.6 (maybe even 0.4 from RHEL 6.0), the format is changed to "channel" (main, inputs etc). Change-Id: I87d4d3ee58e7730cc8243b313a220f49621e195a Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=803666 Signed-off-by: Ravi Nori <[email protected]> --- M backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java M backend/manager/tools/src/main/conf/engine-config.properties 3 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/97/12697/1 diff --git a/backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql b/backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql index a555b84..5dfc595 100644 --- a/backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql +++ b/backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql @@ -710,7 +710,7 @@ -- cluster level with the original value if exists, or the input old value -- and from the update version and beyond, the input value. ------------------------------------------------------------------------------------ -select fn_db_split_config_value('SpiceSecureChannels','smain,sinputs','smain,sinputs,scursor,splayback,srecord,sdisplay,susbredir,ssmartcard', '3.1'); +select fn_db_split_config_value('SpiceSecureChannels','main,inputs','main,inputs,cursor,playback,record,display,usbredir,smartcard', '3.1'); ------------------------------------------------------------------------------------ -- Simple direct updates section diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java index 3fb37ba..2039953 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java @@ -341,7 +341,7 @@ VmGracefulShutdownMessage(115), @Reloadable @TypeConverterAttribute(String.class) - @DefaultValueAttribute("smain,sinputs,scursor,splayback,srecord,sdisplay,ssmartcard,susbredir") + @DefaultValueAttribute("main,inputs,cursor,playback,record,display,smartcard,usbredir") SpiceSecureChannels(117), @Reloadable @TypeConverterAttribute(String.class) diff --git a/backend/manager/tools/src/main/conf/engine-config.properties b/backend/manager/tools/src/main/conf/engine-config.properties index 83a89a0..0bb2dae 100644 --- a/backend/manager/tools/src/main/conf/engine-config.properties +++ b/backend/manager/tools/src/main/conf/engine-config.properties @@ -115,7 +115,7 @@ SpiceReleaseCursorKeys.description="Keyboard keys combination that causes the mouse cursor to be released from its grab on SPICE" SpiceSecureChannels.description="SPICE Secure Channels" SpiceSecureChannels.type=StringMultiple -SpiceSecureChannels.validValues=smain,sinputs,scursor,splayback,srecord,sdisplay,ssmartcard,susbredir +SpiceSecureChannels.validValues=main,inputs,cursor,playback,record,display,smartcard,usbredir SpiceToggleFullScreenKeys.description="Keyboard keys combination that toggles the full-screen state of SPICE client window" SpiceUsbAutoShare.description="Enable USB devices sharing by default in SPICE" SpiceUsbAutoShare.validValues=true,false -- To view, visit http://gerrit.ovirt.org/12697 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I87d4d3ee58e7730cc8243b313a220f49621e195a Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Ravi Nori <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
