r240 - mdadm/trunk/debian

[madduck at users.alioth.debian.org]

Author: madduck
Date: 2006-10-26 20:42:03 +0000 (Thu, 26 Oct 2006)
New Revision: 240

Modified:
   mdadm/trunk/debian/mdadm.config
   mdadm/trunk/debian/mdadm.postinst
   mdadm/trunk/debian/mkconf
Log:
more cleanup of output messages

Modified: mdadm/trunk/debian/mdadm.config
===================================================================
--- mdadm/trunk/debian/mdadm.config	2006-10-26 20:35:47 UTC (rev 239)
+++ mdadm/trunk/debian/mdadm.config	2006-10-26 20:42:03 UTC (rev 240)
@@ -95,8 +95,8 @@
   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

Modified: mdadm/trunk/debian/mdadm.postinst
===================================================================
--- mdadm/trunk/debian/mdadm.postinst	2006-10-26 20:35:47 UTC (rev 239)
+++ mdadm/trunk/debian/mdadm.postinst	2006-10-26 20:42:03 UTC (rev 240)
@@ -17,7 +17,7 @@
       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 @@
         # 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
 

Modified: mdadm/trunk/debian/mkconf
===================================================================
--- mdadm/trunk/debian/mkconf	2006-10-26 20:35:47 UTC (rev 239)
+++ mdadm/trunk/debian/mkconf	2006-10-26 20:42:03 UTC (rev 240)
@@ -32,7 +32,7 @@
     [ -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