summaryrefslogtreecommitdiffstats
path: root/initramfs/distro-specs
diff options
context:
space:
mode:
authorDirk von Suchodoletz2007-05-12 18:11:06 +0200
committerDirk von Suchodoletz2007-05-12 18:11:06 +0200
commit0a1ba371888b65eff11333f9e7718f2a5c5d8b5d (patch)
treefdc3b7cc73a66622f697d034b09fae613c9e5d3f /initramfs/distro-specs
parentAggregated exclude list of files for stage2 for all SuSE versions. (diff)
downloadcore-0a1ba371888b65eff11333f9e7718f2a5c5d8b5d.tar.gz
core-0a1ba371888b65eff11333f9e7718f2a5c5d8b5d.tar.xz
core-0a1ba371888b65eff11333f9e7718f2a5c5d8b5d.zip
Switched default behaviour to late_dm="yes" (to avoid keyboard troubles
in X with SuSE clients). git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1053 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initramfs/distro-specs')
-rw-r--r--initramfs/distro-specs/suse/functions-default10
1 files changed, 5 insertions, 5 deletions
diff --git a/initramfs/distro-specs/suse/functions-default b/initramfs/distro-specs/suse/functions-default
index a9529373..12728e34 100644
--- a/initramfs/distro-specs/suse/functions-default
+++ b/initramfs/distro-specs/suse/functions-default
@@ -228,14 +228,14 @@ sed -e "s,DISPLAYMANAGER=.*,DISPLAYMANAGER=\"$start_xdmcp\"," \
# 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" = "xyes" ] ; then
- 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
-else
+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
}
# configure X display manager (runlevel links and kind of manager)