some fixes and addons ...

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

2 files changed, 9 insertions, 12 deletions

diff --git a/initrd/distro-specs/ubuntu/functions-5.10 b/initrd/distro-specs/ubuntu/functions-5.10
index 951a836a..2e393b4a 100644
--- a/initrd/distro-specs/ubuntu/functions-5.10
+++ b/initrd/distro-specs/ubuntu/functions-5.10
@@ -2,13 +2,13 @@
 #		linux diskless clients (executed within initial
 #		ramdisk after genconfig) 
 #
-# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 31-03-2006
+# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 05-04-2006
 #		Nico Dietrich
 #		Felix Endres
 #
 # Copyright:    (c) 2006 - RZ Universitaet Freiburg
 # 
-# Version:      0.2.1d
+# Version:      0.2.1e
 
 # distro specific stuff to initialize
 preinit () {
@@ -17,8 +17,7 @@ preinit () {
   echo "dhcp:x:101:101::/nonexistent:/bin/false" >>/etc/passwd
 
   # load unix module to provide sockets
-  modprobe ${MODPRV} unix || error "  Failed to load the \"unix\" module. \
-  Problems with Hardware detection\nwill probably arise"
+  modprobe ${MODPRV} unix || error "$df_errumod"
 }
 
 postinit () {
@@ -121,8 +120,7 @@ if [ "x$start_cron" = "xyes" ] ; then
 \nMAILTO=\n-*/15 * * * *\troot\ttest -x /usr/lib/cron/run-crons && \
 /usr/lib/cron/run-crons >/dev/null 2>&1\n" >/mnt/etc/crontab
   else
-    error "  The cron start script seems not to be installed, so requesting \
-\n  the start of cron services make no sense." nonfatal
+    error "$df_errcron" nonfatal
   fi 
 fi
 }
@@ -249,9 +247,7 @@ if [ -f /mnt/etc/init.d/autofs ] ; then
   if [ -n "${automnt_src}" ] ; then
     # local directory and home directory server from machine-setup
     [ -z "${automnt_dir}" ] && automnt_dir="/home"
-    strinstr "/" "${automnt_dir}" && error "  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." nonfatal
+    strinstr "/" "${automnt_dir}" && error "$df_erratpld" nonfatal
     automnt_dir=${automnt_dir#/}
     echo -e "/home\t/etc/auto.${automnt_dir}\n" >> /mnt/etc/auto.master
     echo -e "# /etc/auto.${automnt_dir} created by $0:\n" \
diff --git a/initrd/initrd-stuff/etc/messages b/initrd/initrd-stuff/etc/messages
index c7adeb3e..5806e28e 100644
--- a/initrd/initrd-stuff/etc/messages
+++ b/initrd/initrd-stuff/etc/messages
@@ -3,11 +3,11 @@
 #		version 4
 #		this file could be used for localization of error messages 
 #
-# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 03-04-2006
+# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 05-04-2006
 #
 # Copyright:    (c) 2006 - RZ Universitaet Freiburg
 # 
-# Version:      0.0.3b
+# Version:      0.0.3c
 
 # messages from init
 init_errmsg="functions file contains a lot of script \
@@ -115,6 +115,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_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."
@@ -128,4 +130,3 @@ df_erramnt="  Automounter $df_errserv"
 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."
-