Ticket #6096: Remove target before try to move, also use mv -f to avoid human interaction

1 files changed, 6 insertions, 4 deletions

diff --git a/src/etc/pfSense-rc b/src/etc/pfSense-rc
index 382da91..4d2c3fb 100755
--- a/src/etc/pfSense-rc
+++ b/src/etc/pfSense-rc
@@ -122,14 +122,16 @@ if [ "${USE_MFS_TMPVAR}" != "true" -a -f /root/var/db/pkg/local.sqlite ]; then
 	MOVE_PKG_DATA=1
 	rm -rf /var/db/pkg 2>/dev/null
 	rm -rf /var/cache/pkg 2>/dev/null
-	mv /root/var/db/pkg /var/db
-	mv /root/var/cache/pkg /var/cache
+	mv -f /root/var/db/pkg /var/db
+	mv -f /root/var/cache/pkg /var/cache
 # If use MFS var is enabled, move files to a safe place
 elif [ "${USE_MFS_TMPVAR}" = "true" -a -f /var/db/pkg/local.sqlite ]; then
 	MOVE_PKG_DATA=1
+	rm -rf /root/var/db/pkg 2>/dev/null
+	rm -rf /root/var/cache/pkg 2>/dev/null
 	/bin/mkdir -p /root/var/db /root/var/cache
-	mv /var/db/pkg /root/var/db
-	mv /var/cache/pkg /root/var/cache
+	mv -f /var/db/pkg /root/var/db
+	mv -f /var/cache/pkg /root/var/cache
 fi
 
 if [ "${USE_MFS_TMPVAR}" = "true" ]; then