Commit c793fbd0 authored by Sevan Janiyan's avatar Sevan Janiyan Committed by GitHub
Browse files

Merge pull request #324 from sevan/etcdir

Etcdir
parents ca681f1d f83f95d2
......@@ -17,6 +17,7 @@ $(chilli_SCRIPTS:=.in) chilli.conf.in defaults.in \
CoovaChilliLib.py.in gui-config-default.ini
edit = sed \
-e 's,@ETCDIR\@,$(sysconfdir),g' \
-e 's,@SBINDIR\@,$(sbindir),g' \
-e 's,@INITDIR\@,$(initrddir),g' \
-e 's,@VARTMP\@,$(localstatedir)/tmp,g' \
......
......@@ -6,7 +6,6 @@
# description: CoovaChilli
# Source function library.
. /etc/rc.d/init.d/functions
. @ETCCHILLI@/functions
exec="@SBINDIR@/chilli"
......@@ -30,7 +29,7 @@ MULTI=$(ls @ETCCHILLI@/*/chilli.conf 2>/dev/null)
}
pidfile=@VARRUN@/chilli.pid
CONFIG=/etc/chilli.conf
CONFIG=@ETCDIR@/chilli.conf
if [ -n "$DHCPIF" ]; then
CONFIG=@ETCCHILLI@/$DHCPIF/chilli.conf
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment