From 33edec1e7e1b26373b7f45e96e9878ddb9e0f053 Mon Sep 17 00:00:00 2001
From: Enno Boland <eb@s01.de>
Date: Thu, 12 Feb 2015 12:11:00 +0100
Subject: [PATCH] alfred: move configuration to /etc/sv/.../conf

---
 srcpkgs/alfred/files/alfred/conf     |  1 +
 srcpkgs/alfred/files/alfred/run      | 11 ++---------
 srcpkgs/alfred/files/batadv-vis/conf |  1 +
 srcpkgs/alfred/files/batadv-vis/run  |  5 ++---
 srcpkgs/alfred/files/conf_alfred     |  8 --------
 srcpkgs/alfred/template              |  5 ++---
 6 files changed, 8 insertions(+), 23 deletions(-)
 create mode 100644 srcpkgs/alfred/files/alfred/conf
 create mode 100644 srcpkgs/alfred/files/batadv-vis/conf
 delete mode 100644 srcpkgs/alfred/files/conf_alfred

diff --git a/srcpkgs/alfred/files/alfred/conf b/srcpkgs/alfred/files/alfred/conf
new file mode 100644
index 0000000000..fe3606b61f
--- /dev/null
+++ b/srcpkgs/alfred/files/alfred/conf
@@ -0,0 +1 @@
+OPTS="-i bat0 -b bat0"
diff --git a/srcpkgs/alfred/files/alfred/run b/srcpkgs/alfred/files/alfred/run
index 50348eb679..c80114d09a 100755
--- a/srcpkgs/alfred/files/alfred/run
+++ b/srcpkgs/alfred/files/alfred/run
@@ -1,10 +1,3 @@
 #!/bin/sh
-. /etc/conf.d/alfred
-
-if [ "$MASTER" ]; then
-	master=-m
-else
-	master=
-fi
-
-exec alfred -i "$IF_LIST" -b "$BATMAN_IF" $master
+[ -r conf ] && . ./conf
+exec alfred ${OPTS:=-i "bat0" -b "bat0"}
diff --git a/srcpkgs/alfred/files/batadv-vis/conf b/srcpkgs/alfred/files/batadv-vis/conf
new file mode 100644
index 0000000000..750f8a8d94
--- /dev/null
+++ b/srcpkgs/alfred/files/batadv-vis/conf
@@ -0,0 +1 @@
+OPTS="-si bat0"
diff --git a/srcpkgs/alfred/files/batadv-vis/run b/srcpkgs/alfred/files/batadv-vis/run
index 335f124e41..2fe016ae37 100755
--- a/srcpkgs/alfred/files/batadv-vis/run
+++ b/srcpkgs/alfred/files/batadv-vis/run
@@ -1,4 +1,3 @@
 #!/bin/sh
-. /etc/conf.d/alfred
-
-exec batadv-vis -si "$BATMAN_IF"
+[ -r conf ] && . ./conf
+exec batadv-vis ${OPTS:=-si bat0}
diff --git a/srcpkgs/alfred/files/conf_alfred b/srcpkgs/alfred/files/conf_alfred
deleted file mode 100644
index 39ed66c3c8..0000000000
--- a/srcpkgs/alfred/files/conf_alfred
+++ /dev/null
@@ -1,8 +0,0 @@
-# Run alfred in master mode
-#MASTER=yes
-
-# Comma separated list of interfaces for alfred
-IF_LIST="bat0"
-
-# Batman interface
-BATMAN_IF="bat0"
diff --git a/srcpkgs/alfred/template b/srcpkgs/alfred/template
index ae8d804a76..c50ed4387b 100644
--- a/srcpkgs/alfred/template
+++ b/srcpkgs/alfred/template
@@ -1,7 +1,7 @@
 # Template file for 'alfred'
 pkgname=alfred
 version=2014.4.0
-revision=5
+revision=6
 build_style=gnu-makefile
 short_desc="Daemon for distributing arbitrary information over a batman mesh"
 maintainer="Enno Boland <eb@s01.de>"
@@ -11,11 +11,10 @@ distfiles="http://downloads.open-mesh.org/batman/stable/sources/alfred/alfred-${
 checksum=99e6c64e7069b0b7cb861369d5c198bfc7d74d41509b8edd8a17ba78e7c8d034
 make_build_args="CONFIG_ALFRED_GPSD=n"
 make_install_args="CONFIG_ALFRED_GPSD=n"
-conf_files="/etc/conf.d/alfred"
+conf_files="/etc/sv/alfred/conf /etc/sv/batadv-vis/conf"
 depends="batman-adv"
 
 post_install() {
 	vsv alfred
 	vsv batadv-vis
-	vinstall $FILESDIR/conf_alfred 644 etc/conf.d alfred
 }