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

5 files changed, 22 insertions, 23 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)
diff --git a/initramfs/initrd-stuff/etc/messages b/initramfs/initrd-stuff/etc/messages
index f6084322..b9df8dea 100644
--- a/initramfs/initrd-stuff/etc/messages
+++ b/initramfs/initrd-stuff/etc/messages
@@ -149,8 +149,10 @@ df_errvmw="  VMware X86 emulation $df_errserv"
 df_erramnt="  Automounter $df_errserv"
 df_errnsc="  Name Service caching deamon $df_errserv\n This service might \
 be useful to take load from a ldap user directory."
-df_errafsd="  No afs directory present"
-df_errafsn="  AFS client service is not available"
+df_errafsd="  No afs directory present."
+df_errafsn="  AFS client service is not available."
+df_errkbd="  No non-english keyboard and console settings are installed. \
+Please add\n  them to your stage1 to have them enabled."
 
 # messages from servconfig
 scfg_nfs="  Mount of some NFS source failed ..."
diff --git a/initramfs/initrd-stuff/etc/messages.de b/initramfs/initrd-stuff/etc/messages.de
index b4033849..feb7957d 100644
--- a/initramfs/initrd-stuff/etc/messages.de
+++ b/initramfs/initrd-stuff/etc/messages.de
@@ -160,6 +160,8 @@ Dieser Dienst koennte nuetzlich sein, um Daten von einem ldap Benutzer-\
 Verzeichnis zu bekommen."
 df_errafsd="  Kein AFS Verzeichnis erreichbar"
 df_errafsn="  Der AFS-Klient Dienst ist nicht verfuegbar"
+df_errkbd="  Keine nicht-englische Tastatur und/oder Konsolenunterstuetzung \
+installiert.\n  Falls gewuenscht/benoetigt diese im Stage1 nachinstallieren!"
 
 # messages from servconfig
 scfg_nfs="  Das Einhaengen der NFS Quelle schlug fehl..."
diff --git a/initramfs/initrd-stuff/init b/initramfs/initrd-stuff/init
index e83b1939..463376b4 100755
--- a/initramfs/initrd-stuff/init
+++ b/initramfs/initrd-stuff/init
@@ -157,6 +157,8 @@ in $0\ncountry=\"${COUNTRY}\"" >> /etc/machine-setup
     unionfs=*)
       unionfs=1
       uniondirs=${opts#unionfs=}
+      # most probably it is a good idea to run ldconfig, so enable it
+      ldsc="yes"
     ;;
     # same for AUFS; alternative to unionfs
     aufs)
@@ -164,6 +166,8 @@ in $0\ncountry=\"${COUNTRY}\"" >> /etc/machine-setup
     aufs=*)
       aufs=1
       uniondirs=${opts#aufs=}
+      # most probably it is a good idea to run ldconfig, so enable it
+      ldsc="yes"
     ;;
     # if cowloop should be used, only ontop of network block device and in
     # combination with classical fs, like ext2 useful
@@ -510,17 +514,6 @@ if [ -n "${unionfs}" -o -n "${aufs}" ] ; then
   mkdir -p /mnt/uniontmp
   mount -n --move ${rwdir}/uniontmp /mnt/uniontmp
   chmod 0755 /mnt/uniontmp /mnt
-  # if additional sources should be used for a combined root filesystem
-  # probably more sources should be merged into union (${union} is defined)
-  # allow more than one union??
-  if [ -n "${unionfs}" -o -n "${aufs}" ] ; then
-    # for dir in "${union}"; do
-    # testmkd /unionadd/$dir
-    # mount $dir unionadd/$dir
-    # unionctl mnt --add --after /mnt --mode ro /unionadd/$dir
-    # most probably it is a good idea to run ldconfig, so enable it
-    ldsc="yes"
-  fi
   # run ldconfig if not switched off via kernel command line
   ldcfg
   # runlevel directories should contain no links