rc: sprinkle more exec, better rc.syshook usage in shutdown

This commit is contained in:
Franco Fichtner 2018-06-11 00:03:43 +02:00
parent a738f9f7ee
commit 5dd6901b2b
6 changed files with 16 additions and 16 deletions

View File

@ -16,7 +16,7 @@ cp /etc/rc /etc/rc.bak
cat > /etc/rc <<EOF
#!/bin/sh
# OPNsense rc(8) hook was automatically installed:
if [ -f /usr/local/etc/rc ]; then /usr/local/etc/rc; exit 0; fi
if [ -f /usr/local/etc/rc ]; then exec /usr/local/etc/rc; fi
EOF
cat /etc/rc.bak >> /etc/rc
rm -f /etc/rc.bak
@ -26,7 +26,7 @@ cp /etc/rc.shutdown /etc/rc.shutdown.bak
cat > /etc/rc.shutdown <<EOF
#!/bin/sh
# OPNsense rc(8) hook was automatically installed:
if [ -f /usr/local/etc/rc.shutdown ]; then /usr/local/etc/rc.shutdown; exit 0; fi
if [ -f /usr/local/etc/rc.shutdown ]; then exec /usr/local/etc/rc.shutdown; fi
EOF
cat /etc/rc.shutdown.bak >> /etc/rc.shutdown
rm -f /etc/rc.shutdown.bak

1
plist
View File

@ -129,6 +129,7 @@
/usr/local/etc/rc.syshook.d/90-carp.start
/usr/local/etc/rc.syshook.d/90-cron.start
/usr/local/etc/rc.syshook.d/95-beep.start
/usr/local/etc/rc.syshook.d/99-config.stop
/usr/local/etc/rc.syshook.d/backup/20-captiveportal
/usr/local/etc/rc.syshook.d/backup/20-dhcpleases
/usr/local/etc/rc.syshook.d/backup/20-duid

View File

@ -1,5 +1,5 @@
#!/bin/sh
. /usr/local/etc/rc.shutdown
/usr/local/etc/rc.syshook stop
/sbin/shutdown -op now
exec /sbin/shutdown -op now

View File

@ -1,5 +1,5 @@
#!/bin/sh
. /usr/local/etc/rc.shutdown
/usr/local/etc/rc.syshook stop
/sbin/shutdown -or now
exec /sbin/shutdown -or now

View File

@ -1,13 +1,4 @@
#!/bin/sh
# shutdown syshook / plugin scripts
/usr/local/etc/rc.syshook stop
# wait for config lock to release
php -a >/dev/null << EOF
\$fp = fopen('/conf/config.xml', "a+");
if (flock(\$fp, LOCK_EX)) {
flock(\$fp, LOCK_UN);
fclose(\$fp);
}
EOF
exec /usr/local/etc/rc.syshook stop

View File

@ -0,0 +1,8 @@
#!/usr/local/bin/php
<?php
$fp = fopen('/conf/config.xml', 'a+');
if (flock($fp, LOCK_EX)) {
flock($fp, LOCK_UN);
fclose($fp);
}