summaryrefslogtreecommitdiffstats
path: root/units
diff options
context:
space:
mode:
Diffstat (limited to 'units')
-rw-r--r--units/basic.target2
-rw-r--r--units/blockdev@.target2
-rw-r--r--units/bluetooth.target2
-rw-r--r--units/boot-complete.target2
-rw-r--r--units/console-getty.service.m42
-rw-r--r--units/container-getty@.service.m42
-rw-r--r--units/cryptsetup-pre.target2
-rw-r--r--units/cryptsetup.target2
-rw-r--r--units/debug-shell.service.in2
-rw-r--r--units/dev-hugepages.mount2
-rw-r--r--units/dev-mqueue.mount2
-rw-r--r--units/emergency.service.in2
-rw-r--r--units/emergency.target2
-rw-r--r--units/exit.target2
-rw-r--r--units/final.target2
-rw-r--r--units/first-boot-complete.target2
-rw-r--r--units/getty-pre.target2
-rw-r--r--units/getty.target2
-rw-r--r--units/getty@.service.m42
-rw-r--r--units/graphical.target2
-rw-r--r--units/halt.target2
-rw-r--r--units/hibernate.target2
-rw-r--r--units/hybrid-sleep.target2
-rw-r--r--units/initrd-cleanup.service2
-rw-r--r--units/initrd-fs.target2
-rw-r--r--units/initrd-parse-etc.service2
-rw-r--r--units/initrd-root-device.target2
-rw-r--r--units/initrd-root-fs.target2
-rw-r--r--units/initrd-switch-root.service2
-rw-r--r--units/initrd-switch-root.target2
-rw-r--r--units/initrd-udevadm-cleanup-db.service2
-rw-r--r--units/initrd.target2
-rw-r--r--units/kexec.target2
-rw-r--r--units/kmod-static-nodes.service.in2
-rw-r--r--units/ldconfig.service2
-rw-r--r--units/local-fs-pre.target2
-rw-r--r--units/local-fs.target2
-rw-r--r--units/machine.slice2
-rw-r--r--units/machines.target2
-rw-r--r--units/meson.build2
-rw-r--r--units/modprobe@.service2
-rw-r--r--units/multi-user.target2
-rw-r--r--units/network-online.target2
-rw-r--r--units/network-pre.target2
-rw-r--r--units/network.target2
-rw-r--r--units/nss-lookup.target2
-rw-r--r--units/nss-user-lookup.target2
-rw-r--r--units/paths.target2
-rw-r--r--units/poweroff.target2
-rw-r--r--units/printer.target2
-rw-r--r--units/proc-sys-fs-binfmt_misc.automount2
-rw-r--r--units/proc-sys-fs-binfmt_misc.mount2
-rw-r--r--units/quotaon.service.in2
-rw-r--r--units/rc-local.service.in2
-rw-r--r--units/reboot.target2
-rw-r--r--units/remote-cryptsetup.target2
-rw-r--r--units/remote-fs-pre.target2
-rw-r--r--units/remote-fs.target2
-rw-r--r--units/rescue.service.in2
-rw-r--r--units/rescue.target2
-rw-r--r--units/rpcbind.target2
-rw-r--r--units/serial-getty@.service.m42
-rw-r--r--units/shutdown.target2
-rw-r--r--units/sigpwr.target2
-rw-r--r--units/sleep.target2
-rw-r--r--units/slices.target2
-rw-r--r--units/smartcard.target2
-rw-r--r--units/sockets.target2
-rw-r--r--units/sound.target2
-rw-r--r--units/suspend-then-hibernate.target2
-rw-r--r--units/suspend.target2
-rw-r--r--units/swap.target2
-rw-r--r--units/sys-fs-fuse-connections.mount2
-rw-r--r--units/sys-kernel-config.mount2
-rw-r--r--units/sys-kernel-debug.mount2
-rw-r--r--units/sys-kernel-tracing.mount2
-rw-r--r--units/sysinit.target2
-rw-r--r--units/syslog.socket2
-rw-r--r--units/system-systemd\x2dcryptsetup.slice2
-rw-r--r--units/system-update-cleanup.service2
-rw-r--r--units/system-update-pre.target2
-rw-r--r--units/system-update.target2
-rw-r--r--units/systemd-ask-password-console.path2
-rw-r--r--units/systemd-ask-password-console.service2
-rw-r--r--units/systemd-ask-password-wall.path2
-rw-r--r--units/systemd-ask-password-wall.service2
-rw-r--r--units/systemd-backlight@.service.in2
-rw-r--r--units/systemd-binfmt.service.in2
-rw-r--r--units/systemd-bless-boot.service.in2
-rw-r--r--units/systemd-boot-check-no-failures.service.in2
-rw-r--r--units/systemd-boot-system-token.service2
-rw-r--r--units/systemd-coredump.socket2
-rw-r--r--units/systemd-coredump@.service.in2
-rw-r--r--units/systemd-exit.service2
-rw-r--r--units/systemd-firstboot.service2
-rw-r--r--units/systemd-fsck-root.service.in2
-rw-r--r--units/systemd-fsck@.service.in2
-rw-r--r--units/systemd-halt.service2
-rw-r--r--units/systemd-hibernate-resume@.service.in2
-rw-r--r--units/systemd-hibernate.service.in2
-rw-r--r--units/systemd-homed-activate.service2
-rw-r--r--units/systemd-homed.service.in2
-rw-r--r--units/systemd-hostnamed.service.in2
-rw-r--r--units/systemd-hwdb-update.service.in2
-rw-r--r--units/systemd-hybrid-sleep.service.in2
-rw-r--r--units/systemd-importd.service.in2
-rw-r--r--units/systemd-initctl.service.in2
-rw-r--r--units/systemd-initctl.socket2
-rw-r--r--units/systemd-journal-catalog-update.service2
-rw-r--r--units/systemd-journal-flush.service2
-rw-r--r--units/systemd-journal-gatewayd.service.in2
-rw-r--r--units/systemd-journal-gatewayd.socket2
-rw-r--r--units/systemd-journal-remote.service.in2
-rw-r--r--units/systemd-journal-remote.socket2
-rw-r--r--units/systemd-journal-upload.service.in2
-rw-r--r--units/systemd-journald-audit.socket2
-rw-r--r--units/systemd-journald-dev-log.socket2
-rw-r--r--units/systemd-journald-varlink@.socket2
-rw-r--r--units/systemd-journald.service.in2
-rw-r--r--units/systemd-journald.socket2
-rw-r--r--units/systemd-journald@.service.in2
-rw-r--r--units/systemd-journald@.socket2
-rw-r--r--units/systemd-kexec.service2
-rw-r--r--units/systemd-localed.service.in2
-rw-r--r--units/systemd-logind.service.in2
-rw-r--r--units/systemd-machine-id-commit.service2
-rw-r--r--units/systemd-machined.service.in2
-rw-r--r--units/systemd-modules-load.service.in2
-rw-r--r--units/systemd-network-generator.service.in2
-rw-r--r--units/systemd-networkd-wait-online.service.in2
-rw-r--r--units/systemd-networkd.service.in2
-rw-r--r--units/systemd-networkd.socket2
-rw-r--r--units/systemd-nspawn@.service.in2
-rw-r--r--units/systemd-oomd.service.in2
-rw-r--r--units/systemd-portabled.service.in2
-rw-r--r--units/systemd-poweroff.service2
-rw-r--r--units/systemd-pstore.service.in2
-rw-r--r--units/systemd-quotacheck.service.in2
-rw-r--r--units/systemd-random-seed.service.in2
-rw-r--r--units/systemd-reboot.service2
-rw-r--r--units/systemd-remount-fs.service.in2
-rw-r--r--units/systemd-repart.service.in2
-rw-r--r--units/systemd-resolved.service.in2
-rw-r--r--units/systemd-rfkill.service.in2
-rw-r--r--units/systemd-rfkill.socket2
-rw-r--r--units/systemd-suspend-then-hibernate.service.in2
-rw-r--r--units/systemd-suspend.service.in2
-rw-r--r--units/systemd-sysctl.service.in2
-rw-r--r--units/systemd-sysusers.service2
-rw-r--r--units/systemd-time-wait-sync.service.in2
-rw-r--r--units/systemd-timedated.service.in2
-rw-r--r--units/systemd-timesyncd.service.in2
-rw-r--r--units/systemd-tmpfiles-clean.service2
-rw-r--r--units/systemd-tmpfiles-clean.timer2
-rw-r--r--units/systemd-tmpfiles-setup-dev.service2
-rw-r--r--units/systemd-tmpfiles-setup.service2
-rw-r--r--units/systemd-udev-settle.service2
-rw-r--r--units/systemd-udev-trigger.service2
-rw-r--r--units/systemd-udevd-control.socket2
-rw-r--r--units/systemd-udevd-kernel.socket2
-rw-r--r--units/systemd-udevd.service.in2
-rw-r--r--units/systemd-update-done.service.in2
-rw-r--r--units/systemd-update-utmp-runlevel.service.in2
-rw-r--r--units/systemd-update-utmp.service.in2
-rw-r--r--units/systemd-user-sessions.service.in2
-rw-r--r--units/systemd-userdbd.service.in2
-rw-r--r--units/systemd-userdbd.socket2
-rw-r--r--units/systemd-vconsole-setup.service.in2
-rw-r--r--units/systemd-volatile-root.service.in2
-rw-r--r--units/time-set.target2
-rw-r--r--units/time-sync.target2
-rw-r--r--units/timers.target2
-rw-r--r--units/tmp.mount2
-rw-r--r--units/umount.target2
-rw-r--r--units/usb-gadget.target2
-rw-r--r--units/user-.slice.d/10-defaults.conf2
-rw-r--r--units/user-runtime-dir@.service.in2
-rw-r--r--units/user.slice2
-rw-r--r--units/user/basic.target2
-rw-r--r--units/user/bluetooth.target2
-rw-r--r--units/user/default.target2
-rw-r--r--units/user/exit.target2
-rw-r--r--units/user/graphical-session-pre.target2
-rw-r--r--units/user/graphical-session.target2
-rw-r--r--units/user/meson.build2
-rw-r--r--units/user/paths.target2
-rw-r--r--units/user/printer.target2
-rw-r--r--units/user/shutdown.target2
-rw-r--r--units/user/smartcard.target2
-rw-r--r--units/user/sockets.target2
-rw-r--r--units/user/sound.target2
-rw-r--r--units/user/systemd-exit.service2
-rw-r--r--units/user/systemd-tmpfiles-clean.service2
-rw-r--r--units/user/systemd-tmpfiles-clean.timer2
-rw-r--r--units/user/systemd-tmpfiles-setup.service2
-rw-r--r--units/user/timers.target2
-rw-r--r--units/user/xdg-desktop-autostart.target2
-rw-r--r--units/user@.service.in2
-rw-r--r--units/var-lib-machines.mount2
199 files changed, 199 insertions, 199 deletions
diff --git a/units/basic.target b/units/basic.target
index 4f44292249..d8cdd5ac14 100644
--- a/units/basic.target
+++ b/units/basic.target
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/blockdev@.target b/units/blockdev@.target
index 22a9a5bb2b..ddc85bf890 100644
--- a/units/blockdev@.target
+++ b/units/blockdev@.target
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/bluetooth.target b/units/bluetooth.target
index 62407d363e..8333c2332f 100644
--- a/units/bluetooth.target
+++ b/units/bluetooth.target
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/boot-complete.target b/units/boot-complete.target
index f0b9e57e7c..f302384dc4 100644
--- a/units/boot-complete.target
+++ b/units/boot-complete.target
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/console-getty.service.m4 b/units/console-getty.service.m4
index 7c3992e8e0..d61a490be3 100644
--- a/units/console-getty.service.m4
+++ b/units/console-getty.service.m4
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/container-getty@.service.m4 b/units/container-getty@.service.m4
index e4f9ae5791..92307a3ccb 100644
--- a/units/container-getty@.service.m4
+++ b/units/container-getty@.service.m4
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/cryptsetup-pre.target b/units/cryptsetup-pre.target
index 12e4107f60..6bb8ff75cc 100644
--- a/units/cryptsetup-pre.target
+++ b/units/cryptsetup-pre.target
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/cryptsetup.target b/units/cryptsetup.target
index fdb572bc70..b8eecbdcc1 100644
--- a/units/cryptsetup.target
+++ b/units/cryptsetup.target
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/debug-shell.service.in b/units/debug-shell.service.in
index 9f3868e106..5b4de84eac 100644
--- a/units/debug-shell.service.in
+++ b/units/debug-shell.service.in
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/dev-hugepages.mount b/units/dev-hugepages.mount
index 278ed9b610..517437784c 100644
--- a/units/dev-hugepages.mount
+++ b/units/dev-hugepages.mount
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/dev-mqueue.mount b/units/dev-mqueue.mount
index 0114ad31f0..02683a9e1e 100644
--- a/units/dev-mqueue.mount
+++ b/units/dev-mqueue.mount
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/emergency.service.in b/units/emergency.service.in
index 180d9e6a57..9418f5e717 100644
--- a/units/emergency.service.in
+++ b/units/emergency.service.in
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/emergency.target b/units/emergency.target
index a4e954e857..e7f34beb3e 100644
--- a/units/emergency.target
+++ b/units/emergency.target
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/exit.target b/units/exit.target
index 0a79533a9e..d7a1472a2b 100644
--- a/units/exit.target
+++ b/units/exit.target
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/final.target b/units/final.target
index 0e12386d4d..34f6069dd1 100644
--- a/units/final.target
+++ b/units/final.target
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/first-boot-complete.target b/units/first-boot-complete.target
index 98b236e9ff..b971496100 100644
--- a/units/first-boot-complete.target
+++ b/units/first-boot-complete.target
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/getty-pre.target b/units/getty-pre.target
index adb98bf92c..5cf0875fae 100644
--- a/units/getty-pre.target
+++ b/units/getty-pre.target
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/getty.target b/units/getty.target
index b3110179bf..7e9aac2023 100644
--- a/units/getty.target
+++ b/units/getty.target
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/getty@.service.m4 b/units/getty@.service.m4
index 087d686666..4c21002619 100644
--- a/units/getty@.service.m4
+++ b/units/getty@.service.m4
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/graphical.target b/units/graphical.target
index f3e30e9756..4b2087fa1b 100644
--- a/units/graphical.target
+++ b/units/graphical.target
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/halt.target b/units/halt.target
index 87c33745f2..b06758bf95 100644
--- a/units/halt.target
+++ b/units/halt.target
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/hibernate.target b/units/hibernate.target
index 8580c658e6..9ec6f2a6b1 100644
--- a/units/hibernate.target
+++ b/units/hibernate.target
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/hybrid-sleep.target b/units/hybrid-sleep.target
index e5e22b8187..4ed0b35146 100644
--- a/units/hybrid-sleep.target
+++ b/units/hybrid-sleep.target
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/initrd-cleanup.service b/units/initrd-cleanup.service
index 1120ef3eff..08ab503962 100644
--- a/units/initrd-cleanup.service
+++ b/units/initrd-cleanup.service
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/initrd-fs.target b/units/initrd-fs.target
index 49577c364f..8c6bdf35f5 100644
--- a/units/initrd-fs.target
+++ b/units/initrd-fs.target
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/initrd-parse-etc.service b/units/initrd-parse-etc.service
index 94a9719b50..38df728355 100644
--- a/units/initrd-parse-etc.service
+++ b/units/initrd-parse-etc.service
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/initrd-root-device.target b/units/initrd-root-device.target
index bcb6909320..f3c3d79a2b 100644
--- a/units/initrd-root-device.target
+++ b/units/initrd-root-device.target
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/initrd-root-fs.target b/units/initrd-root-fs.target
index f5a8855b6c..4037ac4126 100644
--- a/units/initrd-root-fs.target
+++ b/units/initrd-root-fs.target
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/initrd-switch-root.service b/units/initrd-switch-root.service
index 682b8af875..e3d6926711 100644
--- a/units/initrd-switch-root.service
+++ b/units/initrd-switch-root.service
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/initrd-switch-root.target b/units/initrd-switch-root.target
index 32ff40a3f6..1e32ec57dd 100644
--- a/units/initrd-switch-root.target
+++ b/units/initrd-switch-root.target
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/initrd-udevadm-cleanup-db.service b/units/initrd-udevadm-cleanup-db.service
index 0d66080de7..bc444736fd 100644
--- a/units/initrd-udevadm-cleanup-db.service
+++ b/units/initrd-udevadm-cleanup-db.service
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/initrd.target b/units/initrd.target
index bfd497ecc3..655158a58b 100644
--- a/units/initrd.target
+++ b/units/initrd.target
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/kexec.target b/units/kexec.target
index 706cd7065c..5d8f8cdc52 100644
--- a/units/kexec.target
+++ b/units/kexec.target
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/kmod-static-nodes.service.in b/units/kmod-static-nodes.service.in
index 0971edf9ec..f4170d6a99 100644
--- a/units/kmod-static-nodes.service.in
+++ b/units/kmod-static-nodes.service.in
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/ldconfig.service b/units/ldconfig.service
index 3c3cbf5607..33824d4d4f 100644
--- a/units/ldconfig.service
+++ b/units/ldconfig.service
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/local-fs-pre.target b/units/local-fs-pre.target
index 9aca15b953..bffa7e95dd 100644
--- a/units/local-fs-pre.target
+++ b/units/local-fs-pre.target
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/local-fs.target b/units/local-fs.target
index 6ba4930087..02797953a5 100644
--- a/units/local-fs.target
+++ b/units/local-fs.target
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/machine.slice b/units/machine.slice
index b4e4c17d88..501d3530c0 100644
--- a/units/machine.slice
+++ b/units/machine.slice
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/machines.target b/units/machines.target
index 224765aa90..165839aeb1 100644
--- a/units/machines.target
+++ b/units/machines.target
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/meson.build b/units/meson.build
index 2f09590736..e249539dc8 100644
--- a/units/meson.build
+++ b/units/meson.build
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
with_runlevels = conf.get('HAVE_SYSV_COMPAT') == 1
diff --git a/units/modprobe@.service b/units/modprobe@.service
index 34a0557735..968994287c 100644
--- a/units/modprobe@.service
+++ b/units/modprobe@.service
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/multi-user.target b/units/multi-user.target
index 386e1b547d..53eb2b7ed0 100644
--- a/units/multi-user.target
+++ b/units/multi-user.target
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/network-online.target b/units/network-online.target
index 8b8c7851e2..c3edfeb4f9 100644
--- a/units/network-online.target
+++ b/units/network-online.target
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/network-pre.target b/units/network-pre.target
index 806eb720f8..70279dacdb 100644
--- a/units/network-pre.target
+++ b/units/network-pre.target
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/network.target b/units/network.target
index 3e4fdff144..08baf126b4 100644
--- a/units/network.target
+++ b/units/network.target
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/nss-lookup.target b/units/nss-lookup.target
index 8d56c8ea36..53e7a31d0e 100644
--- a/units/nss-lookup.target
+++ b/units/nss-lookup.target
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/nss-user-lookup.target b/units/nss-user-lookup.target
index 7436b6c80d..9f0d6192fb 100644
--- a/units/nss-user-lookup.target
+++ b/units/nss-user-lookup.target
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/paths.target b/units/paths.target
index 9b6ed1c13f..1bec148bee 100644
--- a/units/paths.target
+++ b/units/paths.target
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/poweroff.target b/units/poweroff.target
index 47c109ceed..e97f058fdc 100644
--- a/units/poweroff.target
+++ b/units/poweroff.target
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/printer.target b/units/printer.target
index e1fb0d4e34..c695669c5c 100644
--- a/units/printer.target
+++ b/units/printer.target
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/proc-sys-fs-binfmt_misc.automount b/units/proc-sys-fs-binfmt_misc.automount
index 30a6bc9918..a71e249976 100644
--- a/units/proc-sys-fs-binfmt_misc.automount
+++ b/units/proc-sys-fs-binfmt_misc.automount
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/proc-sys-fs-binfmt_misc.mount b/units/proc-sys-fs-binfmt_misc.mount
index 1587853e1e..919271b3e2 100644
--- a/units/proc-sys-fs-binfmt_misc.mount
+++ b/units/proc-sys-fs-binfmt_misc.mount
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/quotaon.service.in b/units/quotaon.service.in
index 25c747439a..fa6b4c8239 100644
--- a/units/quotaon.service.in
+++ b/units/quotaon.service.in
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/rc-local.service.in b/units/rc-local.service.in
index d4aaaf09d4..f7ce98f18e 100644
--- a/units/rc-local.service.in
+++ b/units/rc-local.service.in
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/reboot.target b/units/reboot.target
index c2782db631..a900c90dcf 100644
--- a/units/reboot.target
+++ b/units/reboot.target
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/remote-cryptsetup.target b/units/remote-cryptsetup.target
index 4445d5defe..0a689bfa2d 100644
--- a/units/remote-cryptsetup.target
+++ b/units/remote-cryptsetup.target
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/remote-fs-pre.target b/units/remote-fs-pre.target
index 3f22605c8c..bba5e0ce7c 100644
--- a/units/remote-fs-pre.target
+++ b/units/remote-fs-pre.target
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/remote-fs.target b/units/remote-fs.target
index 0d44348e75..74011d8aec 100644
--- a/units/remote-fs.target
+++ b/units/remote-fs.target
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/rescue.service.in b/units/rescue.service.in
index 4106e2d9f7..2018516003 100644
--- a/units/rescue.service.in
+++ b/units/rescue.service.in
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/rescue.target b/units/rescue.target
index 0e04a94f39..112808358e 100644
--- a/units/rescue.target
+++ b/units/rescue.target
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/rpcbind.target b/units/rpcbind.target
index 801ee4d6ef..8bd853baa5 100644
--- a/units/rpcbind.target
+++ b/units/rpcbind.target
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/serial-getty@.service.m4 b/units/serial-getty@.service.m4
index 4b72bef84e..72c1df590d 100644
--- a/units/serial-getty@.service.m4
+++ b/units/serial-getty@.service.m4
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/shutdown.target b/units/shutdown.target
index d48e6d6494..582ae6ba27 100644
--- a/units/shutdown.target
+++ b/units/shutdown.target
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/sigpwr.target b/units/sigpwr.target
index 8228541dac..beda318c34 100644
--- a/units/sigpwr.target
+++ b/units/sigpwr.target
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/sleep.target b/units/sleep.target
index 9409dc6707..a38a4319ff 100644
--- a/units/sleep.target
+++ b/units/sleep.target
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/slices.target b/units/slices.target
index 84a04d6385..4517e35fc5 100644
--- a/units/slices.target
+++ b/units/slices.target
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/smartcard.target b/units/smartcard.target
index 717ea2311d..0c3fe7210e 100644
--- a/units/smartcard.target
+++ b/units/smartcard.target
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/sockets.target b/units/sockets.target
index 9af67fdb1f..c6e20d7760 100644
--- a/units/sockets.target
+++ b/units/sockets.target
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/sound.target b/units/sound.target
index 19afc2a637..99e68af008 100644
--- a/units/sound.target
+++ b/units/sound.target
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/suspend-then-hibernate.target b/units/suspend-then-hibernate.target
index 999c0a9c86..e998763366 100644
--- a/units/suspend-then-hibernate.target
+++ b/units/suspend-then-hibernate.target
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/suspend.target b/units/suspend.target
index 1a156b4147..bf228f933f 100644
--- a/units/suspend.target
+++ b/units/suspend.target
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/swap.target b/units/swap.target
index 8cef5b6489..bcdd98815b 100644
--- a/units/swap.target
+++ b/units/swap.target
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/sys-fs-fuse-connections.mount b/units/sys-fs-fuse-connections.mount
index 7bbc342be8..cbcdd5f2cc 100644
--- a/units/sys-fs-fuse-connections.mount
+++ b/units/sys-fs-fuse-connections.mount
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/sys-kernel-config.mount b/units/sys-kernel-config.mount
index e6997884dc..001c7b57cc 100644
--- a/units/sys-kernel-config.mount
+++ b/units/sys-kernel-config.mount
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/sys-kernel-debug.mount b/units/sys-kernel-debug.mount
index 618270ddae..d03837bafb 100644
--- a/units/sys-kernel-debug.mount
+++ b/units/sys-kernel-debug.mount
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/sys-kernel-tracing.mount b/units/sys-kernel-tracing.mount
index e29b258a47..8800c96bcd 100644
--- a/units/sys-kernel-tracing.mount
+++ b/units/sys-kernel-tracing.mount
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/sysinit.target b/units/sysinit.target
index b6c16a1412..eed3d16b45 100644
--- a/units/sysinit.target
+++ b/units/sysinit.target
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/syslog.socket b/units/syslog.socket
index c4b1cea2d6..ff76bc5a6f 100644
--- a/units/syslog.socket
+++ b/units/syslog.socket
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/system-systemd\x2dcryptsetup.slice b/units/system-systemd\x2dcryptsetup.slice
index 83310900a7..9369b73ae2 100644
--- a/units/system-systemd\x2dcryptsetup.slice
+++ b/units/system-systemd\x2dcryptsetup.slice
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/system-update-cleanup.service b/units/system-update-cleanup.service
index 41abcd631c..d0878dcb0b 100644
--- a/units/system-update-cleanup.service
+++ b/units/system-update-cleanup.service
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/system-update-pre.target b/units/system-update-pre.target
index 163b75c220..04101389eb 100644
--- a/units/system-update-pre.target
+++ b/units/system-update-pre.target
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/system-update.target b/units/system-update.target
index 29812edf92..dcddfc2ea5 100644
--- a/units/system-update.target
+++ b/units/system-update.target
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-ask-password-console.path b/units/systemd-ask-password-console.path
index 248d597540..a7aac83787 100644
--- a/units/systemd-ask-password-console.path
+++ b/units/systemd-ask-password-console.path
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-ask-password-console.service b/units/systemd-ask-password-console.service
index 6ee4c253a3..d31f3fa70f 100644
--- a/units/systemd-ask-password-console.service
+++ b/units/systemd-ask-password-console.service
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-ask-password-wall.path b/units/systemd-ask-password-wall.path
index 193a9b311e..c82cfd26c7 100644
--- a/units/systemd-ask-password-wall.path
+++ b/units/systemd-ask-password-wall.path
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-ask-password-wall.service b/units/systemd-ask-password-wall.service
index 52a3037cd4..6a70b58cef 100644
--- a/units/systemd-ask-password-wall.service
+++ b/units/systemd-ask-password-wall.service
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-backlight@.service.in b/units/systemd-backlight@.service.in
index 6f7967fd00..317aa38745 100644
--- a/units/systemd-backlight@.service.in
+++ b/units/systemd-backlight@.service.in
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-binfmt.service.in b/units/systemd-binfmt.service.in
index e54e95e11d..ca76750c0a 100644
--- a/units/systemd-binfmt.service.in
+++ b/units/systemd-binfmt.service.in
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-bless-boot.service.in b/units/systemd-bless-boot.service.in
index 511d991d3b..601588fc61 100644
--- a/units/systemd-bless-boot.service.in
+++ b/units/systemd-bless-boot.service.in
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-boot-check-no-failures.service.in b/units/systemd-boot-check-no-failures.service.in
index 27e898b85b..1bf74c2129 100644
--- a/units/systemd-boot-check-no-failures.service.in
+++ b/units/systemd-boot-check-no-failures.service.in
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-boot-system-token.service b/units/systemd-boot-system-token.service
index 8aead02417..55f05ec8d8 100644
--- a/units/systemd-boot-system-token.service
+++ b/units/systemd-boot-system-token.service
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-coredump.socket b/units/systemd-coredump.socket
index c9971b9199..922358fe5d 100644
--- a/units/systemd-coredump.socket
+++ b/units/systemd-coredump.socket
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-coredump@.service.in b/units/systemd-coredump@.service.in
index d1ece27074..219f207835 100644
--- a/units/systemd-coredump@.service.in
+++ b/units/systemd-coredump@.service.in
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-exit.service b/units/systemd-exit.service
index 773c400b47..df6e671e84 100644
--- a/units/systemd-exit.service
+++ b/units/systemd-exit.service
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-firstboot.service b/units/systemd-firstboot.service
index e17fef7b36..2fea88384f 100644
--- a/units/systemd-firstboot.service
+++ b/units/systemd-firstboot.service
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-fsck-root.service.in b/units/systemd-fsck-root.service.in
index 042081ccee..c4a2948120 100644
--- a/units/systemd-fsck-root.service.in
+++ b/units/systemd-fsck-root.service.in
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-fsck@.service.in b/units/systemd-fsck@.service.in
index 332208352d..6d9c9aba69 100644
--- a/units/systemd-fsck@.service.in
+++ b/units/systemd-fsck@.service.in
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-halt.service b/units/systemd-halt.service
index cd16d1de20..37bfe285c0 100644
--- a/units/systemd-halt.service
+++ b/units/systemd-halt.service
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-hibernate-resume@.service.in b/units/systemd-hibernate-resume@.service.in
index a2db06b031..85e0c88169 100644
--- a/units/systemd-hibernate-resume@.service.in
+++ b/units/systemd-hibernate-resume@.service.in
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-hibernate.service.in b/units/systemd-hibernate.service.in
index 963b257ab8..30965411ff 100644
--- a/units/systemd-hibernate.service.in
+++ b/units/systemd-hibernate.service.in
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-homed-activate.service b/units/systemd-homed-activate.service
index 3a5057d3aa..b16fedb4ce 100644
--- a/units/systemd-homed-activate.service
+++ b/units/systemd-homed-activate.service
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-homed.service.in b/units/systemd-homed.service.in
index 4b6a91c984..5ac53ca9dc 100644
--- a/units/systemd-homed.service.in
+++ b/units/systemd-homed.service.in
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-hostnamed.service.in b/units/systemd-hostnamed.service.in
index 017441f9da..d3d0efebd0 100644
--- a/units/systemd-hostnamed.service.in
+++ b/units/systemd-hostnamed.service.in
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-hwdb-update.service.in b/units/systemd-hwdb-update.service.in
index 9887018a1f..57398e5214 100644
--- a/units/systemd-hwdb-update.service.in
+++ b/units/systemd-hwdb-update.service.in
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-hybrid-sleep.service.in b/units/systemd-hybrid-sleep.service.in
index 466ade974c..6fe37daacd 100644
--- a/units/systemd-hybrid-sleep.service.in
+++ b/units/systemd-hybrid-sleep.service.in
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-importd.service.in b/units/systemd-importd.service.in
index 58a7b47259..afe395687d 100644
--- a/units/systemd-importd.service.in
+++ b/units/systemd-importd.service.in
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-initctl.service.in b/units/systemd-initctl.service.in
index c276283908..6367433682 100644
--- a/units/systemd-initctl.service.in
+++ b/units/systemd-initctl.service.in
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-initctl.socket b/units/systemd-initctl.socket
index 9d97579908..598a67f0e4 100644
--- a/units/systemd-initctl.socket
+++ b/units/systemd-initctl.socket
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-journal-catalog-update.service b/units/systemd-journal-catalog-update.service
index 6db55a5490..477925685a 100644
--- a/units/systemd-journal-catalog-update.service
+++ b/units/systemd-journal-catalog-update.service
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-journal-flush.service b/units/systemd-journal-flush.service
index 0f45743fa0..1a71592b93 100644
--- a/units/systemd-journal-flush.service
+++ b/units/systemd-journal-flush.service
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-journal-gatewayd.service.in b/units/systemd-journal-gatewayd.service.in
index 2436f2a2cf..7944d6fd9a 100644
--- a/units/systemd-journal-gatewayd.service.in
+++ b/units/systemd-journal-gatewayd.service.in
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-journal-gatewayd.socket b/units/systemd-journal-gatewayd.socket
index 7c3632b323..30e74e3223 100644
--- a/units/systemd-journal-gatewayd.socket
+++ b/units/systemd-journal-gatewayd.socket
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-journal-remote.service.in b/units/systemd-journal-remote.service.in
index 82befc9912..e48df81e70 100644
--- a/units/systemd-journal-remote.service.in
+++ b/units/systemd-journal-remote.service.in
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-journal-remote.socket b/units/systemd-journal-remote.socket
index 48d0a656ba..2956819038 100644
--- a/units/systemd-journal-remote.socket
+++ b/units/systemd-journal-remote.socket
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-journal-upload.service.in b/units/systemd-journal-upload.service.in
index 8b9a9ebdfb..ba6b6e7344 100644
--- a/units/systemd-journal-upload.service.in
+++ b/units/systemd-journal-upload.service.in
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-journald-audit.socket b/units/systemd-journald-audit.socket
index cb8b774963..f0c0aebc86 100644
--- a/units/systemd-journald-audit.socket
+++ b/units/systemd-journald-audit.socket
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-journald-dev-log.socket b/units/systemd-journald-dev-log.socket
index 7cec55440d..93e8b252b2 100644
--- a/units/systemd-journald-dev-log.socket
+++ b/units/systemd-journald-dev-log.socket
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-journald-varlink@.socket b/units/systemd-journald-varlink@.socket
index b6730c2fa5..05d8cf6ce4 100644
--- a/units/systemd-journald-varlink@.socket
+++ b/units/systemd-journald-varlink@.socket
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-journald.service.in b/units/systemd-journald.service.in
index 0cb1bfa3ca..1c43d8c863 100644
--- a/units/systemd-journald.service.in
+++ b/units/systemd-journald.service.in
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-journald.socket b/units/systemd-journald.socket
index 95d5f21964..ada3520ad1 100644
--- a/units/systemd-journald.socket
+++ b/units/systemd-journald.socket
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-journald@.service.in b/units/systemd-journald@.service.in
index e7ea919328..14a217d025 100644
--- a/units/systemd-journald@.service.in
+++ b/units/systemd-journald@.service.in
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-journald@.socket b/units/systemd-journald@.socket
index 3badd7842a..60c025fcc3 100644
--- a/units/systemd-journald@.socket
+++ b/units/systemd-journald@.socket
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-kexec.service b/units/systemd-kexec.service
index 7413e1d6b1..0aa7933be4 100644
--- a/units/systemd-kexec.service
+++ b/units/systemd-kexec.service
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-localed.service.in b/units/systemd-localed.service.in
index 47f147956b..652b956a34 100644
--- a/units/systemd-localed.service.in
+++ b/units/systemd-localed.service.in
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-logind.service.in b/units/systemd-logind.service.in
index cb44ccbae6..f131b60d4f 100644
--- a/units/systemd-logind.service.in
+++ b/units/systemd-logind.service.in
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-machine-id-commit.service b/units/systemd-machine-id-commit.service
index 5616a35701..89e0613955 100644
--- a/units/systemd-machine-id-commit.service
+++ b/units/systemd-machine-id-commit.service
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-machined.service.in b/units/systemd-machined.service.in
index 0e452ddcab..56c9532659 100644
--- a/units/systemd-machined.service.in
+++ b/units/systemd-machined.service.in
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-modules-load.service.in b/units/systemd-modules-load.service.in
index 26abe21d1b..fdb5b3a41e 100644
--- a/units/systemd-modules-load.service.in
+++ b/units/systemd-modules-load.service.in
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-network-generator.service.in b/units/systemd-network-generator.service.in
index 248a8dc64e..bda8426191 100644
--- a/units/systemd-network-generator.service.in
+++ b/units/systemd-network-generator.service.in
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-networkd-wait-online.service.in b/units/systemd-networkd-wait-online.service.in
index 7666e16669..d868e77775 100644
--- a/units/systemd-networkd-wait-online.service.in
+++ b/units/systemd-networkd-wait-online.service.in
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-networkd.service.in b/units/systemd-networkd.service.in
index c8ff9be3e5..9834b06a43 100644
--- a/units/systemd-networkd.service.in
+++ b/units/systemd-networkd.service.in
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-networkd.socket b/units/systemd-networkd.socket
index bc049e5ade..aa9ad7e02c 100644
--- a/units/systemd-networkd.socket
+++ b/units/systemd-networkd.socket
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-nspawn@.service.in b/units/systemd-nspawn@.service.in
index c91c92707e..a6551f9152 100644
--- a/units/systemd-nspawn@.service.in
+++ b/units/systemd-nspawn@.service.in
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-oomd.service.in b/units/systemd-oomd.service.in
index 67bd117c95..fd7c8d213d 100644
--- a/units/systemd-oomd.service.in
+++ b/units/systemd-oomd.service.in
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-portabled.service.in b/units/systemd-portabled.service.in
index 3051fbd3d0..e00a0065e3 100644
--- a/units/systemd-portabled.service.in
+++ b/units/systemd-portabled.service.in
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-poweroff.service b/units/systemd-poweroff.service
index 8d1d54389b..bb2ddb0e73 100644
--- a/units/systemd-poweroff.service
+++ b/units/systemd-poweroff.service
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-pstore.service.in b/units/systemd-pstore.service.in
index 6e4827f03c..624ee704d5 100644
--- a/units/systemd-pstore.service.in
+++ b/units/systemd-pstore.service.in
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-quotacheck.service.in b/units/systemd-quotacheck.service.in
index 244da0a307..3e10378a89 100644
--- a/units/systemd-quotacheck.service.in
+++ b/units/systemd-quotacheck.service.in
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-random-seed.service.in b/units/systemd-random-seed.service.in
index aa4b3e7357..a7d4acb898 100644
--- a/units/systemd-random-seed.service.in
+++ b/units/systemd-random-seed.service.in
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-reboot.service b/units/systemd-reboot.service
index 505f60aabf..b50a792b0e 100644
--- a/units/systemd-reboot.service
+++ b/units/systemd-reboot.service
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-remount-fs.service.in b/units/systemd-remount-fs.service.in
index 4f4304d68e..51985a793a 100644
--- a/units/systemd-remount-fs.service.in
+++ b/units/systemd-remount-fs.service.in
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-repart.service.in b/units/systemd-repart.service.in
index 9393a64f00..a5565834eb 100644
--- a/units/systemd-repart.service.in
+++ b/units/systemd-repart.service.in
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-resolved.service.in b/units/systemd-resolved.service.in
index 513d96b74c..29adb6bf21 100644
--- a/units/systemd-resolved.service.in
+++ b/units/systemd-resolved.service.in
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-rfkill.service.in b/units/systemd-rfkill.service.in
index af2042f1e5..40a80a0b39 100644
--- a/units/systemd-rfkill.service.in
+++ b/units/systemd-rfkill.service.in
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-rfkill.socket b/units/systemd-rfkill.socket
index 9d408903bb..4ca8d6fc04 100644
--- a/units/systemd-rfkill.socket
+++ b/units/systemd-rfkill.socket
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-suspend-then-hibernate.service.in b/units/systemd-suspend-then-hibernate.service.in
index 5d6a582730..3f811e7e1a 100644
--- a/units/systemd-suspend-then-hibernate.service.in
+++ b/units/systemd-suspend-then-hibernate.service.in
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-suspend.service.in b/units/systemd-suspend.service.in
index 11ed383ba9..40cc83e192 100644
--- a/units/systemd-suspend.service.in
+++ b/units/systemd-suspend.service.in
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-sysctl.service.in b/units/systemd-sysctl.service.in
index 5b0f7f9df4..c4a34a81a2 100644
--- a/units/systemd-sysctl.service.in
+++ b/units/systemd-sysctl.service.in
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-sysusers.service b/units/systemd-sysusers.service
index da05e0eb1b..ff5b3db821 100644
--- a/units/systemd-sysusers.service
+++ b/units/systemd-sysusers.service
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-time-wait-sync.service.in b/units/systemd-time-wait-sync.service.in
index 475182d6bc..212d0e5a15 100644
--- a/units/systemd-time-wait-sync.service.in
+++ b/units/systemd-time-wait-sync.service.in
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-timedated.service.in b/units/systemd-timedated.service.in
index f84bd3830b..6f476173b6 100644
--- a/units/systemd-timedated.service.in
+++ b/units/systemd-timedated.service.in
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-timesyncd.service.in b/units/systemd-timesyncd.service.in
index 08ddb141ba..62120d8190 100644
--- a/units/systemd-timesyncd.service.in
+++ b/units/systemd-timesyncd.service.in
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-tmpfiles-clean.service b/units/systemd-tmpfiles-clean.service
index f20bb143ef..e962954f06 100644
--- a/units/systemd-tmpfiles-clean.service
+++ b/units/systemd-tmpfiles-clean.service
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-tmpfiles-clean.timer b/units/systemd-tmpfiles-clean.timer
index 3e3017820f..6c6cfe7a08 100644
--- a/units/systemd-tmpfiles-clean.timer
+++ b/units/systemd-tmpfiles-clean.timer
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-tmpfiles-setup-dev.service b/units/systemd-tmpfiles-setup-dev.service
index 1027823859..0babe78767 100644
--- a/units/systemd-tmpfiles-setup-dev.service
+++ b/units/systemd-tmpfiles-setup-dev.service
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-tmpfiles-setup.service b/units/systemd-tmpfiles-setup.service
index 29799ee81c..3f028d2533 100644
--- a/units/systemd-tmpfiles-setup.service
+++ b/units/systemd-tmpfiles-setup.service
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-udev-settle.service b/units/systemd-udev-settle.service
index 9352c6f598..994c47fce4 100644
--- a/units/systemd-udev-settle.service
+++ b/units/systemd-udev-settle.service
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-udev-trigger.service b/units/systemd-udev-trigger.service
index cfe8d61c2a..8b2d88e185 100644
--- a/units/systemd-udev-trigger.service
+++ b/units/systemd-udev-trigger.service
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-udevd-control.socket b/units/systemd-udevd-control.socket
index 5b8628c754..a9d5a4d8ca 100644
--- a/units/systemd-udevd-control.socket
+++ b/units/systemd-udevd-control.socket
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-udevd-kernel.socket b/units/systemd-udevd-kernel.socket
index b2a65f1a84..f636aebff8 100644
--- a/units/systemd-udevd-kernel.socket
+++ b/units/systemd-udevd-kernel.socket
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-udevd.service.in b/units/systemd-udevd.service.in
index 9ada3a6a74..f20dd50350 100644
--- a/units/systemd-udevd.service.in
+++ b/units/systemd-udevd.service.in
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-update-done.service.in b/units/systemd-update-done.service.in
index 6e82ec7474..b4aa746673 100644
--- a/units/systemd-update-done.service.in
+++ b/units/systemd-update-done.service.in
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-update-utmp-runlevel.service.in b/units/systemd-update-utmp-runlevel.service.in
index 642d926a31..042145cc2c 100644
--- a/units/systemd-update-utmp-runlevel.service.in
+++ b/units/systemd-update-utmp-runlevel.service.in
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-update-utmp.service.in b/units/systemd-update-utmp.service.in
index b9a668faeb..e2fa2d83ba 100644
--- a/units/systemd-update-utmp.service.in
+++ b/units/systemd-update-utmp.service.in
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-user-sessions.service.in b/units/systemd-user-sessions.service.in
index 13de728b1d..b15a651682 100644
--- a/units/systemd-user-sessions.service.in
+++ b/units/systemd-user-sessions.service.in
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-userdbd.service.in b/units/systemd-userdbd.service.in
index bbfd83a8f2..9b36a17025 100644
--- a/units/systemd-userdbd.service.in
+++ b/units/systemd-userdbd.service.in
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-userdbd.socket b/units/systemd-userdbd.socket
index 2b4bb7a87a..50235dd1ef 100644
--- a/units/systemd-userdbd.socket
+++ b/units/systemd-userdbd.socket
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-vconsole-setup.service.in b/units/systemd-vconsole-setup.service.in
index 9042521c9d..45da056395 100644
--- a/units/systemd-vconsole-setup.service.in
+++ b/units/systemd-vconsole-setup.service.in
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/systemd-volatile-root.service.in b/units/systemd-volatile-root.service.in
index a39e9a4ec2..5ecc702b6d 100644
--- a/units/systemd-volatile-root.service.in
+++ b/units/systemd-volatile-root.service.in
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/time-set.target b/units/time-set.target
index 6b40033529..daac8ef04e 100644
--- a/units/time-set.target
+++ b/units/time-set.target
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/time-sync.target b/units/time-sync.target
index 9106502e8b..e730bbdbb1 100644
--- a/units/time-sync.target
+++ b/units/time-sync.target
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/timers.target b/units/timers.target
index b1aa8c797c..99f82e3b80 100644
--- a/units/timers.target
+++ b/units/timers.target
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/tmp.mount b/units/tmp.mount
index cf6837852f..a8e5851632 100644
--- a/units/tmp.mount
+++ b/units/tmp.mount
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/umount.target b/units/umount.target
index 54fa5aebf2..319b5033cb 100644
--- a/units/umount.target
+++ b/units/umount.target
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/usb-gadget.target b/units/usb-gadget.target
index c666683a98..46de5b8d62 100644
--- a/units/usb-gadget.target
+++ b/units/usb-gadget.target
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/user-.slice.d/10-defaults.conf b/units/user-.slice.d/10-defaults.conf
index c81a00e050..cb3651b728 100644
--- a/units/user-.slice.d/10-defaults.conf
+++ b/units/user-.slice.d/10-defaults.conf
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/user-runtime-dir@.service.in b/units/user-runtime-dir@.service.in
index c168b89f98..ff23e01af8 100644
--- a/units/user-runtime-dir@.service.in
+++ b/units/user-runtime-dir@.service.in
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/user.slice b/units/user.slice
index 3f2d98fcdf..3e4906411d 100644
--- a/units/user.slice
+++ b/units/user.slice
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/user/basic.target b/units/user/basic.target
index 1ae8275c80..6c79304c59 100644
--- a/units/user/basic.target
+++ b/units/user/basic.target
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/user/bluetooth.target b/units/user/bluetooth.target
index 62407d363e..8333c2332f 100644
--- a/units/user/bluetooth.target
+++ b/units/user/bluetooth.target
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/user/default.target b/units/user/default.target
index c50638c918..b1824313da 100644
--- a/units/user/default.target
+++ b/units/user/default.target
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/user/exit.target b/units/user/exit.target
index 11a6f8eabe..ec2dde2b8e 100644
--- a/units/user/exit.target
+++ b/units/user/exit.target
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/user/graphical-session-pre.target b/units/user/graphical-session-pre.target
index 3adfc5aaa4..4b9e3dc67f 100644
--- a/units/user/graphical-session-pre.target
+++ b/units/user/graphical-session-pre.target
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/user/graphical-session.target b/units/user/graphical-session.target
index a38eaabbc4..1f8fafcbe9 100644
--- a/units/user/graphical-session.target
+++ b/units/user/graphical-session.target
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/user/meson.build b/units/user/meson.build
index 33732e7d59..b2a599b6d8 100644
--- a/units/user/meson.build
+++ b/units/user/meson.build
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
units = [
'basic.target',
diff --git a/units/user/paths.target b/units/user/paths.target
index 9b6ed1c13f..1bec148bee 100644
--- a/units/user/paths.target
+++ b/units/user/paths.target
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/user/printer.target b/units/user/printer.target
index e1fb0d4e34..c695669c5c 100644
--- a/units/user/printer.target
+++ b/units/user/printer.target
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/user/shutdown.target b/units/user/shutdown.target
index d48e6d6494..582ae6ba27 100644
--- a/units/user/shutdown.target
+++ b/units/user/shutdown.target
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/user/smartcard.target b/units/user/smartcard.target
index 717ea2311d..0c3fe7210e 100644
--- a/units/user/smartcard.target
+++ b/units/user/smartcard.target
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/user/sockets.target b/units/user/sockets.target
index 9af67fdb1f..c6e20d7760 100644
--- a/units/user/sockets.target
+++ b/units/user/sockets.target
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/user/sound.target b/units/user/sound.target
index 19afc2a637..99e68af008 100644
--- a/units/user/sound.target
+++ b/units/user/sound.target
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/user/systemd-exit.service b/units/user/systemd-exit.service
index 1d3b61e3ab..91953e0524 100644
--- a/units/user/systemd-exit.service
+++ b/units/user/systemd-exit.service
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/user/systemd-tmpfiles-clean.service b/units/user/systemd-tmpfiles-clean.service
index 3be0de5f7d..ff319d2b3a 100644
--- a/units/user/systemd-tmpfiles-clean.service
+++ b/units/user/systemd-tmpfiles-clean.service
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/user/systemd-tmpfiles-clean.timer b/units/user/systemd-tmpfiles-clean.timer
index d1dbad98de..f8f6ef4ab9 100644
--- a/units/user/systemd-tmpfiles-clean.timer
+++ b/units/user/systemd-tmpfiles-clean.timer
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/user/systemd-tmpfiles-setup.service b/units/user/systemd-tmpfiles-setup.service
index c4b29cbe8c..156689edcd 100644
--- a/units/user/systemd-tmpfiles-setup.service
+++ b/units/user/systemd-tmpfiles-setup.service
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/user/timers.target b/units/user/timers.target
index b1aa8c797c..99f82e3b80 100644
--- a/units/user/timers.target
+++ b/units/user/timers.target
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/user/xdg-desktop-autostart.target b/units/user/xdg-desktop-autostart.target
index 22df5a35d3..1be7c4b860 100644
--- a/units/user/xdg-desktop-autostart.target
+++ b/units/user/xdg-desktop-autostart.target
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/user@.service.in b/units/user@.service.in
index ace24369dd..8c6c6d1157 100644
--- a/units/user@.service.in
+++ b/units/user@.service.in
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/units/var-lib-machines.mount b/units/var-lib-machines.mount
index 3658199cc7..82ebfa5245 100644
--- a/units/var-lib-machines.mount
+++ b/units/var-lib-machines.mount
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#