diff options
| author | Felix Endres | 2006-04-11 00:51:44 +0200 |
|---|---|---|
| committer | Felix Endres | 2006-04-11 00:51:44 +0200 |
| commit | cb980c6d876e64ee3248cf1d00f179c6d5a7054f (patch) | |
| tree | fd4af553c888f6df62de05bacd25dad59afc0138 /initrd | |
| parent | code cleanups and small fixes ... (diff) | |
| download | core-cb980c6d876e64ee3248cf1d00f179c6d5a7054f.tar.gz core-cb980c6d876e64ee3248cf1d00f179c6d5a7054f.tar.xz core-cb980c6d876e64ee3248cf1d00f179c6d5a7054f.zip | |
Errormessages adjusted to the new system
git-svn-id: http://svn.openslx.org/svn/openslx/ld4@176 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initrd')
| -rw-r--r-- | initrd/distro-specs/debian/functions-3.1 | 3 | ||||
| -rw-r--r-- | initrd/distro-specs/ubuntu/functions-5.10 | 6 | ||||
| -rw-r--r-- | initrd/initrd-stuff/etc/messages | 2 |
3 files changed, 4 insertions, 7 deletions
diff --git a/initrd/distro-specs/debian/functions-3.1 b/initrd/distro-specs/debian/functions-3.1 index 09e3aa49..1e3e1aa7 100644 --- a/initrd/distro-specs/debian/functions-3.1 +++ b/initrd/distro-specs/debian/functions-3.1 @@ -90,8 +90,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 } diff --git a/initrd/distro-specs/ubuntu/functions-5.10 b/initrd/distro-specs/ubuntu/functions-5.10 index 272b966a..86622be7 100644 --- a/initrd/distro-specs/ubuntu/functions-5.10 +++ b/initrd/distro-specs/ubuntu/functions-5.10 @@ -38,8 +38,7 @@ config_distro () { # 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 @@ -56,8 +55,7 @@ udev_hotplug () { # export UDEVD_EVENT_TIMEOUT=1 # echo "" > /proc/sys/kernel/hotplug # udevd --daemon || result=1 -#else error " udev daemon is not available. Some devices might not \ -#apprear." nonfatal +#else error "df_errudev" nonfatal #fi #return $result #} diff --git a/initrd/initrd-stuff/etc/messages b/initrd/initrd-stuff/etc/messages index 5806e28e..e3df443d 100644 --- a/initrd/initrd-stuff/etc/messages +++ b/initrd/initrd-stuff/etc/messages @@ -120,7 +120,7 @@ df_errumod=" Failed to load the \"unix\" module. \ 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." -df_errudev=" udev daemon is not available. Some devices might not apprear." +df_errudev=" udev daemon is not available. devices might not appear." df_errhotpl=" Hotplug subdirectory is missing! udev(d) might not work as \ expected." df_errcron=" The cron start script $df_errserv" |