summaryrefslogtreecommitdiff
path: root/package/watchdog/patches/patch-src_umount_c
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-04-04 10:34:02 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2010-04-04 10:34:02 +0200
commit5042ac8e5927d0089d3902b1c37e5bcc1565d053 (patch)
treecd2be3085808c5ac59dd70f9c610c6a40bfe3ffd /package/watchdog/patches/patch-src_umount_c
parent401dabf66529cfb5ab47b4c78d5e25fd493eef1f (diff)
parent4d569ed1a3305c7b7abe8fa4273cea3b559cc85a (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts: BUGS package/autoconf/Makefile
Diffstat (limited to 'package/watchdog/patches/patch-src_umount_c')
-rw-r--r--package/watchdog/patches/patch-src_umount_c7
1 files changed, 3 insertions, 4 deletions
diff --git a/package/watchdog/patches/patch-src_umount_c b/package/watchdog/patches/patch-src_umount_c
index cf421ce79..6b5a82c1f 100644
--- a/package/watchdog/patches/patch-src_umount_c
+++ b/package/watchdog/patches/patch-src_umount_c
@@ -1,7 +1,6 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- watchdog-5.2.4.orig.orig/src/umount.c 2003-01-28 07:47:38.000000000 +0100
-+++ watchdog-5.2.4.orig/src/umount.c 2008-10-16 13:00:07.000000000 +0200
-@@ -210,7 +210,7 @@ umount_one (const char *spec, const char
+--- watchdog-5.7.orig/src/umount.c 2010-01-06 13:42:08.000000000 +0100
++++ watchdog-5.7/src/umount.c 2010-02-06 04:39:47.664334843 +0100
+@@ -212,7 +212,7 @@ umount_one (const char *spec, const char
if (res < 0)
umnt_err2 = errno;
/* Do not complain about remote NFS mount points */