From cde9b8f8ddff2a2e048c8fc21bab073e3caa9376 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Thu, 4 May 2017 22:37:27 +0200 Subject: [PATCH] rc: stop depending on config.lib.inc instead of config.inc Looks like the reason for this file has gone. We shall merge the code into config.inc soon. --- src/etc/rc.initial.defaults | 2 +- src/etc/rc.initial.halt | 2 +- src/etc/rc.initial.reboot | 2 +- src/opnsense/scripts/remote_backup.php | 9 ++++----- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/etc/rc.initial.defaults b/src/etc/rc.initial.defaults index bce10cd64..340803772 100755 --- a/src/etc/rc.initial.defaults +++ b/src/etc/rc.initial.defaults @@ -28,7 +28,7 @@ */ require_once("util.inc"); -require_once("config.lib.inc"); +require_once("config.inc"); require_once("system.inc"); $fp = fopen('php://stdin', 'r'); diff --git a/src/etc/rc.initial.halt b/src/etc/rc.initial.halt index dad67875f..ab1b49d01 100755 --- a/src/etc/rc.initial.halt +++ b/src/etc/rc.initial.halt @@ -28,8 +28,8 @@ POSSIBILITY OF SUCH DAMAGE. */ -require_once("config.lib.inc"); require_once("util.inc"); +require_once("config.inc"); require_once("system.inc"); $fp = fopen('php://stdin', 'r'); diff --git a/src/etc/rc.initial.reboot b/src/etc/rc.initial.reboot index 5cef178d6..3f77e43ba 100755 --- a/src/etc/rc.initial.reboot +++ b/src/etc/rc.initial.reboot @@ -27,8 +27,8 @@ POSSIBILITY OF SUCH DAMAGE. */ -require_once("config.lib.inc"); require_once("util.inc"); +require_once("config.inc"); require_once("system.inc"); $fp = fopen('php://stdin', 'r'); diff --git a/src/opnsense/scripts/remote_backup.php b/src/opnsense/scripts/remote_backup.php index a550df86a..31bdff307 100755 --- a/src/opnsense/scripts/remote_backup.php +++ b/src/opnsense/scripts/remote_backup.php @@ -1,9 +1,8 @@ #!/usr/local/bin/php