diff --git a/pkg/+POST_INSTALL b/pkg/+POST_INSTALL
index bbdbffd85..0927f6f28 100644
--- a/pkg/+POST_INSTALL
+++ b/pkg/+POST_INSTALL
@@ -15,8 +15,8 @@ cp /etc/rc /etc/rc.bak
 cat > /etc/rc <<EOF
 #!/bin/sh
 # OPNsense rc(8) hook was automatically installed:
-if [ -d /root/core ]; then /usr/bin/make -C /root/core mount; fi
-if [ -f /usr/local/etc/rc ]; then /usr/local/etc/rc; exit 0; fi
+if [ -f /root/core/src/etc/rc ]; then /root/core/src/etc/rc; exit 0;
+elif [ -f /usr/local/etc/rc ]; then /usr/local/etc/rc; exit 0; fi
 EOF
 cat /etc/rc.bak >> /etc/rc
 rm -f /etc/rc.bak
diff --git a/src/etc/rc b/src/etc/rc
index 1838d2a61..6fb05fcf1 100755
--- a/src/etc/rc
+++ b/src/etc/rc
@@ -112,9 +112,8 @@ else
 	fi
 fi
 
+# mount repo if available
 if [ -d /root/core ]; then
-	# unionfs gets stuck in read-only mode due to early mount
-	/usr/bin/make -C /root/core umount
 	/usr/bin/make -C /root/core mount
 fi