summaryrefslogtreecommitdiffstats
path: root/initramfs/distro-specs/suse/functions-default
diff options
context:
space:
mode:
Diffstat (limited to 'initramfs/distro-specs/suse/functions-default')
-rw-r--r--initramfs/distro-specs/suse/functions-default17
1 files changed, 4 insertions, 13 deletions
diff --git a/initramfs/distro-specs/suse/functions-default b/initramfs/distro-specs/suse/functions-default
index 41dfa5a4..6ae7b376 100644
--- a/initramfs/distro-specs/suse/functions-default
+++ b/initramfs/distro-specs/suse/functions-default
@@ -229,19 +229,10 @@ local dm="$1"
sed -e "s,DISPLAYMANAGER=.*,DISPLAYMANAGER=\"$start_xdmcp\"," \
-e "s,.*_XSERVER.*,DISPLAYMANAGER_STARTS_XSERVER=\"$dm\"," \
-i /mnt/etc/${D_SYSCONFDIR}/displaymanager
-# start the display manager as early as possible, but avoid that it is
-# started twice during bootup ... late_dm can postpone the start of
-# displaymanager and X if problems with keyboard, console occur ...
-# might be connected to running startup scripts in parallel, see above ...
-if [ "x$late_dm" = "xno" ] ; then
- ln -sf /etc/${D_INITDIR}/xdm /mnt/etc/${D_INITBOOTD}/S12boot.xdm
- echo -e "\t(sleep 60; ln -sf ../xdm /etc/${D_INITDIR}/rc5.d/S01xdm; \
- rm /etc/${D_INITBOOTD}/S12boot.xdm) &\n" >>/mnt/etc/${D_INITDIR}/boot.slx
-else
- ln -sf /etc/${D_INITDIR}/xdm /mnt/etc/${D_INITDIR}/rc5.d/S01xdm
- ln -sf /etc/${D_INITDIR}/xdm /mnt/etc/${D_INITDIR}/rc5.d/K18xdm
- sed -e "s,xdm: .*,xdm:," -i /mnt/etc/${D_INITDIR}/.depend.start
-fi
+# start the display manager as early as possible in runlevel 5
+ln -sf /etc/${D_INITDIR}/xdm /mnt/etc/${D_INITDIR}/rc5.d/S01xdm
+ln -sf /etc/${D_INITDIR}/xdm /mnt/etc/${D_INITDIR}/rc5.d/K18xdm
+sed -e "s,xdm: .*,xdm:," -i /mnt/etc/${D_INITDIR}/.depend.start
}
# configure X display manager (runlevel links and kind of manager)
config_xdm () {