Default repo selector to stable repo after upgrade to Plus

pfsense · Jan 24, 2022 · c83b195 · c83b195
1 parent fccb675
commit c83b195
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/etc/inc/pkg-utils.inc b/src/etc/inc/pkg-utils.inc
@@ -1705,11 +1705,11 @@ function save_repo($json) {
 			unlink($f);
 		}
 
-		// If config.xml still contains a reference to the custom repo, replace it
-		if ($config['system']['pkg_repo_conf_path'] == "{$repopath}/{$g['product_name']}-repo-custom.conf") {
-			$config['system']['pkg_repo_conf_path'] = "/usr/local/share/pfSense/pkg/repos/pfSense-repo-next.conf";
+		// If config.xml still contains a reference to the custom repo, replace it with the "stable" repository definition
+		if (strpos($config['system']['pkg_repo_conf_path'], "custom") !== false) {
+			$config['system']['pkg_repo_conf_path'] = "/usr/local/share/pfSense/pkg/repos/pfSense-repo.conf";
 			write_config("-NoReMoTeBaCkUp");
-			pkg_switch_repo("/usr/local/share/pfSense/pkg/repos/pfSense-repo-next.conf");
+			pkg_switch_repo("/usr/local/share/pfSense/pkg/repos/pfSense-repo.conf");
 		}
 	}
 }