From 488e6bc8a934da39e7f7f657c83499677475e98c Mon Sep 17 00:00:00 2001
From: madduck <madduck@3cfab66f-1918-0410-86b3-c06b76f9a464>
Date: Thu, 26 Oct 2006 20:42:03 +0000
Subject: more cleanup of output messages

---
 debian/mdadm.config   | 4 ++--
 debian/mdadm.postinst | 8 ++++----
 debian/mkconf         | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/debian/mdadm.config b/debian/mdadm.config
index 7dcb8504..fbda0d0b 100644
--- a/debian/mdadm.config
+++ b/debian/mdadm.config
@@ -95,8 +95,8 @@ while true; do
   if [ $error -ne 0 ] && [ $ret -eq 30 ]; then
     # there was an error in a previous run of this loop, but the above question
     # was not asked, so we better exit the endless loop...
-    echo "W: unable to determine MD arrays needed for boot." >&2
-    echo "W: falling back to starting all of them..." >&2
+    echo "W: mdadm: unable to determine MD arrays needed for boot." >&2
+    echo "W: mdadm: falling back to starting all of them..." >&2
     INITRDSTART=all
     break
   fi
diff --git a/debian/mdadm.postinst b/debian/mdadm.postinst
index be53bdb4..65a96ee7 100644
--- a/debian/mdadm.postinst
+++ b/debian/mdadm.postinst
@@ -17,7 +17,7 @@ case "${1:-}" in
       modprobe -k md >/dev/null 2>&1 || :
     fi
     if [ ! -f /proc/mdstat ]; then
-      echo 'W: failed to load MD subsystem.' >&2
+      echo 'W: mdadm: failed to load MD subsystem.' >&2
     fi
 
     if [ ! -e /dev/md15 ] \
@@ -149,9 +149,9 @@ _eof
         # no changes by user, so remove
         rm -f /etc/udev/mdadm.rules
       else
-        echo "W: I tried to remove /etc/udev/mdadm.rules (see changelog), but you" >&2
-        echo "W: have modified it, so I won't touch it. Please remove the file" >&2
-        echo "W: at your leisure." >&2
+        echo "W: mdadm: I tried to remove /etc/udev/mdadm.rules (see changelog)," >&2
+        echo "W: mdadm: but you have modified it, so I won't touch it. Please" >&2
+        echo "W: mdadm: remove the file at your leisure." >&2
       fi
     fi
 
diff --git a/debian/mkconf b/debian/mkconf
index 1cf2f6af..fec13a3d 100644
--- a/debian/mkconf
+++ b/debian/mkconf
@@ -32,7 +32,7 @@ case "${1:-}" in
     [ -n "${2:-}" ] && CONFIG=$2
     # only barf if the config file specifies anything else than MAILADDR
     if egrep -qv '^(MAILADDR.*|#.*|)$' $CONFIG 2>/dev/null; then
-      echo "E: ${##*/}: $CONFIG already exists." >&2
+      echo "E: $ME: $CONFIG already exists." >&2
       exit -1
     fi
     
-- 
cgit v1.2.3