From 1f522b2ed623bfcb380deaa2d1e2107a268faac7 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Sat, 16 Jun 2018 11:13:44 +0200
Subject: [PATCH] system: prepare origin.conf -> OPNsense.conf move

PR: https://github.com/opnsense/update/issues/35
---
 src/etc/inc/system.inc | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/etc/inc/system.inc b/src/etc/inc/system.inc
index 756ce780e..a4a4c0214 100644
--- a/src/etc/inc/system.inc
+++ b/src/etc/inc/system.inc
@@ -873,7 +873,11 @@ function system_firmware_configure($verbose = false)
     }
 
     /* rewrite the config via the defaults */
-    $origin_conf = '/usr/local/etc/pkg/repos/origin.conf';
+    $origin_conf = '/usr/local/etc/pkg/repos/OPNsense.conf';
+    /* XXX pre-18.7 fallback */
+    if (!file_exists($origin_conf)) {
+        $origin_conf = '/usr/local/etc/pkg/repos/origin.conf';
+    }
     copy("${origin_conf}.sample", $origin_conf);
 
     if (!empty($config['system']['firmware']['mirror'])) {