From e64f0d0b514e4d37f44ea68fc23812e3075a98a6 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Sun, 17 Jun 2018 18:20:30 +0000
Subject: [PATCH] firmware: test for sample file, not target

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

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