Refreshing host-name-in-default-mailfrom.patch.
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
9c42c250a9
commit
d0d9648c22
3 changed files with 18 additions and 22 deletions
17
debian/patches/debian/0003-host-name-in-default-mailfrom.patch
vendored
Normal file
17
debian/patches/debian/0003-host-name-in-default-mailfrom.patch
vendored
Normal file
|
@ -0,0 +1,17 @@
|
||||||
|
Author: Felix Lechner <felix.lechner@lease-up.com>
|
||||||
|
Description: Add host name to default MAILFROM (Closes: #1006464).
|
||||||
|
The host on which the error occurred is mentioned in the subject and also in
|
||||||
|
the message body, but some may find it useful in the From address, as well.
|
||||||
|
|
||||||
|
diff -Naurp mdadm.orig/Monitor.c mdadm/Monitor.c
|
||||||
|
--- mdadm.orig/Monitor.c
|
||||||
|
+++ mdadm/Monitor.c
|
||||||
|
@@ -447,7 +447,7 @@ static void send_event_email(const char
|
||||||
|
if (info->mailfrom)
|
||||||
|
fprintf(mp, "From: %s\n", info->mailfrom);
|
||||||
|
else
|
||||||
|
- fprintf(mp, "From: %s monitoring <root>\n", Name);
|
||||||
|
+ fprintf(mp, "From: %s monitoring <root@%s>\n", Name, hname);
|
||||||
|
fprintf(mp, "To: %s\n", info->mailaddr);
|
||||||
|
fprintf(mp, "Subject: %s event on %s:%s\n\n", event, dev, hname);
|
||||||
|
fprintf(mp, "This is an automatically generated mail message. \n");
|
|
@ -1,21 +0,0 @@
|
||||||
Description: Add host name to default MAILFROM
|
|
||||||
The host on which the error occurred is mentioned in the subject and also in
|
|
||||||
the message body, but some may find it useful in the From address, as well.
|
|
||||||
Author: Felix Lechner <felix.lechner@lease-up.com>
|
|
||||||
Bug-Debian: https://bugs.debian.org/1006464
|
|
||||||
Forwarded: no
|
|
||||||
---
|
|
||||||
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
|
|
||||||
--- a/Monitor.c
|
|
||||||
+++ b/Monitor.c
|
|
||||||
@@ -440,8 +440,8 @@ static void alert(char *event, char *dev
|
|
||||||
if (info->mailfrom)
|
|
||||||
fprintf(mp, "From: %s\n", info->mailfrom);
|
|
||||||
else
|
|
||||||
- fprintf(mp, "From: %s monitoring <root>\n",
|
|
||||||
- Name);
|
|
||||||
+ fprintf(mp, "From: %s monitoring <root@%s>\n",
|
|
||||||
+ Name, hname);
|
|
||||||
fprintf(mp, "To: %s\n", info->mailaddr);
|
|
||||||
fprintf(mp, "Subject: %s event on %s:%s\n\n",
|
|
||||||
event, dev, hname);
|
|
2
debian/patches/series
vendored
2
debian/patches/series
vendored
|
@ -1,6 +1,6 @@
|
||||||
debian/0001-fix-manpages.patch
|
debian/0001-fix-manpages.patch
|
||||||
debian/0002-mdmonitor-service-simplify.patch
|
debian/0002-mdmonitor-service-simplify.patch
|
||||||
host-name-in-default-mailfrom.patch
|
debian/0003-host-name-in-default-mailfrom.patch
|
||||||
exit-gracefully-when-md-device-not-found.patch
|
exit-gracefully-when-md-device-not-found.patch
|
||||||
sha1-includes.diff
|
sha1-includes.diff
|
||||||
readlink-path.patch
|
readlink-path.patch
|
||||||
|
|
Loading…
Add table
Reference in a new issue