summaryrefslogtreecommitdiff
path: root/src/shared
diff options
context:
space:
mode:
Diffstat (limited to 'src/shared')
-rw-r--r--src/shared/acl-util.c2
-rw-r--r--src/shared/acl-util.h2
-rw-r--r--src/shared/acpi-fpdt.c2
-rw-r--r--src/shared/acpi-fpdt.h2
-rw-r--r--src/shared/apparmor-util.c2
-rw-r--r--src/shared/apparmor-util.h2
-rw-r--r--src/shared/ask-password-api.c2
-rw-r--r--src/shared/ask-password-api.h2
-rw-r--r--src/shared/barrier.c2
-rw-r--r--src/shared/barrier.h2
-rw-r--r--src/shared/base-filesystem.c2
-rw-r--r--src/shared/base-filesystem.h2
-rw-r--r--src/shared/binfmt-util.c2
-rw-r--r--src/shared/binfmt-util.h2
-rw-r--r--src/shared/bitmap.c2
-rw-r--r--src/shared/bitmap.h2
-rw-r--r--src/shared/blkid-util.h2
-rw-r--r--src/shared/bond-util.c2
-rw-r--r--src/shared/bond-util.h2
-rw-r--r--src/shared/boot-timestamps.c2
-rw-r--r--src/shared/boot-timestamps.h2
-rw-r--r--src/shared/bootspec.c2
-rw-r--r--src/shared/bootspec.h2
-rw-r--r--src/shared/bpf-program.c2
-rw-r--r--src/shared/bpf-program.h2
-rw-r--r--src/shared/bridge-util.c2
-rw-r--r--src/shared/bridge-util.h2
-rw-r--r--src/shared/bus-get-properties.c2
-rw-r--r--src/shared/bus-get-properties.h2
-rw-r--r--src/shared/bus-locator.c2
-rw-r--r--src/shared/bus-locator.h2
-rw-r--r--src/shared/bus-log-control-api.c2
-rw-r--r--src/shared/bus-log-control-api.h2
-rw-r--r--src/shared/bus-map-properties.c2
-rw-r--r--src/shared/bus-map-properties.h2
-rw-r--r--src/shared/bus-message-util.c2
-rw-r--r--src/shared/bus-message-util.h2
-rw-r--r--src/shared/bus-object.c2
-rw-r--r--src/shared/bus-object.h2
-rw-r--r--src/shared/bus-polkit.c2
-rw-r--r--src/shared/bus-polkit.h2
-rw-r--r--src/shared/bus-print-properties.c2
-rw-r--r--src/shared/bus-print-properties.h2
-rw-r--r--src/shared/bus-unit-procs.c2
-rw-r--r--src/shared/bus-unit-procs.h2
-rw-r--r--src/shared/bus-unit-util.c2
-rw-r--r--src/shared/bus-unit-util.h2
-rw-r--r--src/shared/bus-util.c2
-rw-r--r--src/shared/bus-util.h2
-rw-r--r--src/shared/bus-wait-for-jobs.c2
-rw-r--r--src/shared/bus-wait-for-jobs.h2
-rw-r--r--src/shared/bus-wait-for-units.c2
-rw-r--r--src/shared/bus-wait-for-units.h2
-rw-r--r--src/shared/calendarspec.c2
-rw-r--r--src/shared/calendarspec.h2
-rw-r--r--src/shared/cgroup-setup.c2
-rw-r--r--src/shared/cgroup-setup.h2
-rw-r--r--src/shared/cgroup-show.c2
-rw-r--r--src/shared/cgroup-show.h2
-rw-r--r--src/shared/chown-recursive.c2
-rw-r--r--src/shared/chown-recursive.h2
-rw-r--r--src/shared/clean-ipc.c2
-rw-r--r--src/shared/clean-ipc.h2
-rw-r--r--src/shared/clock-util.c2
-rw-r--r--src/shared/clock-util.h2
-rw-r--r--src/shared/condition.c2
-rw-r--r--src/shared/condition.h2
-rw-r--r--src/shared/conf-parser.c2
-rw-r--r--src/shared/conf-parser.h2
-rw-r--r--src/shared/coredump-util.c2
-rw-r--r--src/shared/coredump-util.h2
-rw-r--r--src/shared/cpu-set-util.c2
-rw-r--r--src/shared/cpu-set-util.h2
-rw-r--r--src/shared/cryptsetup-util.c2
-rw-r--r--src/shared/cryptsetup-util.h2
-rw-r--r--src/shared/daemon-util.h2
-rw-r--r--src/shared/dev-setup.c2
-rw-r--r--src/shared/dev-setup.h2
-rw-r--r--src/shared/dissect-image.c2
-rw-r--r--src/shared/dissect-image.h2
-rw-r--r--src/shared/dm-util.c2
-rw-r--r--src/shared/dm-util.h2
-rw-r--r--src/shared/dns-domain.c2
-rw-r--r--src/shared/dns-domain.h2
-rw-r--r--src/shared/dropin.c2
-rw-r--r--src/shared/dropin.h2
-rw-r--r--src/shared/efi-loader.c2
-rw-r--r--src/shared/efi-loader.h2
-rw-r--r--src/shared/enable-mempool.c2
-rw-r--r--src/shared/env-file-label.c2
-rw-r--r--src/shared/env-file-label.h2
-rw-r--r--src/shared/ethtool-util.c2
-rw-r--r--src/shared/ethtool-util.h2
-rw-r--r--src/shared/exec-util.c2
-rw-r--r--src/shared/exec-util.h2
-rw-r--r--src/shared/exit-status.c2
-rw-r--r--src/shared/exit-status.h2
-rw-r--r--src/shared/fdset.c2
-rw-r--r--src/shared/fdset.h2
-rw-r--r--src/shared/fileio-label.c2
-rw-r--r--src/shared/fileio-label.h2
-rw-r--r--src/shared/firewall-util.c2
-rw-r--r--src/shared/firewall-util.h2
-rw-r--r--src/shared/format-table.c2
-rw-r--r--src/shared/format-table.h2
-rw-r--r--src/shared/fsck-util.h2
-rw-r--r--src/shared/fstab-util.c2
-rw-r--r--src/shared/fstab-util.h2
-rw-r--r--src/shared/generator.c2
-rw-r--r--src/shared/generator.h2
-rw-r--r--src/shared/geneve-util.c2
-rw-r--r--src/shared/geneve-util.h2
-rw-r--r--src/shared/gpt.c2
-rw-r--r--src/shared/gpt.h2
-rw-r--r--src/shared/group-record.c2
-rw-r--r--src/shared/group-record.h2
-rw-r--r--src/shared/id128-print.c2
-rw-r--r--src/shared/id128-print.h2
-rw-r--r--src/shared/idn-util.c2
-rw-r--r--src/shared/idn-util.h2
-rw-r--r--src/shared/ima-util.c2
-rw-r--r--src/shared/ima-util.h2
-rw-r--r--src/shared/import-util.c2
-rw-r--r--src/shared/import-util.h2
-rw-r--r--src/shared/install-printf.c2
-rw-r--r--src/shared/install-printf.h2
-rw-r--r--src/shared/install.c2
-rw-r--r--src/shared/install.h2
-rw-r--r--src/shared/ip-protocol-list.c2
-rw-r--r--src/shared/ip-protocol-list.h2
-rw-r--r--src/shared/ipvlan-util.c2
-rw-r--r--src/shared/ipvlan-util.h2
-rw-r--r--src/shared/journal-importer.c2
-rw-r--r--src/shared/journal-importer.h2
-rw-r--r--src/shared/journal-util.c2
-rw-r--r--src/shared/journal-util.h2
-rw-r--r--src/shared/json-internal.h2
-rw-r--r--src/shared/json.c2
-rw-r--r--src/shared/json.h2
-rw-r--r--src/shared/libcrypt-util.c2
-rw-r--r--src/shared/libcrypt-util.h2
-rw-r--r--src/shared/libmount-util.h2
-rw-r--r--src/shared/local-addresses.c2
-rw-r--r--src/shared/local-addresses.h2
-rw-r--r--src/shared/lockfile-util.c2
-rw-r--r--src/shared/lockfile-util.h2
-rw-r--r--src/shared/log-link.h2
-rw-r--r--src/shared/logs-show.c2
-rw-r--r--src/shared/logs-show.h2
-rw-r--r--src/shared/loop-util.c2
-rw-r--r--src/shared/loop-util.h2
-rw-r--r--src/shared/machine-image.c2
-rw-r--r--src/shared/machine-image.h2
-rw-r--r--src/shared/machine-pool.c2
-rw-r--r--src/shared/machine-pool.h2
-rw-r--r--src/shared/macvlan-util.c2
-rw-r--r--src/shared/macvlan-util.h2
-rw-r--r--src/shared/main-func.h2
-rw-r--r--src/shared/meson.build2
-rw-r--r--src/shared/mkfs-util.c2
-rw-r--r--src/shared/mkfs-util.h2
-rw-r--r--src/shared/module-util.c2
-rw-r--r--src/shared/module-util.h2
-rw-r--r--src/shared/mount-util.c2
-rw-r--r--src/shared/mount-util.h2
-rw-r--r--src/shared/netif-naming-scheme.c2
-rw-r--r--src/shared/netif-naming-scheme.h2
-rw-r--r--src/shared/nscd-flush.c2
-rw-r--r--src/shared/nscd-flush.h2
-rw-r--r--src/shared/nsflags.c2
-rw-r--r--src/shared/nsflags.h2
-rw-r--r--src/shared/numa-util.c2
-rw-r--r--src/shared/numa-util.h2
-rw-r--r--src/shared/offline-passwd.c2
-rw-r--r--src/shared/offline-passwd.h2
-rw-r--r--src/shared/openssl-util.h2
-rw-r--r--src/shared/os-util.c2
-rw-r--r--src/shared/os-util.h2
-rw-r--r--src/shared/output-mode.c2
-rw-r--r--src/shared/output-mode.h2
-rw-r--r--src/shared/pager.c2
-rw-r--r--src/shared/pager.h2
-rw-r--r--src/shared/pam-util.c2
-rw-r--r--src/shared/pam-util.h2
-rw-r--r--src/shared/pe-header.h2
-rw-r--r--src/shared/pkcs11-util.c2
-rw-r--r--src/shared/pkcs11-util.h2
-rw-r--r--src/shared/pretty-print.c2
-rw-r--r--src/shared/pretty-print.h2
-rw-r--r--src/shared/psi-util.c2
-rw-r--r--src/shared/psi-util.h2
-rw-r--r--src/shared/ptyfwd.c2
-rw-r--r--src/shared/ptyfwd.h2
-rw-r--r--src/shared/pwquality-util.c2
-rw-r--r--src/shared/pwquality-util.h2
-rw-r--r--src/shared/qrcode-util.c2
-rw-r--r--src/shared/qrcode-util.h2
-rw-r--r--src/shared/reboot-util.c2
-rw-r--r--src/shared/reboot-util.h2
-rw-r--r--src/shared/resize-fs.c2
-rw-r--r--src/shared/resize-fs.h2
-rw-r--r--src/shared/resolve-util.c2
-rw-r--r--src/shared/resolve-util.h2
-rw-r--r--src/shared/seccomp-util.c2
-rw-r--r--src/shared/seccomp-util.h2
-rw-r--r--src/shared/securebits-util.c2
-rw-r--r--src/shared/securebits-util.h2
-rw-r--r--src/shared/serialize.c2
-rw-r--r--src/shared/serialize.h2
-rw-r--r--src/shared/service-util.c2
-rw-r--r--src/shared/service-util.h2
-rw-r--r--src/shared/sleep-config.c2
-rw-r--r--src/shared/sleep-config.h2
-rw-r--r--src/shared/socket-netlink.c2
-rw-r--r--src/shared/socket-netlink.h2
-rw-r--r--src/shared/spawn-ask-password-agent.c2
-rw-r--r--src/shared/spawn-ask-password-agent.h2
-rw-r--r--src/shared/spawn-polkit-agent.c2
-rw-r--r--src/shared/spawn-polkit-agent.h2
-rw-r--r--src/shared/specifier.c2
-rw-r--r--src/shared/specifier.h2
-rw-r--r--src/shared/switch-root.c2
-rw-r--r--src/shared/switch-root.h2
-rw-r--r--src/shared/sysctl-util.c2
-rw-r--r--src/shared/sysctl-util.h2
-rw-r--r--src/shared/test-tables.h2
-rw-r--r--src/shared/tests.c2
-rw-r--r--src/shared/tests.h2
-rw-r--r--src/shared/tmpfile-util-label.c2
-rw-r--r--src/shared/tmpfile-util-label.h2
-rw-r--r--src/shared/tomoyo-util.c2
-rw-r--r--src/shared/tomoyo-util.h2
-rw-r--r--src/shared/udev-util.c2
-rw-r--r--src/shared/udev-util.h2
-rw-r--r--src/shared/uid-range.c2
-rw-r--r--src/shared/uid-range.h2
-rw-r--r--src/shared/unit-file.c2
-rw-r--r--src/shared/unit-file.h2
-rw-r--r--src/shared/user-record-nss.c2
-rw-r--r--src/shared/user-record-nss.h2
-rw-r--r--src/shared/user-record-show.c2
-rw-r--r--src/shared/user-record-show.h2
-rw-r--r--src/shared/user-record.c2
-rw-r--r--src/shared/user-record.h2
-rw-r--r--src/shared/userdb.c2
-rw-r--r--src/shared/userdb.h2
-rw-r--r--src/shared/utmp-wtmp.c2
-rw-r--r--src/shared/utmp-wtmp.h2
-rw-r--r--src/shared/varlink.c2
-rw-r--r--src/shared/varlink.h2
-rw-r--r--src/shared/verbs.c2
-rw-r--r--src/shared/verbs.h2
-rw-r--r--src/shared/vlan-util.c2
-rw-r--r--src/shared/vlan-util.h2
-rw-r--r--src/shared/volatile-util.c2
-rw-r--r--src/shared/volatile-util.h2
-rw-r--r--src/shared/watchdog.c2
-rw-r--r--src/shared/watchdog.h2
-rw-r--r--src/shared/web-util.c2
-rw-r--r--src/shared/web-util.h2
-rw-r--r--src/shared/wifi-util.c2
-rw-r--r--src/shared/wifi-util.h2
-rw-r--r--src/shared/xml.c2
-rw-r--r--src/shared/xml.h2
264 files changed, 264 insertions, 264 deletions
diff --git a/src/shared/acl-util.c b/src/shared/acl-util.c
index 7a2767c37b..ef4b88361f 100644
--- a/src/shared/acl-util.c
+++ b/src/shared/acl-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <stdbool.h>
diff --git a/src/shared/acl-util.h b/src/shared/acl-util.h
index b6a6f480f8..837e8699ee 100644
--- a/src/shared/acl-util.h
+++ b/src/shared/acl-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <errno.h>
diff --git a/src/shared/acpi-fpdt.c b/src/shared/acpi-fpdt.c
index 38c464c912..1124453799 100644
--- a/src/shared/acpi-fpdt.c
+++ b/src/shared/acpi-fpdt.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <fcntl.h>
diff --git a/src/shared/acpi-fpdt.h b/src/shared/acpi-fpdt.h
index 8d288937ef..9eef92bc35 100644
--- a/src/shared/acpi-fpdt.h
+++ b/src/shared/acpi-fpdt.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <time-util.h>
diff --git a/src/shared/apparmor-util.c b/src/shared/apparmor-util.c
index c4a4b04d22..68e1c557c0 100644
--- a/src/shared/apparmor-util.c
+++ b/src/shared/apparmor-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <stddef.h>
diff --git a/src/shared/apparmor-util.h b/src/shared/apparmor-util.h
index 7fbaf90dcc..8007aeb695 100644
--- a/src/shared/apparmor-util.h
+++ b/src/shared/apparmor-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdbool.h>
diff --git a/src/shared/ask-password-api.c b/src/shared/ask-password-api.c
index a727b98e7c..e1c9fe40f8 100644
--- a/src/shared/ask-password-api.c
+++ b/src/shared/ask-password-api.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <fcntl.h>
diff --git a/src/shared/ask-password-api.h b/src/shared/ask-password-api.h
index 528e3d0197..7aac5e5976 100644
--- a/src/shared/ask-password-api.h
+++ b/src/shared/ask-password-api.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdbool.h>
diff --git a/src/shared/barrier.c b/src/shared/barrier.c
index 80b597b5ca..9c93d61a3c 100644
--- a/src/shared/barrier.c
+++ b/src/shared/barrier.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <fcntl.h>
diff --git a/src/shared/barrier.h b/src/shared/barrier.h
index 0eb3d2792e..b11dce4fc0 100644
--- a/src/shared/barrier.h
+++ b/src/shared/barrier.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdbool.h>
diff --git a/src/shared/base-filesystem.c b/src/shared/base-filesystem.c
index 657407da2d..1d05409086 100644
--- a/src/shared/base-filesystem.c
+++ b/src/shared/base-filesystem.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <fcntl.h>
diff --git a/src/shared/base-filesystem.h b/src/shared/base-filesystem.h
index 39d970811d..a33975f3b5 100644
--- a/src/shared/base-filesystem.h
+++ b/src/shared/base-filesystem.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <sys/types.h>
diff --git a/src/shared/binfmt-util.c b/src/shared/binfmt-util.c
index c673c0435d..724d7f27d9 100644
--- a/src/shared/binfmt-util.c
+++ b/src/shared/binfmt-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <sys/stat.h>
#include <sys/statvfs.h>
diff --git a/src/shared/binfmt-util.h b/src/shared/binfmt-util.h
index 70feaad314..2f008d12ff 100644
--- a/src/shared/binfmt-util.h
+++ b/src/shared/binfmt-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
int disable_binfmt(void);
diff --git a/src/shared/bitmap.c b/src/shared/bitmap.c
index 2eba72dd59..5d450c8832 100644
--- a/src/shared/bitmap.c
+++ b/src/shared/bitmap.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <stddef.h>
diff --git a/src/shared/bitmap.h b/src/shared/bitmap.h
index 312cee9ce7..1c305a2c41 100644
--- a/src/shared/bitmap.h
+++ b/src/shared/bitmap.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdbool.h>
diff --git a/src/shared/blkid-util.h b/src/shared/blkid-util.h
index eb07a88ba9..3f38e9b308 100644
--- a/src/shared/blkid-util.h
+++ b/src/shared/blkid-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#if HAVE_BLKID
diff --git a/src/shared/bond-util.c b/src/shared/bond-util.c
index 2296ecd9de..e04b201155 100644
--- a/src/shared/bond-util.c
+++ b/src/shared/bond-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "bond-util.h"
#include "string-table.h"
diff --git a/src/shared/bond-util.h b/src/shared/bond-util.h
index 66f86e77fa..a8f9ecb454 100644
--- a/src/shared/bond-util.h
+++ b/src/shared/bond-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <netinet/in.h>
diff --git a/src/shared/boot-timestamps.c b/src/shared/boot-timestamps.c
index 4ce146033d..8786e89c0e 100644
--- a/src/shared/boot-timestamps.c
+++ b/src/shared/boot-timestamps.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "acpi-fpdt.h"
#include "boot-timestamps.h"
diff --git a/src/shared/boot-timestamps.h b/src/shared/boot-timestamps.h
index 4e648f18e2..55b7ad19aa 100644
--- a/src/shared/boot-timestamps.h
+++ b/src/shared/boot-timestamps.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <time-util.h>
diff --git a/src/shared/bootspec.c b/src/shared/bootspec.c
index 189fa25639..e50408ab53 100644
--- a/src/shared/bootspec.c
+++ b/src/shared/bootspec.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <stdio.h>
#include <linux/magic.h>
diff --git a/src/shared/bootspec.h b/src/shared/bootspec.h
index 1075a41d54..1557bd0680 100644
--- a/src/shared/bootspec.h
+++ b/src/shared/bootspec.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
diff --git a/src/shared/bpf-program.c b/src/shared/bpf-program.c
index e5c9df4004..32881477d5 100644
--- a/src/shared/bpf-program.c
+++ b/src/shared/bpf-program.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <fcntl.h>
#include <sys/stat.h>
diff --git a/src/shared/bpf-program.h b/src/shared/bpf-program.h
index a21589eb1f..eef77f9d8e 100644
--- a/src/shared/bpf-program.h
+++ b/src/shared/bpf-program.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <linux/bpf.h>
diff --git a/src/shared/bridge-util.c b/src/shared/bridge-util.c
index 83a94ef104..e1a8bcb680 100644
--- a/src/shared/bridge-util.c
+++ b/src/shared/bridge-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "bridge-util.h"
#include "string-table.h"
diff --git a/src/shared/bridge-util.h b/src/shared/bridge-util.h
index 5b1c3e9ea9..c9b02d822f 100644
--- a/src/shared/bridge-util.h
+++ b/src/shared/bridge-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <netinet/in.h>
diff --git a/src/shared/bus-get-properties.c b/src/shared/bus-get-properties.c
index 5a123bb8f3..32f68d5e6a 100644
--- a/src/shared/bus-get-properties.c
+++ b/src/shared/bus-get-properties.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "bus-get-properties.h"
#include "rlimit-util.h"
diff --git a/src/shared/bus-get-properties.h b/src/shared/bus-get-properties.h
index f3934a86a2..9832c0d067 100644
--- a/src/shared/bus-get-properties.h
+++ b/src/shared/bus-get-properties.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include "sd-bus.h"
diff --git a/src/shared/bus-locator.c b/src/shared/bus-locator.c
index 2a5aa74677..3754d1dd68 100644
--- a/src/shared/bus-locator.c
+++ b/src/shared/bus-locator.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "bus-locator.h"
#include "macro.h"
diff --git a/src/shared/bus-locator.h b/src/shared/bus-locator.h
index 2b892360b8..fe3b876527 100644
--- a/src/shared/bus-locator.h
+++ b/src/shared/bus-locator.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include "sd-bus.h"
diff --git a/src/shared/bus-log-control-api.c b/src/shared/bus-log-control-api.c
index 7c487ada9f..06e6697a33 100644
--- a/src/shared/bus-log-control-api.c
+++ b/src/shared/bus-log-control-api.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "alloc-util.h"
#include "bus-get-properties.h"
diff --git a/src/shared/bus-log-control-api.h b/src/shared/bus-log-control-api.h
index 64eaa540f4..85f60a7a2f 100644
--- a/src/shared/bus-log-control-api.h
+++ b/src/shared/bus-log-control-api.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include "sd-bus.h"
diff --git a/src/shared/bus-map-properties.c b/src/shared/bus-map-properties.c
index 5cc8ce222d..84608567aa 100644
--- a/src/shared/bus-map-properties.c
+++ b/src/shared/bus-map-properties.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "bus-map-properties.h"
#include "alloc-util.h"
diff --git a/src/shared/bus-map-properties.h b/src/shared/bus-map-properties.h
index 94242ecc3f..2a766e3cc0 100644
--- a/src/shared/bus-map-properties.h
+++ b/src/shared/bus-map-properties.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include "sd-bus.h"
diff --git a/src/shared/bus-message-util.c b/src/shared/bus-message-util.c
index 85e1e98e19..19500a552d 100644
--- a/src/shared/bus-message-util.c
+++ b/src/shared/bus-message-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "bus-message-util.h"
diff --git a/src/shared/bus-message-util.h b/src/shared/bus-message-util.h
index 98ad035ee4..b82c0830a0 100644
--- a/src/shared/bus-message-util.h
+++ b/src/shared/bus-message-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include "sd-bus.h"
diff --git a/src/shared/bus-object.c b/src/shared/bus-object.c
index 217d43d333..f2e53913fb 100644
--- a/src/shared/bus-object.c
+++ b/src/shared/bus-object.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "bus-introspect.h"
#include "bus-object.h"
diff --git a/src/shared/bus-object.h b/src/shared/bus-object.h
index 8add854e59..145bbd268f 100644
--- a/src/shared/bus-object.h
+++ b/src/shared/bus-object.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdbool.h>
diff --git a/src/shared/bus-polkit.c b/src/shared/bus-polkit.c
index 0722b1a118..14122e0876 100644
--- a/src/shared/bus-polkit.c
+++ b/src/shared/bus-polkit.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "bus-internal.h"
#include "bus-message.h"
diff --git a/src/shared/bus-polkit.h b/src/shared/bus-polkit.h
index 29b3923047..91a88a2807 100644
--- a/src/shared/bus-polkit.h
+++ b/src/shared/bus-polkit.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include "sd-bus.h"
diff --git a/src/shared/bus-print-properties.c b/src/shared/bus-print-properties.c
index bf7d050fa3..4cea25073d 100644
--- a/src/shared/bus-print-properties.c
+++ b/src/shared/bus-print-properties.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "bus-print-properties.h"
#include "cap-list.h"
diff --git a/src/shared/bus-print-properties.h b/src/shared/bus-print-properties.h
index 1c21dff2c8..a4574758e5 100644
--- a/src/shared/bus-print-properties.h
+++ b/src/shared/bus-print-properties.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdbool.h>
diff --git a/src/shared/bus-unit-procs.c b/src/shared/bus-unit-procs.c
index 5ae54efb19..3e97be9671 100644
--- a/src/shared/bus-unit-procs.c
+++ b/src/shared/bus-unit-procs.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "bus-unit-procs.h"
#include "hashmap.h"
diff --git a/src/shared/bus-unit-procs.h b/src/shared/bus-unit-procs.h
index 1cb5ca6271..78c55697ae 100644
--- a/src/shared/bus-unit-procs.h
+++ b/src/shared/bus-unit-procs.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include "sd-bus.h"
diff --git a/src/shared/bus-unit-util.c b/src/shared/bus-unit-util.c
index 79c2e0cf19..fe3a41f438 100644
--- a/src/shared/bus-unit-util.c
+++ b/src/shared/bus-unit-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "alloc-util.h"
#include "bus-error.h"
diff --git a/src/shared/bus-unit-util.h b/src/shared/bus-unit-util.h
index 544767b033..999caf65cd 100644
--- a/src/shared/bus-unit-util.h
+++ b/src/shared/bus-unit-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include "sd-bus.h"
diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c
index aa5dadba45..fbda218b3b 100644
--- a/src/shared/bus-util.c
+++ b/src/shared/bus-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <fcntl.h>
diff --git a/src/shared/bus-util.h b/src/shared/bus-util.h
index 1a1389fd1e..a02d82a52e 100644
--- a/src/shared/bus-util.h
+++ b/src/shared/bus-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdbool.h>
diff --git a/src/shared/bus-wait-for-jobs.c b/src/shared/bus-wait-for-jobs.c
index eb33ba2340..b2a9e031ce 100644
--- a/src/shared/bus-wait-for-jobs.c
+++ b/src/shared/bus-wait-for-jobs.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "alloc-util.h"
#include "bus-wait-for-jobs.h"
diff --git a/src/shared/bus-wait-for-jobs.h b/src/shared/bus-wait-for-jobs.h
index 614a2c9de9..0155887455 100644
--- a/src/shared/bus-wait-for-jobs.h
+++ b/src/shared/bus-wait-for-jobs.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include "sd-bus.h"
diff --git a/src/shared/bus-wait-for-units.c b/src/shared/bus-wait-for-units.c
index 7592dcf18d..4f1c505bd3 100644
--- a/src/shared/bus-wait-for-units.c
+++ b/src/shared/bus-wait-for-units.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "bus-map-properties.h"
#include "bus-wait-for-units.h"
diff --git a/src/shared/bus-wait-for-units.h b/src/shared/bus-wait-for-units.h
index a20f3d8fd7..f7ab666f15 100644
--- a/src/shared/bus-wait-for-units.h
+++ b/src/shared/bus-wait-for-units.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include "macro.h"
diff --git a/src/shared/calendarspec.c b/src/shared/calendarspec.c
index bcc51f973c..7162592fbf 100644
--- a/src/shared/calendarspec.c
+++ b/src/shared/calendarspec.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <ctype.h>
#include <errno.h>
diff --git a/src/shared/calendarspec.h b/src/shared/calendarspec.h
index 0a5d95b4b1..3bfe82d7f6 100644
--- a/src/shared/calendarspec.h
+++ b/src/shared/calendarspec.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
/* A structure for specifying (possibly repetitive) points in calendar
diff --git a/src/shared/cgroup-setup.c b/src/shared/cgroup-setup.c
index e9995645eb..f197f715c7 100644
--- a/src/shared/cgroup-setup.c
+++ b/src/shared/cgroup-setup.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <ftw.h>
#include <unistd.h>
diff --git a/src/shared/cgroup-setup.h b/src/shared/cgroup-setup.h
index 43ce32e30d..7eabce2451 100644
--- a/src/shared/cgroup-setup.h
+++ b/src/shared/cgroup-setup.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdbool.h>
diff --git a/src/shared/cgroup-show.c b/src/shared/cgroup-show.c
index b8bf3c2726..f7c24f8860 100644
--- a/src/shared/cgroup-show.c
+++ b/src/shared/cgroup-show.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <dirent.h>
#include <errno.h>
diff --git a/src/shared/cgroup-show.h b/src/shared/cgroup-show.h
index dfb26f8291..fbbf7663b3 100644
--- a/src/shared/cgroup-show.h
+++ b/src/shared/cgroup-show.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdbool.h>
diff --git a/src/shared/chown-recursive.c b/src/shared/chown-recursive.c
index cb75d9a11b..4563729b7c 100644
--- a/src/shared/chown-recursive.c
+++ b/src/shared/chown-recursive.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <fcntl.h>
#include <sys/stat.h>
diff --git a/src/shared/chown-recursive.h b/src/shared/chown-recursive.h
index 14a79733f5..00038c3b32 100644
--- a/src/shared/chown-recursive.h
+++ b/src/shared/chown-recursive.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <sys/types.h>
diff --git a/src/shared/clean-ipc.c b/src/shared/clean-ipc.c
index 5d8f66c602..77fe227e36 100644
--- a/src/shared/clean-ipc.c
+++ b/src/shared/clean-ipc.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <fcntl.h>
diff --git a/src/shared/clean-ipc.h b/src/shared/clean-ipc.h
index eaff47d4b7..ed348fb601 100644
--- a/src/shared/clean-ipc.h
+++ b/src/shared/clean-ipc.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <sys/types.h>
diff --git a/src/shared/clock-util.c b/src/shared/clock-util.c
index 8669547c13..2caa70fa52 100644
--- a/src/shared/clock-util.c
+++ b/src/shared/clock-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <fcntl.h>
diff --git a/src/shared/clock-util.h b/src/shared/clock-util.h
index b9db54eac9..3f1ae7abfc 100644
--- a/src/shared/clock-util.h
+++ b/src/shared/clock-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <time.h>
diff --git a/src/shared/condition.c b/src/shared/condition.c
index af5d48f55b..b2ec690bc3 100644
--- a/src/shared/condition.c
+++ b/src/shared/condition.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <fcntl.h>
diff --git a/src/shared/condition.h b/src/shared/condition.h
index e5ad43f945..0d9754eb85 100644
--- a/src/shared/condition.h
+++ b/src/shared/condition.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdbool.h>
diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c
index 524f57ff80..35d301d9db 100644
--- a/src/shared/conf-parser.c
+++ b/src/shared/conf-parser.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <limits.h>
diff --git a/src/shared/conf-parser.h b/src/shared/conf-parser.h
index d2391d43bb..8f8714361d 100644
--- a/src/shared/conf-parser.h
+++ b/src/shared/conf-parser.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <errno.h>
diff --git a/src/shared/coredump-util.c b/src/shared/coredump-util.c
index 67897414bc..a0b648bf79 100644
--- a/src/shared/coredump-util.c
+++ b/src/shared/coredump-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "coredump-util.h"
#include "extract-word.h"
diff --git a/src/shared/coredump-util.h b/src/shared/coredump-util.h
index ff2e511bf1..a7f3c0e86c 100644
--- a/src/shared/coredump-util.h
+++ b/src/shared/coredump-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include "macro.h"
diff --git a/src/shared/cpu-set-util.c b/src/shared/cpu-set-util.c
index 8779d1d4d3..2c3b5bb034 100644
--- a/src/shared/cpu-set-util.c
+++ b/src/shared/cpu-set-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <stddef.h>
diff --git a/src/shared/cpu-set-util.h b/src/shared/cpu-set-util.h
index 9ec83f6930..3c63a58826 100644
--- a/src/shared/cpu-set-util.h
+++ b/src/shared/cpu-set-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <sched.h>
diff --git a/src/shared/cryptsetup-util.c b/src/shared/cryptsetup-util.c
index 9d86478b06..34a078e7e7 100644
--- a/src/shared/cryptsetup-util.c
+++ b/src/shared/cryptsetup-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#if HAVE_LIBCRYPTSETUP
#include "alloc-util.h"
diff --git a/src/shared/cryptsetup-util.h b/src/shared/cryptsetup-util.h
index 046953b8cc..b96ffc74e3 100644
--- a/src/shared/cryptsetup-util.h
+++ b/src/shared/cryptsetup-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include "macro.h"
diff --git a/src/shared/daemon-util.h b/src/shared/daemon-util.h
index 04b8245310..585e4894a0 100644
--- a/src/shared/daemon-util.h
+++ b/src/shared/daemon-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdbool.h>
diff --git a/src/shared/dev-setup.c b/src/shared/dev-setup.c
index d970640993..b788b06913 100644
--- a/src/shared/dev-setup.c
+++ b/src/shared/dev-setup.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <stdlib.h>
diff --git a/src/shared/dev-setup.h b/src/shared/dev-setup.h
index 437c0e96e6..92ba6cf764 100644
--- a/src/shared/dev-setup.h
+++ b/src/shared/dev-setup.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <sys/types.h>
diff --git a/src/shared/dissect-image.c b/src/shared/dissect-image.c
index 394692093c..b32a8bc4e4 100644
--- a/src/shared/dissect-image.c
+++ b/src/shared/dissect-image.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#if HAVE_VALGRIND_MEMCHECK_H
#include <valgrind/memcheck.h>
diff --git a/src/shared/dissect-image.h b/src/shared/dissect-image.h
index f5db7327bd..3b30e08f90 100644
--- a/src/shared/dissect-image.h
+++ b/src/shared/dissect-image.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdbool.h>
diff --git a/src/shared/dm-util.c b/src/shared/dm-util.c
index cfb13bad4c..b48b9b5cbc 100644
--- a/src/shared/dm-util.c
+++ b/src/shared/dm-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <fcntl.h>
#include <linux/dm-ioctl.h>
diff --git a/src/shared/dm-util.h b/src/shared/dm-util.h
index 997963c042..e6e3d7d8c5 100644
--- a/src/shared/dm-util.h
+++ b/src/shared/dm-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
int dm_deferred_remove_cancel(const char *name);
diff --git a/src/shared/dns-domain.c b/src/shared/dns-domain.c
index 35d2eaa9f1..8bd1e3a6ac 100644
--- a/src/shared/dns-domain.c
+++ b/src/shared/dns-domain.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <endian.h>
#include <netinet/in.h>
diff --git a/src/shared/dns-domain.h b/src/shared/dns-domain.h
index 60de7af227..77f596294d 100644
--- a/src/shared/dns-domain.h
+++ b/src/shared/dns-domain.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <errno.h>
diff --git a/src/shared/dropin.c b/src/shared/dropin.c
index 6c614b5c0a..89f4b8ad89 100644
--- a/src/shared/dropin.c
+++ b/src/shared/dropin.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <stdarg.h>
diff --git a/src/shared/dropin.h b/src/shared/dropin.h
index addf1dab14..54cceaff1a 100644
--- a/src/shared/dropin.h
+++ b/src/shared/dropin.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include "hashmap.h"
diff --git a/src/shared/efi-loader.c b/src/shared/efi-loader.c
index 9411fc8cef..20f70da31a 100644
--- a/src/shared/efi-loader.c
+++ b/src/shared/efi-loader.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <stdlib.h>
#include <sys/stat.h>
diff --git a/src/shared/efi-loader.h b/src/shared/efi-loader.h
index 171274a0e3..34476f4ced 100644
--- a/src/shared/efi-loader.h
+++ b/src/shared/efi-loader.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include "efivars.h"
diff --git a/src/shared/enable-mempool.c b/src/shared/enable-mempool.c
index a571b43f57..1abfccbd81 100644
--- a/src/shared/enable-mempool.c
+++ b/src/shared/enable-mempool.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "mempool.h"
diff --git a/src/shared/env-file-label.c b/src/shared/env-file-label.c
index add68d224d..468afce2ba 100644
--- a/src/shared/env-file-label.c
+++ b/src/shared/env-file-label.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <sys/stat.h>
diff --git a/src/shared/env-file-label.h b/src/shared/env-file-label.h
index 158fc4ec0b..d68058ab2e 100644
--- a/src/shared/env-file-label.h
+++ b/src/shared/env-file-label.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
/* These functions are split out of fileio.h (and not for example just flags to the functions they wrap) in order to
diff --git a/src/shared/ethtool-util.c b/src/shared/ethtool-util.c
index e36b4090ad..e60d516126 100644
--- a/src/shared/ethtool-util.c
+++ b/src/shared/ethtool-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <net/if.h>
#include <sys/ioctl.h>
diff --git a/src/shared/ethtool-util.h b/src/shared/ethtool-util.h
index 9e3f1ed51a..f94b3e15bf 100644
--- a/src/shared/ethtool-util.h
+++ b/src/shared/ethtool-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <macro.h>
diff --git a/src/shared/exec-util.c b/src/shared/exec-util.c
index 8fb936dcce..61ee3b18d5 100644
--- a/src/shared/exec-util.c
+++ b/src/shared/exec-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <dirent.h>
#include <errno.h>
diff --git a/src/shared/exec-util.h b/src/shared/exec-util.h
index 9fe9012516..a69d57c7ae 100644
--- a/src/shared/exec-util.h
+++ b/src/shared/exec-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdbool.h>
diff --git a/src/shared/exit-status.c b/src/shared/exit-status.c
index e2b6c67953..b71dd7afd5 100644
--- a/src/shared/exit-status.c
+++ b/src/shared/exit-status.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <signal.h>
#include <stdlib.h>
diff --git a/src/shared/exit-status.h b/src/shared/exit-status.h
index 7ac99a4810..05707bf722 100644
--- a/src/shared/exit-status.h
+++ b/src/shared/exit-status.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdbool.h>
diff --git a/src/shared/fdset.c b/src/shared/fdset.c
index dfe8242fc4..679e4aad22 100644
--- a/src/shared/fdset.c
+++ b/src/shared/fdset.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <fcntl.h>
diff --git a/src/shared/fdset.h b/src/shared/fdset.h
index ceabb82311..39d15ee4aa 100644
--- a/src/shared/fdset.h
+++ b/src/shared/fdset.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdbool.h>
diff --git a/src/shared/fileio-label.c b/src/shared/fileio-label.c
index 49ab29720b..d03b0548ec 100644
--- a/src/shared/fileio-label.c
+++ b/src/shared/fileio-label.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <sys/stat.h>
diff --git a/src/shared/fileio-label.h b/src/shared/fileio-label.h
index 8f88955d81..03b4a16417 100644
--- a/src/shared/fileio-label.h
+++ b/src/shared/fileio-label.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdio.h>
diff --git a/src/shared/firewall-util.c b/src/shared/firewall-util.c
index 4d4d615bb7..007d2cb39b 100644
--- a/src/shared/firewall-util.c
+++ b/src/shared/firewall-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
/* Temporary work-around for broken glibc vs. linux kernel header definitions
* This is already fixed upstream, remove this when distributions have updated.
diff --git a/src/shared/firewall-util.h b/src/shared/firewall-util.h
index 4fc71dade2..0a51a3c692 100644
--- a/src/shared/firewall-util.h
+++ b/src/shared/firewall-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdbool.h>
diff --git a/src/shared/format-table.c b/src/shared/format-table.c
index 1063baba52..a13a198b7a 100644
--- a/src/shared/format-table.c
+++ b/src/shared/format-table.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <ctype.h>
#include <net/if.h>
diff --git a/src/shared/format-table.h b/src/shared/format-table.h
index 0d7b7c48c5..965549b60a 100644
--- a/src/shared/format-table.h
+++ b/src/shared/format-table.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdbool.h>
diff --git a/src/shared/fsck-util.h b/src/shared/fsck-util.h
index 78ec18dd07..855137c99a 100644
--- a/src/shared/fsck-util.h
+++ b/src/shared/fsck-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
/* exit codes as defined in fsck(8) */
diff --git a/src/shared/fstab-util.c b/src/shared/fstab-util.c
index ca88813602..292b97cd69 100644
--- a/src/shared/fstab-util.c
+++ b/src/shared/fstab-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <stdio.h>
diff --git a/src/shared/fstab-util.h b/src/shared/fstab-util.h
index a73575e95c..1a602cb56b 100644
--- a/src/shared/fstab-util.h
+++ b/src/shared/fstab-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdbool.h>
diff --git a/src/shared/generator.c b/src/shared/generator.c
index d61b367d33..4d49b7d52b 100644
--- a/src/shared/generator.c
+++ b/src/shared/generator.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <unistd.h>
diff --git a/src/shared/generator.h b/src/shared/generator.h
index 579e291fe8..ff6072f53d 100644
--- a/src/shared/generator.h
+++ b/src/shared/generator.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdio.h>
diff --git a/src/shared/geneve-util.c b/src/shared/geneve-util.c
index fad01e208b..36ef9c83c7 100644
--- a/src/shared/geneve-util.c
+++ b/src/shared/geneve-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "geneve-util.h"
#include "string-table.h"
diff --git a/src/shared/geneve-util.h b/src/shared/geneve-util.h
index 63c03ae02a..3865f805a4 100644
--- a/src/shared/geneve-util.h
+++ b/src/shared/geneve-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <linux/if_link.h>
diff --git a/src/shared/gpt.c b/src/shared/gpt.c
index 53a3f4bfe6..ebcaa9d70f 100644
--- a/src/shared/gpt.c
+++ b/src/shared/gpt.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "gpt.h"
#include "string-util.h"
diff --git a/src/shared/gpt.h b/src/shared/gpt.h
index b162eb9d0d..94752ea128 100644
--- a/src/shared/gpt.h
+++ b/src/shared/gpt.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <endian.h>
diff --git a/src/shared/group-record.c b/src/shared/group-record.c
index d999ff95f8..da3ed0a850 100644
--- a/src/shared/group-record.c
+++ b/src/shared/group-record.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "group-record.h"
#include "strv.h"
diff --git a/src/shared/group-record.h b/src/shared/group-record.h
index 85c91eb1f5..f81020437c 100644
--- a/src/shared/group-record.h
+++ b/src/shared/group-record.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include "json.h"
diff --git a/src/shared/id128-print.c b/src/shared/id128-print.c
index 6237424e82..f232767adf 100644
--- a/src/shared/id128-print.c
+++ b/src/shared/id128-print.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <stdio.h>
diff --git a/src/shared/id128-print.h b/src/shared/id128-print.h
index 247558231c..d69cb9b551 100644
--- a/src/shared/id128-print.h
+++ b/src/shared/id128-print.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
diff --git a/src/shared/idn-util.c b/src/shared/idn-util.c
index 75d815df38..83c4b3c530 100644
--- a/src/shared/idn-util.c
+++ b/src/shared/idn-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#if HAVE_LIBIDN2
# include <idn2.h>
diff --git a/src/shared/idn-util.h b/src/shared/idn-util.h
index d958559ec9..4698eed3b8 100644
--- a/src/shared/idn-util.h
+++ b/src/shared/idn-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#if HAVE_LIBIDN2
diff --git a/src/shared/ima-util.c b/src/shared/ima-util.c
index 0d4ce3cafc..e37c9ad226 100644
--- a/src/shared/ima-util.c
+++ b/src/shared/ima-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <unistd.h>
diff --git a/src/shared/ima-util.h b/src/shared/ima-util.h
index 8f20741c33..922db786e6 100644
--- a/src/shared/ima-util.h
+++ b/src/shared/ima-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdbool.h>
diff --git a/src/shared/import-util.c b/src/shared/import-util.c
index 0a57c08990..298c066dff 100644
--- a/src/shared/import-util.c
+++ b/src/shared/import-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
diff --git a/src/shared/import-util.h b/src/shared/import-util.h
index d85aa565cc..8d017f61d1 100644
--- a/src/shared/import-util.h
+++ b/src/shared/import-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdbool.h>
diff --git a/src/shared/install-printf.c b/src/shared/install-printf.c
index 9267d52b96..af350a63a5 100644
--- a/src/shared/install-printf.c
+++ b/src/shared/install-printf.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <stdio.h>
diff --git a/src/shared/install-printf.h b/src/shared/install-printf.h
index fa8ea7ef81..34e129413e 100644
--- a/src/shared/install-printf.h
+++ b/src/shared/install-printf.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include "install.h"
diff --git a/src/shared/install.c b/src/shared/install.c
index cd14b2c4be..302497a965 100644
--- a/src/shared/install.c
+++ b/src/shared/install.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <fcntl.h>
diff --git a/src/shared/install.h b/src/shared/install.h
index 23ac995332..84bf1f59d2 100644
--- a/src/shared/install.h
+++ b/src/shared/install.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
typedef enum UnitFilePresetMode UnitFilePresetMode;
diff --git a/src/shared/ip-protocol-list.c b/src/shared/ip-protocol-list.c
index aa675ea10b..0623d5e9be 100644
--- a/src/shared/ip-protocol-list.c
+++ b/src/shared/ip-protocol-list.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <netinet/in.h>
diff --git a/src/shared/ip-protocol-list.h b/src/shared/ip-protocol-list.h
index 5c94969695..abe3f5fc28 100644
--- a/src/shared/ip-protocol-list.h
+++ b/src/shared/ip-protocol-list.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
const char *ip_protocol_to_name(int id);
diff --git a/src/shared/ipvlan-util.c b/src/shared/ipvlan-util.c
index da6be76789..1f2e2ffe7b 100644
--- a/src/shared/ipvlan-util.c
+++ b/src/shared/ipvlan-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <net/if.h>
diff --git a/src/shared/ipvlan-util.h b/src/shared/ipvlan-util.h
index dda659d42d..90f755b472 100644
--- a/src/shared/ipvlan-util.h
+++ b/src/shared/ipvlan-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <netinet/in.h>
diff --git a/src/shared/journal-importer.c b/src/shared/journal-importer.c
index 7c4fc7021d..e95b638f4d 100644
--- a/src/shared/journal-importer.c
+++ b/src/shared/journal-importer.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <unistd.h>
diff --git a/src/shared/journal-importer.h b/src/shared/journal-importer.h
index 783edff5d3..e0073fcea8 100644
--- a/src/shared/journal-importer.h
+++ b/src/shared/journal-importer.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
diff --git a/src/shared/journal-util.c b/src/shared/journal-util.c
index 4d0edbb7d0..29659aa6b7 100644
--- a/src/shared/journal-util.c
+++ b/src/shared/journal-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "acl-util.h"
#include "fs-util.h"
diff --git a/src/shared/journal-util.h b/src/shared/journal-util.h
index 34ad1bfc8e..db7000ffef 100644
--- a/src/shared/journal-util.h
+++ b/src/shared/journal-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdbool.h>
diff --git a/src/shared/json-internal.h b/src/shared/json-internal.h
index fabff0c860..63afd22417 100644
--- a/src/shared/json-internal.h
+++ b/src/shared/json-internal.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
diff --git a/src/shared/json.c b/src/shared/json.c
index dc06dcb6b8..ddf6dcb663 100644
--- a/src/shared/json.c
+++ b/src/shared/json.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <locale.h>
diff --git a/src/shared/json.h b/src/shared/json.h
index 1d6fec67b6..0809f3187e 100644
--- a/src/shared/json.h
+++ b/src/shared/json.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <fcntl.h>
diff --git a/src/shared/libcrypt-util.c b/src/shared/libcrypt-util.c
index 8a46ace205..5b315413aa 100644
--- a/src/shared/libcrypt-util.c
+++ b/src/shared/libcrypt-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#if HAVE_CRYPT_H
/* libxcrypt is a replacement for glibc's libcrypt, and libcrypt might be
diff --git a/src/shared/libcrypt-util.h b/src/shared/libcrypt-util.h
index 924a35d3e1..5b9b945629 100644
--- a/src/shared/libcrypt-util.h
+++ b/src/shared/libcrypt-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdbool.h>
diff --git a/src/shared/libmount-util.h b/src/shared/libmount-util.h
index 7c3b855df5..db9728c332 100644
--- a/src/shared/libmount-util.h
+++ b/src/shared/libmount-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdio.h>
diff --git a/src/shared/local-addresses.c b/src/shared/local-addresses.c
index aaad0d9ff0..7be6b945f2 100644
--- a/src/shared/local-addresses.c
+++ b/src/shared/local-addresses.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "sd-netlink.h"
diff --git a/src/shared/local-addresses.h b/src/shared/local-addresses.h
index e88c5e5d21..c633995dc9 100644
--- a/src/shared/local-addresses.h
+++ b/src/shared/local-addresses.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include "sd-netlink.h"
diff --git a/src/shared/lockfile-util.c b/src/shared/lockfile-util.c
index 260c2088d5..6f059abfff 100644
--- a/src/shared/lockfile-util.c
+++ b/src/shared/lockfile-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <fcntl.h>
diff --git a/src/shared/lockfile-util.h b/src/shared/lockfile-util.h
index e0eef34cdc..36063270dd 100644
--- a/src/shared/lockfile-util.h
+++ b/src/shared/lockfile-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
typedef struct LockFile {
diff --git a/src/shared/log-link.h b/src/shared/log-link.h
index b844f9ef81..bb692e0518 100644
--- a/src/shared/log-link.h
+++ b/src/shared/log-link.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include "log.h"
diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c
index f7d3e01b49..0bcc8f41c9 100644
--- a/src/shared/logs-show.c
+++ b/src/shared/logs-show.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <fcntl.h>
diff --git a/src/shared/logs-show.h b/src/shared/logs-show.h
index 345efa4b2b..71ebe13573 100644
--- a/src/shared/logs-show.h
+++ b/src/shared/logs-show.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdbool.h>
diff --git a/src/shared/loop-util.c b/src/shared/loop-util.c
index 740dccb935..62d5b7ae8e 100644
--- a/src/shared/loop-util.c
+++ b/src/shared/loop-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#if HAVE_VALGRIND_MEMCHECK_H
#include <valgrind/memcheck.h>
diff --git a/src/shared/loop-util.h b/src/shared/loop-util.h
index 16f215b059..9538daea31 100644
--- a/src/shared/loop-util.h
+++ b/src/shared/loop-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include "macro.h"
diff --git a/src/shared/machine-image.c b/src/shared/machine-image.c
index 71d6a2c80b..671a56b9e9 100644
--- a/src/shared/machine-image.c
+++ b/src/shared/machine-image.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <fcntl.h>
diff --git a/src/shared/machine-image.h b/src/shared/machine-image.h
index 9fd45899c8..95a8f5cfbd 100644
--- a/src/shared/machine-image.h
+++ b/src/shared/machine-image.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdbool.h>
diff --git a/src/shared/machine-pool.c b/src/shared/machine-pool.c
index 7e3312835d..1f0b0b4730 100644
--- a/src/shared/machine-pool.c
+++ b/src/shared/machine-pool.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
diff --git a/src/shared/machine-pool.h b/src/shared/machine-pool.h
index 6f59a18fb6..3f528ab060 100644
--- a/src/shared/machine-pool.h
+++ b/src/shared/machine-pool.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdint.h>
diff --git a/src/shared/macvlan-util.c b/src/shared/macvlan-util.c
index 926b4d42a0..11dffe99b2 100644
--- a/src/shared/macvlan-util.c
+++ b/src/shared/macvlan-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "conf-parser.h"
#include "macvlan-util.h"
diff --git a/src/shared/macvlan-util.h b/src/shared/macvlan-util.h
index 7670bbf402..0d3a5f4050 100644
--- a/src/shared/macvlan-util.h
+++ b/src/shared/macvlan-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <linux/if_link.h>
diff --git a/src/shared/main-func.h b/src/shared/main-func.h
index cf23ad450c..05cdffeec0 100644
--- a/src/shared/main-func.h
+++ b/src/shared/main-func.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdlib.h>
diff --git a/src/shared/meson.build b/src/shared/meson.build
index 260ee5a8b6..f30fe44995 100644
--- a/src/shared/meson.build
+++ b/src/shared/meson.build
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
shared_sources = files('''
acl-util.h
diff --git a/src/shared/mkfs-util.c b/src/shared/mkfs-util.c
index 6289a73399..ce10e60bb6 100644
--- a/src/shared/mkfs-util.c
+++ b/src/shared/mkfs-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "id128-util.h"
#include "mkfs-util.h"
diff --git a/src/shared/mkfs-util.h b/src/shared/mkfs-util.h
index 54e9b931e6..7647afbfc7 100644
--- a/src/shared/mkfs-util.h
+++ b/src/shared/mkfs-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdbool.h>
diff --git a/src/shared/module-util.c b/src/shared/module-util.c
index e1d394c0e1..587e6369fb 100644
--- a/src/shared/module-util.c
+++ b/src/shared/module-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
diff --git a/src/shared/module-util.h b/src/shared/module-util.h
index c386c5b459..4db8c5f04e 100644
--- a/src/shared/module-util.h
+++ b/src/shared/module-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <libkmod.h>
diff --git a/src/shared/mount-util.c b/src/shared/mount-util.c
index 83ce749d12..b19b3849aa 100644
--- a/src/shared/mount-util.c
+++ b/src/shared/mount-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <stdlib.h>
diff --git a/src/shared/mount-util.h b/src/shared/mount-util.h
index 63de2c7dff..6202008a81 100644
--- a/src/shared/mount-util.h
+++ b/src/shared/mount-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <mntent.h>
diff --git a/src/shared/netif-naming-scheme.c b/src/shared/netif-naming-scheme.c
index 0a701b0e92..df520ab89e 100644
--- a/src/shared/netif-naming-scheme.c
+++ b/src/shared/netif-naming-scheme.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "alloc-util.h"
#include "netif-naming-scheme.h"
diff --git a/src/shared/netif-naming-scheme.h b/src/shared/netif-naming-scheme.h
index db47d2909e..503a74ea33 100644
--- a/src/shared/netif-naming-scheme.h
+++ b/src/shared/netif-naming-scheme.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdbool.h>
diff --git a/src/shared/nscd-flush.c b/src/shared/nscd-flush.c
index 10fdbaf326..dfc47c4234 100644
--- a/src/shared/nscd-flush.c
+++ b/src/shared/nscd-flush.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <sys/poll.h>
#include "fd-util.h"
diff --git a/src/shared/nscd-flush.h b/src/shared/nscd-flush.h
index 22774bf4b7..5aafa9a24e 100644
--- a/src/shared/nscd-flush.h
+++ b/src/shared/nscd-flush.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
int nscd_flush_cache(char **databases);
diff --git a/src/shared/nsflags.c b/src/shared/nsflags.c
index 4dbd18b868..2845041cf4 100644
--- a/src/shared/nsflags.c
+++ b/src/shared/nsflags.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
diff --git a/src/shared/nsflags.h b/src/shared/nsflags.h
index 0aeb0bc891..3d774c755c 100644
--- a/src/shared/nsflags.h
+++ b/src/shared/nsflags.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include "missing_sched.h"
diff --git a/src/shared/numa-util.c b/src/shared/numa-util.c
index 3ec8ffc5b2..7e41d68662 100644
--- a/src/shared/numa-util.c
+++ b/src/shared/numa-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <sched.h>
diff --git a/src/shared/numa-util.h b/src/shared/numa-util.h
index 2a9ced74e8..2f736c9c35 100644
--- a/src/shared/numa-util.h
+++ b/src/shared/numa-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include "cpu-set-util.h"
diff --git a/src/shared/offline-passwd.c b/src/shared/offline-passwd.c
index 2d14a38dfe..b607aacf57 100644
--- a/src/shared/offline-passwd.c
+++ b/src/shared/offline-passwd.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "fd-util.h"
#include "fs-util.h"
diff --git a/src/shared/offline-passwd.h b/src/shared/offline-passwd.h
index 90bdfc79be..587af7b01c 100644
--- a/src/shared/offline-passwd.h
+++ b/src/shared/offline-passwd.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <sys/types.h>
diff --git a/src/shared/openssl-util.h b/src/shared/openssl-util.h
index a7dab530e4..1b49834dd8 100644
--- a/src/shared/openssl-util.h
+++ b/src/shared/openssl-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#if HAVE_OPENSSL
diff --git a/src/shared/os-util.c b/src/shared/os-util.c
index 042e77c8c7..3b7e495846 100644
--- a/src/shared/os-util.c
+++ b/src/shared/os-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "alloc-util.h"
#include "env-file.h"
diff --git a/src/shared/os-util.h b/src/shared/os-util.h
index b54bb0916d..1d9b0b146b 100644
--- a/src/shared/os-util.h
+++ b/src/shared/os-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdio.h>
diff --git a/src/shared/output-mode.c b/src/shared/output-mode.c
index 107b345538..1645b756df 100644
--- a/src/shared/output-mode.c
+++ b/src/shared/output-mode.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "output-mode.h"
#include "string-table.h"
diff --git a/src/shared/output-mode.h b/src/shared/output-mode.h
index 1b4765b3ec..a879054b67 100644
--- a/src/shared/output-mode.h
+++ b/src/shared/output-mode.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include "json.h"
diff --git a/src/shared/pager.c b/src/shared/pager.c
index 9af7009b3f..cd8a840e57 100644
--- a/src/shared/pager.c
+++ b/src/shared/pager.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <stddef.h>
diff --git a/src/shared/pager.h b/src/shared/pager.h
index 8299e23856..b3b1b4f6b0 100644
--- a/src/shared/pager.h
+++ b/src/shared/pager.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdbool.h>
diff --git a/src/shared/pam-util.c b/src/shared/pam-util.c
index ff44df7762..621e7fe802 100644
--- a/src/shared/pam-util.c
+++ b/src/shared/pam-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <security/pam_ext.h>
#include <syslog.h>
diff --git a/src/shared/pam-util.h b/src/shared/pam-util.h
index 26d07b7f0c..41f1835b3c 100644
--- a/src/shared/pam-util.h
+++ b/src/shared/pam-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <security/pam_modules.h>
diff --git a/src/shared/pe-header.h b/src/shared/pe-header.h
index 13cb1d8a15..54433c79b8 100644
--- a/src/shared/pe-header.h
+++ b/src/shared/pe-header.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
diff --git a/src/shared/pkcs11-util.c b/src/shared/pkcs11-util.c
index 400cebb66f..e74f0be260 100644
--- a/src/shared/pkcs11-util.c
+++ b/src/shared/pkcs11-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <fcntl.h>
diff --git a/src/shared/pkcs11-util.h b/src/shared/pkcs11-util.h
index 959e7c3e0d..f14607de84 100644
--- a/src/shared/pkcs11-util.h
+++ b/src/shared/pkcs11-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdbool.h>
diff --git a/src/shared/pretty-print.c b/src/shared/pretty-print.c
index f690f334a2..ca5b25a7ab 100644
--- a/src/shared/pretty-print.c
+++ b/src/shared/pretty-print.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <sys/utsname.h>
#include <errno.h>
diff --git a/src/shared/pretty-print.h b/src/shared/pretty-print.h
index b3057ae6b8..4619f4e4d7 100644
--- a/src/shared/pretty-print.h
+++ b/src/shared/pretty-print.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
void print_separator(void);
diff --git a/src/shared/psi-util.c b/src/shared/psi-util.c
index 21e965b04b..7a184d53f7 100644
--- a/src/shared/psi-util.c
+++ b/src/shared/psi-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <stdio.h>
#include <unistd.h>
diff --git a/src/shared/psi-util.h b/src/shared/psi-util.h
index 9810dbec6e..415fbbdd47 100644
--- a/src/shared/psi-util.h
+++ b/src/shared/psi-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdbool.h>
diff --git a/src/shared/ptyfwd.c b/src/shared/ptyfwd.c
index 6bcdfff41a..754b4f5a94 100644
--- a/src/shared/ptyfwd.c
+++ b/src/shared/ptyfwd.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <fcntl.h>
diff --git a/src/shared/ptyfwd.h b/src/shared/ptyfwd.h
index 887d3cba53..f0ae6e949d 100644
--- a/src/shared/ptyfwd.h
+++ b/src/shared/ptyfwd.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdbool.h>
diff --git a/src/shared/pwquality-util.c b/src/shared/pwquality-util.c
index 67332833a5..4000bef89e 100644
--- a/src/shared/pwquality-util.c
+++ b/src/shared/pwquality-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <unistd.h>
diff --git a/src/shared/pwquality-util.h b/src/shared/pwquality-util.h
index a49de07990..de288bb017 100644
--- a/src/shared/pwquality-util.h
+++ b/src/shared/pwquality-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include "macro.h"
diff --git a/src/shared/qrcode-util.c b/src/shared/qrcode-util.c
index 96d3df493a..7050e186b7 100644
--- a/src/shared/qrcode-util.c
+++ b/src/shared/qrcode-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "qrcode-util.h"
diff --git a/src/shared/qrcode-util.h b/src/shared/qrcode-util.h
index 036c3f7f90..6fc45c93d1 100644
--- a/src/shared/qrcode-util.h
+++ b/src/shared/qrcode-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdio.h>
diff --git a/src/shared/reboot-util.c b/src/shared/reboot-util.c
index 888f685aed..756f9d30e0 100644
--- a/src/shared/reboot-util.c
+++ b/src/shared/reboot-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <unistd.h>
diff --git a/src/shared/reboot-util.h b/src/shared/reboot-util.h
index 1e98ee1dba..bbca8b858d 100644
--- a/src/shared/reboot-util.h
+++ b/src/shared/reboot-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
int update_reboot_parameter_and_warn(const char *parameter, bool keep);
diff --git a/src/shared/resize-fs.c b/src/shared/resize-fs.c
index 24a17a2ffe..33cb78babf 100644
--- a/src/shared/resize-fs.c
+++ b/src/shared/resize-fs.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <linux/btrfs.h>
#include <linux/magic.h>
diff --git a/src/shared/resize-fs.h b/src/shared/resize-fs.h
index 92b41d318c..8831fd8b40 100644
--- a/src/shared/resize-fs.h
+++ b/src/shared/resize-fs.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <inttypes.h>
diff --git a/src/shared/resolve-util.c b/src/shared/resolve-util.c
index 615cb6d852..1023b62499 100644
--- a/src/shared/resolve-util.c
+++ b/src/shared/resolve-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "conf-parser.h"
#include "resolve-util.h"
diff --git a/src/shared/resolve-util.h b/src/shared/resolve-util.h
index a7a9c77bdf..4ea24a60b3 100644
--- a/src/shared/resolve-util.h
+++ b/src/shared/resolve-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include "conf-parser.h"
diff --git a/src/shared/seccomp-util.c b/src/shared/seccomp-util.c
index f6a8e4963d..6ca2c5713d 100644
--- a/src/shared/seccomp-util.c
+++ b/src/shared/seccomp-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <fcntl.h>
diff --git a/src/shared/seccomp-util.h b/src/shared/seccomp-util.h
index ff3b96df4b..610597127e 100644
--- a/src/shared/seccomp-util.h
+++ b/src/shared/seccomp-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <seccomp.h>
diff --git a/src/shared/securebits-util.c b/src/shared/securebits-util.c
index b2abaf4f52..c867807bec 100644
--- a/src/shared/securebits-util.c
+++ b/src/shared/securebits-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <stdio.h>
diff --git a/src/shared/securebits-util.h b/src/shared/securebits-util.h
index b5ec6ee0e6..f2e65cfcb0 100644
--- a/src/shared/securebits-util.h
+++ b/src/shared/securebits-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include "missing_securebits.h"
diff --git a/src/shared/serialize.c b/src/shared/serialize.c
index 00b70a777e..45f57d6a53 100644
--- a/src/shared/serialize.c
+++ b/src/shared/serialize.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <fcntl.h>
diff --git a/src/shared/serialize.h b/src/shared/serialize.h
index 9e61c825aa..6d4f1ef418 100644
--- a/src/shared/serialize.h
+++ b/src/shared/serialize.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdio.h>
diff --git a/src/shared/service-util.c b/src/shared/service-util.c
index c9b684fc05..092be6ee7f 100644
--- a/src/shared/service-util.c
+++ b/src/shared/service-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <getopt.h>
#include <stdio.h>
diff --git a/src/shared/service-util.h b/src/shared/service-util.h
index 928c5961e7..360341fb2f 100644
--- a/src/shared/service-util.h
+++ b/src/shared/service-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include "bus-object.h"
diff --git a/src/shared/sleep-config.c b/src/shared/sleep-config.c
index 134cedaf8b..cea51482de 100644
--- a/src/shared/sleep-config.c
+++ b/src/shared/sleep-config.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
/***
Copyright © 2018 Dell Inc.
***/
diff --git a/src/shared/sleep-config.h b/src/shared/sleep-config.h
index 86dfbf19be..4b30e6db53 100644
--- a/src/shared/sleep-config.h
+++ b/src/shared/sleep-config.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <linux/fiemap.h>
diff --git a/src/shared/socket-netlink.c b/src/shared/socket-netlink.c
index 23970dbe55..4a7007d06e 100644
--- a/src/shared/socket-netlink.c
+++ b/src/shared/socket-netlink.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <arpa/inet.h>
#include <errno.h>
diff --git a/src/shared/socket-netlink.h b/src/shared/socket-netlink.h
index e6cd7d9bf1..eac599159d 100644
--- a/src/shared/socket-netlink.h
+++ b/src/shared/socket-netlink.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include "sd-netlink.h"
diff --git a/src/shared/spawn-ask-password-agent.c b/src/shared/spawn-ask-password-agent.c
index ddaebf0f61..1f07b198fa 100644
--- a/src/shared/spawn-ask-password-agent.c
+++ b/src/shared/spawn-ask-password-agent.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <signal.h>
#include <stdlib.h>
diff --git a/src/shared/spawn-ask-password-agent.h b/src/shared/spawn-ask-password-agent.h
index 97b12fe268..a76cdb11fe 100644
--- a/src/shared/spawn-ask-password-agent.h
+++ b/src/shared/spawn-ask-password-agent.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdbool.h>
diff --git a/src/shared/spawn-polkit-agent.c b/src/shared/spawn-polkit-agent.c
index 4d6c0cae6c..a0024eb2ea 100644
--- a/src/shared/spawn-polkit-agent.c
+++ b/src/shared/spawn-polkit-agent.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <poll.h>
diff --git a/src/shared/spawn-polkit-agent.h b/src/shared/spawn-polkit-agent.h
index 56b0175944..325dfdde46 100644
--- a/src/shared/spawn-polkit-agent.h
+++ b/src/shared/spawn-polkit-agent.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdbool.h>
diff --git a/src/shared/specifier.c b/src/shared/specifier.c
index 112cf6f8fb..86731f8cd2 100644
--- a/src/shared/specifier.c
+++ b/src/shared/specifier.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <stdbool.h>
diff --git a/src/shared/specifier.h b/src/shared/specifier.h
index 50c6cbd6ab..f3c038a1f1 100644
--- a/src/shared/specifier.h
+++ b/src/shared/specifier.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include "string-util.h"
diff --git a/src/shared/switch-root.c b/src/shared/switch-root.c
index bd89cb4ef1..e0dd17a2f8 100644
--- a/src/shared/switch-root.c
+++ b/src/shared/switch-root.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <fcntl.h>
diff --git a/src/shared/switch-root.h b/src/shared/switch-root.h
index f4d48cb431..4e04283e53 100644
--- a/src/shared/switch-root.h
+++ b/src/shared/switch-root.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdbool.h>
diff --git a/src/shared/sysctl-util.c b/src/shared/sysctl-util.c
index 8543dbd2d0..670c33108b 100644
--- a/src/shared/sysctl-util.c
+++ b/src/shared/sysctl-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <fcntl.h>
diff --git a/src/shared/sysctl-util.h b/src/shared/sysctl-util.h
index 316cfcccf9..32364196f9 100644
--- a/src/shared/sysctl-util.h
+++ b/src/shared/sysctl-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdbool.h>
diff --git a/src/shared/test-tables.h b/src/shared/test-tables.h
index 4eeda3b1bb..bb8177b649 100644
--- a/src/shared/test-tables.h
+++ b/src/shared/test-tables.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <stdio.h>
#include <stdlib.h>
diff --git a/src/shared/tests.c b/src/shared/tests.c
index 808e2e6040..ab7d799029 100644
--- a/src/shared/tests.c
+++ b/src/shared/tests.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <sched.h>
#include <signal.h>
diff --git a/src/shared/tests.h b/src/shared/tests.h
index 552e0f2c22..c1350763ad 100644
--- a/src/shared/tests.h
+++ b/src/shared/tests.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdbool.h>
diff --git a/src/shared/tmpfile-util-label.c b/src/shared/tmpfile-util-label.c
index c12d7c1375..d37c0b0845 100644
--- a/src/shared/tmpfile-util-label.c
+++ b/src/shared/tmpfile-util-label.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <sys/stat.h>
diff --git a/src/shared/tmpfile-util-label.h b/src/shared/tmpfile-util-label.h
index 97a875161b..01afc0658d 100644
--- a/src/shared/tmpfile-util-label.h
+++ b/src/shared/tmpfile-util-label.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdio.h>
diff --git a/src/shared/tomoyo-util.c b/src/shared/tomoyo-util.c
index 75c24d8007..2347179cbc 100644
--- a/src/shared/tomoyo-util.c
+++ b/src/shared/tomoyo-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <unistd.h>
diff --git a/src/shared/tomoyo-util.h b/src/shared/tomoyo-util.h
index 06e8227857..a6ee7d4b26 100644
--- a/src/shared/tomoyo-util.h
+++ b/src/shared/tomoyo-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdbool.h>
diff --git a/src/shared/udev-util.c b/src/shared/udev-util.c
index 7bb9f40a75..030922eca9 100644
--- a/src/shared/udev-util.c
+++ b/src/shared/udev-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <unistd.h>
diff --git a/src/shared/udev-util.h b/src/shared/udev-util.h
index 0eb7f81904..270861e55e 100644
--- a/src/shared/udev-util.h
+++ b/src/shared/udev-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include "sd-device.h"
diff --git a/src/shared/uid-range.c b/src/shared/uid-range.c
index 201d27ab63..5d5bf7f21d 100644
--- a/src/shared/uid-range.c
+++ b/src/shared/uid-range.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <stdlib.h>
diff --git a/src/shared/uid-range.h b/src/shared/uid-range.h
index 49ba38287e..ef168cdb33 100644
--- a/src/shared/uid-range.h
+++ b/src/shared/uid-range.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdbool.h>
diff --git a/src/shared/unit-file.c b/src/shared/unit-file.c
index 3b51c7c998..4c307199e6 100644
--- a/src/shared/unit-file.c
+++ b/src/shared/unit-file.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "sd-id128.h"
diff --git a/src/shared/unit-file.h b/src/shared/unit-file.h
index d36bb07cc2..5463b0ab13 100644
--- a/src/shared/unit-file.h
+++ b/src/shared/unit-file.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdbool.h>
diff --git a/src/shared/user-record-nss.c b/src/shared/user-record-nss.c
index d06c8abdbe..88b8fc2f8f 100644
--- a/src/shared/user-record-nss.c
+++ b/src/shared/user-record-nss.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "errno-util.h"
#include "format-util.h"
diff --git a/src/shared/user-record-nss.h b/src/shared/user-record-nss.h
index e2a87f664c..22ab04d6ee 100644
--- a/src/shared/user-record-nss.h
+++ b/src/shared/user-record-nss.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <grp.h>
diff --git a/src/shared/user-record-show.c b/src/shared/user-record-show.c
index 9046fafcb2..29790282b4 100644
--- a/src/shared/user-record-show.c
+++ b/src/shared/user-record-show.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "format-util.h"
#include "fs-util.h"
diff --git a/src/shared/user-record-show.h b/src/shared/user-record-show.h
index 4dcee180a2..dcef065d92 100644
--- a/src/shared/user-record-show.h
+++ b/src/shared/user-record-show.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include "user-record.h"
diff --git a/src/shared/user-record.c b/src/shared/user-record.c
index 7e7b28eb55..afa3986642 100644
--- a/src/shared/user-record.c
+++ b/src/shared/user-record.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <sys/mount.h>
diff --git a/src/shared/user-record.h b/src/shared/user-record.h
index 2e74b910c2..542a0dc84a 100644
--- a/src/shared/user-record.h
+++ b/src/shared/user-record.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <inttypes.h>
diff --git a/src/shared/userdb.c b/src/shared/userdb.c
index 57e58a61a9..2d480283d1 100644
--- a/src/shared/userdb.c
+++ b/src/shared/userdb.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <sys/auxv.h>
diff --git a/src/shared/userdb.h b/src/shared/userdb.h
index 2464f54c3e..ee207b518e 100644
--- a/src/shared/userdb.h
+++ b/src/shared/userdb.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <sys/socket.h>
diff --git a/src/shared/utmp-wtmp.c b/src/shared/utmp-wtmp.c
index 9edcd8302a..b36bc20512 100644
--- a/src/shared/utmp-wtmp.c
+++ b/src/shared/utmp-wtmp.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <fcntl.h>
diff --git a/src/shared/utmp-wtmp.h b/src/shared/utmp-wtmp.h
index fe55bad12d..3e71f76b27 100644
--- a/src/shared/utmp-wtmp.h
+++ b/src/shared/utmp-wtmp.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdbool.h>
diff --git a/src/shared/varlink.c b/src/shared/varlink.c
index fabfe78280..e7be33ca70 100644
--- a/src/shared/varlink.c
+++ b/src/shared/varlink.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <sys/poll.h>
diff --git a/src/shared/varlink.h b/src/shared/varlink.h
index 030db39b2f..7ea1f9113f 100644
--- a/src/shared/varlink.h
+++ b/src/shared/varlink.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include "sd-event.h"
diff --git a/src/shared/verbs.c b/src/shared/verbs.c
index d2744b6918..2d19172c6f 100644
--- a/src/shared/verbs.c
+++ b/src/shared/verbs.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <getopt.h>
diff --git a/src/shared/verbs.h b/src/shared/verbs.h
index b6a1afcdee..245bb37ae4 100644
--- a/src/shared/verbs.h
+++ b/src/shared/verbs.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdbool.h>
diff --git a/src/shared/vlan-util.c b/src/shared/vlan-util.c
index 180f56ede8..cb43d50220 100644
--- a/src/shared/vlan-util.c
+++ b/src/shared/vlan-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "conf-parser.h"
#include "parse-util.h"
diff --git a/src/shared/vlan-util.h b/src/shared/vlan-util.h
index c55adee3c0..0336908bf3 100644
--- a/src/shared/vlan-util.h
+++ b/src/shared/vlan-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdbool.h>
diff --git a/src/shared/volatile-util.c b/src/shared/volatile-util.c
index 5ca6ab3376..3323897a4c 100644
--- a/src/shared/volatile-util.c
+++ b/src/shared/volatile-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
diff --git a/src/shared/volatile-util.h b/src/shared/volatile-util.h
index 2d31bb1174..9a1bb384e9 100644
--- a/src/shared/volatile-util.h
+++ b/src/shared/volatile-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
typedef enum VolatileMode {
diff --git a/src/shared/watchdog.c b/src/shared/watchdog.c
index 8c8fef6ca0..d33acafe64 100644
--- a/src/shared/watchdog.c
+++ b/src/shared/watchdog.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <fcntl.h>
diff --git a/src/shared/watchdog.h b/src/shared/watchdog.h
index ce739fd8a3..b7587db3ab 100644
--- a/src/shared/watchdog.h
+++ b/src/shared/watchdog.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdbool.h>
diff --git a/src/shared/web-util.c b/src/shared/web-util.c
index edf650d200..82cd5fbd6b 100644
--- a/src/shared/web-util.c
+++ b/src/shared/web-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <stdbool.h>
diff --git a/src/shared/web-util.h b/src/shared/web-util.h
index c9e67e5c0a..ec54669f50 100644
--- a/src/shared/web-util.h
+++ b/src/shared/web-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdbool.h>
diff --git a/src/shared/wifi-util.c b/src/shared/wifi-util.c
index 22bb3041fb..ae5cecc25d 100644
--- a/src/shared/wifi-util.c
+++ b/src/shared/wifi-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <net/ethernet.h>
#include <linux/nl80211.h>
diff --git a/src/shared/wifi-util.h b/src/shared/wifi-util.h
index c7553fafde..01b0c3c635 100644
--- a/src/shared/wifi-util.h
+++ b/src/shared/wifi-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
diff --git a/src/shared/xml.c b/src/shared/xml.c
index 78ac42f080..8ff3feafe4 100644
--- a/src/shared/xml.c
+++ b/src/shared/xml.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <stddef.h>
diff --git a/src/shared/xml.h b/src/shared/xml.h
index 8da2ff5f75..217b3b0e40 100644
--- a/src/shared/xml.h
+++ b/src/shared/xml.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
enum {