gentoo resync : 14.07.2018

3 files changed, 30 insertions, 4 deletions

diff --git a/net-misc/igmpproxy/files/igmpproxy.confd b/net-misc/igmpproxy/files/igmpproxy.confd
new file mode 100644
index 000000000000..cbbc38cb9167
--- /dev/null
+++ b/net-misc/igmpproxy/files/igmpproxy.confd
@@ -0,0 +1,5 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Additional command line options, see igmpproxy(8) for more information
+IGMPPROXY_OPTS=""
diff --git a/net-misc/igmpproxy/files/igmpproxy.initd b/net-misc/igmpproxy/files/igmpproxy.initd
new file mode 100644
index 000000000000..d8f727ba034c
--- /dev/null
+++ b/net-misc/igmpproxy/files/igmpproxy.initd
@@ -0,0 +1,20 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+config="/etc/${RC_SVCNAME}.conf"
+name="IGMPproxy"
+pidfile="/run/${RC_SVCNAME}.pid"
+
+command="igmpproxy"
+command_args="${IGMPPROXY_OPTS} ${config}"
+procname="${RC_SVCNAME}"
+
+start_pre() {
+	if [ ! -f "${config}" ]; then
+		eerror "Please create ${config} before starting ${name}!"
+		return 1
+	else
+		return 0
+	fi
+}
diff --git a/net-misc/igmpproxy/files/igmpproxy.service b/net-misc/igmpproxy/files/igmpproxy.service
index a682bed09e0a..ae949566c9e4 100644
--- a/net-misc/igmpproxy/files/igmpproxy.service
+++ b/net-misc/igmpproxy/files/igmpproxy.service
@@ -1,9 +1,10 @@
 [Unit]
-Description=IGMP proxy
-After=network.target
+Description=IGMPproxy
+After=network-online.target
 
 [Service]
-ExecStart=/usr/sbin/igmpproxy /etc/igmpproxy.conf
+ExecStart=igmpproxy /etc/igmpproxy.conf
+Type=simple
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=network.target