summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Reichelt <debian@nachtgeist.net>2015-09-22 03:58:13 +0000
committerDaniel Baumann <daniel.baumann@open-infrastructure.net>2016-06-03 13:42:55 +0000
commitc1359d18e595e6867b978bcea32a3857951c3027 (patch)
tree052bed3202a9fc8f45eea9f5e4402e47df1b98d4
parentFixing naming of config snippets in manpages. (diff)
downloadsystem-config-c1359d18e595e6867b978bcea32a3857951c3027.tar.xz
system-config-c1359d18e595e6867b978bcea32a3857951c3027.zip
Fixing hook for disabling display managers.
Init scripts of current display manager packages explicitly check the existence of /etx/X11/default-display-manager and *do* continue the start procedure if it doesn't exist (checked with kdm, lxdm, sddm, wdm, xdm). So instead of deleting the file, set its content to something that just won't match the respective string check for the DM name in the init script. Signed-off-by: Daniel Baumann <daniel.baumann@open-infrastructure.net>
-rwxr-xr-xcomponents/1140-xserver-xorg6
1 files changed, 5 insertions, 1 deletions
diff --git a/components/1140-xserver-xorg b/components/1140-xserver-xorg
index 92bda89..7804877 100755
--- a/components/1140-xserver-xorg
+++ b/components/1140-xserver-xorg
@@ -84,7 +84,11 @@ Config ()
then
case "${LIVE_X_SESSION_MANAGER}" in
none)
- rm -f /etc/X11/default-display-manager
+ _DM_FILE="/etc/X11/default-display-manager"
+ if [ -e "${_DM_FILE}" ]
+ then
+ sed -i "s|\(.*\)|\1 # disabled by live-config:|" -- "${_DM_FILE}"
+ fi
;;
*)