From 355939b2280e265e2d6890f69712efcc54658f8b Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Mon, 15 May 2017 06:37:11 +0200
Subject: [PATCH] rc: improve print of syshook invokes

---
 src/etc/rc.syshook                    | 7 ++++---
 src/etc/rc.syshook.d/05-beep.stop     | 1 +
 src/etc/rc.syshook.d/20-freebsd.start | 1 +
 src/etc/rc.syshook.d/90-cron.start    | 1 +
 src/etc/rc.syshook.d/95-beep.start    | 1 +
 5 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/etc/rc.syshook b/src/etc/rc.syshook
index 422d2d187..c2bcaa617 100755
--- a/src/etc/rc.syshook
+++ b/src/etc/rc.syshook
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (c) 2015-2016 Franco Fichtner <franco@opnsense.org>
+# Copyright (c) 2015-2017 Franco Fichtner <franco@opnsense.org>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -54,11 +54,12 @@ for SYSHOOK in ${SYSHOOKS}; do
 	# extract syshook origin
 	SYSHOOK=${SYSHOOK##"${SYSDIR}/"}
 	SYSHOOK=${SYSHOOK%%".${SYSLEVEL}"}
+	SYSNAME=${SYSHOOK#??-}
 
-	echo "rc.syshook(${SYSLEVEL}): running ${SYSHOOK#??-}"
+	echo ">>> Invoking ${SYSLEVEL} script '${SYSNAME}'"
 
 	if ! ${SYSDIR}/${SYSHOOK}.${SYSLEVEL}; then
-		echo "rc.syshook(${SYSLEVEL}): error in ${SYSHOOK#??-}"
+		echo ">>> Error in ${SYSLEVEL} script '${SYSNAME}'"
 	fi
 done
 
diff --git a/src/etc/rc.syshook.d/05-beep.stop b/src/etc/rc.syshook.d/05-beep.stop
index 7ef38d35f..7f5be0046 100755
--- a/src/etc/rc.syshook.d/05-beep.stop
+++ b/src/etc/rc.syshook.d/05-beep.stop
@@ -1,2 +1,3 @@
 #!/bin/sh
+
 /usr/local/sbin/beep.sh stop
diff --git a/src/etc/rc.syshook.d/20-freebsd.start b/src/etc/rc.syshook.d/20-freebsd.start
index e7b89a870..6abc6326e 100755
--- a/src/etc/rc.syshook.d/20-freebsd.start
+++ b/src/etc/rc.syshook.d/20-freebsd.start
@@ -1,2 +1,3 @@
 #!/bin/sh
+
 /usr/local/etc/rc.freebsd start
diff --git a/src/etc/rc.syshook.d/90-cron.start b/src/etc/rc.syshook.d/90-cron.start
index 4295a8559..5502422fa 100755
--- a/src/etc/rc.syshook.d/90-cron.start
+++ b/src/etc/rc.syshook.d/90-cron.start
@@ -1,3 +1,4 @@
 #!/bin/sh
+
 echo -n "Starting Cron: "
 configctl cron restart
diff --git a/src/etc/rc.syshook.d/95-beep.start b/src/etc/rc.syshook.d/95-beep.start
index cc1404f20..332a2e484 100755
--- a/src/etc/rc.syshook.d/95-beep.start
+++ b/src/etc/rc.syshook.d/95-beep.start
@@ -1,2 +1,3 @@
 #!/bin/sh
+
 /usr/local/sbin/beep.sh start