diff options
| author | Dirk von Suchodoletz | 2007-05-05 16:46:39 +0200 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2007-05-05 16:46:39 +0200 |
| commit | 5372025f1d779f8c3303794f6237059ecd8f05f0 (patch) | |
| tree | 19cc7d04c5050297b45ddc5f149ae33c3424ae17 /initramfs/distro-specs/suse | |
| parent | Update of Stage3 error messages ... (diff) | |
| download | core-5372025f1d779f8c3303794f6237059ecd8f05f0.tar.gz core-5372025f1d779f8c3303794f6237059ecd8f05f0.tar.xz core-5372025f1d779f8c3303794f6237059ecd8f05f0.zip | |
Hope that solves the "hanging/no keyboard" X display problem: Reordering
of start scripts, devices available ...
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@996 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initramfs/distro-specs/suse')
| -rw-r--r-- | initramfs/distro-specs/suse/functions-10.2 | 18 | ||||
| -rw-r--r-- | initramfs/distro-specs/suse/functions-default | 4 |
2 files changed, 12 insertions, 10 deletions
diff --git a/initramfs/distro-specs/suse/functions-10.2 b/initramfs/distro-specs/suse/functions-10.2 index a5823ed6..1e3956c6 100644 --- a/initramfs/distro-specs/suse/functions-10.2 +++ b/initramfs/distro-specs/suse/functions-10.2 @@ -158,15 +158,17 @@ SUBSYSTEM==\"usb\", ACTION==\"remove\", PROGRAM=\"/var/X11R6/bin/vm-udev\"" \ fi } # set up keytable (function run in hwautocfg) -# kbd runlevel link is in the list of initial runlevel scripts (see -# suse/config-10.2 file) keytable () { -# remove unneeded components from the startscript -sed -e "/wanted keytable/,/^fi$/d;/load usb drivers/,/^esac$/d" \ - -i /mnt/etc/${D_INITDIR}/kbd -sed -e "s,KEYTABLE=.*,KEYTABLE=\"${KEYTABLE}\"," \ - -i /mnt/etc/${D_SYSCONFDIR}/keyboard -rllinker kbd "20" "20" +if [ -f /mnt/etc/${D_INITDIR}/kbd ] ; then + # remove unneeded components from the startscript + sed -e "/wanted keytable/,/^fi$/d;/load usb drivers/,/^esac$/d" \ + -i /mnt/etc/${D_INITDIR}/kbd + sed -e "s,KEYTABLE=.*,KEYTABLE=\"${KEYTABLE}\"," \ + -i /mnt/etc/${D_SYSCONFDIR}/keyboard + ln -sf /etc/${D_INITDIR}/kbd /mnt/etc/${D_INITBOOTD}/S01boot.kbd +else + error "$df_errkbd" nonfatal +fi } # consolefont and language (function run in hwautocfg) diff --git a/initramfs/distro-specs/suse/functions-default b/initramfs/distro-specs/suse/functions-default index c39202c4..165b1634 100644 --- a/initramfs/distro-specs/suse/functions-default +++ b/initramfs/distro-specs/suse/functions-default @@ -233,9 +233,9 @@ if [ "x$late_dm" = "xyes" ] ; then 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 - ln -sf /etc/${D_INITDIR}/xdm /mnt/etc/${D_INITBOOTD}/S12xdm + ln -sf /etc/${D_INITDIR}/xdm /mnt/etc/${D_INITBOOTD}/S02boot.xdm echo -e "\t(sleep 60; ln -sf ../xdm /etc/${D_INITDIR}/rc5.d/S01xdm; \ - rm /etc/${D_INITBOOTD}/S12xdm) &\n" >>/mnt/etc/${D_INITDIR}/boot.slx + rm /etc/${D_INITBOOTD}/S02boot.xdm) &\n" >>/mnt/etc/${D_INITDIR}/boot.slx fi } # configure X display manager (runlevel links and kind of manager) |