Merge pull request #1146 from sever-sever/T8410

T8410: Fix typos and mistakes in scripts and comments

11 files changed, 22 insertions, 22 deletions

diff --git a/README.md b/README.md
index 0a1fd85f..490dacbf 100644
--- a/README.md
+++ b/README.md
@@ -34,9 +34,9 @@ There are several directories with their own purpose:
  * `build/`    Used for temporary files used for the build and for build artifacts
  * `data/`     Data required for building the ISO (e.g. boot splash/configs)
  * `packages/` This directory can hold arbitrary *.deb
-               packages which will be embeded into the resulting ISO.
+               packages which will be embedded into the resulting ISO.
                Among other things those packages will be: Linux Kernel, FRR,
-               Netfiler...
+               Netfilter...
  * `scripts/`  Scripts that are used for the build process
  * `tools/`    Scripts that are used for maintainer's tasks automation and other
                purposes, but not during ISO build process
diff --git a/data/build-types/release.toml b/data/build-types/release.toml
index 5b460be9..338b9ada 100644
--- a/data/build-types/release.toml
+++ b/data/build-types/release.toml
@@ -353,8 +353,8 @@ Ours.
 We do not assert any Intellectual Property Rights over:
 (a) components created by third parties that may be taken from upstream
     sources in binary form compiled by Us from the source code;
-(b) source code and documentation of the Software, which is develope
-    ollaboratively and is open to contributions by parties not affiliated with
+(b) source code and documentation of the Software, which is developed
+    collaboratively and is open to contributions by parties not affiliated with
     Us (to such purpose, contributors give Us non-exclusive rights according
     to the licenses of the Software and documentation);
 (c) third parties software or programs included therein or therewith the
diff --git a/data/live-build-config/hooks/live/30-strongswan-configs.chroot b/data/live-build-config/hooks/live/30-strongswan-configs.chroot
index a0efc126..c71eefce 100755
--- a/data/live-build-config/hooks/live/30-strongswan-configs.chroot
+++ b/data/live-build-config/hooks/live/30-strongswan-configs.chroot
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
 # The Cisco Unity plugin, that implements a proprietary extension
-# for IPsec split tunneling, interfers with DMVPN
+# for IPsec split tunneling, interferes with DMVPN
 #
 # Since we do not do remote access IPsec, the simplest solution
 # is to disable it entirely from the start.
diff --git a/data/live-build-config/includes.binary/compat b/data/live-build-config/includes.binary/compat
index 2bdeeb14..adba17ff 100644
--- a/data/live-build-config/includes.binary/compat
+++ b/data/live-build-config/includes.binary/compat
@@ -1,4 +1,4 @@
-# VyOS 1.3.x image upgrade scipt checked if an image file was a valid ISO file
+# VyOS 1.3.x image upgrade script checked if an image file was a valid ISO file
 # by grepping it for "ISO9660".
 # (The correct way to do that would be to use file/libmagic,
 #  but we cannot change the past).
diff --git a/data/live-build-config/includes.chroot/etc/login.defs b/data/live-build-config/includes.chroot/etc/login.defs
index e582b369..b1fa0fa6 100644
--- a/data/live-build-config/includes.chroot/etc/login.defs
+++ b/data/live-build-config/includes.chroot/etc/login.defs
@@ -181,8 +181,8 @@ GID_MAX                 60000
 
 #
 # Max number of login retries if password is bad. This will most likely be
-# overriden by PAM, since the default pam_unix module has it's own built
-# in of 3 retries. However, this is a safe fallback in case you are using
+# overridden by PAM, since the default pam_unix module has its own built-in
+# limit of 3 retries. However, this is a safe fallback in case you are using
 # an authentication module that does not enforce PAM_MAXTRIES.
 #
 LOGIN_RETRIES           5
@@ -226,7 +226,7 @@ USERGROUPS_ENAB yes
 #
 # Instead of the real user shell, the program specified by this parameter
 # will be launched, although its visible name (argv[0]) will be the shell's.
-# The program may do whatever it wants (logging, additional authentification,
+# The program may do whatever it wants (logging, additional authentication,
 # banner, ...) before running the actual shell.
 #
 # FAKE_SHELL /bin/fakeshell
@@ -297,7 +297,7 @@ ENCRYPT_METHOD SHA512
 #                                               #
 # These options are now handled by PAM. Please  #
 # edit the appropriate file in /etc/pam.d/ to   #
-# enable the equivelants of them.
+# enable the equivalents of them.
 #
 ###############
 
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 6d913222..cc7abad0 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -312,7 +312,7 @@ RUN apt-get update && apt-get install -y \
       python3-pytest-cov \
       cloud-utils
 
-# Install utillities for building grub and u-boot images
+# Install utilities for building grub and u-boot images
 RUN if dpkg-architecture -iarm64; then \
     apt-get update && apt-get install -y \
       dosfstools \
@@ -353,10 +353,10 @@ RUN sed "s/^%sudo.*/%sudo\tALL=(ALL) NOPASSWD:ALL/g" -i /etc/sudoers && \
     echo "vyos_bld\tALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers && \
     chmod a+s /usr/sbin/useradd /usr/sbin/groupadd
 
