fix "udevadm constrol" misspellings (fixed in SVN)

[Frank Batschulat (Oracle)]

From: "Timothy Tacker" <> To: vbox-dev@…

Subject: [vbox-dev] [PATCH] correct spelling of control throughout Date: Wed, 29 Jul 2020 10:10:07 +0200

The word control was misspelled as constrol in multiple locations. This bug was discovered because it was causing a udevadm command to fail during execution of the redhat_postinstall.sh script. The below patch corrects these misspellings. Following this change, the udevadm command no longer fails on CentOS 8 during execution of the above referenced script. None of the other corrections of this spelling were tested; so they should be verified prior to incorporation of this patch.

I'm licensing this patch under the MIT license. Please review. Feedback is welcome. Thanks!

Timothy Tacker

---
  .../Additions/x11/x11include/xorg-server-1.4.2/xf86PciIds.h | 4 ++--
  .../x11/x11include/xorg-server-1.4.2/xf86PciStdIds.h        | 4 ++--
  src/VBox/Main/UnattendedTemplates/debian_postinstall.sh     | 2 +-
  src/VBox/Main/UnattendedTemplates/redhat_postinstall.sh     | 2 +-
  src/VBox/ValidationKit/bootsectors/bs3kit/bs3kit.h          | 6 +++---
  5 files changed, 9 insertions(+), 9 deletions(-)

diff --git
a/src/VBox/Additions/x11/x11include/xorg-server-1.4.2/xf86PciIds.h
b/src/VBox/Additions/x11/x11include/xorg-server-1.4.2/xf86PciIds.h
index 87d23f4b..e02b93d2 100644
--- a/src/VBox/Additions/x11/x11include/xorg-server-1.4.2/xf86PciIds.h
+++ b/src/VBox/Additions/x11/x11include/xorg-server-1.4.2/xf86PciIds.h
@@ -10,7 +10,7 @@
   */

  /*
- * Copyright � 2002 by the XFree86 Project, Inc.
+ * Copyright � 2002 by the XFree86 Project, Inc.
   *
   * The pci.ids file and the data it contains are from the Linux PCI ID's
   * Project (http://pciids.sf.net/).  It is maintained by Martin Mares
@@ -13489,7 +13489,7 @@ static const char pci_subsys_11ab_4320_11ab_0321[]
= "Marvell RDK-8003";
  static const char pci_subsys_11ab_4320_11ab_1021[] = "Marvell RDK-8010";
  #endif
  #ifdef INIT_SUBSYS_INFO
-static const char pci_subsys_11ab_4320_11ab_4320[] = "Marvell Yukon
Gigabit Ethernet 10/100/1000Baset-T Constroller (Asus)";
+static const char pci_subsys_11ab_4320_11ab_4320[] = "Marvell Yukon
Gigabit Ethernet 10/100/1000Baset-T Controller (Asus)";
  #endif
  #ifdef INIT_SUBSYS_INFO
  static const char pci_subsys_11ab_4320_11ab_5021[] = "Marvell Yukon
Gigabit Ethernet 10/100/1000Base-T Controller (64 bit)";
diff --git
a/src/VBox/Additions/x11/x11include/xorg-server-1.4.2/xf86PciStdIds.h
b/src/VBox/Additions/x11/x11include/xorg-server-1.4.2/xf86PciStdIds.h
index 87d23f4b..e02b93d2 100644
--- a/src/VBox/Additions/x11/x11include/xorg-server-1.4.2/xf86PciStdIds.h
+++ b/src/VBox/Additions/x11/x11include/xorg-server-1.4.2/xf86PciStdIds.h
@@ -10,7 +10,7 @@
   */

  /*
- * Copyright � 2002 by the XFree86 Project, Inc.
+ * Copyright � 2002 by the XFree86 Project, Inc.
   *
   * The pci.ids file and the data it contains are from the Linux PCI ID's
   * Project (http://pciids.sf.net/).  It is maintained by Martin Mares
@@ -13489,7 +13489,7 @@ static const char pci_subsys_11ab_4320_11ab_0321[]
= "Marvell RDK-8003";
  static const char pci_subsys_11ab_4320_11ab_1021[] = "Marvell RDK-8010";
  #endif
  #ifdef INIT_SUBSYS_INFO
-static const char pci_subsys_11ab_4320_11ab_4320[] = "Marvell Yukon
Gigabit Ethernet 10/100/1000Baset-T Constroller (Asus)";
+static const char pci_subsys_11ab_4320_11ab_4320[] = "Marvell Yukon
Gigabit Ethernet 10/100/1000Baset-T Controller (Asus)";
  #endif
  #ifdef INIT_SUBSYS_INFO
  static const char pci_subsys_11ab_4320_11ab_5021[] = "Marvell Yukon
Gigabit Ethernet 10/100/1000Base-T Controller (64 bit)";
diff --git a/src/VBox/Main/UnattendedTemplates/debian_postinstall.sh
b/src/VBox/Main/UnattendedTemplates/debian_postinstall.sh
index c4e05aeb..8e14cd46 100755
--- a/src/VBox/Main/UnattendedTemplates/debian_postinstall.sh
+++ b/src/VBox/Main/UnattendedTemplates/debian_postinstall.sh
@@ -211,7 +211,7 @@ echo
"--------------------------------------------------" >> "${MY_LOGFILE}"
  echo '** Installing VirtualBox Guest Additions...' | tee -a  
"${MY_LOGFILE}"
  MY_IGNORE_EXITCODE=2  # returned if modules already loaded and reboot
required.
  log_command_in_target /bin/bash
"${MY_CHROOT_CDROM}/vboxadditions/VBoxLinuxAdditions.run" --nox11
-log_command_in_target /bin/bash -c "udevadm constrol --reload-rules" # GAs
doesn't yet do this.
+log_command_in_target /bin/bash -c "udevadm control --reload-rules" # GAs
doesn't yet do this.
  log_command_in_target /bin/bash -c "udevadm trigger"                 #
(ditto)
  MY_IGNORE_EXITCODE=
  log_command_in_target usermod -a -G vboxsf "@@VBOX_INSERT_USER_LOGIN@@"
diff --git a/src/VBox/Main/UnattendedTemplates/redhat_postinstall.sh
b/src/VBox/Main/UnattendedTemplates/redhat_postinstall.sh
index 82f77590..a41e8eba 100755
--- a/src/VBox/Main/UnattendedTemplates/redhat_postinstall.sh
+++ b/src/VBox/Main/UnattendedTemplates/redhat_postinstall.sh
@@ -191,7 +191,7 @@ echo
"--------------------------------------------------" >> "${MY_LOGFILE}"
  echo '** Installing VirtualBox Guest Additions...' | tee -a  
"${MY_LOGFILE}"
  MY_IGNORE_EXITCODE=2  # returned if modules already loaded and reboot
required.
  log_command_in_target /bin/bash
"${MY_CHROOT_CDROM}/vboxadditions/VBoxLinuxAdditions.run" --nox11
-log_command_in_target /bin/bash -c "udevadm constrol --reload-rules" # GAs
doesn't yet do this.
+log_command_in_target /bin/bash -c "udevadm control --reload-rules" # GAs
doesn't yet do this.
  log_command_in_target /bin/bash -c "udevadm trigger"                 #
(ditto)
  MY_IGNORE_EXITCODE=
  log_command_in_target usermod -a -G vboxsf "@@VBOX_INSERT_USER_LOGIN@@"
diff --git a/src/VBox/ValidationKit/bootsectors/bs3kit/bs3kit.h
b/src/VBox/ValidationKit/bootsectors/bs3kit/bs3kit.h
index 2812b981..b2394794 100644
--- a/src/VBox/ValidationKit/bootsectors/bs3kit/bs3kit.h
+++ b/src/VBox/ValidationKit/bootsectors/bs3kit/bs3kit.h
@@ -2024,7 +2024,7 @@ BS3_CMN_PROTO_STUB(void, Bs3SlabInit,(PBS3SLABCTL
pSlabCtl, size_t cbSlabCtl, ui
   * Allocates one chunk from a slab.
   *
   * @returns Pointer to a chunk on success, NULL if we're out of chunks.
- * @param   pSlabCtl        The slab constrol structure to allocate from.
+ * @param   pSlabCtl        The slab control structure to allocate from.
   */
  BS3_CMN_PROTO_STUB(void BS3_FAR *, Bs3SlabAlloc,(PBS3SLABCTL pSlabCtl));

