diff options
| author | Renato Botelho <renato@netgate.com> | 2017-01-02 12:54:00 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2017-01-02 12:57:00 -0200 |
| commit | 1494b4fa1582ea7a58f66dc8df7d29e1814a52bc (patch) | |
| tree | 9a295e63a1ab457690024f4b6274a63ccdf50fb3 /src/etc | |
| parent | 550a7f4bdda8a3634e8ca7fe1c58496d442a5da1 (diff) | |
| download | pfsense-1494b4fa1582ea7a58f66dc8df7d29e1814a52bc.zip pfsense-1494b4fa1582ea7a58f66dc8df7d29e1814a52bc.tar.gz | |
Ticket #6096: Remove target before try to move, also use mv -f to avoid human interaction
Diffstat (limited to 'src/etc')
| -rwxr-xr-x | src/etc/rc | 10 |
1 files changed, 6 insertions, 4 deletions
@@ -160,14 +160,16 @@ if [ "${PLATFORM}" != "cdrom" ]; 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 elif [ "${PLATFORM}" = "nanobsd" ]; then MOVE_PKG_DATA=1 |
