put error/info messages to a separat file (base for later localization

...)



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

2 files changed, 13 insertions, 23 deletions

diff --git a/initrd/distro-specs/gentoo/functions-2005.1 b/initrd/distro-specs/gentoo/functions-2005.1
index c28eccae..9408122e 100644
--- a/initrd/distro-specs/gentoo/functions-2005.1
+++ b/initrd/distro-specs/gentoo/functions-2005.1
@@ -2,11 +2,11 @@
 #		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>, 02-04-2006
 #
 # Copyright:    (c) 2006 - RZ Universitaet Freiburg
 # 
-# Version:      0.0.1d
+# Version:      0.0.2a
 
 # distro specific stuff to initialize
 preinit () {
@@ -37,8 +37,7 @@ if [ -x /bin/udevd ] ; then
   export UDEVD_EVENT_TIMEOUT=1
   echo "" > /proc/sys/kernel/hotplug
   udevd &
-else error "  udev daemon is not available. Some devices might not \
-apprear." nonfatal
+else error $df_errudev nonfatal
 fi
 }
 
@@ -116,8 +115,7 @@ if [ "x$start_cron" = "xyes" ] ; then
   if [ -f /mnt/etc/init.d/cron ] ; then
     :
   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
 }
@@ -128,8 +126,7 @@ if [ "x$start_syslog" = "xyes" ] ; then
   if [ -f /mnt/etc/init.d/syslog-ng ] ; then
     rllinker syslog-ng
   else
-    error "  The syslog start script does not seem to be installed, so \
-requesting\n  the start of service does not make much sense." nonfatal
+    error $df_errsysl nonfatal
   fi
 fi
 }
@@ -140,8 +137,7 @@ if [ "x$start_sshd" = "xyes" ] ; then
   if [ -f /mnt/etc/init.d/sshd ] ; then
     rllinker "sshd"
   else
-    error "  The sshd start script does not seem to be installed, so \
-requesting\n  the start of service does not make much sense." nonfatal
+    error $df_errsshd nonfatal
   fi
 fi
 }
@@ -244,7 +240,7 @@ variable \${automnt_dir} appropriately in\n  machine-setup file." nonfatal
     config_portmap
   fi
 else
-  error "  Automounter seems not to be installed" nonfatal
+  error $df_erramnt nonfatal
 fi
 }
 
diff --git a/initrd/distro-specs/suse/functions-9.3 b/initrd/distro-specs/suse/functions-9.3
index f08517b6..1b58c332 100644
--- a/initrd/distro-specs/suse/functions-9.3
+++ b/initrd/distro-specs/suse/functions-9.3
@@ -4,11 +4,11 @@
 #		functions file). This file is the main base for the 
 #		following SuSE distributions
 #
-# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 30-03-2006
+# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 02-04-2006
 #
 # Copyright:    (c) 2006 - RZ Universitaet Freiburg
 # 
-# Version:      0.2.1e
+# Version:      0.2.2a
 
 # distro specific stuff to initialize
 preinit () {
@@ -107,8 +107,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
 }
@@ -126,8 +125,7 @@ if [ "x$start_syslog" = "xyes" ] ; then
       cp /etc/syslog-ng.conf /mnt/etc/syslog-ng/syslog-ng.conf
       rllinker syslog "02" "20"
   else
-    error "  The syslog start script does not seem to be installed, so \
-requesting\n  the start of service does not make much sense." nonfatal
+    error $df_errsysl nonfatal
   fi
 fi
 }
@@ -140,8 +138,7 @@ if [ "x$start_sshd" = "xyes" ] ; then
     testmkd /mnt/var/lib/empty
     rllinker "sshd" "12" "10"
   else
-    error "  The sshd start script does not seem to be installed, so \
-requesting\n  the start of service does not make much sense." nonfatal
+    error $df_errsshd nonfatal
   fi
 fi
 }
@@ -303,7 +300,6 @@ fi
 # configure gdm as display manager
 config_kdm () {
 config_dm_entry yes
-
 }
 
 # configure bluetooth services
@@ -384,9 +380,7 @@ if [ -f /mnt/etc/sysconfig/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" \