From 11b7ca4d0114b76daf644c5e4dab78c3a5a227bf Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Fri, 14 Feb 2025 10:43:34 +0100 Subject: [PATCH] system: add an "import" syshook; closes #8325 Allow import hooks to be overwritten or manipulated. No functional changes but it allows to bootstrap a /conf/config.xml before opnsense-importer (making it skip import) or modifying the imported /conf/config.xml afterwards. --- plist | 1 + src/etc/rc | 4 ++-- src/etc/rc.syshook.d/import/20-importer | 4 ++++ 3 files changed, 7 insertions(+), 2 deletions(-) create mode 100755 src/etc/rc.syshook.d/import/20-importer diff --git a/plist b/plist index fc436e785..f7d269efd 100644 --- a/plist +++ b/plist @@ -135,6 +135,7 @@ /usr/local/etc/rc.syshook.d/early/15-templates /usr/local/etc/rc.syshook.d/early/20-backup /usr/local/etc/rc.syshook.d/early/90-carp +/usr/local/etc/rc.syshook.d/import/20-importer /usr/local/etc/rc.syshook.d/monitor/10-dpinger /usr/local/etc/rc.syshook.d/start/10-newwanip /usr/local/etc/rc.syshook.d/start/20-freebsd diff --git a/src/etc/rc b/src/etc/rc index 6a6ded20a..b6f4be9a9 100755 --- a/src/etc/rc +++ b/src/etc/rc @@ -185,8 +185,8 @@ fi # set keyboard map if needed /etc/rc.d/syscons onestart -# run the config importer during early startup -/usr/local/sbin/opnsense-importer -b +# Execute the import syshook / plugin commands +/usr/local/etc/rc.syshook import # all sorts of maintenance tasks for /var /usr/local/etc/rc.subr.d/var diff --git a/src/etc/rc.syshook.d/import/20-importer b/src/etc/rc.syshook.d/import/20-importer new file mode 100755 index 000000000..35ea492bf --- /dev/null +++ b/src/etc/rc.syshook.d/import/20-importer @@ -0,0 +1,4 @@ +#!/bin/sh + +# run the config importer during early startup +/usr/local/sbin/opnsense-importer -b