From 4bc06da775a94bd8a1d788c3addf7d61aabff4e8 Mon Sep 17 00:00:00 2001 From: Matthias Lisin <6209465+ml-@users.noreply.github.com> Date: Wed, 16 Oct 2024 07:02:21 +0200 Subject: [PATCH 1/4] man: fix args order for udevadm info cmd --- TODO | 2 +- man/fido2-crypttab.sh | 2 +- man/tpm2-crypttab.sh | 2 +- man/yubikey-crypttab.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/TODO b/TODO index 91127eff943..3fad822bc66 100644 --- a/TODO +++ b/TODO @@ -795,7 +795,7 @@ Features: * udevd: extend memory pressure logic: also kill any idle worker processes * udevadm: to make symlink querying with udevadm nicer: - - do not enable the pager for queries like 'udevadm info -q -r symlink' + - do not enable the pager for queries like 'udevadm info -q symlink -r' - add mode with newlines instead of spaces (for grep)? * SIGRTMIN+18 and memory pressure handling should still be added to: hostnamed, diff --git a/man/fido2-crypttab.sh b/man/fido2-crypttab.sh index 43654a52364..d1c31e3e8ce 100644 --- a/man/fido2-crypttab.sh +++ b/man/fido2-crypttab.sh @@ -10,7 +10,7 @@ sudo systemd-cryptsetup attach mytest /dev/sdXn - fido2-device=auto # If that worked, let's now add the same line persistently to /etc/crypttab, # for the future. We don't want to use the (unstable) /dev/sdX name, so let's # figure out a stable link: -udevadm info -q -r symlink /dev/sdXn +udevadm info -q symlink -r /dev/sdXn # Now add the line using the by-uuid symlink to /etc/crypttab: sudo bash -c 'echo "mytest /dev/disk/by-uuid/... - fido2-device=auto" >>/etc/crypttab' diff --git a/man/tpm2-crypttab.sh b/man/tpm2-crypttab.sh index 2be349959fd..f22a0b445e4 100644 --- a/man/tpm2-crypttab.sh +++ b/man/tpm2-crypttab.sh @@ -10,7 +10,7 @@ sudo systemd-cryptsetup attach mytest /dev/sdXn - tpm2-device=auto # If that worked, let's now add the same line persistently to /etc/crypttab, # for the future. We don't want to use the (unstable) /dev/sdX name, so let's # figure out a stable link: -udevadm info -q -r symlink /dev/sdXn +udevadm info -q symlink -r /dev/sdXn # Now add the line using the by-uuid symlink to /etc/crypttab: sudo bash -c 'echo "mytest /dev/disk/by-uuid/... - tpm2-device=auto" >>/etc/crypttab' diff --git a/man/yubikey-crypttab.sh b/man/yubikey-crypttab.sh index a66a88fe1ce..00de2702e36 100644 --- a/man/yubikey-crypttab.sh +++ b/man/yubikey-crypttab.sh @@ -26,7 +26,7 @@ sudo systemd-cryptsetup attach mytest /dev/sdXn - pkcs11-uri=auto # If that worked, let's now add the same line persistently to /etc/crypttab, # for the future. We don't want to use the (unstable) /dev/sdX name, so let's # figure out a stable link: -udevadm info -q -r symlink /dev/sdXn +udevadm info -q symlink -r /dev/sdXn # Now add the line using the by-uuid symlink to /etc/crypttab: sudo bash -c 'echo "mytest /dev/disk/by-uuid/... - pkcs11-uri=auto" >>/etc/crypttab' From f441831c9e00b31cb10a3c9d0a4b95c5f19f1181 Mon Sep 17 00:00:00 2001 From: Matthias Lisin <6209465+ml-@users.noreply.github.com> Date: Thu, 19 Dec 2024 10:32:52 +0100 Subject: [PATCH 2/4] man/sysupdate.d: fix wrong PathRelativeTo value --- man/sysupdate.d.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/man/sysupdate.d.xml b/man/sysupdate.d.xml index bec423705c7..5c9a7428baa 100644 --- a/man/sysupdate.d.xml +++ b/man/sysupdate.d.xml @@ -672,7 +672,7 @@ Specifies what anchor point Path= should be relative to. Takes one of root, esp, xbootldr, - boot or directory. If unspecified, defaults to + boot or explicit. If unspecified, defaults to root. If set to root, esp, xbootldr, From 1462736c7eee580b94e977c0a7fdd8fa51ccbab9 Mon Sep 17 00:00:00 2001 From: Matthias Lisin <6209465+ml-@users.noreply.github.com> Date: Thu, 19 Dec 2024 11:30:13 +0100 Subject: [PATCH 3/4] sysupdate: fix args order of formatted error --- src/sysupdate/sysupdate-transfer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sysupdate/sysupdate-transfer.c b/src/sysupdate/sysupdate-transfer.c index 1143c3cf637..f0e8ad3b36c 100644 --- a/src/sysupdate/sysupdate-transfer.c +++ b/src/sysupdate/sysupdate-transfer.c @@ -596,7 +596,7 @@ int transfer_read_definition(Transfer *t, const char *path, const char **dirs, H !IN_SET(t->target.type, RESOURCE_DIRECTORY, RESOURCE_SUBVOLUME))) return log_syntax(NULL, LOG_ERR, path, 1, SYNTHETIC_ERRNO(EINVAL), "Target type '%s' is incompatible with source type '%s', refusing.", - resource_type_to_string(t->source.type), resource_type_to_string(t->target.type)); + resource_type_to_string(t->target.type), resource_type_to_string(t->source.type)); if (!t->source.path && !t->source.path_auto) return log_syntax(NULL, LOG_ERR, path, 1, SYNTHETIC_ERRNO(EINVAL), From 6e3f32cc56a58fde6c319b927ade13ac14690b0f Mon Sep 17 00:00:00 2001 From: Matthias Lisin <6209465+ml-@users.noreply.github.com> Date: Thu, 19 Dec 2024 12:04:24 +0100 Subject: [PATCH 4/4] man/sysupdate.features: fix typos --- man/sysupdate.features.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/man/sysupdate.features.xml b/man/sysupdate.features.xml index d33df94490f..e3a02d6f9d2 100644 --- a/man/sysupdate.features.xml +++ b/man/sysupdate.features.xml @@ -93,7 +93,7 @@ XML file. This may be used by software centers (such as GNOME Software or KDE Discover) to present rich metadata about this feature. - This includes display names, chagnelogs, icons, and more. + This includes display names, changelogs, icons, and more. This setting supports specifier expansion; see below for details on supported specifiers. @@ -177,7 +177,7 @@ Enabled=false The above defines the devel feature, and disables it by default. - Now let's a define a transfer that's associated with this feature: + Now let's define a transfer that's associated with this feature: # /usr/lib/sysupdate.d/50-devel.transfer [Transfer]