webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

collectd: Ignore errors from OpenVPN configuration file

Browse Source
This commit is contained in:
Michael Tremer
2015-04-12 22:44:50 +02:00
parent 79e7688b69
commit abd93c4241
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lfs/collectd
View File

@@ -101,6 +101,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0020-openvpn-Make-read-functions-robust-like-in-8516f9abb.patch
cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0021-openvpn-Fix-copy-and-paste-error.patch
cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0022-openvpn-Change-data-type-from-COUNTER-to-DERIVE.patch
cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/silence-openvpn-errors.patch
cd $(DIR_APP) && ./configure --prefix=/usr --localstatedir=/var \
--disable-{apple_sensors,csv,ipvs,mbmon,memcached,mysql} \
--disable-{netlink,nginx,nut,perl,serial,snmp,tape,vserver,xmms} \

13
src/patches/collectd/silence-openvpn-errors.patch Normal file
View File

@@ -0,0 +1,13 @@
diff --git a/src/openvpn.c b/src/openvpn.c
index d446e9957b68..cc33eed61e25 100644
--- a/src/openvpn.c
+++ b/src/openvpn.c
@@ -567,7 +567,7 @@ static int openvpn_read (void)
read += vpn_read;
}
- return (read ? 0 : -1);
+ return 0;
} /* int openvpn_read */
static int version_detect (const char *filename)