Fix for certain keyboard (inactivity) problem, introduction of keytable

setup function ...



git-svn-id: http://svn.openslx.org/svn/openslx/ld4@279 95ad53e4-c205-0410-b2fa-d234c58c8868

3 files changed, 40 insertions, 9 deletions

diff --git a/initrd/distro-specs/suse/functions-default b/initrd/distro-specs/suse/functions-default
index df284978..d3cd5dc2 100644
--- a/initrd/distro-specs/suse/functions-default
+++ b/initrd/distro-specs/suse/functions-default
@@ -144,13 +144,18 @@ 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 is
-# started twice during bootup - quickhack ...
-#ln -sf /etc/${D_INITDIR}/xdm /mnt/etc/${D_INITDIR}/rc5.d/S01xdm
-ln -sf ../xdm /mnt/etc/${D_INITDIR}/rc5.d/K20xdm
-echo -e "\tsleep 2; /etc/${D_INITDIR}/xdm start >${LOGFILE} 2>&1\n\
-\t( sleep 120; ln -sf ../xdm /etc/${D_INITDIR}/rc5.d/S01xdm \
->${LOGFILE} 2>&1) &\n" >>/mnt/etc/${D_INITDIR}/boot.ld
+# 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 ...
+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
+  ln -sf /etc/${D_INITDIR}/xdm /mnt/etc/${D_INITBOOTD}/S02xdm
+  echo -e "\t(sleep 60; ln -sf ../xdm /etc/${D_INITDIR}/rc5.d/S01xdm; \
+  rm /etc/${D_INITBOOTD}/S02xdm) &\n" >>/mnt/etc/${D_INITDIR}/boot.ld
+fi
 }
 
 # configure X display manager (runlevel links and kind of manager)
@@ -207,7 +212,7 @@ $vmsessions
 BaseXsession=/etc/opt/gnome/gdm/Xsession
 UserAuthFBDir=/tmp
 UserAuthFile=.Xauthority
-StandardXServer=/usr/X11R6/bin/X
+StandardXServer=/usr/X11R6/bin/X +kb -I
 Xnest=/usr/X11R6/bin/Xnest -audit 0 -name Xnest
 
 [security]
@@ -341,7 +346,19 @@ sed -e "s,START_SERVICES.*,START_SERVICES=\"yes\"," \
 cp /etc/bluetooth /mnt/etc/${D_SYSCONFDIR}/bluetooth
 }
 
-# consolefont and language
+# set up keytable (function run in hwautocfg)
+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
+# just ensure that keytable is initialized before xdm starts
+ln -sf /etc/${D_INITDIR}/kbd /mnt/etc/${D_INITBOOTD}/S01kbd
+ln -sf /etc/${D_INITDIR}/kbd /mnt/etc/${D_INITBOOTD}/K20kbd
+}
+
+# consolefont and language (function run in hwautocfg)
 consolefont () {
 echo -e "\tsetfont ${CONSOLE_FONT} >${LOGFILE} 2>&1\n" \
   >>/mnt/etc/${D_INITDIR}/boot.ld
diff --git a/initrd/distro-specs/ubuntu/functions-6.06 b/initrd/distro-specs/ubuntu/functions-6.06
index 8a6465dc..7ca485fe 100644
--- a/initrd/distro-specs/ubuntu/functions-6.06
+++ b/initrd/distro-specs/ubuntu/functions-6.06
@@ -138,9 +138,15 @@ done
 #PATH=\"\$PATH:/var/X11R6/bin\"" >>/mnt/etc/profile
 }
 
+# set up keytable (function run in hwautocfg)
+keytable () {
+# fixme -- use keytable setup script here
+:
+}
 
 # consolefont and language
 consolefont () {
+# better change that in /etc/functions to UTF8 default
 if [ "$LANG" == "de_DE@euro" ] ; then
   LANG=de_DE.UTF8
 fi
diff --git a/initrd/distro-specs/ubuntu/functions-default b/initrd/distro-specs/ubuntu/functions-default
index 75a94176..2def5937 100644
--- a/initrd/distro-specs/ubuntu/functions-default
+++ b/initrd/distro-specs/ubuntu/functions-default
@@ -174,11 +174,19 @@ if [ "x$start_snmp" = "xyes" ] ; then
   fi
 }
 
+# set up keytable (function run in hwautocfg)
+keytable () {
+# fixme -- use keytable setup script here
+:
+}
+
 # consolefont
 consolefont () {
 echo -e "setfont ${CONSOLE_FONT} >${LOGFILE} 2>&1" \
   >>/mnt/etc/${D_INITDIR}/boot.ld
 }
+
+
 # acpi and powersave
 config_acpi () {
   rllinker "acpid" "10" "19"