diff --git a/src/etc/rc.bootup b/src/etc/rc.bootup index 88a54a998..7a7ad21b8 100755 --- a/src/etc/rc.bootup +++ b/src/etc/rc.bootup @@ -2,33 +2,33 @@ - Copyright (C) 2004-2009 Scott Ullrich - Copyright (C) 2003-2004 Manuel Kasper . - Copyright (C) 2009 Erik Kristensen - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, - INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, - OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. -*/ + * Copyright (C) 2014-2018 Franco Fichtner + * Copyright (C) 2004-2009 Scott Ullrich + * Copyright (C) 2003-2004 Manuel Kasper + * Copyright (C) 2009 Erik Kristensen + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, + * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY + * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ /* looks weird, but means we started PHP successfully */ echo "done.\n"; @@ -115,13 +115,10 @@ services_dhcrelay6_configure(true); prefer_ipv4_or_ipv6(); plugins_configure('vpn', true); filter_configure_sync(true); - -/* XXX components must generate their stuff on their own */ -configd_run('template reload *'); - plugins_configure('bootup', true); - rrd_configure(true); + +/* XXX this seems misplaced */ system_powerd_configure(true); /* diff --git a/src/etc/rc.newwanip b/src/etc/rc.newwanip index 486d3e2a5..5295f7df2 100755 --- a/src/etc/rc.newwanip +++ b/src/etc/rc.newwanip @@ -2,7 +2,7 @@ + * Copyright (C) 2017-2018 Franco Fichtner * Copyright (C) 2006 Scott Ullrich * Copyright (C) 2003-2005 Manuel Kasper * All rights reserved. @@ -162,13 +162,13 @@ if (!is_ipaddr($cacheip) || $ip != $cacheip || !is_ipaddr($configip)) { system_routing_configure($interface); setup_gateways_monitor(); + plugins_configure('vpn', false, array($interface)); filter_configure_sync(); if (is_ipaddr($ip)) { @file_put_contents($cacheip_file, $ip); } - plugins_configure('vpn', false, array($interface)); plugins_configure('newwanip', false, array($interface)); rrd_configure(); } diff --git a/src/etc/rc.newwanipv6 b/src/etc/rc.newwanipv6 index 1438c4f51..bb5c17897 100755 --- a/src/etc/rc.newwanipv6 +++ b/src/etc/rc.newwanipv6 @@ -2,7 +2,7 @@ + * Copyright (C) 2017-2018 Franco Fichtner * Copyright (C) 2006 Scott Ullrich * Copyright (C) 2003-2005 Manuel Kasper * All rights reserved. @@ -143,13 +143,13 @@ if (!is_ipaddr($cacheip) || $ip != $cacheip || !is_ipaddr($configip)) { system_routing_configure($interface); setup_gateways_monitor(); + plugins_configure('vpn', false, array($interface)); filter_configure_sync(); if (is_ipaddr($ip)) { @file_put_contents($cacheip_file, $ip); } - plugins_configure('vpn', false, array($interface)); plugins_configure('newwanip', false, array($interface)); rrd_configure(); } diff --git a/src/etc/rc.syshook.d/20-freebsd.start b/src/etc/rc.syshook.d/20-freebsd.start index 6abc6326e..56caeeee1 100755 --- a/src/etc/rc.syshook.d/20-freebsd.start +++ b/src/etc/rc.syshook.d/20-freebsd.start @@ -1,3 +1,8 @@ #!/bin/sh +# services need their configuration +echo -n "Configuring services: " +configctl template reload * + +# start up the configured services /usr/local/etc/rc.freebsd start