completed relocations of messages to specific file for init, functions

and suse-functions ...


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

2 files changed, 11 insertions, 12 deletions

diff --git a/initrd/distro-specs/gentoo/functions-2005.1 b/initrd/distro-specs/gentoo/functions-2005.1
index 9416607f..85e141ae 100644
--- a/initrd/distro-specs/gentoo/functions-2005.1
+++ b/initrd/distro-specs/gentoo/functions-2005.1
@@ -37,7 +37,7 @@ if [ -x /bin/udevd ] ; then
   export UDEVD_EVENT_TIMEOUT=1
   echo "" > /proc/sys/kernel/hotplug
   udevd &
-else error $df_errudev nonfatal
+else error "$df_errudev" nonfatal
 fi
 }
 
@@ -115,7 +115,7 @@ if [ "x$start_cron" = "xyes" ] ; then
   if [ -f /mnt/etc/${D_INITDIR}/cron ] ; then
     :
   else
-    error $df_errcron nonfatal
+    error "$df_errcron" nonfatal
   fi
 fi
 }
@@ -126,7 +126,7 @@ if [ "x$start_syslog" = "xyes" ] ; then
   if [ -f /mnt/etc/${D_INITDIR}/syslog-ng ] ; then
     rllinker syslog-ng
   else
-    error $df_errsysl nonfatal
+    error "$df_errsysl" nonfatal
   fi
 fi
 }
@@ -137,7 +137,7 @@ if [ "x$start_sshd" = "xyes" ] ; then
   if [ -f /mnt/etc/${D_INITDIR}/sshd ] ; then
     rllinker "sshd"
   else
-    error $df_errsshd nonfatal
+    error "$df_errsshd" nonfatal
   fi
 fi
 }
@@ -228,7 +228,7 @@ if [ -f /mnt/etc/${D_INITDIR}/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 $df_erratpld 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" \
@@ -238,7 +238,7 @@ if [ -f /mnt/etc/${D_INITDIR}/autofs ] ; then
     config_portmap
   fi
 else
-  error $df_erramnt 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 53270443..7e2c83fd 100644
--- a/initrd/distro-specs/suse/functions-9.3
+++ b/initrd/distro-specs/suse/functions-9.3
@@ -44,8 +44,7 @@ echo -e "DXS VERSION = 4.0a\nINITRAMFS GENERATION DATE = $date" \
 # udev/hotplug - auto device discovery service
 udev_hotplug () {
 local result=0
-[ -d /etc/hotplug -a -d /etc/hotplug.d ] || error "  Hotplug subdirectory \
-is missing! udev(d) might not work as expected." nonfatal
+[ -d /etc/hotplug -a -d /etc/hotplug.d ] || error "$df_errhotpl" nonfatal
 echo "Enabling hotplug/udev"
 udevstart || result=1
 udevd -d || result=1
@@ -107,7 +106,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 $df_errcron nonfatal
+    error "$df_errcron" nonfatal
   fi 
 fi
 }
@@ -125,7 +124,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 $df_errsysl nonfatal
+    error "$df_errsysl" nonfatal
   fi
 fi
 }
@@ -138,7 +137,7 @@ if [ "x$start_sshd" = "xyes" ] ; then
     testmkd /mnt/var/lib/empty
     rllinker "sshd" "12" "10"
   else
-    error $df_errsshd nonfatal
+    error "$df_errsshd" nonfatal
   fi
 fi
 }
@@ -380,7 +379,7 @@ if [ -f /mnt/etc/${D_SYSCONFDIR}/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 $df_erratpld 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" \