From ddf6323145d50d33a897687474c73770328bf757 Mon Sep 17 00:00:00 2001 From: Henrik Gombos Date: Sat, 19 Aug 2023 08:35:56 -0400 Subject: [PATCH] fix: codespell --- docs/HACKING.md | 2 +- dracut-functions.sh | 4 ++-- man/dracut.8.asc | 2 +- man/dracut.cmdline.7.asc | 4 ++-- man/dracut.conf.5.asc | 2 +- man/dracut.modules.7.asc | 2 +- modules.d/01fips/fips.sh | 2 +- modules.d/01systemd-tmpfiles/module-setup.sh | 10 +++++----- modules.d/06rngd/module-setup.sh | 2 +- modules.d/35network-legacy/dhclient-script.sh | 4 ++-- modules.d/35network-legacy/dhcp-multi.sh | 4 ++-- modules.d/35network-legacy/ifup.sh | 2 +- modules.d/40network/net-lib.sh | 2 +- modules.d/45ifcfg/write-ifcfg.sh | 2 +- modules.d/45url-lib/url-lib.sh | 2 +- modules.d/90dmsquash-live/dmsquash-live-root.sh | 2 +- modules.d/95fcoe/lldpad.sh | 2 +- modules.d/95nfs/parse-nfsroot.sh | 4 ++-- modules.d/98dracut-systemd/dracut-mount.sh | 2 +- modules.d/99base/dracut-dev-lib.sh | 2 +- modules.d/99base/dracut-lib.sh | 2 +- modules.d/99base/init.sh | 2 +- src/dracut-cpio/src/main.rs | 2 +- src/dracut-cpio/third_party/crosvm/argument.rs | 2 +- src/install/macro.h | 2 +- test/TEST-10-RAID/create-root.sh | 2 +- test/TEST-12-RAID-DEG/create-root.sh | 2 +- test/TEST-13-ENC-RAID-LVM/create-root.sh | 2 +- test/TEST-14-IMSM/create-root.sh | 2 +- test/TEST-14-IMSM/test.sh | 2 +- test/TEST-20-NFS/dhcpd.conf | 4 ++-- test/TEST-20-NFS/test.sh | 4 ++-- test/TEST-30-ISCSI/dhcpd.conf | 4 ++-- test/TEST-35-ISCSI-MULTI/dhcpd.conf | 4 ++-- test/TEST-50-MULTINIC/test.sh | 2 +- 35 files changed, 48 insertions(+), 48 deletions(-) diff --git a/docs/HACKING.md b/docs/HACKING.md index 74dd7800b..579d81d6a 100644 --- a/docs/HACKING.md +++ b/docs/HACKING.md @@ -165,7 +165,7 @@ dracut_install_dir/modules.d/ functionality the module implements is being used on the host system. For example, if this module handles installing support for LUKS encrypted volumes, it should return 0 if all the tools to handle - encrpted volumes are available and the host system has the root + encrypted volumes are available and the host system has the root partition on an encrypted volume, 1 otherwise. `depends()`: diff --git a/dracut-functions.sh b/dracut-functions.sh index 8afbbd801..13eed0441 100755 --- a/dracut-functions.sh +++ b/dracut-functions.sh @@ -91,9 +91,9 @@ ldconfig_paths() { $DRACUT_LDCONFIG ${dracutsysrootdir:+-r ${dracutsysrootdir} -f /etc/ld.so.conf} -pN 2> /dev/null | grep -E -v '/(lib|lib64|usr/lib|usr/lib64)/[^/]*$' | sed -n 's,.* => \(.*\)/.*,\1,p' | sort | uniq } -# Version comparision function. Assumes Linux style version scheme. +# Version comparison function. Assumes Linux style version scheme. # $1 = version a -# $2 = comparision op (gt, ge, eq, le, lt, ne) +# $2 = comparison op (gt, ge, eq, le, lt, ne) # $3 = version b vercmp() { local _n1 diff --git a/man/dracut.8.asc b/man/dracut.8.asc index e3ba217d7..ae4497e77 100644 --- a/man/dracut.8.asc +++ b/man/dracut.8.asc @@ -577,7 +577,7 @@ and no /etc/cmdline/*.conf will be generated into the initramfs. might be _/efi_, _/boot_ or _/boot/efi_ depending on where the ESP partition is mounted. The is taken from BUILD_ID in _/usr/lib/os-release_ or if it exists _/etc/os-release_ and is left out, - if BUILD_ID is non-existant or empty. + if BUILD_ID is non-existent or empty. **--no-uefi**:: Disables UEFI mode. diff --git a/man/dracut.cmdline.7.asc b/man/dracut.cmdline.7.asc index 2e99b7370..fefa2092c 100644 --- a/man/dracut.cmdline.7.asc +++ b/man/dracut.cmdline.7.asc @@ -211,7 +211,7 @@ It should be attached to any report about dracut problems. NOTE: memstrack is a memory tracing tool that tracks the total memory consumption, and peak memory consumption of each kernel modules and userspace progress during the whole initramfs runtime, report - is genereted and the end of initramsfs run. + is generated and the end of initramsfs run. 5 - /proc/meminfo + /proc/slabinfo + memstrack (with top memory stacktrace) NOTE: memstrack (with top memory stacktrace) will print top memory allocation stack traces during the whole initramfs runtime. @@ -415,7 +415,7 @@ Compared to using GPG encrypted keyfiles on an unencrypted device this provides the following advantages: - you can unlock your disk(s) using multiple passphrases -- better security by not loosing the key stretching mechanism +- better security by not losing the key stretching mechanism To use an encrypted _keydev_ you *must* ensure that it becomes available by using the keyword `keysource`, e.g. diff --git a/man/dracut.conf.5.asc b/man/dracut.conf.5.asc index 905274c67..f1705ce18 100644 --- a/man/dracut.conf.5.asc +++ b/man/dracut.conf.5.asc @@ -273,7 +273,7 @@ Logging levels: might be _/efi_, _/boot_ or _/boot/efi_ depending on where the ESP partition is mounted. The is taken from BUILD_ID in _/usr/lib/os-release_ or if it exists _/etc/os-release_ and is left out, - if BUILD_ID is non-existant or empty. + if BUILD_ID is non-existent or empty. *machine_id=*"__{yes|no}__":: Affects the default output filename of the UEFI executable, including the diff --git a/man/dracut.modules.7.asc b/man/dracut.modules.7.asc index 3c056430f..c1e86247f 100644 --- a/man/dracut.modules.7.asc +++ b/man/dracut.modules.7.asc @@ -272,7 +272,7 @@ installs an executable/script in the dracut hook with priority ==== inst_rules [ ...] -installs one or more udev rules. Non-existant udev rules are reported, but do +installs one or more udev rules. Non-existent udev rules are reported, but do not let dracut fail. ==== instmods [ ... ] diff --git a/modules.d/01fips/fips.sh b/modules.d/01fips/fips.sh index 22f38c815..2e7b7cb0d 100755 --- a/modules.d/01fips/fips.sh +++ b/modules.d/01fips/fips.sh @@ -162,7 +162,7 @@ do_fips() { elif ! [ -e "/boot/${BOOT_IMAGE_PATH}/${BOOT_IMAGE_NAME}" ]; then #if /boot is not a separate partition BOOT_IMAGE might start with /boot BOOT_IMAGE_PATH=${BOOT_IMAGE_PATH#"/boot"} - #on some achitectures BOOT_IMAGE does not contain path to kernel + #on some architectures BOOT_IMAGE does not contain path to kernel #so if we can't find anything, let's treat it in the same way as if it was empty if ! [ -e "/boot/${BOOT_IMAGE_PATH}/${BOOT_IMAGE_NAME}" ]; then BOOT_IMAGE_NAME="vmlinuz-${KERNEL}" diff --git a/modules.d/01systemd-tmpfiles/module-setup.sh b/modules.d/01systemd-tmpfiles/module-setup.sh index f504e780c..6bd42c0a3 100755 --- a/modules.d/01systemd-tmpfiles/module-setup.sh +++ b/modules.d/01systemd-tmpfiles/module-setup.sh @@ -25,11 +25,11 @@ depends() { install() { # Excluding "$tmpfilesdir/home.conf", sets up /home /srv - # Excluding "$tmpfilesdir/journal-nocow.conf", requires spesific btrfs setup - # Excluding "$tmpfilesdir/legacy.conf", belongs in seperated legacy module - # Excluding "$tmpfilesdir/systemd-nologin.conf", belongs in seperated pam module - # Excluding "$tmpfilesdir/systemd-nspawn.conf", belongs in seperated machined module - # Excluding "$tmpfilesdir/x11.conf", belongs in seperated x11 module + # Excluding "$tmpfilesdir/journal-nocow.conf", requires specific btrfs setup + # Excluding "$tmpfilesdir/legacy.conf", belongs in separated legacy module + # Excluding "$tmpfilesdir/systemd-nologin.conf", belongs in separated pam module + # Excluding "$tmpfilesdir/systemd-nspawn.conf", belongs in separated machined module + # Excluding "$tmpfilesdir/x11.conf", belongs in separated x11 module inst_multiple -o \ /usr/lib/group \ diff --git a/modules.d/06rngd/module-setup.sh b/modules.d/06rngd/module-setup.sh index d94a47afa..aec8d576c 100755 --- a/modules.d/06rngd/module-setup.sh +++ b/modules.d/06rngd/module-setup.sh @@ -33,7 +33,7 @@ depends() { install() { inst rngd inst_simple "${moddir}/rngd.service" "${systemdsystemunitdir}/rngd.service" - # make sure dependant libs are installed too + # make sure dependent libs are installed too inst_libdir_file opensc-pkcs11.so $SYSTEMCTL -q --root "$initdir" add-wants sysinit.target rngd.service diff --git a/modules.d/35network-legacy/dhclient-script.sh b/modules.d/35network-legacy/dhclient-script.sh index 240c0fad5..b3e5e7574 100755 --- a/modules.d/35network-legacy/dhclient-script.sh +++ b/modules.d/35network-legacy/dhclient-script.sh @@ -71,7 +71,7 @@ setup_interface() { fi >> /tmp/net."$netif".resolv.conf fi # Note: hostname can be fqdn OR short hostname, so chop off any - # trailing domain name and explicity add any domain if set. + # trailing domain name and explicitly add any domain if set. [ -n "$hostname" ] && echo "echo ${hostname%."$domain"}${domain:+.$domain} > /proc/sys/kernel/hostname" > /tmp/net."$netif".hostname } @@ -104,7 +104,7 @@ setup_interface6() { fi # Note: hostname can be fqdn OR short hostname, so chop off any - # trailing domain name and explicity add any domain if set. + # trailing domain name and explicitly add any domain if set. [ -n "$hostname" ] && echo "echo ${hostname%."$domain"}${domain:+.$domain} > /proc/sys/kernel/hostname" > /tmp/net."$netif".hostname } diff --git a/modules.d/35network-legacy/dhcp-multi.sh b/modules.d/35network-legacy/dhcp-multi.sh index 788984b57..60e03741c 100755 --- a/modules.d/35network-legacy/dhcp-multi.sh +++ b/modules.d/35network-legacy/dhcp-multi.sh @@ -92,9 +92,9 @@ if [ $ret -eq 0 ]; then : > "/tmp/net.$(cat /sys/class/net/"${netif}"/address).up" fi - # Check if DHCP also suceeded on another interface before this one. + # Check if DHCP also succeeded on another interface before this one. # We will always use the first one on which DHCP succeeded, by using - # a commom file $IFNETFILE, to synchronize between threads. + # a common file $IFNETFILE, to synchronize between threads. # Consider the race condition in which multiple threads # corresponding to different interfaces may try to read $IFNETFILE # and find it does not exist; they may all end up thinking they are the diff --git a/modules.d/35network-legacy/ifup.sh b/modules.d/35network-legacy/ifup.sh index 68ec3777e..3b54b6c48 100755 --- a/modules.d/35network-legacy/ifup.sh +++ b/modules.d/35network-legacy/ifup.sh @@ -420,7 +420,7 @@ if ! ip link show dev "$netif" > /dev/null 2>&1; then fi # disable manual ifup while netroot is set for simplifying our logic -# in netroot case we prefer netroot to bringup $netif automaticlly +# in netroot case we prefer netroot to bringup $netif automatically [ -n "$2" -a "$2" = "-m" ] && [ -z "$netroot" ] && manualup="$2" if [ -n "$manualup" ]; then diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh index 02845dbc3..fa09c4090 100755 --- a/modules.d/40network/net-lib.sh +++ b/modules.d/40network/net-lib.sh @@ -298,7 +298,7 @@ ibft_to_cmdline() { echo "ip=$dev:dhcp" fi elif [ -e "${iface}"/ip-addr ]; then - # skip not assigned ip adresses + # skip not assigned ip addresses [ "$ip" = "0.0.0.0" ] && continue [ -e "${iface}"/gateway ] && read -r gw < "${iface}"/gateway [ "$gw" = "0.0.0.0" ] && unset gw diff --git a/modules.d/45ifcfg/write-ifcfg.sh b/modules.d/45ifcfg/write-ifcfg.sh index ddb1dc309..5550cce30 100755 --- a/modules.d/45ifcfg/write-ifcfg.sh +++ b/modules.d/45ifcfg/write-ifcfg.sh @@ -108,7 +108,7 @@ interface_bind() { return 1 fi - # see, if we can bind it to some hw parms + # see, if we can bind it to some hw params if hw_bind "$_netif" "$_macaddr"; then # only print out DEVICE, if it's user assigned is_kernel_ethernet_name "$_netif" && return 0 diff --git a/modules.d/45url-lib/url-lib.sh b/modules.d/45url-lib/url-lib.sh index cfc81e36d..7c3ef1e5c 100755 --- a/modules.d/45url-lib/url-lib.sh +++ b/modules.d/45url-lib/url-lib.sh @@ -16,7 +16,7 @@ type mkuniqdir > /dev/null 2>&1 || . /lib/dracut-lib.sh # 0: success # 253: unknown error (file missing) # 254: unhandled URL scheme / protocol -# 255: bad arguments / unparseable URLs +# 255: bad arguments / unparsable URLs # other: fetch command failure (whatever curl/mount/etc return) fetch_url() { local url="$1" outloc="$2" diff --git a/modules.d/90dmsquash-live/dmsquash-live-root.sh b/modules.d/90dmsquash-live/dmsquash-live-root.sh index 81c6ed8e7..e80833948 100755 --- a/modules.d/90dmsquash-live/dmsquash-live-root.sh +++ b/modules.d/90dmsquash-live/dmsquash-live-root.sh @@ -301,7 +301,7 @@ do_live_overlay() { echo 0 "$sz" snapshot "$base" "$over" PO 8 | dmsetup create live-rw fi - # Create a device for the ro base of overlayed file systems. + # Create a device for the ro base of overlaid file systems. if [ -z "$overlayfs" ]; then echo 0 "$sz" linear "$BASE_LOOPDEV" 0 | dmsetup create --readonly live-base fi diff --git a/modules.d/95fcoe/lldpad.sh b/modules.d/95fcoe/lldpad.sh index 5a94f20cb..f992ae225 100755 --- a/modules.d/95fcoe/lldpad.sh +++ b/modules.d/95fcoe/lldpad.sh @@ -6,7 +6,7 @@ if ! getargbool 1 rd.fcoe -d -n rd.nofcoe; then fi # Note lldpad will stay running after switchroot, the system initscripts -# are to kill it and start a new lldpad to take over. Data is transfered +# are to kill it and start a new lldpad to take over. Data is transferred # between the 2 using a shm segment lldpad -d # wait for lldpad to be ready diff --git a/modules.d/95nfs/parse-nfsroot.sh b/modules.d/95nfs/parse-nfsroot.sh index 729bbc218..0c8dbbb4b 100755 --- a/modules.d/95nfs/parse-nfsroot.sh +++ b/modules.d/95nfs/parse-nfsroot.sh @@ -103,7 +103,7 @@ nfsroot_to_var "$netroot" # Set fstype, might help somewhere fstype=${nfs#/dev/} -# Rewrite root so we don't have to parse this uglyness later on again +# Rewrite root so we don't have to parse this ugliness later on again netroot="$fstype:$server:$path:$options" # If we don't have a server, we need dhcp @@ -116,7 +116,7 @@ fi # shellcheck disable=SC2034 rootok=1 -# Shut up init error check or make sure that block parser wont get +# Shut up init error check or make sure that block parser won't get # confused by having /dev/nfs[4] root="$fstype" diff --git a/modules.d/98dracut-systemd/dracut-mount.sh b/modules.d/98dracut-systemd/dracut-mount.sh index 1fd061cd8..789294144 100755 --- a/modules.d/98dracut-systemd/dracut-mount.sh +++ b/modules.d/98dracut-systemd/dracut-mount.sh @@ -11,7 +11,7 @@ make_trace_mem "hook mount" '1:shortmem' '2+:mem' '3+:slab' getarg 'rd.break=mount' -d 'rdbreak=mount' && emergency_shell -n mount "Break before mount" # mount scripts actually try to mount the root filesystem, and may -# be sourced any number of times. As soon as one suceeds, no more are sourced. +# be sourced any number of times. As soon as one succeeds, no more are sourced. i=0 while :; do if ismounted "$NEWROOT"; then diff --git a/modules.d/99base/dracut-dev-lib.sh b/modules.d/99base/dracut-dev-lib.sh index 63265f210..577950871 100755 --- a/modules.d/99base/dracut-dev-lib.sh +++ b/modules.d/99base/dracut-dev-lib.sh @@ -21,7 +21,7 @@ str_replace() { } # get a systemd-compatible unit name from a path -# (mimicks unit_name_from_path_instance()) +# (mimics unit_name_from_path_instance()) dev_unit_name() { local dev="$1" diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh index a8ca2c96e..39609d82a 100755 --- a/modules.d/99base/dracut-lib.sh +++ b/modules.d/99base/dracut-lib.sh @@ -337,7 +337,7 @@ getoptcomma() { # Splits given string 'str' with separator 'sep' into variables 'var1', 'var2', # 'varN'. If number of fields is less than number of variables, remaining are # not set. If number of fields is greater than number of variables, the last -# variable takes remaining fields. In short - it acts similary to 'read'. +# variable takes remaining fields. In short - it acts similarly to 'read'. # # splitsep sep str var1 var2 varN # diff --git a/modules.d/99base/init.sh b/modules.d/99base/init.sh index ca1df90d5..285059e51 100755 --- a/modules.d/99base/init.sh +++ b/modules.d/99base/init.sh @@ -228,7 +228,7 @@ source_hook pre-mount getarg 'rd.break=mount' -d 'rdbreak=mount' && emergency_shell -n mount "Break before mount" # mount scripts actually try to mount the root filesystem, and may -# be sourced any number of times. As soon as one suceeds, no more are sourced. +# be sourced any number of times. As soon as one succeeds, no more are sourced. _i_mount=0 while :; do if ismounted "$NEWROOT"; then diff --git a/src/dracut-cpio/src/main.rs b/src/dracut-cpio/src/main.rs index 816fc5101..c3bfe904f 100644 --- a/src/dracut-cpio/src/main.rs +++ b/src/dracut-cpio/src/main.rs @@ -112,7 +112,7 @@ struct ArchiveState { // offset from the start of this archive off: u64, // next mapped inode number, used instead of source file inode numbers to - // ensure reproducability. XXX: should track inode per mapped dev? + // ensure reproducibility. XXX: should track inode per mapped dev? ino: u32, } diff --git a/src/dracut-cpio/third_party/crosvm/argument.rs b/src/dracut-cpio/third_party/crosvm/argument.rs index 64be18227..a2dbbbd7a 100644 --- a/src/dracut-cpio/third_party/crosvm/argument.rs +++ b/src/dracut-cpio/third_party/crosvm/argument.rs @@ -146,7 +146,7 @@ pub struct Argument { pub short: Option, /// The long name of this argument. pub long: &'static str, - /// Helpfuly usage information for this argument to display to the user. + /// Helpful usage information for this argument to display to the user. pub help: &'static str, } diff --git a/src/install/macro.h b/src/install/macro.h index 003cf80ac..cc426c909 100644 --- a/src/install/macro.h +++ b/src/install/macro.h @@ -265,7 +265,7 @@ do { \ } \ } while(false) -/* Because statfs.t_type can be int on some architecures, we have to cast +/* Because statfs.t_type can be int on some architectures, we have to cast * the const magic to the type, otherwise the compiler warns about * signed/unsigned comparison, because the magic can be 32 bit unsigned. */ diff --git a/test/TEST-10-RAID/create-root.sh b/test/TEST-10-RAID/create-root.sh index 97e6d9507..05dec0f1b 100755 --- a/test/TEST-10-RAID/create-root.sh +++ b/test/TEST-10-RAID/create-root.sh @@ -11,7 +11,7 @@ udevadm control --reload udevadm settle set -ex mdadm --create /dev/md0 --run --auto=yes --level=5 --raid-devices=3 /dev/disk/by-id/ata-disk_raid[123] -# wait for the array to finish initailizing, otherwise this sometimes fails +# wait for the array to finish initializing, otherwise this sometimes fails # randomly. mdadm -W /dev/md0 || : printf test > keyfile diff --git a/test/TEST-12-RAID-DEG/create-root.sh b/test/TEST-12-RAID-DEG/create-root.sh index 97e6d9507..05dec0f1b 100755 --- a/test/TEST-12-RAID-DEG/create-root.sh +++ b/test/TEST-12-RAID-DEG/create-root.sh @@ -11,7 +11,7 @@ udevadm control --reload udevadm settle set -ex mdadm --create /dev/md0 --run --auto=yes --level=5 --raid-devices=3 /dev/disk/by-id/ata-disk_raid[123] -# wait for the array to finish initailizing, otherwise this sometimes fails +# wait for the array to finish initializing, otherwise this sometimes fails # randomly. mdadm -W /dev/md0 || : printf test > keyfile diff --git a/test/TEST-13-ENC-RAID-LVM/create-root.sh b/test/TEST-13-ENC-RAID-LVM/create-root.sh index 3f620c904..b681e6b4d 100755 --- a/test/TEST-13-ENC-RAID-LVM/create-root.sh +++ b/test/TEST-13-ENC-RAID-LVM/create-root.sh @@ -20,7 +20,7 @@ cryptsetup luksOpen /dev/disk/by-id/ata-disk_disk1 dracut_disk1 < /keyfile cryptsetup luksOpen /dev/disk/by-id/ata-disk_disk2 dracut_disk2 < /keyfile cryptsetup luksOpen /dev/disk/by-id/ata-disk_disk3 dracut_disk3 < /keyfile mdadm --create /dev/md0 --run --auto=yes --level=5 --raid-devices=3 /dev/mapper/dracut_disk1 /dev/mapper/dracut_disk2 /dev/mapper/dracut_disk3 -# wait for the array to finish initailizing, otherwise this sometimes fails +# wait for the array to finish initializing, otherwise this sometimes fails # randomly. mdadm -W /dev/md0 lvm pvcreate -ff -y /dev/md0 diff --git a/test/TEST-14-IMSM/create-root.sh b/test/TEST-14-IMSM/create-root.sh index 469884519..97d29d995 100755 --- a/test/TEST-14-IMSM/create-root.sh +++ b/test/TEST-14-IMSM/create-root.sh @@ -51,7 +51,7 @@ udevadm settle mdadm --create /dev/md0 --run --auto=yes --level=5 --raid-devices=3 \ /dev/mapper/isw*p*[234] -# wait for the array to finish initailizing, otherwise this sometimes fails +# wait for the array to finish initializing, otherwise this sometimes fails # randomly. mdadm -W /dev/md0 set -e diff --git a/test/TEST-14-IMSM/test.sh b/test/TEST-14-IMSM/test.sh index 8b95f3f6d..06959cd4f 100755 --- a/test/TEST-14-IMSM/test.sh +++ b/test/TEST-14-IMSM/test.sh @@ -41,7 +41,7 @@ test_run() { client_run rd.auto rd.md.imsm=0 || return 1 client_run rd.md.uuid="$MD_UUID" rd.dm=0 || return 1 # This test succeeds, because the mirror parts are found without - # assembling the mirror itsself, which is what we want + # assembling the mirror itself, which is what we want client_run rd.md.uuid="$MD_UUID" rd.md=0 rd.md.imsm failme && return 1 client_run rd.md.uuid="$MD_UUID" rd.md=0 failme && return 1 # the following test hangs on newer md diff --git a/test/TEST-20-NFS/dhcpd.conf b/test/TEST-20-NFS/dhcpd.conf index 6b2ac439b..02fcc4d45 100644 --- a/test/TEST-20-NFS/dhcpd.conf +++ b/test/TEST-20-NFS/dhcpd.conf @@ -12,7 +12,7 @@ option domain-search "example.com"; option domain-name "other.com"; # MAC numbering scheme: -# NFSv3: last octect starts at 0x00 and works up +# NFSv3: last octet starts at 0x00 and works up group { # NFSv3 root=dhcp or root={/dev/,}nfs, use server-id @@ -94,7 +94,7 @@ option domain-name "other.com"; } # MAC numbering scheme: - # NFSv4: last octect starts at 0x80 and works up + # NFSv4: last octet starts at 0x80 and works up group { # NFSv4 root={/dev/,}nfs4, use server-id diff --git a/test/TEST-20-NFS/test.sh b/test/TEST-20-NFS/test.sh index 715de3523..6cbf1d00b 100755 --- a/test/TEST-20-NFS/test.sh +++ b/test/TEST-20-NFS/test.sh @@ -122,8 +122,8 @@ client_test() { test_nfsv3() { # MAC numbering scheme: - # NFSv3: last octect starts at 0x00 and works up - # NFSv4: last octect starts at 0x80 and works up + # NFSv3: last octet starts at 0x00 and works up + # NFSv4: last octet starts at 0x80 and works up client_test "NFSv3 root=dhcp DHCP path only" 52:54:00:12:34:00 \ "root=dhcp" 192.168.50.1 -wsize=4096 || return 1 diff --git a/test/TEST-30-ISCSI/dhcpd.conf b/test/TEST-30-ISCSI/dhcpd.conf index 3c4dad74e..fd306ea8e 100644 --- a/test/TEST-30-ISCSI/dhcpd.conf +++ b/test/TEST-30-ISCSI/dhcpd.conf @@ -12,7 +12,7 @@ subnet 192.168.50.0 netmask 255.255.255.0 { option domain-name "other.com"; # MAC numbering scheme: - # NFSv3: last octect starts at 0x00 and works up + # NFSv3: last octet starts at 0x00 and works up group { option root-path "iscsi:192.168.50.1:::1:iqn.2009-06.dracut:target0"; @@ -34,7 +34,7 @@ subnet 192.168.51.0 netmask 255.255.255.0 { option domain-name "other.com"; # MAC numbering scheme: - # NFSv3: last octect starts at 0x00 and works up + # NFSv3: last octet starts at 0x00 and works up group { #option root-path "iscsi:192.168.51.1:::1:iqn.2009-06.dracut:target1"; diff --git a/test/TEST-35-ISCSI-MULTI/dhcpd.conf b/test/TEST-35-ISCSI-MULTI/dhcpd.conf index 3c4dad74e..fd306ea8e 100644 --- a/test/TEST-35-ISCSI-MULTI/dhcpd.conf +++ b/test/TEST-35-ISCSI-MULTI/dhcpd.conf @@ -12,7 +12,7 @@ subnet 192.168.50.0 netmask 255.255.255.0 { option domain-name "other.com"; # MAC numbering scheme: - # NFSv3: last octect starts at 0x00 and works up + # NFSv3: last octet starts at 0x00 and works up group { option root-path "iscsi:192.168.50.1:::1:iqn.2009-06.dracut:target0"; @@ -34,7 +34,7 @@ subnet 192.168.51.0 netmask 255.255.255.0 { option domain-name "other.com"; # MAC numbering scheme: - # NFSv3: last octect starts at 0x00 and works up + # NFSv3: last octet starts at 0x00 and works up group { #option root-path "iscsi:192.168.51.1:::1:iqn.2009-06.dracut:target1"; diff --git a/test/TEST-50-MULTINIC/test.sh b/test/TEST-50-MULTINIC/test.sh index 4e34c327d..bdccd2309 100755 --- a/test/TEST-50-MULTINIC/test.sh +++ b/test/TEST-50-MULTINIC/test.sh @@ -119,7 +119,7 @@ test_run() { test_client() { # Mac Numbering Scheme - # ...:00-02 receive IP adresses all others don't + # ...:00-02 receive IP addresses all others don't # ...:02 receives a dhcp root-path # PXE Style BOOTIF= -- 2.39.2