Change in ovirt-engine[ovirt-engine-3.6]: engine: various fixes in sysprep XML templates

[Code Review]

>From Tal Nisan <tnisan at redhat.com>:

Tal Nisan has submitted this change and it was merged.

Change subject: engine: various fixes in sysprep XML templates
......................................................................


engine: various fixes in sysprep XML templates

The commit performs several commits:

1) Reorder elements in the template
The order of elements is arbitrary to some degree. The commit reorders
the elements so that the order is same between 32-bit and 64-bit version
of the XML. This leads to nicer diffs and makes it easier to spot
errors. In the process some useless comments were removed.

2) Change x86 sections to amd64 in 64-bit templates
Each component block in the sysprep template is tied to the
architecture. We have had mistakenly some of the blocks marked as x86 in
templates for 64-bit systems.

3) Fix messed up locales in sysprep templates
There were following problems with locales:
- some locales were expanded from wrong variables
- some locales had value en-US hardcoded
- some input locales used hardcoded 0409:00000409 (that is US keyboard)

Bug-Url: https://bugzilla.redhat.com/1402817
Change-Id: I33840d74d157efddeb280a52318517d8b15db29f
Signed-off-by: Tomáš Golembiovský <tgolembi at redhat.com>
---
M packaging/conf/sysprep/sysprep.2k12x64
M packaging/conf/sysprep/sysprep.2k8
M packaging/conf/sysprep/sysprep.2k8x64
M packaging/conf/sysprep/sysprep.w10
M packaging/conf/sysprep/sysprep.w10x64
M packaging/conf/sysprep/sysprep.w7x64
M packaging/conf/sysprep/sysprep.w8
M packaging/conf/sysprep/sysprep.w8x64
8 files changed, 148 insertions(+), 167 deletions(-)

Approvals:
  Tomas Jelinek: Looks good to me, approved
  Jenkins CI: Passed CI tests
  Tomas Golembiovsky: Verified



-- 
To view, visit https://gerrit.ovirt.org/67988
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I33840d74d157efddeb280a52318517d8b15db29f
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.6
Gerrit-Owner: Tomas Golembiovsky <tgolembi at redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Tal Nisan <tnisan at redhat.com>
Gerrit-Reviewer: Tomas Golembiovsky <tgolembi at redhat.com>
Gerrit-Reviewer: Tomas Jelinek <tjelinek at redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation at ovirt.org>