From b549727cf82a94ba810540bb9d7d27fd6d6c6dd8 Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Sat, 21 Aug 2010 15:57:07 +0200
Subject: Small fixes for Xorg keyboard of SuSE11.3 and Ubuntu functions ...

---
 initramfs/distro-specs/ubuntu/functions-default   | 4 ++++
 initramfs/stage3-stuff/bin/hwautocfg              | 1 +
 initramfs/stage3-stuff/etc/messages               | 3 ++-
 initramfs/stage3-stuff/etc/messages.de            | 1 +
 os-plugins/plugins/xserver/OpenSLX/Distro/Suse.pm | 2 +-
 5 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/initramfs/distro-specs/ubuntu/functions-default b/initramfs/distro-specs/ubuntu/functions-default
index 11d82e9a..1a863966 100644
--- a/initramfs/distro-specs/ubuntu/functions-default
+++ b/initramfs/distro-specs/ubuntu/functions-default
@@ -258,8 +258,12 @@ fi
 }
 # start portmapper (needed at least for nfsN and nis services)
 config_portmap () {
+if [ -f /mnt/etc/init.inactive/portmap.conf ]; then
   mv /mnt/etc/init.inactive/portmap.conf /mnt/etc/init
   mv /mnt/etc/init.inactive/statd.conf /mnt/etc/init
+else
+  error "$df_errpmap" nonfatal
+fi
 }
 # mostly unused yet (needs to be properly integrated)
 config_nfs () {
diff --git a/initramfs/stage3-stuff/bin/hwautocfg b/initramfs/stage3-stuff/bin/hwautocfg
index fdf9f485..b21cf776 100755
--- a/initramfs/stage3-stuff/bin/hwautocfg
+++ b/initramfs/stage3-stuff/bin/hwautocfg
@@ -28,6 +28,7 @@ done
 echo "0 0 0 0" >/proc/sys/kernel/printk
 echo "/sbin/mdev" >/proc/sys/kernel/hotplug
 modprobe -a ${MODPRV} usbhid hid-bright 2>/dev/null &
+# check from vga= that the traditional framebuffer is needed e.g. for splashy
 # get information on the graphics adaptor if bootsplash or xserver plugins are
 # present and the new drm/kms infrastructure is present
 if strinfile "vga=" /proc/cmdline; then
diff --git a/initramfs/stage3-stuff/etc/messages b/initramfs/stage3-stuff/etc/messages
index 8c362144..81748642 100644
--- a/initramfs/stage3-stuff/etc/messages
+++ b/initramfs/stage3-stuff/etc/messages
@@ -153,13 +153,14 @@ is needed\n  for the bootup procedure to follow. If upstart is used instead no \
 inittab\n  is needed any more, but a proper configured events.d."
 df_errumod="    Failed to load the \"unix\" module. Problems with Hardware \
 detection\nwill probably arise."
-df_errserv="seems not to be installed or start script is\n  not available\
+df_errserv=" seems not to be installed or start script is\n  not available\
 so requesting the start of service make no sense. Please\n  disable service\
 or install the files/packages needed."
 df_errcron="  The cron start script $df_errserv" 
 df_errsysl="  The syslog start script $df_errserv"
 df_errsshd="  The sshd start script $df_errserv"
 df_erryp="  The NIS client $df_errserv"
+df_errpmap="   The portmapper $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."
diff --git a/initramfs/stage3-stuff/etc/messages.de b/initramfs/stage3-stuff/etc/messages.de
index 0d68b551..a1ff5149 100644
--- a/initramfs/stage3-stuff/etc/messages.de
+++ b/initramfs/stage3-stuff/etc/messages.de
@@ -169,6 +169,7 @@ df_errcron="  Das cron Start-Skript $df_errserv"
 df_errsysl="  Das syslog Start-Skript $df_errserv"
 df_errsshd="  Das sshd Start-Skript $df_errserv"
 df_erryp="  Der NIS-Klient $df_errserv"
+df_errpmap="   Der Portmapper $df_errserv"
 df_erramnt="  Der Automounter $df_errserv"
 df_errnsc="  Der Name Service Zwischenspeicherungs Daemon $df_errserv\n  \
 Dieser Dienst koennte nuetzlich sein, um Daten von einem ldap Benutzer-\
diff --git a/os-plugins/plugins/xserver/OpenSLX/Distro/Suse.pm b/os-plugins/plugins/xserver/OpenSLX/Distro/Suse.pm
index 29342f3b..7a706019 100644
--- a/os-plugins/plugins/xserver/OpenSLX/Distro/Suse.pm
+++ b/os-plugins/plugins/xserver/OpenSLX/Distro/Suse.pm
@@ -41,6 +41,7 @@ sub setupXserverScript
     # add stuff to the script generated via Base.pm
     $script .= unshiftHereDoc(<<'    End-of-Here');
         # SuSE specific extension to stage3 xserver.sh
+        testmkd /mnt/etc/X11/xorg.conf.d
         # Add InputClass to proper setup the keyboard and other input
         echo 'Section "InputClass"
           Identifier      "evdev pointer catchall"
@@ -75,7 +76,6 @@ sub setupXserverScript
         # Xorg hardware is autodetected, so no module information provided
         [ -z "${xmodule}" ] && \
           sed "/Section \"Device\"/,/EndSection/d" -i ${xfc}
-        testmkd /mnt/etc/X11/xorg.conf.d
         testmkd /mnt/var/lib/xkb/compiled
         testmkd /mnt/var/lib/X11
         testmkd /mnt/var/lib/xdm/authdir/authfiles 0700
-- 
cgit v1.2.3-55-g7522