afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'rel/5.1' into emane-cleanup

Browse source
This commit is contained in:
Blake J. Harnden 2018-03-20 14:39:32 -07:00
commit 952cd2ffbd
2 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
configure.ac
View file

@ -203,9 +203,6 @@ else
fi fi
# Output files # Output files
#gui/core-gui
#scripts/core-daemon.service
#daemon/core/constants.py
AC_CONFIG_FILES([Makefile AC_CONFIG_FILES([Makefile
gui/version.tcl gui/version.tcl
gui/Makefile gui/Makefile

2
daemon/core/constants.py.in
View file

@ -11,7 +11,7 @@ SYSCTL_BIN = "@sysctl_path@/sysctl"
IP_BIN = "@ip_path@/ip" IP_BIN = "@ip_path@/ip"
TC_BIN = "@tc_path@/tc" TC_BIN = "@tc_path@/tc"
EBTABLES_BIN = "@ebtables_path@/ebtables" EBTABLES_BIN = "@ebtables_path@/ebtables"
QUAGGA_STATE_DIR = "@CORE_STATE_DIR@/run/quagga" QUAGGA_STATE_DIR = "/var/run/quagga"
MOUNT_BIN = "@mount_path@/mount" MOUNT_BIN = "@mount_path@/mount"
UMOUNT_BIN = "@umount_path@/umount" UMOUNT_BIN = "@umount_path@/umount"
OVS_BIN = "@ovs_vs_path@/ovs-vsctl" OVS_BIN = "@ovs_vs_path@/ovs-vsctl"