From 35e370d4d70ea56e4a880e40f61618bc1673b8dd Mon Sep 17 00:00:00 2001 From: root Date: Thu, 2 Aug 2018 21:54:14 +0000 Subject: [PATCH] addign dhcpcd5 conflict dependency and fixing rc.local to exit 0 --- debian/changelog | 2 +- debian/control | 2 +- files/rc.local | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 13b5d77..058dc10 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -wit-hypervisor-config (1.1) unstable; urgency=low +wit-hypervisor-config (1.2) unstable; urgency=low * Initial release. diff --git a/debian/control b/debian/control index 0330fd3..3f3cbc8 100644 --- a/debian/control +++ b/debian/control @@ -9,5 +9,5 @@ Package: wit-hypervisor-config Architecture: all Depends: ${misc:Depends}, frr (>= 4.0-wit), sed, tcpdump, mtr-tiny, iproute2, ifupdown, ipmitool, iptables, lldpd, strongswan, telnet, netcat, fping, curl, wget, ifstat, rsyslog, ncurses-term, net-tools, bridge-utils, vlan, gnupg, sudo, isc-dhcp-client Provides: ${diverted-files} -Conflicts: ${diverted-files} +Conflicts: ${diverted-files}, dhcpcd5 Description: configure this box as wit hypervisor/datanode diff --git a/files/rc.local b/files/rc.local index 5e6557b..d033727 100755 --- a/files/rc.local +++ b/files/rc.local @@ -1,3 +1,5 @@ #!/bin/bash [ -d /sys/kernel/debug/i40e ] && echo lldp stop | /usr/bin/tee /sys/kernel/debug/i40e/*/command + +exit 0