rc: defer recover for packages to avoid database duplication

src/etc/rc

@@ -61,8 +61,8 @@ else
 	done
 fi
 
-# regenerate groups and users
-/usr/local/etc/rc.recover > /dev/null
+# regenerate groups and users for base
+/usr/local/etc/rc.recover base > /dev/null
 
 # rewrite message of the day
 /etc/rc.d/motd onestart
@@ -169,6 +169,9 @@ fi
 
 echo "done."
 
+# regenerate groups and users for packages
+/usr/local/etc/rc.recover pkg > /dev/null
+
 # Recreate capabilities DB
 /usr/bin/cap_mkdb /etc/login.conf
 

src/etc/rc.recover

@@ -148,12 +148,31 @@ function recover_rebuild()
 	passthru('/bin/sync');
 }
 
-/* first stage recovers the base system state */
-file_put_contents('/etc/group', $etc_group);
-file_put_contents('/etc/master.passwd', $etc_master_passwd);
-file_put_contents('/etc/shells', $etc_shells);
-recover_rebuild();
-
-/* second stage recovers the ports system state */
-recover_ports();
-recover_rebuild();
+function recover_base()
+{
+	file_put_contents('/etc/group', $etc_group);
+	file_put_contents('/etc/master.passwd', $etc_master_passwd);
+	file_put_contents('/etc/shells', $etc_shells);
+	recover_rebuild();
+}
+
+function recover_pkg()
+{
+	recover_ports();
+	recover_rebuild();
+}
+
+$stage = isset($argv[1]) ? $argv[1] : 'both';
+
+switch ($stage) {
+	case 'base':
+		recover_base();
+		break;
+	case 'pkg':
+		recover_pkg();
+		break;
+	default:
+		recover_base();
+		recover_pkg();
+		break;
+}