Commit 83cd6ea0 authored by Vangelis Koukis's avatar Vangelis Koukis
Browse files

Move DisableRemoteDesktopConnections to prio 41

Move DisableRemoteDesktopConnections from priority 40
to priority 41, ensuring it runs after 40InstalUnattend.in.

This makes the dependency between the installed answer file and
the DisableRemoteDesktopConnections task explicit:
The task assumes that RDP connections will be re-enabled via
an appropriate <RunSynchronousCommand> entry in the answer file,
which must already exist.

Making the dependency explicit, allows making the process more robust
in the future: The DisableRemoteDesktopConnections task should not
blindly assume that a potentially Image-specific unattend.xml file
contains the specific <RunSynchronousCommand> entry it requires,
but may insert it explicitly, since the answer file is bound to have
been detected or installed via the the previously executed
40InstallUnattend task.
parent 88406207
#! /bin/bash
# Copyright (C) 2011 GRNET S.A.
# Copyright (C) 2011, 2015 GRNET S.A. and individual contributors.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
......@@ -27,9 +27,16 @@
#
# This task will change the value of `fDenyTSConnection' registry key located
# under `HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server\'
# to "true". This will disable RDP connections. The key will change back to
# "false" during the specialize pass of the Windows setup.
# to "true". This will disable RDP connections.
# We assume that the key will change back to "false" during the specialize
# pass of the Windows setup via an appropriate <RunSynchronousCommand>
# entry in the unattend.xml or similar answer file for SYSPREP.
#
# TODO: Stop relying on specific entries in unattend.xml, which may
# have been heavily customized for a specific Image. Instead, insert the
# required # entry to re-enable RDP explicitly, and only if it was previously
# enabled.
set -e
. "@commondir@/common.sh"
......
......@@ -6,9 +6,9 @@ dist_tasks_SCRIPTS = \
30MountImage \
40AddSwap \
40DeleteSSHKeys \
40DisableRemoteDesktopConnections \
40InstallUnattend \
40SELinuxAutorelabel \
41DisableRemoteDesktopConnections \
50AssignHostname \
50ChangePassword \
50ConfigureNetwork \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment