From 2b4787453a18f5b42b3da853d5dccd233dcd33c6 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Fri, 22 Sep 2017 19:10:36 +0200
Subject: [PATCH] rc: thin out the etc/ directory a bit by stashing boot
 scripts away

---
 plist                                         |  8 ++++----
 src/etc/rc                                    | 10 +++++-----
 src/etc/{rc.crashdump => rc.subr.d/crashdump} |  0
 src/etc/{rc.livemode => rc.subr.d/livemode}   |  0
 src/etc/{rc.recover => rc.subr.d/recover}     |  0
 src/etc/{rc.swapon => rc.subr.d/swapon}       |  0
 6 files changed, 9 insertions(+), 9 deletions(-)
 rename src/etc/{rc.crashdump => rc.subr.d/crashdump} (100%)
 rename src/etc/{rc.livemode => rc.subr.d/livemode} (100%)
 rename src/etc/{rc.recover => rc.subr.d/recover} (100%)
 rename src/etc/{rc.swapon => rc.subr.d/swapon} (100%)

diff --git a/plist b/plist
index dfa6fd423..629e7a523 100644
--- a/plist
+++ b/plist
@@ -75,7 +75,6 @@
 /usr/local/etc/rc.carpbackup
 /usr/local/etc/rc.carpmaster
 /usr/local/etc/rc.configure_firmware
-/usr/local/etc/rc.crashdump
 /usr/local/etc/rc.d/captiveportal
 /usr/local/etc/rc.d/configd
 /usr/local/etc/rc.d/flowd_aggregate
@@ -106,7 +105,6 @@
 /usr/local/etc/rc.ipfw.postload
 /usr/local/etc/rc.kill_states
 /usr/local/etc/rc.linkup
-/usr/local/etc/rc.livemode
 /usr/local/etc/rc.loader
 /usr/local/etc/rc.loader.d/00-banner
 /usr/local/etc/rc.loader.d/20-brand
@@ -119,15 +117,17 @@
 /usr/local/etc/rc.newwanipv6
 /usr/local/etc/rc.openvpn
 /usr/local/etc/rc.reboot
-/usr/local/etc/rc.recover
 /usr/local/etc/rc.reload_all
 /usr/local/etc/rc.reload_interfaces
 /usr/local/etc/rc.resolv_conf_generate
 /usr/local/etc/rc.restart_webgui
 /usr/local/etc/rc.shutdown
 /usr/local/etc/rc.sshd
+/usr/local/etc/rc.subr.d/crashdump
+/usr/local/etc/rc.subr.d/livemode
+/usr/local/etc/rc.subr.d/recover
+/usr/local/etc/rc.subr.d/swapon
 /usr/local/etc/rc.subr.d/var
-/usr/local/etc/rc.swapon
 /usr/local/etc/rc.syshook
 /usr/local/etc/rc.syshook.d/05-beep.stop
 /usr/local/etc/rc.syshook.d/05-update.early
diff --git a/src/etc/rc b/src/etc/rc
index 970faf141..584db76f2 100755
--- a/src/etc/rc
+++ b/src/etc/rc
@@ -117,7 +117,7 @@ else
 fi
 
 # regenerate groups and users for base
-/usr/local/etc/rc.recover base > /dev/null
+/usr/local/etc/rc.subr.d/recover base > /dev/null
 
 # set keyboard map if needed
 /etc/rc.d/syscons onestart
@@ -145,8 +145,8 @@ else
 fi
 
 # set up and recover a crash dump before activating swap
-/usr/local/etc/rc.crashdump
-/usr/local/etc/rc.swapon
+/usr/local/etc/rc.subr.d/crashdump
+/usr/local/etc/rc.subr.d/swapon
 
 echo -n "."
 /sbin/ldconfig -elf /usr/lib /usr/local/lib /lib
@@ -163,7 +163,7 @@ fi
 echo "done."
 
 # Regenerate groups and users for packages
-/usr/local/etc/rc.recover pkg > /dev/null 2> /dev/null
+/usr/local/etc/rc.subr.d/recover pkg > /dev/null 2> /dev/null
 
 # Recreate capabilities DB
 /usr/bin/cap_mkdb /etc/login.conf
@@ -188,6 +188,6 @@ echo -n "Root file system: "
 mount | grep ' on / ' | awk '{ print $1 }'
 
 /usr/local/etc/rc.initial.banner
-/usr/local/etc/rc.livemode
+/usr/local/etc/rc.subr.d/livemode
 
 exit 0
diff --git a/src/etc/rc.crashdump b/src/etc/rc.subr.d/crashdump
similarity index 100%
rename from src/etc/rc.crashdump
rename to src/etc/rc.subr.d/crashdump
diff --git a/src/etc/rc.livemode b/src/etc/rc.subr.d/livemode
similarity index 100%
rename from src/etc/rc.livemode
rename to src/etc/rc.subr.d/livemode
diff --git a/src/etc/rc.recover b/src/etc/rc.subr.d/recover
similarity index 100%
rename from src/etc/rc.recover
rename to src/etc/rc.subr.d/recover
diff --git a/src/etc/rc.swapon b/src/etc/rc.subr.d/swapon
similarity index 100%
rename from src/etc/rc.swapon
rename to src/etc/rc.subr.d/swapon