From b60f5a3d6c7c208cba20fb03fb0169afc7046a1b Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Mon, 6 Jul 2015 08:28:28 +0200
Subject: [PATCH] rc: fix recover stage on /var MFS

Keep a symlink on the true file system underneath MFS to keep
pkg(8) operating correctly all the time.
---
 src/etc/rc | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/etc/rc b/src/etc/rc
index 5758ace36..a8b5f9f91 100755
--- a/src/etc/rc
+++ b/src/etc/rc
@@ -157,6 +157,9 @@ if [ ${USE_MFS_TMPVAR} -ne 0 ]; then
 	if [ ! -d /root/var/db/pkg ]; then
 		mkdir -p /root/var/db
 		mv /var/db/pkg /root/var/db
+		# create a symlink underneath as well
+		# to fix early boot pkg(8) issues:
+		ln -s /root/var/db/pkg /var/db/pkg
 	fi
 
 	mdmfs -S -M -s ${tmpsize} md /tmp
@@ -170,6 +173,9 @@ elif [ -d /root/var/db/pkg ]; then
 	# User must have just disabled RAM disks,
 	# let's move these back into place.
 	mkdir -p /var/db
+	# reverse the recovery symlink before moving
+	# back the original database:
+	rm -f /var/db/pkg
 	mv /root/var/db/pkg /var/db/
 fi