From 4a445a250111c239073613d2b3eef5d49c57b682 Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Thu, 18 May 2006 16:22:59 +0000
Subject: Moved autofs configuration to servconfig, try to load modules for usb
 keyboards on fatal errors in initialramfs

git-svn-id: http://svn.openslx.org/svn/openslx/ld4@217 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 initrd/initrd-stuff/etc/functions |  2 ++
 initrd/initrd-stuff/etc/messages  | 19 +++++++++++--------
 2 files changed, 13 insertions(+), 8 deletions(-)

(limited to 'initrd/initrd-stuff/etc')

diff --git a/initrd/initrd-stuff/etc/functions b/initrd/initrd-stuff/etc/functions
index 54eddc42..26a361b6 100644
--- a/initrd/initrd-stuff/etc/functions
+++ b/initrd/initrd-stuff/etc/functions
@@ -55,6 +55,8 @@ if [ -n "$2" ] ; then
   [ "$DEBUGLEVEL" -gt 2 ] && usleep 20
 else
   echo -e "${error_msg}${e_msg}${error_shell}"
+  # load usb modules to have keyboard enabled
+  modprobe -a usbcore uhci-hcd ohci-hcd usbhid 2>&1 >/dev/null
   /bin/sh
   echo -n "Reboot now? [y]"
   read input
diff --git a/initrd/initrd-stuff/etc/messages b/initrd/initrd-stuff/etc/messages
index 98d8b1b2..865774be 100644
--- a/initrd/initrd-stuff/etc/messages
+++ b/initrd/initrd-stuff/etc/messages
@@ -7,7 +7,7 @@
 #
 # Copyright:    (c) 2006 - RZ Universitaet Freiburg
 # 
-# Version:      0.0.3e
+# Version:      0.0.3f
 
 # messages from init
 init_errmsg="functions file contains a lot of script \
@@ -114,8 +114,8 @@ $error_dhcp"
 error_ldapcfg="  The configuration via ldap is not implemented yet."
 
 # messages from distro functions
-df_errumod="    Failed to load the \"unix\" module. \
-  Problems with Hardware detection\nwill probably arise"
+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 not available\n  \
 so requesting the start of service make no sense. Please disable service\n  \
 or install the files needed."
@@ -125,15 +125,18 @@ expected."
 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_erramnt="  Automounter $df_errserv"
-df_erradir="  Only one directory level is allowed and the directory should \
-exist (on\n  the server) or should be creatable (UnionFS)."
-df_erratpld="  Only toplevel directories \
-are allowed as mount points for user home\n  directories. Please set the \
-variable \${automnt_dir} appropriately in\n  machine-setup file."
+df_errnsc="  Name Service caching deamon $df_errserv\n This service might \
+be useful to take load from a ldap user directory."
 
 # messages from servconfig
 scfg_nfs="  Mount of some NFS source failed ..."
+scfg_erradir="  Only one directory level is allowed and the directory should \
+exist (on\n  the server) or should be creatable (UnionFS)."
+scfg_erratpld="  Only toplevel directories \
+are allowed as mount points for user home\n  directories. Please set the \
+variable \${automnt_dir} appropriately in\n  machine-setup file."
 
 # messages from hwautocfg
 hcfg_xcfg="  You should define the variable D_XF86CONFFILE in yours distro \
-- 
cgit v1.2.3-55-g7522