-# Ensure sure all users have access to Go
+# Ensure all users have access to Go
 RUN echo "export PATH=/opt/go/bin:\$PATH" >> /etc/skel/.bashrc
 
-# Rise upper limit for UID when working in an Active Direcotry integrated
+# Raise upper limit for UID when working in an Active Directory integrated
 # environment. This solves the warning: vyos_bld's uid 1632000007 outside of the
 # UID_MIN 1000 and UID_MAX 60000 range.
 RUN sed -i 's/UID_MAX\t\t\t60000/UID_MAX\t\t\t2000000000/g' /etc/login.defs
diff --git a/scripts/check-qemu-install b/scripts/check-qemu-install
index 79ed9ce4..6ac4b73e 100755
--- a/scripts/check-qemu-install
+++ b/scripts/check-qemu-install
@@ -102,7 +102,7 @@ parser.add_argument('--iso', help='ISO file to install')
 parser.add_argument('--disk', help='name of disk image file', nargs='?')
 parser.add_argument('--keep', help='Do not remove disk-image after installation',
                               action='store_true', default=False)
-parser.add_argument('--silent', help='Do not show output on stdout unless an error has occured',
+parser.add_argument('--silent', help='Do not show output on stdout unless an error has occurred',
                               action='store_true', default=False)
 parser.add_argument('--debug', help='Send all debug output to stdout',
                                action='store_true', default=False)
@@ -1244,13 +1244,13 @@ except pexpect.exceptions.TIMEOUT:
     EXCEPTION = 1
 
 except pexpect.exceptions.ExceptionPexpect:
-    log.error('Exeption while executing QEMU')
+    log.error('Exception while executing QEMU')
     log.error('Is qemu working on this system?')
     log.error(traceback.format_exc())
     EXCEPTION = 1
 
 except Exception:
-    log.error('Unknown error occured!')
+    log.error('Unknown error occurred!')
     traceback.print_exc()
     EXCEPTION = 1
 
diff --git a/scripts/image-build/build-vyos-image b/scripts/image-build/build-vyos-image
index f8c70327..a311c2d8 100755
--- a/scripts/image-build/build-vyos-image
+++ b/scripts/image-build/build-vyos-image
@@ -370,7 +370,7 @@ def build():
         shutil.copytree(sb_certs, f'{lb_config_dir}/includes.chroot/var/lib/shim-signed/mok')
 
     # Switch to the build directory, this is crucial for the live-build work
-    # because the efective build config files etc. are there.
+    # because the effective build config files etc. are there.
     #
     # All directory paths from this point must be relative to BUILD_DIR,
     # not to the vyos-build repository root.
@@ -404,7 +404,7 @@ def build():
         # Initialize Git object from our repository
         try:
             repo = git.Repo('.', search_parent_directories=True)
-            # Retrieve the Git commit ID of the repository, 14 charaters will be sufficient
+            # Retrieve the Git commit ID of the repository, 14 characters will be sufficient
             build_git = repo.head.object.hexsha[:14]
 
             # Retrieve git branch name or current tag
diff --git a/scripts/package-build/linux-kernel/README.md b/scripts/package-build/linux-kernel/README.md
index 927e880c..cc02262a 100644
--- a/scripts/package-build/linux-kernel/README.md
+++ b/scripts/package-build/linux-kernel/README.md
@@ -22,8 +22,8 @@ folder.
 ### Config
 
 The Kernel configuration used is [x86_64_vyos_defconfig](x86_64_vyos_defconfig)
-which will be copied on demand during the Pipeline run into the `arch/x86/configs`i
-direcotry of the Kernel source tree.
+which will be copied on demand during the Pipeline run into the `arch/x86/configs`
+directory of the Kernel source tree.
 
 Other configurations can be added in the future easily.
 
diff --git a/scripts/package-build/linux-kernel/build-kernel.sh b/scripts/package-build/linux-kernel/build-kernel.sh
index cae3d8db..a0364897 100755
--- a/scripts/package-build/linux-kernel/build-kernel.sh
+++ b/scripts/package-build/linux-kernel/build-kernel.sh
@@ -44,7 +44,7 @@ do
 done
 
 # VyOS requires some small Kernel Patches - apply them here
-# It's easier to habe them here and make use of the upstream
+# It's easier to have them here and make use of the upstream
 # repository instead of maintaining a full Kernel Fork.
 # Saving time/resources is essential :-)
 PATCH_DIR=${CWD}/patches/kernel
diff --git a/scripts/package-build/linux-kernel/build-mellanox-ofed.sh b/scripts/package-build/linux-kernel/build-mellanox-ofed.sh
index 3f8a50f0..a810d765 100755
--- a/scripts/package-build/linux-kernel/build-mellanox-ofed.sh
+++ b/scripts/package-build/linux-kernel/build-mellanox-ofed.sh
@@ -53,7 +53,7 @@ fi
 # Verify integrity
 echo "${DRIVER_SHA1} ${DRIVER_FILE}" | sha1sum -c -
 if [ $? != 0 ]; then
-    echo SHA1 checksum missmatch
+    echo SHA1 checksum mismatch
     exit 1
 fi