From b4385511abaa12345b6cff1764191efc23aef340 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Thu, 22 Sep 2016 23:55:29 +0200
Subject: [PATCH] Mk: reorder automatic script hooks, annotate TODO

---
 Mk/plugins.mk | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/Mk/plugins.mk b/Mk/plugins.mk
index fa4e01c30..c7eea2f3c 100644
--- a/Mk/plugins.mk
+++ b/Mk/plugins.mk
@@ -100,12 +100,7 @@ scripts-manual:
 	done
 
 scripts-auto:
-	@if [ -d ${.CURDIR}/src/etc/rc.loader.d ]; then \
-		for SCRIPT in +POST_INSTALL +POST_DEINSTALL; do \
-			echo 'echo "Reloading firmware configuration"' >> ${DESTDIR}/$${SCRIPT}; \
-			echo '/usr/local/etc/rc.configure_firmware' >> ${DESTDIR}/$${SCRIPT}; \
-		done; \
-	fi
+	# XXX ticket #35
 	@if [ -d ${.CURDIR}/src/opnsense/service/conf/actions.d ]; then \
 		for SCRIPT in +POST_INSTALL +POST_DEINSTALL; do \
 			echo 'echo "Restarting configd"' >> ${DESTDIR}/$${SCRIPT}; \
@@ -114,6 +109,12 @@ scripts-auto:
 			echo 'fi' >> ${DESTDIR}/$${SCRIPT}; \
 		done; \
 	fi
+	@if [ -d ${.CURDIR}/src/etc/rc.loader.d ]; then \
+		for SCRIPT in +POST_INSTALL +POST_DEINSTALL; do \
+			echo 'echo "Reloading firmware configuration"' >> ${DESTDIR}/$${SCRIPT}; \
+			echo '/usr/local/etc/rc.configure_firmware' >> ${DESTDIR}/$${SCRIPT}; \
+		done; \
+	fi
 
 install: check
 	@mkdir -p ${DESTDIR}${LOCALBASE}