Commit 5e648312 authored by Franco Fichtner's avatar Franco Fichtner

pkg: restart configd to sync the new code

While there, switch to the defaults when reloading the webgui.
parent 32cbae06
...@@ -24,3 +24,9 @@ rm -f /etc/rc.bak ...@@ -24,3 +24,9 @@ rm -f /etc/rc.bak
echo "Writing OPNsense version" echo "Writing OPNsense version"
mkdir -p /usr/local/opnsense/version mkdir -p /usr/local/opnsense/version
echo "%%REPO_VERSION%%-%%REPO_COMMENT%%" > /usr/local/opnsense/version/opnsense echo "%%REPO_VERSION%%-%%REPO_COMMENT%%" > /usr/local/opnsense/version/opnsense
if [ -f /var/run/configd.pid ]; then
echo "Restarting configd"
pkill -F /var/run/configd.pid
/usr/local/opnsense/service/configd.py
fi
...@@ -60,15 +60,11 @@ function sigkillbypid($pidfile, $sig) { ...@@ -60,15 +60,11 @@ function sigkillbypid($pidfile, $sig) {
} }
/* kill a process by name */ /* kill a process by name */
function sigkillbyname($procname, $sig) { function killbyname($procname)
if(isvalidproc($procname)) {
return mwexec("/usr/bin/killall " . escapeshellarg("-{$sig}") . " " . escapeshellarg($procname), true); if (isvalidproc($procname)) {
} mwexec('/usr/bin/killall ' . escapeshellarg($procname));
}
/* kill a process by name */
function killbyname($procname) {
if(isvalidproc($procname))
mwexec("/usr/bin/killall " . escapeshellarg($procname));
} }
function is_subsystem_dirty($subsystem = "") { function is_subsystem_dirty($subsystem = "") {
......
...@@ -9,7 +9,7 @@ require_once("rrd.inc"); ...@@ -9,7 +9,7 @@ require_once("rrd.inc");
echo "Restarting webConfigurator..."; echo "Restarting webConfigurator...";
sigkillbyname("lighttpd", "KILL"); killbyname("lighttpd");
while (is_process_running("lighttpd")) { while (is_process_running("lighttpd")) {
echo '.'; echo '.';
......
<?php <?php
/* /*
Copyright (C) 2014-2015 Deciso B.V. Copyright (C) 2014-2015 Deciso B.V.
Copyright (C) 2004, 2005 Scott Ullrich Copyright (C) 2004, 2005 Scott Ullrich
...@@ -34,7 +35,7 @@ require_once("shaper.inc"); ...@@ -34,7 +35,7 @@ require_once("shaper.inc");
require_once("util.inc"); require_once("util.inc");
if($_GET['reset'] <> "") { if($_GET['reset'] <> "") {
sigkillbyname('pfctl', SIGKILL); killbyname('pfctl');
exit; exit;
} }
......
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