shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-22 17:35:35 +03:00
Code

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

Browse Source 
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.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2024-02-21 12:38:27 +01:00
parent 6812498cb2
commit 5ea4afcf00
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/backlight/backlight.c
View File

@ -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 /* 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" * 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 * "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 * 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 * 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 /* 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 * 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. */ * backlight devices that do not have the same parent PCI device. */
log_debug("Found multiple graphics cards on PCI bus. " log_debug("Found multiple graphics cards on PCI bus; "
"Skipping to associate platform backlight devices on non-PCI bus."); "skipping deduplication of platform backlight devices not on PCI bus.");
r = sd_device_enumerator_add_match_parent(enumerate, parent); r = sd_device_enumerator_add_match_parent(enumerate, parent);
if (r < 0) if (r < 0)

2
src/kernel-install/kernel-install.c
View File

@ -511,7 +511,7 @@ static int context_load_machine_info(Context *c) {
if (r < 0 && r != -ENXIO) if (r < 0 && r != -ENXIO)
log_warning_errno(r, "Failed to read $KERNEL_INSTALL_READ_MACHINE_INFO, assuming yes: %m"); log_warning_errno(r, "Failed to read $KERNEL_INSTALL_READ_MACHINE_INFO, assuming yes: %m");
if (r == 0) { if (r == 0) {
log_debug("Skipping to read /etc/machine-info."); log_debug("Skipping reading of /etc/machine-info.");
return 0; return 0;
} }

4
src/udev/net/link-config.c
View File

@ -741,7 +741,7 @@ static int link_generate_new_name(Link *link) {
device = link->device; device = link->device;
if (link->action != SD_DEVICE_ADD) { 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)); device_action_to_string(link->action));
goto no_rename; goto no_rename;
} }
@ -821,7 +821,7 @@ static int link_generate_alternative_names(Link *link) {
assert(!link->altnames); assert(!link->altnames);
if (link->action != SD_DEVICE_ADD) { 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)); device_action_to_string(link->action));
return 0; return 0;
} }

2
src/udev/udev-builtin-net_setup_link.c
View File

@ -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"); 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)) { 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)); device_action_to_string(action));
/* Import previously assigned .link file name. */ /* Import previously assigned .link file name. */