diff options
| author | Dirk von Suchodoletz | 2007-05-12 18:11:06 +0200 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2007-05-12 18:11:06 +0200 |
| commit | 0a1ba371888b65eff11333f9e7718f2a5c5d8b5d (patch) | |
| tree | fdc3b7cc73a66622f697d034b09fae613c9e5d3f | |
| parent | Aggregated exclude list of files for stage2 for all SuSE versions. (diff) | |
| download | core-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
| -rw-r--r-- | initramfs/distro-specs/suse/functions-default | 10 | ||||
| -rw-r--r-- | installer/OpenSLX/OSExport/Distro/SUSE.pm | 1 | ||||
| -rw-r--r-- | installer/default_files/machine-setup.default | 5 |
3 files changed, 7 insertions, 9 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) diff --git a/installer/OpenSLX/OSExport/Distro/SUSE.pm b/installer/OpenSLX/OSExport/Distro/SUSE.pm index fedcdbe1..923f1de8 100644 --- a/installer/OpenSLX/OSExport/Distro/SUSE.pm +++ b/installer/OpenSLX/OSExport/Distro/SUSE.pm @@ -42,7 +42,6 @@ sub initDistroInfo - /var/tmp/* - /var/spool/* - /var/run/* - - /var/opt/openslx - /var/mail - /var/log/* - /var/lock/* diff --git a/installer/default_files/machine-setup.default b/installer/default_files/machine-setup.default index 713c1c64..5f8f0225 100644 --- a/installer/default_files/machine-setup.default +++ b/installer/default_files/machine-setup.default @@ -113,9 +113,8 @@ dm_allow_shutdown="user" # try to start g/k/xdm with X as fast as possible late_dm="no" # if there are problems with key, console etc. set late_dm="yes" - adds -# about five seconds to graphical login delay (might be connected to trying -# of parallel starting boot scripts) -#late_dm="yes" +# few seconds to graphical login delay (default setting) +#late_dm="no" # should Xorg/XFree server be started or some special windowmanager be run # in kiosk mode e.g. start_x="kde" |