udev,backlight,kernel-install: reword sentences starting with "Skipping to"

That's not gramatically correct.

In backlight, change "assocation" to "deduplication". Without the context,
it's probably not clear at all that we "associate" them to ignore them.

diff --git a/src/backlight/backlight.c b/src/backlight/backlight.c
index 6a2ad17fbf6880733ce4099f8d20089c40ab550d..61264059941b769a0e9d4ab748e368e3d57dc8d4 100644 (file)
--- a/src/backlight/backlight.c
+++ b/src/backlight/backlight.c
@@ -175,7 +175,7 @@ static int validate_device(sd_device *device) {
 
         /* Verify whether we should actually care for a specific backlight device. For backlight devices
          * there might be multiple ways to access the same control: "firmware" (i.e. ACPI), "platform"
-         * (i.e. via the machine's EC) and "raw" (via the graphics card). In general we should prefer
+         * (i.e. via the machine's EC), and "raw" (via the graphics card). In general we should prefer
          * "firmware" (i.e. ACPI) or "platform" access over "raw" access, in order not to confuse the
          * BIOS/EC, and compatibility with possible low-level hotkey handling of screen brightness. The
          * kernel will already make sure to expose only one of "firmware" and "platform" for the same
@@ -239,8 +239,8 @@ static int validate_device(sd_device *device) {
                         /* If the system has multiple graphics cards, then we cannot associate platform
                          * devices on non-PCI bus (especially WMI bus) with PCI devices. Let's ignore all
                          * backlight devices that do not have the same parent PCI device. */
-                        log_debug("Found multiple graphics cards on PCI bus. "
-                                  "Skipping to associate platform backlight devices on non-PCI bus.");
+                        log_debug("Found multiple graphics cards on PCI bus; "
+                                  "skipping deduplication of platform backlight devices not on PCI bus.");
 
                         r = sd_device_enumerator_add_match_parent(enumerate, parent);
                         if (r < 0)

diff --git a/src/kernel-install/kernel-install.c b/src/kernel-install/kernel-install.c
index 2523d43944959bd62e65cc5ce6b5b0c7ca5804cd..aa81af70d08f95d06550a4b393bb57c6d93c3f4c 100644 (file)
--- a/src/kernel-install/kernel-install.c
+++ b/src/kernel-install/kernel-install.c
@@ -511,7 +511,7 @@ static int context_load_machine_info(Context *c) {
         if (r < 0 && r != -ENXIO)
                 log_warning_errno(r, "Failed to read $KERNEL_INSTALL_READ_MACHINE_INFO, assuming yes: %m");
         if (r == 0) {
-                log_debug("Skipping to read /etc/machine-info.");
+                log_debug("Skipping reading of /etc/machine-info.");
                 return 0;
         }
 

diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c
index a8b2cc23a2c57747030de4f73c63b636c59f14c8..5320b84b1d7fc47e73065b29c8c695e86a2280f9 100644 (file)
--- a/src/udev/net/link-config.c
+++ b/src/udev/net/link-config.c
@@ -741,7 +741,7 @@ static int link_generate_new_name(Link *link) {
         device = link->device;
 
         if (link->action != SD_DEVICE_ADD) {
-                log_link_debug(link, "Skipping to apply Name= and NamePolicy= on '%s' uevent.",
+                log_link_debug(link, "Not applying Name= and NamePolicy= on '%s' uevent.",
                                device_action_to_string(link->action));
                 goto no_rename;
         }
@@ -821,7 +821,7 @@ static int link_generate_alternative_names(Link *link) {
         assert(!link->altnames);
 
         if (link->action != SD_DEVICE_ADD) {
-                log_link_debug(link, "Skipping to apply AlternativeNames= and AlternativeNamesPolicy= on '%s' uevent.",
+                log_link_debug(link, "Not applying AlternativeNames= and AlternativeNamesPolicy= on '%s' uevent.",
                                device_action_to_string(link->action));
                 return 0;
         }

diff --git a/src/udev/udev-builtin-net_setup_link.c b/src/udev/udev-builtin-net_setup_link.c
index fc614443efadcd69730ee03bdefe3374f76f6076..df89679de340c502f83fb8d541742f8b3162d009 100644 (file)
--- a/src/udev/udev-builtin-net_setup_link.c
+++ b/src/udev/udev-builtin-net_setup_link.c
@@ -26,7 +26,7 @@ static int builtin_net_setup_link(UdevEvent *event, int argc, char **argv, bool
                 return log_device_error_errno(dev, r, "Failed to get action: %m");
 
         if (!IN_SET(action, SD_DEVICE_ADD, SD_DEVICE_BIND, SD_DEVICE_MOVE)) {
-                log_device_debug(dev, "Skipping to apply .link settings on '%s' uevent.",
+                log_device_debug(dev, "Not applying .link settings on '%s' uevent.",
                                  device_action_to_string(action));
 
                 /* Import previously assigned .link file name. */