Commit 2053bd01 authored by Franco Fichtner's avatar Franco Fichtner

rc: php must be ready before configd because it may use it

Also remove the captive portal RRD graph removal.  We really need
to improve the GUI in order to solve the issue of stale RRD files
gracefully.
parent a6132af6
...@@ -213,6 +213,9 @@ fi ...@@ -213,6 +213,9 @@ fi
# Recreate capabilities DB # Recreate capabilities DB
/usr/bin/cap_mkdb /etc/login.conf /usr/bin/cap_mkdb /etc/login.conf
# Set up the correct php.ini content
/usr/local/etc/rc.php_ini_setup
# startup configd # startup configd
/usr/local/etc/rc.d/configd start /usr/local/etc/rc.d/configd start
...@@ -221,15 +224,11 @@ fi ...@@ -221,15 +224,11 @@ fi
/usr/local/etc/rc.backup_netflow restore /usr/local/etc/rc.backup_netflow restore
/usr/local/etc/rc.backup_rrd restore /usr/local/etc/rc.backup_rrd restore
# Set up the correct php.ini content
/usr/local/etc/rc.php_ini_setup
# Execute the early syshook / plugin commands # Execute the early syshook / plugin commands
/usr/local/etc/rc.syshook early /usr/local/etc/rc.syshook early
# let the PHP-based configuration subsystem set up the system now # let the PHP-based configuration subsystem set up the system now
echo -n "Launching the init system..." echo -n "Launching the init system..."
rm -f /root/lighttpd*
touch /var/run/booting touch /var/run/booting
/usr/local/etc/rc.bootup /usr/local/etc/rc.bootup
rm /var/run/booting rm /var/run/booting
...@@ -244,10 +243,6 @@ fi ...@@ -244,10 +243,6 @@ fi
# Execute the normal syshook / plugin commands # Execute the normal syshook / plugin commands
/usr/local/etc/rc.syshook start /usr/local/etc/rc.syshook start
# 16.1 migration code for stale captive portal files to be removed in 16.7
rm -rf /var/db/rrd/*-concurrent.rrd
rm -rf /var/db/rrd/*-loggedin.rrd
echo -n "Starting CRON... " echo -n "Starting CRON... "
cd /tmp && /usr/sbin/cron -s 2>/dev/null cd /tmp && /usr/sbin/cron -s 2>/dev/null
echo "done." echo "done."
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment