aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron LI <aly@aaronly.me>2019-01-01 10:51:26 +0800
committerAaron LI <aly@aaronly.me>2019-01-01 10:51:26 +0800
commite9f3c7b21b7e083bc847836011f4d8c8e8b9c974 (patch)
tree974e0cbeb2ca490305f0480de40a27752b116608
parent94f3275841b4d025071f7a3e5e2a9cada64ca744 (diff)
downloaddfly-update-e9f3c7b21b7e083bc847836011f4d8c8e8b9c974.tar.bz2
Several minor changes
-rw-r--r--README2
-rwxr-xr-xdfly-update9
2 files changed, 5 insertions, 6 deletions
diff --git a/README b/README
index 95df901..2af3e17 100644
--- a/README
+++ b/README
@@ -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_
}