firmware: test for sample file, not target

PR: https://github.com/opnsense/update/issues/35
This commit is contained in:
Franco Fichtner 2018-06-17 18:20:30 +00:00
parent 1f522b2ed6
commit e64f0d0b51

View File

@ -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(