@@ -2033,7 +2033,7 @@ BS3_CMN_PROTO_STUB(void BS3_FAR *,
Bs3SlabAlloc,(PBS3SLABCTL pSlabCtl));
   *
   * @returns Pointer to the request number of chunks on success, NULL if
we're
   *          out of chunks.
- * @param   pSlabCtl        The slab constrol structure to allocate from.
+ * @param   pSlabCtl        The slab control structure to allocate from.
   * @param   cChunks         The number of contiguous chunks we want.
   * @param   fFlags          Flags, see BS3_SLAB_ALLOC_F_XXX
   */
@@ -2044,7 +2044,7 @@ BS3_CMN_PROTO_STUB(void BS3_FAR *,
Bs3SlabAllocEx,(PBS3SLABCTL pSlabCtl, uint16_
   *
   * @returns Number of chunks actually freed.  When correctly used, this
will
   *          match the @a cChunks parameter, of course.
- * @param   pSlabCtl        The slab constrol structure to free from.
+ * @param   pSlabCtl        The slab control structure to free from.
   * @param   uFlatChunkPtr   The flat address of the chunks to free.
   * @param   cChunks         The number of contiguous chunks to free.
   */

[Frank Batschulat (Oracle)]

https://www.virtualbox.org/pipermail/vbox-dev/2020-July/015526.html

[Frank Batschulat (Oracle)]

NB: We don't fix the 3rd party files like the X server ones from the Xfree68 project at the beginning of the email. The rest should be fixed.

[Frank Batschulat (Oracle)]

fixed in trunk revision: r139715
fixed in 6.1.X revision: r139716