diff options
| author | Mihail Vasiliev <mick@corp.linkintel.ru> | 2016-04-02 19:48:05 +0300 |
|---|---|---|
| committer | Mihail Vasiliev <mick@corp.linkintel.ru> | 2016-04-02 19:48:05 +0300 |
| commit | 12f19de392ec9eaebc4ec51ac19f225288147832 (patch) | |
| tree | 4c04da61258abfe50cbd39c0c2dd91cf5e1a2aea | |
| parent | 809651ebaa701ffc6e222257c64720f77b3d14c3 (diff) | |
| parent | e611d966761270dbb80cf8ff77698d8b571a6ebe (diff) | |
| download | vyatta-wanloadbalance-12f19de392ec9eaebc4ec51ac19f225288147832.tar.gz vyatta-wanloadbalance-12f19de392ec9eaebc4ec51ac19f225288147832.zip | |
Merge branch 'current' into HEAD
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | debian/changelog | 10 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | src/lbdata.cc | 2 | ||||
| -rw-r--r-- | src/main.cc | 1 |
5 files changed, 14 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index b1dedce..321c931 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -dhcphookdir = /etc/dhcp3/dhclient-exit-hooks.d +dhcphookdir = /etc/dhcp/dhclient-exit-hooks.d ppphookdir = /etc/ppp/ip-up.d pppwanlbdir = /var/run/load-balance/ppp cfgdir = $(datadir)/vyatta-cfg/templates diff --git a/debian/changelog b/debian/changelog index b64b917..a06ef86 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +vyatta-wanloadbalance (0.13.68+vyos2+current1) unstable; urgency=medium + + [ Thomas Jepp ] + * Fix build depends. + * Fix build failures when building for jessie. + + [ Kim Hagen ] + + -- Kim Hagen <kim.sidney@gmail.com> Sun, 24 Jan 2016 15:27:39 -0500 + vyatta-wanloadbalance (0.13.68+vyos2+lithium9) unstable; urgency=low [ Alex Harpin ] diff --git a/debian/control b/debian/control index 10345bc..a6a7080 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: vyatta-wanloadbalance Section: contrib/net Priority: extra Maintainer: VyOS Package Maintainers <maintainers@vyos.net> -Build-Depends: debhelper (>= 5), autotools-dev +Build-Depends: debhelper (>= 5), autotools-dev, automake, autoconf, cpio, libtool Standards-Version: 3.7.2 Package: vyatta-wanloadbalance diff --git a/src/lbdata.cc b/src/lbdata.cc index 99c36e7..60578de 100644 --- a/src/lbdata.cc +++ b/src/lbdata.cc @@ -332,7 +332,7 @@ LBData::update_dhcp_nexthop() LBData::InterfaceHealthIter h_iter = _iface_health_coll.begin(); while (h_iter != _iface_health_coll.end()) { if (h_iter->second._nexthop == "dhcp") { - string file("/var/lib/dhcp3/dhclient_"+h_iter->first+"_lease"); + string file("/var/lib/dhcp/dhclient_"+h_iter->first+"_lease"); FILE *fp = fopen(file.c_str(),"r"); if (fp) { char str[1025]; diff --git a/src/main.cc b/src/main.cc index 1904885..7994696 100644 --- a/src/main.cc +++ b/src/main.cc @@ -14,6 +14,7 @@ #include "stdlib.h" #include <unistd.h> #include <iostream> +#include <unistd.h> #include "loadbalance.hh" bool g_check_path = false; |