Merge branch 'eudev-project:master' into hwdb.7

.github/workflows/build.yml

@@ -51,6 +51,8 @@ jobs:
             autoconf \
             automake \
             xsltproc \
+            docbook-xml \
+            docbook-xsl \
             gperf \
             libglib-object-introspection-perl \
             libglib2.0-dev \

man/udev.7

@@ -548,7 +548,7 @@ with the same name as a hwdb file in
 /dev/null, disables the hwdb file entirely\&. hwdb files must have the extension
 \&.hwdb; other extensions are ignored\&.
 .PP
-The hwdb file contains data records consisting of matches and associated key\-value pairs\&. Every record in the hwdb starts with one or more match string, specifying a shell glob to compare the database lookup string against\&. Multiple match lines are specified in additional consecutive lines\&. Every match line is compared indivdually, they are combined by OR\&. Every match line must start at the first character of the line\&.
+The hwdb file contains data records consisting of matches and associated key\-value pairs\&. Every record in the hwdb starts with one or more match string, specifying a shell glob to compare the database lookup string against\&. Multiple match lines are specified in additional consecutive lines\&. Every match line is compared individually, they are combined by OR\&. Every match line must start at the first character of the line\&.
 .PP
 The match lines are followed by one or more key\-value pair lines, which are recognized by a leading space character\&. The key name and value are separated by
 =\&. An empty line signifies the end of a record\&. Lines beginning with

man/udev.xml

@@ -752,7 +752,7 @@
       associated key-value pairs. Every record in the hwdb starts with one or
       more match string, specifying a shell glob to compare the database
       lookup string against. Multiple match lines are specified in additional
-      consecutive lines. Every match line is compared indivdually, they are
+      consecutive lines. Every match line is compared individually, they are
       combined by OR. Every match line must start at the first character of
       the line.</para>
 

src/cdrom_id/cdrom_id.c

@@ -645,7 +645,7 @@ static int cd_media_info(struct udev *udev, int fd)
         if (!cd_media_cd_rom)
                 cd_media_state = media_status[header[2] & 3];
 
-        /* fresh DVD-RW in restricted overwite mode reports itself as
+        /* fresh DVD-RW in restricted overwrite mode reports itself as
          * "appendable"; change it to "blank" to make it consistent with what
          * gets reported after blanking, and what userspace expects  */
         if (cd_media_dvd_rw_ro && (header[2] & 3) == 1)

src/libudev/libudev-monitor.c

@@ -232,7 +232,7 @@ struct udev_monitor *udev_monitor_new_from_netlink_fd(struct udev *udev, const c
  * source. Valid sources identifiers are "udev" and "kernel".
  *
  * Applications should usually not connect directly to the
- * "kernel" events, because the devices might not be useable
+ * "kernel" events, because the devices might not be usable
  * at that time, before udev has configured them, and created
  * device nodes. Accessing devices at the same time as udev,
  * might result in unpredictable behavior. The "udev" events

src/shared/hashmap.h

@@ -33,7 +33,7 @@
  * necessary to instantiate an object for each Hashmap use.
  *
  * If ENABLE_DEBUG_HASHMAP is defined (by configuring with --enable-debug=hashmap),
- * the implemention will:
+ * the implementation will:
  * - store extra data for debugging and statistics (see tools/gdb-sd_dump_hashmaps.py)
  * - perform extra checks for invalid use of iterators
  */
@@ -86,8 +86,8 @@ unsigned long trivial_hash_func(const void *p, const uint8_t hash_key[HASH_KEY_S
 int trivial_compare_func(const void *a, const void *b) _const_;
 extern const struct hash_ops trivial_hash_ops;
 
-/* 32bit values we can always just embedd in the pointer itself, but
- * in order to support 32bit archs we need store 64bit values
+/* 32bit values we can always just embed in the pointer itself, but
+ * in order to support 32bit archs we need to store 64bit values
  * indirectly, since they don't fit in a pointer. */
 unsigned long uint64_hash_func(const void *p, const uint8_t hash_key[HASH_KEY_SIZE]) _pure_;
 int uint64_compare_func(const void *a, const void *b) _pure_;

src/shared/macro.h

@@ -185,7 +185,7 @@ static inline size_t IOVEC_INCREMENT(struct iovec *i, unsigned n, size_t k) {
         return k;
 }
 
- /* 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.
  */

src/shared/path-util.c

@@ -287,7 +287,7 @@ int path_compare(const char *a, const char *b) {
         assert(a);
         assert(b);
 
-        /* A relative path and an abolute path must not compare as equal.
+        /* A relative path and an absolute path must not compare as equal.
          * Which one is sorted before the other does not really matter.
          * Here a relative path is ordered before an absolute path. */
         d = (a[0] == '/') - (b[0] == '/');

src/udev/udev.conf

@@ -1,3 +1,6 @@
 # see udev.conf(5) for details
+#
+# udevd is also started in the initrd.  When this file is modified you might
+# also want to rebuild the initrd, so that it will include the modified configuration.
 
 #udev_log="info"

test/udev-test.pl

@@ -262,7 +262,7 @@
 EOF
         },
         {
-                desc            => "sustitution of sysfs value (%s{file})",
+                desc            => "substitution of sysfs value (%s{file})",
                 devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
                 exp_name        => "disk-ATA-sda" ,
                 rules           => <<EOF