The branch stable/13 has been updated by jlduran:
URL:
https://cgit.FreeBSD.org/src/commit/?id=6b466bbd6134980985b67a68787e4258c0e49b88
commit 6b466bbd6134980985b67a68787e4258c0e49b88
Author: Jose Luis Duran <jldu...@freebsd.org>
AuthorDate: 2024-11-15 04:54:09 +0000
Commit: Jose Luis Duran <jldu...@freebsd.org>
CommitDate: 2024-12-16 15:13:59 +0000
nanobsd: Fix typos
Fix a number of typos in the code or comments.
Files under dhcpd, embedded, pcengines, and rescue were intentionally
omitted. These directories will be reviewed at a later date.
PR: 269884
Reviewed by: imp, zlei
Approved by: emaste (mentor)
MFC after: 1 month
Differential Revision: https://reviews.freebsd.org/D47587
(cherry picked from commit 12cbad923dbcccb3d6f71a77ad3241508f186048)
---
tools/tools/nanobsd/Files/root/save_cfg | 2 +-
tools/tools/nanobsd/defaults.sh | 10 +++++-----
tools/tools/nanobsd/fill_pkg.sh | 2 +-
tools/tools/nanobsd/mtree-dedup.awk | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/tools/tools/nanobsd/Files/root/save_cfg
b/tools/tools/nanobsd/Files/root/save_cfg
index 1931e5c79923..24f812197a68 100644
--- a/tools/tools/nanobsd/Files/root/save_cfg
+++ b/tools/tools/nanobsd/Files/root/save_cfg
@@ -62,7 +62,7 @@ do
# Add to cfg (y/n/i)?
# y) -> save this file in /cfg
# n) -> do not save this file in /cfg for current
script invocation ONLY
- # i) -> add file to ignore list (/cfg/.ignore
hiereachy) and never save
+ # i) -> add file to ignore list (/cfg/.ignore
hierarchy) and never save
# try to add this file to /cfg.
#
# touch is used to add files to /cfg to keep the script
flow straight and easy
diff --git a/tools/tools/nanobsd/defaults.sh b/tools/tools/nanobsd/defaults.sh
index 8ef9cc0a6066..c2efcbd52571 100755
--- a/tools/tools/nanobsd/defaults.sh
+++ b/tools/tools/nanobsd/defaults.sh
@@ -497,10 +497,10 @@ run_late_customize ( ) (
# a user's cfg file would override this.
#
fixup_before_diskimage ( ) (
- # Run the deduplication script that takes the matalog journal and
+ # Run the deduplication script that takes the metalog journal and
# combines multiple entries for the same file (see source for
# details). We take the extra step of removing the size keywords. This
- # script, and many of the user scripts, copies, appeneds and otherwise
+ # script, and many of the user scripts, copies, appends and otherwise
# modifies files in the build, changing their sizes. These actions are
# impossible to trap, so go ahead remove the size= keyword. For this
# narrow use, it doesn't buy us any protection and just gets in the way.
@@ -814,7 +814,7 @@ cust_pkgng ( ) (
CR "${PKGCMD} add /_.p/${_NANO_PKG_PACKAGE}"
(
- # Expand any glob characters in pacakge list
+ # Expand any glob characters in package list
cd "${NANO_PACKAGE_DIR}"
_PKGS=`find ${NANO_PACKAGE_LIST} -not -name
"${_NANO_PKG_PACKAGE}" -print | sort | uniq`
@@ -905,7 +905,7 @@ usage ( ) {
# Setup and Export Internal variables
#
-export_var ( ) { # Don't wawnt a subshell
+export_var ( ) { # Don't want a subshell
var=$1
# Lookup value of the variable.
eval val=\$$var
@@ -914,7 +914,7 @@ export_var ( ) { # Don't wawnt a subshell
}
# Call this function to set defaults _after_ parsing options.
-# dont want a subshell otherwise variable setting is thrown away.
+# don't want a subshell otherwise variable setting is thrown away.
set_defaults_and_export ( ) {
: ${NANO_OBJ:=/usr/obj/nanobsd.${NANO_NAME}}
: ${MAKEOBJDIRPREFIX:=${NANO_OBJ}}
diff --git a/tools/tools/nanobsd/fill_pkg.sh b/tools/tools/nanobsd/fill_pkg.sh
index 6734498350a9..17d163709f91 100644
--- a/tools/tools/nanobsd/fill_pkg.sh
+++ b/tools/tools/nanobsd/fill_pkg.sh
@@ -160,7 +160,7 @@ for i in `cat "$PL"` ; do
if [ -f "$NANO_PKG_DUMP/$i.pkg" ] ; then
$COPY "$NANO_PKG_DUMP/$i.pkg" "$NANO_PKG_DIR"
else
- echo "Package $i misssing in $NANO_PKG_DUMP" 1>&2
+ echo "Package $i missing in $NANO_PKG_DUMP" 1>&2
exit 1
fi
done
diff --git a/tools/tools/nanobsd/mtree-dedup.awk
b/tools/tools/nanobsd/mtree-dedup.awk
index e30f3100b4da..8840047f5318 100755
--- a/tools/tools/nanobsd/mtree-dedup.awk
+++ b/tools/tools/nanobsd/mtree-dedup.awk
@@ -84,7 +84,7 @@ function mtree_from_kvs(path, kvs)
return lv;
}
-# Parse the mtree line into path + KVs. Use a sentinal value
+# Parse the mtree line into path + KVs. Use a sentinel value
# for a bare keyword, which is extremely unlikely to be used
# for real.
function line2kv(kvs, str)
