Merge remote branch 'upstream/master'

Conflicts:
	etc/inc/interfaces.inc
	etc/inc/system.inc

1 files changed, 11 insertions, 2 deletions

diff --git a/etc/rc.bootup b/etc/rc.bootup
index fe1faa3..6333ab8 100755
--- a/etc/rc.bootup
+++ b/etc/rc.bootup
@@ -255,8 +255,7 @@ setup_gateways_monitor();
 echo "done.\n";
 
 echo "Synchronizing user settings...";
-if (empty($config['system']['webgui']['backend']))
-	local_sync_accounts();
+local_sync_accounts();
 echo "done.\n";
 
 if($avail > 0 and $avail < 65) {
@@ -381,6 +380,16 @@ activate_powerd();
 if (file_exists("/sbin/shutdown.old"))
 	@unlink("/sbin/shutdown.old");
 
+/* Resync / Reinstall packages if need be */
+if(file_exists('/conf/needs_package_sync')) {
+	if($config['installedpackages'] <> '' && is_array($config['installedpackages']['package'])) {
+		require_once("pkg-utils.inc");
+		if($g['platform'] == "pfSense" || $g['platform'] == "nanobsd") {
+			pkg_reinstall_all();
+		}
+	}
+}
+
 /* done */
 unset($g['booting']);