From a8c94d834713c7e47a2cb2f08054fc8504161a8c Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Mon, 13 Oct 2014 12:10:02 +0200
Subject: [PATCH] NetworkManager: added runit service.

---
 srcpkgs/NetworkManager/files/NetworkManager/run       |  7 +++++++
 srcpkgs/NetworkManager/files/NetworkManager/supervise |  1 +
 srcpkgs/NetworkManager/template                       | 11 +++++++----
 3 files changed, 15 insertions(+), 4 deletions(-)
 create mode 100755 srcpkgs/NetworkManager/files/NetworkManager/run
 create mode 120000 srcpkgs/NetworkManager/files/NetworkManager/supervise

diff --git a/srcpkgs/NetworkManager/files/NetworkManager/run b/srcpkgs/NetworkManager/files/NetworkManager/run
new file mode 100755
index 00000000000..17e0b14681f
--- /dev/null
+++ b/srcpkgs/NetworkManager/files/NetworkManager/run
@@ -0,0 +1,7 @@
+#!/bin/sh
+sv check dbus >/dev/null || exit 1
+# Create required dirs
+[ ! -d /etc/NetworkManager/dispatcher.d ] && mkdir -m0755 -p /etc/NetworkManager/dispatcher.d
+[ ! -d /etc/NetworkManager/system-connections ] && mkdir -m0755 -p /etc/NetworkManager/system-connections
+[ ! -d /var/lib/NetworkManager ] && mkdir -m0700 -p /var/lib/NetworkManager
+exec NetworkManager -n
diff --git a/srcpkgs/NetworkManager/files/NetworkManager/supervise b/srcpkgs/NetworkManager/files/NetworkManager/supervise
new file mode 120000
index 00000000000..f3667807303
--- /dev/null
+++ b/srcpkgs/NetworkManager/files/NetworkManager/supervise
@@ -0,0 +1 @@
+/run/runit/supervise.NetworkManager
\ No newline at end of file
diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template
index e51af6b6e27..8689dd8c584 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -1,7 +1,7 @@
 # Template file for 'NetworkManager'
 pkgname=NetworkManager
 version=0.9.10.0
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--with-dhcpcd=/usr/sbin/dhcpcd --with-dhclient=no
  --with-system-ca-path=/etc/ssl/certs --enable-more-warnings=no
@@ -30,7 +30,7 @@ makedepends="libuuid-devel gnutls-devel dbus-glib-devel libgudev-devel
 lib32disabled=yes
 depends="dbus iproute2 dhcpcd>=5.5.4_1 wpa_supplicant ModemManager mobile-broadband-provider-info"
 conf_files="/etc/${pkgname}/${pkgname}.conf"
-systemd_services="${pkgname}.service on ${pkgname}-dispatcher.service on"
+replaces="runit-void<20141013_2"
 
 # Package build options
 build_options="gir systemd"
@@ -50,6 +50,7 @@ if [ "$build_option_systemd" ]; then
 	configure_args+=" --with-session-tracking=systemd --with-suspend-resume=systemd"
 	configure_args+=" --with-systemdsystemunitdir=/usr/lib/systemd/system"
 	makedepends+=" systemd-devel"
+	systemd_services="${pkgname}.service on ${pkgname}-dispatcher.service on"
 else
 	configure_args+=" --with-session-tracking=consolekit --with-suspend-resume=upower"
 fi
@@ -63,9 +64,12 @@ pre_configure() {
 
 post_install() {
 	vinstall ${FILESDIR}/${pkgname}.conf 644 etc/${pkgname}
-	vinstall ${FILESDIR}/tmpfilesd 644 usr/lib/tmpfiles.d ${pkgname}.conf
+	if [ "$build_option_systemd" ]; then
+		vinstall ${FILESDIR}/tmpfilesd 644 usr/lib/tmpfiles.d ${pkgname}.conf
+	fi
 	# remove unused stuff
 	rm -rf ${DESTDIR}/etc/init.d
+	vsv ${pkgname}
 }
 
 libnm_package() {
@@ -78,7 +82,6 @@ libnm_package() {
 		fi
 	}
 }
-
 NetworkManager-devel_package() {
 	depends="dbus-glib-devel libnm-${version}_${revision}"
 	short_desc+=" - development files"