diff options
| -rw-r--r-- | README | 2 | ||||
| -rwxr-xr-x | dfly-update | 9 |
2 files changed, 5 insertions, 6 deletions
@@ -74,7 +74,7 @@ Versions - Install "/rescue" directory - Improve mtree(8) usage * 0.1.3 (2018-04-16) - - Fix the issue that the old Makefile_upgrade been used + - Fix the issue that the old "Makefile_upgrade" was used - Make the upgrade messages more concise * 0.1.2 (2018-03-11) - First usable version for broader testing diff --git a/dfly-update b/dfly-update index 48a8a15..a609023 100755 --- a/dfly-update +++ b/dfly-update @@ -86,10 +86,9 @@ FILES_IGNORE=' /etc/rc.conf /etc/spwd.db ' -# Filename suffix for the temporarily backup files to avoid overriding. +# Filename suffix for the temporarily backup files to avoid overwriting. BAK_SUF="__bak__" -# Filename suffix for newly installed config files that need (manual) -# merge. +# Filename suffix for newly installed files that need (manual) merge. NEW_SUF="__new__" @@ -243,7 +242,7 @@ install_system() { path=${item#*:} echo " * mtree: ${path} ... " mtree -deUq -f ${MNT_DIR}/etc.hdd/mtree/${file} -p ${path} || - exit ${EC_MTREE} + exit ${EC_MTREE} done echo " => Installing kernel and world ..." @@ -369,7 +368,7 @@ postupgrade() { +---------------------------------------------------------+ After manually merge the above files, reboot into the new system, and upgrade the packages with: - # pkg upgrade -f + # pkg upgrade [-f] +=========================================================+ _EOF_ } |