summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2018-06-12 17:04:27 +0200
committerSven Eden <yamakuzure@gmx.net>2018-08-24 16:47:08 +0200
commitdd656b3679e4b5a7ec3534bf8786b022327e080d (patch)
tree6b9e903037c207344610befd40dd4cee2f8abe9a /src
parent3f87ae2530d8bb022f54526c3a568165a34acf05 (diff)
tree-wide: drop 'This file is part of systemd' blurb
This part of the copyright blurb stems from the GPL use recommendations: https://www.gnu.org/licenses/gpl-howto.en.html The concept appears to originate in times where version control was per file, instead of per tree, and was a way to glue the files together. Ultimately, we nowadays don't live in that world anymore, and this information is entirely useless anyway, as people are very welcome to copy these files into any projects they like, and they shouldn't have to change bits that are part of our copyright header for that. hence, let's just get rid of this old cruft, and shorten our codebase a bit.
Diffstat (limited to 'src')
-rw-r--r--src/basic/alloc-util.c2
-rw-r--r--src/basic/alloc-util.h2
-rw-r--r--src/basic/audit-util.c2
-rw-r--r--src/basic/audit-util.h2
-rw-r--r--src/basic/build.h2
-rw-r--r--src/basic/bus-label.c2
-rw-r--r--src/basic/bus-label.h2
-rw-r--r--src/basic/cap-list.c2
-rw-r--r--src/basic/cap-list.h2
-rw-r--r--src/basic/capability-util.c2
-rw-r--r--src/basic/capability-util.h2
-rw-r--r--src/basic/cgroup-util.c2
-rw-r--r--src/basic/cgroup-util.h2
-rw-r--r--src/basic/conf-files.c2
-rw-r--r--src/basic/conf-files.h2
-rw-r--r--src/basic/copy.c105
-rw-r--r--src/basic/copy.h2
-rw-r--r--src/basic/def.h2
-rw-r--r--src/basic/dirent-util.c2
-rw-r--r--src/basic/dirent-util.h2
-rw-r--r--src/basic/env-util.c2
-rw-r--r--src/basic/env-util.h2
-rw-r--r--src/basic/errno-list.c2
-rw-r--r--src/basic/errno-list.h2
-rw-r--r--src/basic/escape.c2
-rw-r--r--src/basic/escape.h2
-rw-r--r--src/basic/exec-util.c2
-rw-r--r--src/basic/exec-util.h2
-rw-r--r--src/basic/extract-word.c2
-rw-r--r--src/basic/extract-word.h2
-rw-r--r--src/basic/fd-util.c2
-rw-r--r--src/basic/fd-util.h2
-rw-r--r--src/basic/fileio-label.c2
-rw-r--r--src/basic/fileio-label.h2
-rw-r--r--src/basic/fileio.c24
-rw-r--r--src/basic/fileio.h2
-rw-r--r--src/basic/format-util.h2
-rw-r--r--src/basic/fs-util.c18
-rw-r--r--src/basic/fs-util.h3
-rw-r--r--src/basic/hash-funcs.c2
-rw-r--r--src/basic/hash-funcs.h2
-rw-r--r--src/basic/hashmap.c2
-rw-r--r--src/basic/hashmap.h2
-rw-r--r--src/basic/hexdecoct.c2
-rw-r--r--src/basic/hexdecoct.h2
-rw-r--r--src/basic/hostname-util.c2
-rw-r--r--src/basic/hostname-util.h2
-rw-r--r--src/basic/io-util.c2
-rw-r--r--src/basic/io-util.h2
-rw-r--r--src/basic/khash.c2
-rw-r--r--src/basic/khash.h2
-rw-r--r--src/basic/label.c2
-rw-r--r--src/basic/label.h2
-rw-r--r--src/basic/list.h2
-rw-r--r--src/basic/locale-util.c2
-rw-r--r--src/basic/locale-util.h2
-rw-r--r--src/basic/log.c2
-rw-r--r--src/basic/log.h2
-rw-r--r--src/basic/login-util.c2
-rw-r--r--src/basic/login-util.h2
-rw-r--r--src/basic/macro.h2
-rw-r--r--src/basic/memfd-util.c2
-rw-r--r--src/basic/memfd-util.h2
-rw-r--r--src/basic/mempool.c2
-rw-r--r--src/basic/mempool.h2
-rw-r--r--src/basic/missing.h2
-rw-r--r--src/basic/missing_syscall.h2
-rw-r--r--src/basic/mkdir-label.c2
-rw-r--r--src/basic/mkdir.c2
-rw-r--r--src/basic/mkdir.h2
-rw-r--r--src/basic/mount-util.c2
-rw-r--r--src/basic/mount-util.h2
-rw-r--r--src/basic/parse-util.c2
-rw-r--r--src/basic/parse-util.h2
-rw-r--r--src/basic/path-util.c2
-rw-r--r--src/basic/path-util.h2
-rw-r--r--src/basic/prioq.c2
-rw-r--r--src/basic/prioq.h2
-rw-r--r--src/basic/proc-cmdline.c2
-rw-r--r--src/basic/proc-cmdline.h2
-rw-r--r--src/basic/process-util.c2
-rw-r--r--src/basic/process-util.h2
-rw-r--r--src/basic/random-util.c2
-rw-r--r--src/basic/random-util.h2
-rw-r--r--src/basic/raw-clone.h2
-rw-r--r--src/basic/refcnt.h2
-rw-r--r--src/basic/rm-rf.c2
-rw-r--r--src/basic/rm-rf.h2
-rw-r--r--src/basic/selinux-util.c2
-rw-r--r--src/basic/selinux-util.h2
-rw-r--r--src/basic/set.h2
-rw-r--r--src/basic/sigbus.c2
-rw-r--r--src/basic/sigbus.h2
-rw-r--r--src/basic/signal-util.c2
-rw-r--r--src/basic/signal-util.h2
-rw-r--r--src/basic/smack-util.c2
-rw-r--r--src/basic/smack-util.h2
-rw-r--r--src/basic/socket-util.c2
-rw-r--r--src/basic/socket-util.h2
-rw-r--r--src/basic/special.h2
-rw-r--r--src/basic/stat-util.c2
-rw-r--r--src/basic/stat-util.h2
-rw-r--r--src/basic/stdio-util.h2
-rw-r--r--src/basic/string-table.c2
-rw-r--r--src/basic/string-table.h2
-rw-r--r--src/basic/string-util.c2
-rw-r--r--src/basic/string-util.h2
-rw-r--r--src/basic/strv.c2
-rw-r--r--src/basic/strv.h2
-rw-r--r--src/basic/syslog-util.c2
-rw-r--r--src/basic/syslog-util.h2
-rw-r--r--src/basic/terminal-util.c2
-rw-r--r--src/basic/terminal-util.h2
-rw-r--r--src/basic/time-util.c2
-rw-r--r--src/basic/time-util.h2
-rw-r--r--src/basic/umask-util.h2
-rw-r--r--src/basic/unaligned.h2
-rw-r--r--src/basic/unit-def.c2
-rw-r--r--src/basic/unit-def.h2
-rw-r--r--src/basic/unit-name.c2
-rw-r--r--src/basic/unit-name.h2
-rw-r--r--src/basic/user-util.c2
-rw-r--r--src/basic/user-util.h2
-rw-r--r--src/basic/utf8.c2
-rw-r--r--src/basic/utf8.h2
-rw-r--r--src/basic/util.c2
-rw-r--r--src/basic/util.h2
-rw-r--r--src/basic/verbs.c2
-rw-r--r--src/basic/verbs.h2
-rw-r--r--src/basic/virt.c2
-rw-r--r--src/basic/virt.h2
-rw-r--r--src/basic/xattr-util.c2
-rw-r--r--src/basic/xattr-util.h2
-rw-r--r--src/cgroups-agent/cgroups-agent.c2
-rw-r--r--src/core/cgroup.c2
-rw-r--r--src/core/cgroup.h2
-rw-r--r--src/core/mount-setup.c2
-rw-r--r--src/core/mount-setup.h2
-rw-r--r--src/libelogind/libelogind.sym2
-rw-r--r--src/libelogind/sd-bus/bus-common-errors.c2
-rw-r--r--src/libelogind/sd-bus/bus-common-errors.h2
-rw-r--r--src/libelogind/sd-bus/bus-container.c2
-rw-r--r--src/libelogind/sd-bus/bus-container.h2
-rw-r--r--src/libelogind/sd-bus/bus-control.c2
-rw-r--r--src/libelogind/sd-bus/bus-control.h2
-rw-r--r--src/libelogind/sd-bus/bus-convenience.c2
-rw-r--r--src/libelogind/sd-bus/bus-creds.c2
-rw-r--r--src/libelogind/sd-bus/bus-creds.h2
-rw-r--r--src/libelogind/sd-bus/bus-error.c2
-rw-r--r--src/libelogind/sd-bus/bus-error.h2
-rw-r--r--src/libelogind/sd-bus/bus-gvariant.c2
-rw-r--r--src/libelogind/sd-bus/bus-gvariant.h2
-rw-r--r--src/libelogind/sd-bus/bus-internal.c2
-rw-r--r--src/libelogind/sd-bus/bus-internal.h2
-rw-r--r--src/libelogind/sd-bus/bus-introspect.c2
-rw-r--r--src/libelogind/sd-bus/bus-introspect.h2
-rw-r--r--src/libelogind/sd-bus/bus-kernel.c2
-rw-r--r--src/libelogind/sd-bus/bus-kernel.h2
-rw-r--r--src/libelogind/sd-bus/bus-match.c2
-rw-r--r--src/libelogind/sd-bus/bus-match.h2
-rw-r--r--src/libelogind/sd-bus/bus-message.c2
-rw-r--r--src/libelogind/sd-bus/bus-message.h2
-rw-r--r--src/libelogind/sd-bus/bus-objects.c2
-rw-r--r--src/libelogind/sd-bus/bus-objects.h2
-rw-r--r--src/libelogind/sd-bus/bus-protocol.h2
-rw-r--r--src/libelogind/sd-bus/bus-signature.c2
-rw-r--r--src/libelogind/sd-bus/bus-signature.h2
-rw-r--r--src/libelogind/sd-bus/bus-slot.c2
-rw-r--r--src/libelogind/sd-bus/bus-slot.h2
-rw-r--r--src/libelogind/sd-bus/bus-socket.c2
-rw-r--r--src/libelogind/sd-bus/bus-socket.h2
-rw-r--r--src/libelogind/sd-bus/bus-track.c2
-rw-r--r--src/libelogind/sd-bus/bus-track.h2
-rw-r--r--src/libelogind/sd-bus/bus-type.c2
-rw-r--r--src/libelogind/sd-bus/bus-type.h2
-rw-r--r--src/libelogind/sd-bus/sd-bus.c2
-rw-r--r--src/libelogind/sd-bus/test-bus-error.c2
-rw-r--r--src/libelogind/sd-bus/test-bus-introspect.c2
-rw-r--r--src/libelogind/sd-bus/test-bus-match.c2
-rw-r--r--src/libelogind/sd-bus/test-bus-server.c2
-rw-r--r--src/libelogind/sd-bus/test-bus-signature.c2
-rw-r--r--src/libelogind/sd-daemon/sd-daemon.c2
-rw-r--r--src/libelogind/sd-event/sd-event.c2
-rw-r--r--src/libelogind/sd-event/test-event.c2
-rw-r--r--src/libelogind/sd-id128/id128-util.c2
-rw-r--r--src/libelogind/sd-id128/id128-util.h2
-rw-r--r--src/libelogind/sd-id128/sd-id128.c2
-rw-r--r--src/libelogind/sd-login/sd-login.c2
-rw-r--r--src/libelogind/sd-login/test-login.c2
-rw-r--r--src/login/inhibit.c2
-rw-r--r--src/login/loginctl.c2
-rw-r--r--src/login/logind-acl.c2
-rw-r--r--src/login/logind-acl.h2
-rw-r--r--src/login/logind-action.c15
-rw-r--r--src/login/logind-action.h2
-rw-r--r--src/login/logind-button.c2
-rw-r--r--src/login/logind-button.h2
-rw-r--r--src/login/logind-core.c2
-rw-r--r--src/login/logind-dbus.c2
-rw-r--r--src/login/logind-device.c2
-rw-r--r--src/login/logind-device.h2
-rw-r--r--src/login/logind-inhibit.c2
-rw-r--r--src/login/logind-inhibit.h2
-rw-r--r--src/login/logind-seat-dbus.c2
-rw-r--r--src/login/logind-seat.c2
-rw-r--r--src/login/logind-seat.h2
-rw-r--r--src/login/logind-session-dbus.c2
-rw-r--r--src/login/logind-session-device.c2
-rw-r--r--src/login/logind-session-device.h2
-rw-r--r--src/login/logind-session.c2
-rw-r--r--src/login/logind-session.h2
-rw-r--r--src/login/logind-user-dbus.c2
-rw-r--r--src/login/logind-user.c2
-rw-r--r--src/login/logind-user.h2
-rw-r--r--src/login/logind-utmp.c2
-rw-r--r--src/login/logind.c2
-rw-r--r--src/login/logind.h2
-rw-r--r--src/login/pam_elogind.c2
-rw-r--r--src/login/pam_elogind.sym2
-rw-r--r--src/login/sysfs-show.c2
-rw-r--r--src/login/sysfs-show.h2
-rw-r--r--src/login/test-inhibit.c2
-rw-r--r--src/login/test-login-shared.c2
-rw-r--r--src/login/test-login-tables.c2
-rw-r--r--src/shared/acl-util.c2
-rw-r--r--src/shared/acl-util.h2
-rw-r--r--src/shared/bus-util.c2
-rw-r--r--src/shared/bus-util.h2
-rw-r--r--src/shared/clean-ipc.c2
-rw-r--r--src/shared/clean-ipc.h2
-rw-r--r--src/shared/conf-parser.c3
-rw-r--r--src/shared/conf-parser.h2
-rw-r--r--src/shared/nsflags.c2
-rw-r--r--src/shared/nsflags.h2
-rw-r--r--src/shared/output-mode.c2
-rw-r--r--src/shared/output-mode.h2
-rw-r--r--src/shared/sleep-config.c2
-rw-r--r--src/shared/sleep-config.h5
-rw-r--r--src/shared/spawn-polkit-agent.c2
-rw-r--r--src/shared/spawn-polkit-agent.h2
-rw-r--r--src/shared/test-tables.h2
-rw-r--r--src/shared/udev-util.c2
-rw-r--r--src/shared/udev-util.h2
-rw-r--r--src/shared/utmp-wtmp.c2
-rw-r--r--src/shared/utmp-wtmp.h2
-rw-r--r--src/sleep/sleep.c2
-rw-r--r--src/systemd/_sd-common.h2
-rw-r--r--src/systemd/sd-bus-protocol.h2
-rw-r--r--src/systemd/sd-bus-vtable.h2
-rw-r--r--src/systemd/sd-bus.h2
-rw-r--r--src/systemd/sd-daemon.h2
-rw-r--r--src/systemd/sd-event.h2
-rw-r--r--src/systemd/sd-id128.h2
-rw-r--r--src/systemd/sd-login.h2
-rw-r--r--src/systemd/sd-messages.h2
-rw-r--r--src/test/test-alloc-util.c2
-rw-r--r--src/test/test-cgroup.c2
-rw-r--r--src/test/test-conf-files.c2
-rw-r--r--src/test/test-conf-parser.c2
-rw-r--r--src/test/test-copy.c22
-rw-r--r--src/test/test-dlopen.c2
-rw-r--r--src/test/test-ellipsize.c2
-rw-r--r--src/test/test-escape.c2
-rw-r--r--src/test/test-exec-util.c2
-rw-r--r--src/test/test-extract-word.c2
-rw-r--r--src/test/test-fd-util.c2
-rw-r--r--src/test/test-fs-util.c2
-rw-r--r--src/test/test-hash.c2
-rw-r--r--src/test/test-hashmap-plain.c2
-rw-r--r--src/test/test-hashmap.c2
-rw-r--r--src/test/test-helper.h2
-rw-r--r--src/test/test-hexdecoct.c2
-rw-r--r--src/test/test-id128.c2
-rw-r--r--src/test/test-io-util.c2
-rw-r--r--src/test/test-ipcrm.c2
-rw-r--r--src/test/test-list.c2
-rw-r--r--src/test/test-locale-util.c2
-rw-r--r--src/test/test-log.c2
-rw-r--r--src/test/test-parse-util.c2
-rw-r--r--src/test/test-path-util.c2
-rw-r--r--src/test/test-prioq.c2
-rw-r--r--src/test/test-proc-cmdline.c2
-rw-r--r--src/test/test-process-util.c2
-rw-r--r--src/test/test-random-util.c2
-rw-r--r--src/test/test-selinux.c2
-rw-r--r--src/test/test-set.c2
-rw-r--r--src/test/test-signal-util.c4
-rw-r--r--src/test/test-siphash24.c2
-rw-r--r--src/test/test-sizeof.c2
-rw-r--r--src/test/test-stat-util.c2
-rw-r--r--src/test/test-string-util.c2
-rw-r--r--src/test/test-strip-tab-ansi.c2
-rw-r--r--src/test/test-unaligned.c2
-rw-r--r--src/test/test-user-util.c2
-rw-r--r--src/test/test-utf8.c2
-rw-r--r--src/test/test-util.c2
-rw-r--r--src/test/test-verbs.c2
-rw-r--r--src/update-utmp/update-utmp.c2
298 files changed, 71 insertions, 706 deletions
diff --git a/src/basic/alloc-util.c b/src/basic/alloc-util.c
index eceff4f24..130612c3d 100644
--- a/src/basic/alloc-util.c
+++ b/src/basic/alloc-util.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/basic/alloc-util.h b/src/basic/alloc-util.h
index bae6a2845..0e575aff7 100644
--- a/src/basic/alloc-util.h
+++ b/src/basic/alloc-util.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/basic/audit-util.c b/src/basic/audit-util.c
index 0a4062afd..a70c9856f 100644
--- a/src/basic/audit-util.c
+++ b/src/basic/audit-util.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/basic/audit-util.h b/src/basic/audit-util.h
index d8cfafe23..733ea0d6d 100644
--- a/src/basic/audit-util.h
+++ b/src/basic/audit-util.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/basic/build.h b/src/basic/build.h
index b0ac77e8f..c088ca487 100644
--- a/src/basic/build.h
+++ b/src/basic/build.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/basic/bus-label.c b/src/basic/bus-label.c
index fee38b505..c647e8ae0 100644
--- a/src/basic/bus-label.c
+++ b/src/basic/bus-label.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2013 Lennart Poettering
***/
diff --git a/src/basic/bus-label.h b/src/basic/bus-label.h
index 0df46f86b..8d480d396 100644
--- a/src/basic/bus-label.h
+++ b/src/basic/bus-label.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2013 Lennart Poettering
***/
diff --git a/src/basic/cap-list.c b/src/basic/cap-list.c
index 01f163b60..dd13376a7 100644
--- a/src/basic/cap-list.c
+++ b/src/basic/cap-list.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2014 Lennart Poettering
***/
diff --git a/src/basic/cap-list.h b/src/basic/cap-list.h
index db65d5f0e..c81c6748b 100644
--- a/src/basic/cap-list.h
+++ b/src/basic/cap-list.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2014 Lennart Poettering
***/
diff --git a/src/basic/capability-util.c b/src/basic/capability-util.c
index 911f62b35..23669a71d 100644
--- a/src/basic/capability-util.c
+++ b/src/basic/capability-util.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/basic/capability-util.h b/src/basic/capability-util.h
index 47462d2dc..6b4c11876 100644
--- a/src/basic/capability-util.h
+++ b/src/basic/capability-util.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c
index 156118b4a..ad71e6e8a 100644
--- a/src/basic/cgroup-util.c
+++ b/src/basic/cgroup-util.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/basic/cgroup-util.h b/src/basic/cgroup-util.h
index d8ddff95a..b1d160030 100644
--- a/src/basic/cgroup-util.h
+++ b/src/basic/cgroup-util.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/basic/conf-files.c b/src/basic/conf-files.c
index b29243ee4..30a490326 100644
--- a/src/basic/conf-files.c
+++ b/src/basic/conf-files.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/basic/conf-files.h b/src/basic/conf-files.h
index a3adc0828..bc7a45019 100644
--- a/src/basic/conf-files.h
+++ b/src/basic/conf-files.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2010-2012 Lennart Poettering
Copyright 2010-2012 Kay Sievers
***/
diff --git a/src/basic/copy.c b/src/basic/copy.c
index 5b53f2e0f..bb17d3ae3 100644
--- a/src/basic/copy.c
+++ b/src/basic/copy.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2014 Lennart Poettering
***/
@@ -29,6 +27,7 @@
#include "io-util.h"
//#include "macro.h"
#include "missing.h"
+//#include "mount-util.h"
//#include "string-util.h"
#include "strv.h"
#include "time-util.h"
@@ -36,7 +35,12 @@
#include "user-util.h"
//#include "xattr-util.h"
-#define COPY_BUFFER_SIZE (16*1024u)
+#define COPY_BUFFER_SIZE (16U*1024U)
+
+/* A safety net for descending recursively into file system trees to copy. On Linux PATH_MAX is 4096, which means the
+ * deepest valid path one can build is around 2048, which we hence use as a safety net here, to not spin endlessly in
+ * case of bind mount cycles and suchlike. */
+#define COPY_DEPTH_MAX 2048U
static ssize_t try_copy_file_range(
int fd_in, loff_t *off_in,
@@ -482,6 +486,7 @@ static int fd_copy_directory(
int dt,
const char *to,
dev_t original_device,
+ unsigned depth_left,
uid_t override_uid,
gid_t override_gid,
CopyFlags copy_flags) {
@@ -495,6 +500,9 @@ static int fd_copy_directory(
assert(st);
assert(to);
+ if (depth_left == 0)
+ return -ENAMETOOLONG;
+
if (from)
fdf = openat(df, from, O_RDONLY|O_DIRECTORY|O_CLOEXEC|O_NOCTTY|O_NOFOLLOW);
else
@@ -533,13 +541,40 @@ static int fd_copy_directory(
continue;
}
- if (buf.st_dev != original_device)
- continue;
+ if (S_ISDIR(buf.st_mode)) {
+ /*
+ * Don't descend into directories on other file systems, if this is requested. We do a simple
+ * .st_dev check here, which basically comes for free. Note that we do this check only on
+ * directories, not other kind of file system objects, for two reason:
+ *
+ * • The kernel's overlayfs pseudo file system that overlays multiple real file systems
+ * propagates the .st_dev field of the file system a file originates from all the way up
+ * through the stack to stat(). It doesn't do that for directories however. This means that
+ * comparing .st_dev on non-directories suggests that they all are mount points. To avoid
+ * confusion we hence avoid relying on this check for regular files.
+ *
+ * • The main reason we do this check at all is to protect ourselves from bind mount cycles,
+ * where we really want to avoid descending down in all eternity. However the .st_dev check
+ * is usually not sufficient for this protection anyway, as bind mount cycles from the same
+ * file system onto itself can't be detected that way. (Note we also do a recursion depth
+ * check, which is probably the better protection in this regard, which is why
+ * COPY_SAME_MOUNT is optional).
+ */
+
+ if (FLAGS_SET(copy_flags, COPY_SAME_MOUNT)) {
+ if (buf.st_dev != original_device)
+ continue;
+
+ r = fd_is_mount_point(dirfd(d), de->d_name, 0);
+ if (r < 0)
+ return r;
+ if (r > 0)
+ continue;
+ }
- if (S_ISREG(buf.st_mode))
+ q = fd_copy_directory(dirfd(d), de->d_name, &buf, fdt, de->d_name, original_device, depth_left-1, override_uid, override_gid, copy_flags);
+ } else if (S_ISREG(buf.st_mode))
q = fd_copy_regular(dirfd(d), de->d_name, &buf, fdt, de->d_name, override_uid, override_gid, copy_flags);
- else if (S_ISDIR(buf.st_mode))
- q = fd_copy_directory(dirfd(d), de->d_name, &buf, fdt, de->d_name, original_device, override_uid, override_gid, copy_flags);
else if (S_ISLNK(buf.st_mode))
q = fd_copy_symlink(dirfd(d), de->d_name, &buf, fdt, de->d_name, override_uid, override_gid, copy_flags);
else if (S_ISFIFO(buf.st_mode))
@@ -589,7 +624,7 @@ int copy_tree_at(int fdf, const char *from, int fdt, const char *to, uid_t overr
if (S_ISREG(st.st_mode))
return fd_copy_regular(fdf, from, &st, fdt, to, override_uid, override_gid, copy_flags);
else if (S_ISDIR(st.st_mode))
- return fd_copy_directory(fdf, from, &st, fdt, to, st.st_dev, override_uid, override_gid, copy_flags);
+ return fd_copy_directory(fdf, from, &st, fdt, to, st.st_dev, COPY_DEPTH_MAX, override_uid, override_gid, copy_flags);
else if (S_ISLNK(st.st_mode))
return fd_copy_symlink(fdf, from, &st, fdt, to, override_uid, override_gid, copy_flags);
else if (S_ISFIFO(st.st_mode))
@@ -616,7 +651,7 @@ int copy_directory_fd(int dirfd, const char *to, CopyFlags copy_flags) {
if (!S_ISDIR(st.st_mode))
return -ENOTDIR;
- return fd_copy_directory(dirfd, NULL, &st, AT_FDCWD, to, st.st_dev, UID_INVALID, GID_INVALID, copy_flags);
+ return fd_copy_directory(dirfd, NULL, &st, AT_FDCWD, to, st.st_dev, COPY_DEPTH_MAX, UID_INVALID, GID_INVALID, copy_flags);
}
int copy_directory(const char *from, const char *to, CopyFlags copy_flags) {
@@ -631,7 +666,7 @@ int copy_directory(const char *from, const char *to, CopyFlags copy_flags) {
if (!S_ISDIR(st.st_mode))
return -ENOTDIR;
- return fd_copy_directory(AT_FDCWD, from, &st, AT_FDCWD, to, st.st_dev, UID_INVALID, GID_INVALID, copy_flags);
+ return fd_copy_directory(AT_FDCWD, from, &st, AT_FDCWD, to, st.st_dev, COPY_DEPTH_MAX, UID_INVALID, GID_INVALID, copy_flags);
}
int copy_file_fd(const char *from, int fdt, CopyFlags copy_flags) {
@@ -684,55 +719,31 @@ int copy_file(const char *from, const char *to, int flags, mode_t mode, unsigned
}
int copy_file_atomic(const char *from, const char *to, mode_t mode, unsigned chattr_flags, CopyFlags copy_flags) {
- _cleanup_(unlink_and_freep) char *t = NULL;
- _cleanup_close_ int fdt = -1;
+ _cleanup_free_ char *t = NULL;
int r;
assert(from);
assert(to);
- /* We try to use O_TMPFILE here to create the file if we can. Note that that only works if COPY_REPLACE is not
- * set though as we need to use linkat() for linking the O_TMPFILE file into the file system but that system
- * call can't replace existing files. Hence, if COPY_REPLACE is set we create a temporary name in the file
- * system right-away and unconditionally which we then can renameat() to the right name after we completed
- * writing it. */
-
- if (copy_flags & COPY_REPLACE) {
- r = tempfn_random(to, NULL, &t);
- if (r < 0)
- return r;
-
- fdt = open(t, O_CREAT|O_EXCL|O_NOFOLLOW|O_NOCTTY|O_WRONLY|O_CLOEXEC, 0600);
- if (fdt < 0) {
- t = mfree(t);
- return -errno;
- }
- } else {
- fdt = open_tmpfile_linkable(to, O_WRONLY|O_CLOEXEC, &t);
- if (fdt < 0)
- return fdt;
- }
-
- if (chattr_flags != 0)
- (void) chattr_fd(fdt, chattr_flags, (unsigned) -1);
-
- r = copy_file_fd(from, fdt, copy_flags);
+ r = tempfn_random(to, NULL, &t);
if (r < 0)
return r;
- if (fchmod(fdt, mode) < 0)
- return -errno;
+ r = copy_file(from, t, O_NOFOLLOW|O_EXCL, mode, chattr_flags, copy_flags);
+ if (r < 0)
+ return r;
if (copy_flags & COPY_REPLACE) {
- if (renameat(AT_FDCWD, t, AT_FDCWD, to) < 0)
- return -errno;
- } else {
- r = link_tmpfile(fdt, t, to);
+ r = renameat(AT_FDCWD, t, AT_FDCWD, to);
if (r < 0)
- return r;
+ r = -errno;
+ } else
+ r = rename_noreplace(AT_FDCWD, t, AT_FDCWD, to);
+ if (r < 0) {
+ (void) unlink(t);
+ return r;
}
- t = mfree(t);
return 0;
}
diff --git a/src/basic/copy.h b/src/basic/copy.h
index d54010560..885597167 100644
--- a/src/basic/copy.h
+++ b/src/basic/copy.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2014 Lennart Poettering
***/
diff --git a/src/basic/def.h b/src/basic/def.h
index d171e5b8a..6e871d37e 100644
--- a/src/basic/def.h
+++ b/src/basic/def.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/basic/dirent-util.c b/src/basic/dirent-util.c
index e093a3bba..4a061837f 100644
--- a/src/basic/dirent-util.c
+++ b/src/basic/dirent-util.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2010-2012 Lennart Poettering
***/
diff --git a/src/basic/dirent-util.h b/src/basic/dirent-util.h
index 00d061b63..047ccd225 100644
--- a/src/basic/dirent-util.h
+++ b/src/basic/dirent-util.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/basic/env-util.c b/src/basic/env-util.c
index 90d2f06a8..54cbe1533 100644
--- a/src/basic/env-util.c
+++ b/src/basic/env-util.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2012 Lennart Poettering
***/
diff --git a/src/basic/env-util.h b/src/basic/env-util.h
index 7ac73792f..cafc18bad 100644
--- a/src/basic/env-util.h
+++ b/src/basic/env-util.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2013 Lennart Poettering
***/
diff --git a/src/basic/errno-list.c b/src/basic/errno-list.c
index e6fc0baeb..259b1ec0a 100644
--- a/src/basic/errno-list.c
+++ b/src/basic/errno-list.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2013 Lennart Poettering
***/
diff --git a/src/basic/errno-list.h b/src/basic/errno-list.h
index 6725ae9ad..c549b055d 100644
--- a/src/basic/errno-list.h
+++ b/src/basic/errno-list.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2013 Lennart Poettering
***/
diff --git a/src/basic/escape.c b/src/basic/escape.c
index 98b4bdf18..f736aa6ee 100644
--- a/src/basic/escape.c
+++ b/src/basic/escape.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/basic/escape.h b/src/basic/escape.h
index 7889dc714..f77b3fcad 100644
--- a/src/basic/escape.h
+++ b/src/basic/escape.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/basic/exec-util.c b/src/basic/exec-util.c
index ad486db1a..96dc7dce0 100644
--- a/src/basic/exec-util.c
+++ b/src/basic/exec-util.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/basic/exec-util.h b/src/basic/exec-util.h
index 9ebeab96a..c66aa7fc5 100644
--- a/src/basic/exec-util.h
+++ b/src/basic/exec-util.h
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2017 Zbigniew Jędrzejewski-Szmek
***/
diff --git a/src/basic/extract-word.c b/src/basic/extract-word.c
index e2d4eb4aa..4b7b77e92 100644
--- a/src/basic/extract-word.c
+++ b/src/basic/extract-word.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/basic/extract-word.h b/src/basic/extract-word.h
index be21521d6..55bd8ba6c 100644
--- a/src/basic/extract-word.h
+++ b/src/basic/extract-word.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/basic/fd-util.c b/src/basic/fd-util.c
index efe974ee2..836ba7e76 100644
--- a/src/basic/fd-util.c
+++ b/src/basic/fd-util.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/basic/fd-util.h b/src/basic/fd-util.h
index 7f7ac8901..8bc6c0128 100644
--- a/src/basic/fd-util.h
+++ b/src/basic/fd-util.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/basic/fileio-label.c b/src/basic/fileio-label.c
index 69b58b7b9..7b71bec9b 100644
--- a/src/basic/fileio-label.c
+++ b/src/basic/fileio-label.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
Copyright 2010 Harald Hoyer
***/
diff --git a/src/basic/fileio-label.h b/src/basic/fileio-label.h
index 2bfffbfa7..1455af041 100644
--- a/src/basic/fileio-label.h
+++ b/src/basic/fileio-label.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
Copyright 2010 Harald Hoyer
***/
diff --git a/src/basic/fileio.c b/src/basic/fileio.c
index 2d742c911..afe2fd17b 100644
--- a/src/basic/fileio.c
+++ b/src/basic/fileio.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
@@ -1571,29 +1569,21 @@ int read_nul_string(FILE *f, char **ret) {
}
int mkdtemp_malloc(const char *template, char **ret) {
- _cleanup_free_ char *p = NULL;
- int r;
+ char *p;
+ assert(template);
assert(ret);
- if (template)
- p = strdup(template);
- else {
- const char *tmp;
-
- r = tmp_dir(&tmp);
- if (r < 0)
- return r;
-
- p = strjoin(tmp, "/XXXXXX");
- }
+ p = strdup(template);
if (!p)
return -ENOMEM;
- if (!mkdtemp(p))
+ if (!mkdtemp(p)) {
+ free(p);
return -errno;
+ }
- *ret = TAKE_PTR(p);
+ *ret = p;
return 0;
}
#endif // 0
diff --git a/src/basic/fileio.h b/src/basic/fileio.h
index 0a23c9fae..e367b9ac9 100644
--- a/src/basic/fileio.h
+++ b/src/basic/fileio.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/basic/format-util.h b/src/basic/format-util.h
index c9e81192b..4ea34749d 100644
--- a/src/basic/format-util.h
+++ b/src/basic/format-util.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2015 Ronny Chevalier
***/
diff --git a/src/basic/fs-util.c b/src/basic/fs-util.c
index 1f2765737..84946989b 100644
--- a/src/basic/fs-util.c
+++ b/src/basic/fs-util.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
@@ -239,22 +237,6 @@ int chmod_and_chown(const char *path, mode_t mode, uid_t uid, gid_t gid) {
return 0;
}
-int fchmod_and_chown(int fd, mode_t mode, uid_t uid, gid_t gid) {
- /* Under the assumption that we are running privileged we
- * first change the access mode and only then hand out
- * ownership to avoid a window where access is too open. */
-
- if (mode != MODE_INVALID)
- if (fchmod(fd, mode) < 0)
- return -errno;
-
- if (uid != UID_INVALID || gid != GID_INVALID)
- if (fchown(fd, uid, gid) < 0)
- return -errno;
-
- return 0;
-}
-
int fchmod_umask(int fd, mode_t m) {
mode_t u;
int r;
diff --git a/src/basic/fs-util.h b/src/basic/fs-util.h
index 4e65fd238..7feb0acc9 100644
--- a/src/basic/fs-util.h
+++ b/src/basic/fs-util.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
@@ -37,7 +35,6 @@ int readlink_and_make_absolute(const char *p, char **r);
#endif // 0
int chmod_and_chown(const char *path, mode_t mode, uid_t uid, gid_t gid);
-int fchmod_and_chown(int fd, mode_t mode, uid_t uid, gid_t gid);
int fchmod_umask(int fd, mode_t mode);
int fchmod_opath(int fd, mode_t m);
diff --git a/src/basic/hash-funcs.c b/src/basic/hash-funcs.c
index 13e357efd..3b695a125 100644
--- a/src/basic/hash-funcs.c
+++ b/src/basic/hash-funcs.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
Copyright 2014 Michal Schmidt
***/
diff --git a/src/basic/hash-funcs.h b/src/basic/hash-funcs.h
index 0c963af8e..343af5d68 100644
--- a/src/basic/hash-funcs.h
+++ b/src/basic/hash-funcs.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
Copyright 2014 Michal Schmidt
***/
diff --git a/src/basic/hashmap.c b/src/basic/hashmap.c
index 95c15c26c..eef11502a 100644
--- a/src/basic/hashmap.c
+++ b/src/basic/hashmap.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
Copyright 2014 Michal Schmidt
***/
diff --git a/src/basic/hashmap.h b/src/basic/hashmap.h
index 701eecbdb..3d544dc73 100644
--- a/src/basic/hashmap.h
+++ b/src/basic/hashmap.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
Copyright 2014 Michal Schmidt
***/
diff --git a/src/basic/hexdecoct.c b/src/basic/hexdecoct.c
index b3ea05ce5..92c164283 100644
--- a/src/basic/hexdecoct.c
+++ b/src/basic/hexdecoct.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/basic/hexdecoct.h b/src/basic/hexdecoct.h
index c2f11013e..b49ddc8c2 100644
--- a/src/basic/hexdecoct.h
+++ b/src/basic/hexdecoct.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/basic/hostname-util.c b/src/basic/hostname-util.c
index 022aaba0f..71ce9e5d3 100644
--- a/src/basic/hostname-util.c
+++ b/src/basic/hostname-util.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2015 Lennart Poettering
***/
diff --git a/src/basic/hostname-util.h b/src/basic/hostname-util.h
index 439b12e64..7e31d19d8 100644
--- a/src/basic/hostname-util.h
+++ b/src/basic/hostname-util.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2010-2015 Lennart Poettering
***/
diff --git a/src/basic/io-util.c b/src/basic/io-util.c
index 593db66da..dd67389fd 100644
--- a/src/basic/io-util.c
+++ b/src/basic/io-util.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/basic/io-util.h b/src/basic/io-util.h
index e4717b6f3..ab43ca5b5 100644
--- a/src/basic/io-util.h
+++ b/src/basic/io-util.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/basic/khash.c b/src/basic/khash.c
index c66e9faee..08859832f 100644
--- a/src/basic/khash.c
+++ b/src/basic/khash.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2016 Lennart Poettering
***/
diff --git a/src/basic/khash.h b/src/basic/khash.h
index 3fa867e37..5c7d306c9 100644
--- a/src/basic/khash.h
+++ b/src/basic/khash.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2016 Lennart Poettering
***/
diff --git a/src/basic/label.c b/src/basic/label.c
index 1641a6918..18905ab2e 100644
--- a/src/basic/label.c
+++ b/src/basic/label.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/basic/label.h b/src/basic/label.h
index 1f3eb54d3..dcf677248 100644
--- a/src/basic/label.h
+++ b/src/basic/label.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/basic/list.h b/src/basic/list.h
index 3ec7e73fc..6ae88ec6b 100644
--- a/src/basic/list.h
+++ b/src/basic/list.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/basic/locale-util.c b/src/basic/locale-util.c
index b382af192..fb31e8ffb 100644
--- a/src/basic/locale-util.c
+++ b/src/basic/locale-util.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2014 Lennart Poettering
***/
diff --git a/src/basic/locale-util.h b/src/basic/locale-util.h
index 144e2bc63..80c2d871a 100644
--- a/src/basic/locale-util.h
+++ b/src/basic/locale-util.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2014 Lennart Poettering
***/
diff --git a/src/basic/log.c b/src/basic/log.c
index a506d30d3..3f6c45188 100644
--- a/src/basic/log.c
+++ b/src/basic/log.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/basic/log.h b/src/basic/log.h
index 75ecd8493..ec672c75f 100644
--- a/src/basic/log.h
+++ b/src/basic/log.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/basic/login-util.c b/src/basic/login-util.c
index d69b413e6..59ac08140 100644
--- a/src/basic/login-util.c
+++ b/src/basic/login-util.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2013 Zbigniew Jędrzejewski-Szmek
***/
diff --git a/src/basic/login-util.h b/src/basic/login-util.h
index ed454bd67..28c00e148 100644
--- a/src/basic/login-util.h
+++ b/src/basic/login-util.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2013 Zbigniew Jędrzejewski-Szmek
***/
diff --git a/src/basic/macro.h b/src/basic/macro.h
index 05f5e9fa6..4d33e7028 100644
--- a/src/basic/macro.h
+++ b/src/basic/macro.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/basic/memfd-util.c b/src/basic/memfd-util.c
index 17e8acf6a..c0d67ece9 100644
--- a/src/basic/memfd-util.c
+++ b/src/basic/memfd-util.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2013 Lennart Poettering
***/
diff --git a/src/basic/memfd-util.h b/src/basic/memfd-util.h
index c9920f7c1..b0e058b5e 100644
--- a/src/basic/memfd-util.h
+++ b/src/basic/memfd-util.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2013 Lennart Poettering
***/
diff --git a/src/basic/mempool.c b/src/basic/mempool.c
index 2e55639e8..5792ca972 100644
--- a/src/basic/mempool.c
+++ b/src/basic/mempool.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2010-2014 Lennart Poettering
Copyright 2014 Michal Schmidt
***/
diff --git a/src/basic/mempool.h b/src/basic/mempool.h
index ba0c0bd8f..dad4a4f9c 100644
--- a/src/basic/mempool.h
+++ b/src/basic/mempool.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2011-2014 Lennart Poettering
Copyright 2014 Michal Schmidt
***/
diff --git a/src/basic/missing.h b/src/basic/missing.h
index 5b194261d..1d06ce535 100644
--- a/src/basic/missing.h
+++ b/src/basic/missing.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/basic/missing_syscall.h b/src/basic/missing_syscall.h
index b26332bc2..ff7e76a57 100644
--- a/src/basic/missing_syscall.h
+++ b/src/basic/missing_syscall.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
Copyright 2016 Zbigniew Jędrzejewski-Szmek
***/
diff --git a/src/basic/mkdir-label.c b/src/basic/mkdir-label.c
index c723c4e69..28e93f0b8 100644
--- a/src/basic/mkdir-label.c
+++ b/src/basic/mkdir-label.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
Copyright 2013 Kay Sievers
***/
diff --git a/src/basic/mkdir.c b/src/basic/mkdir.c
index 12d8e377d..3d5471874 100644
--- a/src/basic/mkdir.c
+++ b/src/basic/mkdir.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/basic/mkdir.h b/src/basic/mkdir.h
index c0e08fcfb..f26486f3e 100644
--- a/src/basic/mkdir.h
+++ b/src/basic/mkdir.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
Copyright 2013 Kay Sievers
***/
diff --git a/src/basic/mount-util.c b/src/basic/mount-util.c
index 76c0969d4..e05fabe3e 100644
--- a/src/basic/mount-util.c
+++ b/src/basic/mount-util.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/basic/mount-util.h b/src/basic/mount-util.h
index d02976d89..37ec09f03 100644
--- a/src/basic/mount-util.h
+++ b/src/basic/mount-util.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/basic/parse-util.c b/src/basic/parse-util.c
index a64d9f5a7..ef7c2cabd 100644
--- a/src/basic/parse-util.c
+++ b/src/basic/parse-util.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/basic/parse-util.h b/src/basic/parse-util.h
index fc52d1f22..2b594edb1 100644
--- a/src/basic/parse-util.h
+++ b/src/basic/parse-util.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/basic/path-util.c b/src/basic/path-util.c
index 3aabe5278..a0a2857d3 100644
--- a/src/basic/path-util.c
+++ b/src/basic/path-util.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2010-2012 Lennart Poettering
***/
diff --git a/src/basic/path-util.h b/src/basic/path-util.h
index 9f356c94d..e559e50b7 100644
--- a/src/basic/path-util.h
+++ b/src/basic/path-util.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2010-2012 Lennart Poettering
***/
diff --git a/src/basic/prioq.c b/src/basic/prioq.c
index 1db2d9efc..fd51e0587 100644
--- a/src/basic/prioq.c
+++ b/src/basic/prioq.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2013 Lennart Poettering
***/
diff --git a/src/basic/prioq.h b/src/basic/prioq.h
index e348c6464..a3e378a92 100644
--- a/src/basic/prioq.h
+++ b/src/basic/prioq.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2013 Lennart Poettering
***/
diff --git a/src/basic/proc-cmdline.c b/src/basic/proc-cmdline.c
index 723683100..31ffbc1ef 100644
--- a/src/basic/proc-cmdline.c
+++ b/src/basic/proc-cmdline.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/basic/proc-cmdline.h b/src/basic/proc-cmdline.h
index 35a75b499..ca7bf990c 100644
--- a/src/basic/proc-cmdline.h
+++ b/src/basic/proc-cmdline.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/basic/process-util.c b/src/basic/process-util.c
index 74a6e4abf..2ce006e4a 100644
--- a/src/basic/process-util.c
+++ b/src/basic/process-util.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/basic/process-util.h b/src/basic/process-util.h
index c5655e995..23b934168 100644
--- a/src/basic/process-util.h
+++ b/src/basic/process-util.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/basic/random-util.c b/src/basic/random-util.c
index e8637ef9b..03c89c1eb 100644
--- a/src/basic/random-util.c
+++ b/src/basic/random-util.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/basic/random-util.h b/src/basic/random-util.h
index 723917057..c829da084 100644
--- a/src/basic/random-util.h
+++ b/src/basic/random-util.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/basic/raw-clone.h b/src/basic/raw-clone.h
index c801939d1..7cf86aaf0 100644
--- a/src/basic/raw-clone.h
+++ b/src/basic/raw-clone.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
Copyright 2016 Michael Karcher
***/
diff --git a/src/basic/refcnt.h b/src/basic/refcnt.h
index 0d5b3f4e1..a341fd55b 100644
--- a/src/basic/refcnt.h
+++ b/src/basic/refcnt.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2013 Lennart Poettering
***/
diff --git a/src/basic/rm-rf.c b/src/basic/rm-rf.c
index 9143f0066..fa7e94f19 100644
--- a/src/basic/rm-rf.c
+++ b/src/basic/rm-rf.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2015 Lennart Poettering
***/
diff --git a/src/basic/rm-rf.h b/src/basic/rm-rf.h
index 53d8485a4..9f74bce08 100644
--- a/src/basic/rm-rf.h
+++ b/src/basic/rm-rf.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2015 Lennart Poettering
***/
diff --git a/src/basic/selinux-util.c b/src/basic/selinux-util.c
index cdeeb3e2a..1403b9b14 100644
--- a/src/basic/selinux-util.c
+++ b/src/basic/selinux-util.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/basic/selinux-util.h b/src/basic/selinux-util.h
index 1509b1cc3..dc689c7d8 100644
--- a/src/basic/selinux-util.h
+++ b/src/basic/selinux-util.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/basic/set.h b/src/basic/set.h
index caad46ced..daf14ce89 100644
--- a/src/basic/set.h
+++ b/src/basic/set.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/basic/sigbus.c b/src/basic/sigbus.c
index d7db5b56a..16751a9b3 100644
--- a/src/basic/sigbus.c
+++ b/src/basic/sigbus.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2014 Lennart Poettering
***/
diff --git a/src/basic/sigbus.h b/src/basic/sigbus.h
index 9c0c66a77..a262f3c6c 100644
--- a/src/basic/sigbus.h
+++ b/src/basic/sigbus.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2014 Lennart Poettering
***/
diff --git a/src/basic/signal-util.c b/src/basic/signal-util.c
index 5bd5c71ce..e0e9444e4 100644
--- a/src/basic/signal-util.c
+++ b/src/basic/signal-util.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2015 Lennart Poettering
***/
diff --git a/src/basic/signal-util.h b/src/basic/signal-util.h
index a52b1d2fa..5b7b127d9 100644
--- a/src/basic/signal-util.h
+++ b/src/basic/signal-util.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2010-2015 Lennart Poettering
***/
diff --git a/src/basic/smack-util.c b/src/basic/smack-util.c
index 491b421ab..363d68911 100644
--- a/src/basic/smack-util.c
+++ b/src/basic/smack-util.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2013 Intel Corporation
Author: Auke Kok <auke-jan.h.kok@intel.com>
diff --git a/src/basic/smack-util.h b/src/basic/smack-util.h
index 6821d4245..8cdf0cc0f 100644
--- a/src/basic/smack-util.h
+++ b/src/basic/smack-util.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2013 Intel Corporation
Author: Auke Kok <auke-jan.h.kok@intel.com>
diff --git a/src/basic/socket-util.c b/src/basic/socket-util.c
index 177f2aa4f..5f7276424 100644
--- a/src/basic/socket-util.c
+++ b/src/basic/socket-util.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/basic/socket-util.h b/src/basic/socket-util.h
index bf99f4107..28c488409 100644
--- a/src/basic/socket-util.h
+++ b/src/basic/socket-util.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/basic/special.h b/src/basic/special.h
index 136a5b2da..9a3cbaf95 100644
--- a/src/basic/special.h
+++ b/src/basic/special.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/basic/stat-util.c b/src/basic/stat-util.c
index d88f97fdf..8c6a36fe0 100644
--- a/src/basic/stat-util.c
+++ b/src/basic/stat-util.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2010-2012 Lennart Poettering
***/
diff --git a/src/basic/stat-util.h b/src/basic/stat-util.h
index 325caf445..1bf59c3b4 100644
--- a/src/basic/stat-util.h
+++ b/src/basic/stat-util.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2010-2012 Lennart Poettering
***/
diff --git a/src/basic/stdio-util.h b/src/basic/stdio-util.h
index 87d8917a5..8a7544cf5 100644
--- a/src/basic/stdio-util.h
+++ b/src/basic/stdio-util.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/basic/string-table.c b/src/basic/string-table.c
index 6857202f8..33a5dbc57 100644
--- a/src/basic/string-table.c
+++ b/src/basic/string-table.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/basic/string-table.h b/src/basic/string-table.h
index 1786bcfda..6bc60b65e 100644
--- a/src/basic/string-table.h
+++ b/src/basic/string-table.h
@@ -3,8 +3,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/basic/string-util.c b/src/basic/string-util.c
index 1f8bf3d4d..ed7714801 100644
--- a/src/basic/string-util.c
+++ b/src/basic/string-util.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/basic/string-util.h b/src/basic/string-util.h
index 1671697a0..2dcfecc79 100644
--- a/src/basic/string-util.h
+++ b/src/basic/string-util.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/basic/strv.c b/src/basic/strv.c
index 0c2d1c848..fa5101772 100644
--- a/src/basic/strv.c
+++ b/src/basic/strv.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/basic/strv.h b/src/basic/strv.h
index 0b4ff30e9..1de570910 100644
--- a/src/basic/strv.h
+++ b/src/basic/strv.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/basic/syslog-util.c b/src/basic/syslog-util.c
index c3b91bfb6..bcee72c49 100644
--- a/src/basic/syslog-util.c
+++ b/src/basic/syslog-util.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/basic/syslog-util.h b/src/basic/syslog-util.h
index 02778affb..c63648a66 100644
--- a/src/basic/syslog-util.h
+++ b/src/basic/syslog-util.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/basic/terminal-util.c b/src/basic/terminal-util.c
index 18cfb4c75..dab4f10b0 100644
--- a/src/basic/terminal-util.c
+++ b/src/basic/terminal-util.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/basic/terminal-util.h b/src/basic/terminal-util.h
index c56b19d07..cc5ba0cfa 100644
--- a/src/basic/terminal-util.h
+++ b/src/basic/terminal-util.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/basic/time-util.c b/src/basic/time-util.c
index 2e465296f..34a90ed1b 100644
--- a/src/basic/time-util.c
+++ b/src/basic/time-util.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/basic/time-util.h b/src/basic/time-util.h
index 94534794a..df3c718f4 100644
--- a/src/basic/time-util.h
+++ b/src/basic/time-util.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/basic/umask-util.h b/src/basic/umask-util.h
index ce705247d..25796883e 100644
--- a/src/basic/umask-util.h
+++ b/src/basic/umask-util.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/basic/unaligned.h b/src/basic/unaligned.h
index feddaa919..0bb62b319 100644
--- a/src/basic/unaligned.h
+++ b/src/basic/unaligned.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2014 Tom Gundersen
***/
diff --git a/src/basic/unit-def.c b/src/basic/unit-def.c
index fd42e0a24..abfa11ab1 100644
--- a/src/basic/unit-def.c
+++ b/src/basic/unit-def.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/basic/unit-def.h b/src/basic/unit-def.h
index 3f13a1c8f..1d785c43b 100644
--- a/src/basic/unit-def.h
+++ b/src/basic/unit-def.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/basic/unit-name.c b/src/basic/unit-name.c
index 12323fb4d..fe6349bfd 100644
--- a/src/basic/unit-name.c
+++ b/src/basic/unit-name.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/basic/unit-name.h b/src/basic/unit-name.h
index 07229769a..ac997ad7e 100644
--- a/src/basic/unit-name.h
+++ b/src/basic/unit-name.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/basic/user-util.c b/src/basic/user-util.c
index 796e00f69..b3e4ce503 100644
--- a/src/basic/user-util.c
+++ b/src/basic/user-util.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/basic/user-util.h b/src/basic/user-util.h
index e0de7a9a8..5cd1a515d 100644
--- a/src/basic/user-util.h
+++ b/src/basic/user-util.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/basic/utf8.c b/src/basic/utf8.c
index af86f74d1..3b8b7b12c 100644
--- a/src/basic/utf8.c
+++ b/src/basic/utf8.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2008-2011 Kay Sievers
Copyright 2012 Lennart Poettering
***/
diff --git a/src/basic/utf8.h b/src/basic/utf8.h
index d6936ea46..ffe49c128 100644
--- a/src/basic/utf8.h
+++ b/src/basic/utf8.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2012 Lennart Poettering
***/
diff --git a/src/basic/util.c b/src/basic/util.c
index 635d1672a..8bd0bff75 100644
--- a/src/basic/util.c
+++ b/src/basic/util.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/basic/util.h b/src/basic/util.h
index 7722e583c..27d09e98c 100644
--- a/src/basic/util.h
+++ b/src/basic/util.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/basic/verbs.c b/src/basic/verbs.c
index a52cd2ad9..e0b60eca9 100644
--- a/src/basic/verbs.c
+++ b/src/basic/verbs.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2014 Lennart Poettering
***/
diff --git a/src/basic/verbs.h b/src/basic/verbs.h
index fde6a1fdc..0e5c33cff 100644
--- a/src/basic/verbs.h
+++ b/src/basic/verbs.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2014 Lennart Poettering
***/
diff --git a/src/basic/virt.c b/src/basic/virt.c
index dfc384ede..529722a2a 100644
--- a/src/basic/virt.c
+++ b/src/basic/virt.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2011 Lennart Poettering
***/
diff --git a/src/basic/virt.h b/src/basic/virt.h
index 0910e0df5..9fdcb5d13 100644
--- a/src/basic/virt.h
+++ b/src/basic/virt.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2011 Lennart Poettering
***/
diff --git a/src/basic/xattr-util.c b/src/basic/xattr-util.c
index 2b50ee352..0f948e4be 100644
--- a/src/basic/xattr-util.c
+++ b/src/basic/xattr-util.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/basic/xattr-util.h b/src/basic/xattr-util.h
index 2176a4def..4ec9052e5 100644
--- a/src/basic/xattr-util.h
+++ b/src/basic/xattr-util.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/cgroups-agent/cgroups-agent.c b/src/cgroups-agent/cgroups-agent.c
index 9c026f755..b98c0432c 100644
--- a/src/cgroups-agent/cgroups-agent.c
+++ b/src/cgroups-agent/cgroups-agent.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/core/cgroup.c b/src/core/cgroup.c
index fa5aa7082..139d86c36 100644
--- a/src/core/cgroup.c
+++ b/src/core/cgroup.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2013 Lennart Poettering
***/
diff --git a/src/core/cgroup.h b/src/core/cgroup.h
index a6b705aa6..207546154 100644
--- a/src/core/cgroup.h
+++ b/src/core/cgroup.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2013 Lennart Poettering
***/
diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c
index f56fce19c..6a453e813 100644
--- a/src/core/mount-setup.c
+++ b/src/core/mount-setup.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/core/mount-setup.h b/src/core/mount-setup.h
index 211a65589..ecd1f79da 100644
--- a/src/core/mount-setup.h
+++ b/src/core/mount-setup.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/libelogind/libelogind.sym b/src/libelogind/libelogind.sym
index e63668b2a..788e10034 100644
--- a/src/libelogind/libelogind.sym
+++ b/src/libelogind/libelogind.sym
@@ -1,8 +1,6 @@
/***
SPDX-License-Identifier: LGPL-2.1+
- This file is part of systemd.
-
systemd is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2.1 of the License, or
diff --git a/src/libelogind/sd-bus/bus-common-errors.c b/src/libelogind/sd-bus/bus-common-errors.c
index 3cc8b0f9d..808023df1 100644
--- a/src/libelogind/sd-bus/bus-common-errors.c
+++ b/src/libelogind/sd-bus/bus-common-errors.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2014 Zbigniew Jędrzejewski-Szmek
***/
diff --git a/src/libelogind/sd-bus/bus-common-errors.h b/src/libelogind/sd-bus/bus-common-errors.h
index 619a2a852..54f63b082 100644
--- a/src/libelogind/sd-bus/bus-common-errors.h
+++ b/src/libelogind/sd-bus/bus-common-errors.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2013 Lennart Poettering
***/
diff --git a/src/libelogind/sd-bus/bus-container.c b/src/libelogind/sd-bus/bus-container.c
index a9127376c..47691960a 100644
--- a/src/libelogind/sd-bus/bus-container.c
+++ b/src/libelogind/sd-bus/bus-container.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2013 Lennart Poettering
***/
diff --git a/src/libelogind/sd-bus/bus-container.h b/src/libelogind/sd-bus/bus-container.h
index 168658461..54c76c482 100644
--- a/src/libelogind/sd-bus/bus-container.h
+++ b/src/libelogind/sd-bus/bus-container.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2013 Lennart Poettering
***/
diff --git a/src/libelogind/sd-bus/bus-control.c b/src/libelogind/sd-bus/bus-control.c
index cf340747a..ed0705ae9 100644
--- a/src/libelogind/sd-bus/bus-control.c
+++ b/src/libelogind/sd-bus/bus-control.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2013 Lennart Poettering
***/
diff --git a/src/libelogind/sd-bus/bus-control.h b/src/libelogind/sd-bus/bus-control.h
index a9edc8cb7..c3a5f7ce2 100644
--- a/src/libelogind/sd-bus/bus-control.h
+++ b/src/libelogind/sd-bus/bus-control.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2013 Lennart Poettering
***/
diff --git a/src/libelogind/sd-bus/bus-convenience.c b/src/libelogind/sd-bus/bus-convenience.c
index 2ac8cfa63..47da334b9 100644
--- a/src/libelogind/sd-bus/bus-convenience.c
+++ b/src/libelogind/sd-bus/bus-convenience.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2013 Lennart Poettering
***/
diff --git a/src/libelogind/sd-bus/bus-creds.c b/src/libelogind/sd-bus/bus-creds.c
index 8ccb96ff9..44adb871e 100644
--- a/src/libelogind/sd-bus/bus-creds.c
+++ b/src/libelogind/sd-bus/bus-creds.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2013 Lennart Poettering
***/
diff --git a/src/libelogind/sd-bus/bus-creds.h b/src/libelogind/sd-bus/bus-creds.h
index 723a833d6..fe490a176 100644
--- a/src/libelogind/sd-bus/bus-creds.h
+++ b/src/libelogind/sd-bus/bus-creds.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2013 Lennart Poettering
***/
diff --git a/src/libelogind/sd-bus/bus-error.c b/src/libelogind/sd-bus/bus-error.c
index 5e8846be4..61d727fae 100644
--- a/src/libelogind/sd-bus/bus-error.c
+++ b/src/libelogind/sd-bus/bus-error.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2013 Lennart Poettering
***/
diff --git a/src/libelogind/sd-bus/bus-error.h b/src/libelogind/sd-bus/bus-error.h
index 4f704627c..9d2763c91 100644
--- a/src/libelogind/sd-bus/bus-error.h
+++ b/src/libelogind/sd-bus/bus-error.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2013 Lennart Poettering
***/
diff --git a/src/libelogind/sd-bus/bus-gvariant.c b/src/libelogind/sd-bus/bus-gvariant.c
index 0edae49d5..4c72a3906 100644
--- a/src/libelogind/sd-bus/bus-gvariant.c
+++ b/src/libelogind/sd-bus/bus-gvariant.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2013 Lennart Poettering
***/
diff --git a/src/libelogind/sd-bus/bus-gvariant.h b/src/libelogind/sd-bus/bus-gvariant.h
index dcf04609c..1d4e08776 100644
--- a/src/libelogind/sd-bus/bus-gvariant.h
+++ b/src/libelogind/sd-bus/bus-gvariant.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2013 Lennart Poettering
***/
diff --git a/src/libelogind/sd-bus/bus-internal.c b/src/libelogind/sd-bus/bus-internal.c
index 23ac2d0bc..b6b4d84df 100644
--- a/src/libelogind/sd-bus/bus-internal.c
+++ b/src/libelogind/sd-bus/bus-internal.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2013 Lennart Poettering
***/
diff --git a/src/libelogind/sd-bus/bus-internal.h b/src/libelogind/sd-bus/bus-internal.h
index cfe299e01..cac5c3d47 100644
--- a/src/libelogind/sd-bus/bus-internal.h
+++ b/src/libelogind/sd-bus/bus-internal.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2013 Lennart Poettering
***/
diff --git a/src/libelogind/sd-bus/bus-introspect.c b/src/libelogind/sd-bus/bus-introspect.c
index dab2bd61b..c95778673 100644
--- a/src/libelogind/sd-bus/bus-introspect.c
+++ b/src/libelogind/sd-bus/bus-introspect.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2013 Lennart Poettering
***/
diff --git a/src/libelogind/sd-bus/bus-introspect.h b/src/libelogind/sd-bus/bus-introspect.h
index e3f8ced72..44bd35f87 100644
--- a/src/libelogind/sd-bus/bus-introspect.h
+++ b/src/libelogind/sd-bus/bus-introspect.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2013 Lennart Poettering
***/
diff --git a/src/libelogind/sd-bus/bus-kernel.c b/src/libelogind/sd-bus/bus-kernel.c
index e3cb13a44..800085ac8 100644
--- a/src/libelogind/sd-bus/bus-kernel.c
+++ b/src/libelogind/sd-bus/bus-kernel.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2013 Lennart Poettering
***/
diff --git a/src/libelogind/sd-bus/bus-kernel.h b/src/libelogind/sd-bus/bus-kernel.h
index adba108c1..d8821dd45 100644
--- a/src/libelogind/sd-bus/bus-kernel.h
+++ b/src/libelogind/sd-bus/bus-kernel.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2013 Lennart Poettering
***/
diff --git a/src/libelogind/sd-bus/bus-match.c b/src/libelogind/sd-bus/bus-match.c
index d425a6861..aa049dd82 100644
--- a/src/libelogind/sd-bus/bus-match.c
+++ b/src/libelogind/sd-bus/bus-match.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2013 Lennart Poettering
***/
diff --git a/src/libelogind/sd-bus/bus-match.h b/src/libelogind/sd-bus/bus-match.h
index aa59ae484..4643df010 100644
--- a/src/libelogind/sd-bus/bus-match.h
+++ b/src/libelogind/sd-bus/bus-match.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2013 Lennart Poettering
***/
diff --git a/src/libelogind/sd-bus/bus-message.c b/src/libelogind/sd-bus/bus-message.c
index 6da0942f1..dd1865b0e 100644
--- a/src/libelogind/sd-bus/bus-message.c
+++ b/src/libelogind/sd-bus/bus-message.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2013 Lennart Poettering
***/
diff --git a/src/libelogind/sd-bus/bus-message.h b/src/libelogind/sd-bus/bus-message.h
index b46d6ca8c..9740f1d61 100644
--- a/src/libelogind/sd-bus/bus-message.h
+++ b/src/libelogind/sd-bus/bus-message.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2013 Lennart Poettering
***/
diff --git a/src/libelogind/sd-bus/bus-objects.c b/src/libelogind/sd-bus/bus-objects.c
index 49c312371..6713b6ba6 100644
--- a/src/libelogind/sd-bus/bus-objects.c
+++ b/src/libelogind/sd-bus/bus-objects.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2013 Lennart Poettering
***/
diff --git a/src/libelogind/sd-bus/bus-objects.h b/src/libelogind/sd-bus/bus-objects.h
index 218ee678a..64fa3b58c 100644
--- a/src/libelogind/sd-bus/bus-objects.h
+++ b/src/libelogind/sd-bus/bus-objects.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2013 Lennart Poettering
***/
diff --git a/src/libelogind/sd-bus/bus-protocol.h b/src/libelogind/sd-bus/bus-protocol.h
index ed9ecd641..df0739ac9 100644
--- a/src/libelogind/sd-bus/bus-protocol.h
+++ b/src/libelogind/sd-bus/bus-protocol.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2013 Lennart Poettering
***/
diff --git a/src/libelogind/sd-bus/bus-signature.c b/src/libelogind/sd-bus/bus-signature.c
index 662a1eac5..707a1e7d1 100644
--- a/src/libelogind/sd-bus/bus-signature.c
+++ b/src/libelogind/sd-bus/bus-signature.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2013 Lennart Poettering
***/
diff --git a/src/libelogind/sd-bus/bus-signature.h b/src/libelogind/sd-bus/bus-signature.h
index 73c2e1ea2..c2b1f5a6c 100644
--- a/src/libelogind/sd-bus/bus-signature.h
+++ b/src/libelogind/sd-bus/bus-signature.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2013 Lennart Poettering
***/
diff --git a/src/libelogind/sd-bus/bus-slot.c b/src/libelogind/sd-bus/bus-slot.c
index db9af9a97..77a057e3a 100644
--- a/src/libelogind/sd-bus/bus-slot.c
+++ b/src/libelogind/sd-bus/bus-slot.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2013 Lennart Poettering
***/
diff --git a/src/libelogind/sd-bus/bus-slot.h b/src/libelogind/sd-bus/bus-slot.h
index 5352f6379..966957180 100644
--- a/src/libelogind/sd-bus/bus-slot.h
+++ b/src/libelogind/sd-bus/bus-slot.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2014 Lennart Poettering
***/
diff --git a/src/libelogind/sd-bus/bus-socket.c b/src/libelogind/sd-bus/bus-socket.c
index 57c539142..e32fdb031 100644
--- a/src/libelogind/sd-bus/bus-socket.c
+++ b/src/libelogind/sd-bus/bus-socket.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2013 Lennart Poettering
***/
diff --git a/src/libelogind/sd-bus/bus-socket.h b/src/libelogind/sd-bus/bus-socket.h
index 0bc5b6360..87df7040e 100644
--- a/src/libelogind/sd-bus/bus-socket.h
+++ b/src/libelogind/sd-bus/bus-socket.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2013 Lennart Poettering
***/
diff --git a/src/libelogind/sd-bus/bus-track.c b/src/libelogind/sd-bus/bus-track.c
index 1819eaffd..846556cb3 100644
--- a/src/libelogind/sd-bus/bus-track.c
+++ b/src/libelogind/sd-bus/bus-track.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2013 Lennart Poettering
***/
diff --git a/src/libelogind/sd-bus/bus-track.h b/src/libelogind/sd-bus/bus-track.h
index 769211dbe..facbb6daa 100644
--- a/src/libelogind/sd-bus/bus-track.h
+++ b/src/libelogind/sd-bus/bus-track.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2013 Lennart Poettering
***/
diff --git a/src/libelogind/sd-bus/bus-type.c b/src/libelogind/sd-bus/bus-type.c
index 5288e379a..1ca6da51a 100644
--- a/src/libelogind/sd-bus/bus-type.c
+++ b/src/libelogind/sd-bus/bus-type.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2013 Lennart Poettering
***/
diff --git a/src/libelogind/sd-bus/bus-type.h b/src/libelogind/sd-bus/bus-type.h
index dd8e552df..109a3287f 100644
--- a/src/libelogind/sd-bus/bus-type.h
+++ b/src/libelogind/sd-bus/bus-type.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2013 Lennart Poettering
***/
diff --git a/src/libelogind/sd-bus/sd-bus.c b/src/libelogind/sd-bus/sd-bus.c
index 220fcdcf5..0b4a498a7 100644
--- a/src/libelogind/sd-bus/sd-bus.c
+++ b/src/libelogind/sd-bus/sd-bus.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2013 Lennart Poettering
***/
diff --git a/src/libelogind/sd-bus/test-bus-error.c b/src/libelogind/sd-bus/test-bus-error.c
index 135166e2f..871971979 100644
--- a/src/libelogind/sd-bus/test-bus-error.c
+++ b/src/libelogind/sd-bus/test-bus-error.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2013 Lennart Poettering
***/
diff --git a/src/libelogind/sd-bus/test-bus-introspect.c b/src/libelogind/sd-bus/test-bus-introspect.c
index 4b5039a07..9889c6533 100644
--- a/src/libelogind/sd-bus/test-bus-introspect.c
+++ b/src/libelogind/sd-bus/test-bus-introspect.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2013 Lennart Poettering
***/
diff --git a/src/libelogind/sd-bus/test-bus-match.c b/src/libelogind/sd-bus/test-bus-match.c
index 1fe3c1462..c4cbdb581 100644
--- a/src/libelogind/sd-bus/test-bus-match.c
+++ b/src/libelogind/sd-bus/test-bus-match.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2013 Lennart Poettering
***/
diff --git a/src/libelogind/sd-bus/test-bus-server.c b/src/libelogind/sd-bus/test-bus-server.c
index 373d59643..b3ebd34a3 100644
--- a/src/libelogind/sd-bus/test-bus-server.c
+++ b/src/libelogind/sd-bus/test-bus-server.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2013 Lennart Poettering
***/
diff --git a/src/libelogind/sd-bus/test-bus-signature.c b/src/libelogind/sd-bus/test-bus-signature.c
index 8a2cd3430..e46d72364 100644
--- a/src/libelogind/sd-bus/test-bus-signature.c
+++ b/src/libelogind/sd-bus/test-bus-signature.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2013 Lennart Poettering
***/
diff --git a/src/libelogind/sd-daemon/sd-daemon.c b/src/libelogind/sd-daemon/sd-daemon.c
index d60eb561d..a6746b650 100644
--- a/src/libelogind/sd-daemon/sd-daemon.c
+++ b/src/libelogind/sd-daemon/sd-daemon.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/libelogind/sd-event/sd-event.c b/src/libelogind/sd-event/sd-event.c
index ca104281e..d59cba713 100644
--- a/src/libelogind/sd-event/sd-event.c
+++ b/src/libelogind/sd-event/sd-event.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2013 Lennart Poettering
***/
diff --git a/src/libelogind/sd-event/test-event.c b/src/libelogind/sd-event/test-event.c
index 3834a1162..d18e54d42 100644
--- a/src/libelogind/sd-event/test-event.c
+++ b/src/libelogind/sd-event/test-event.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2013 Lennart Poettering
***/
diff --git a/src/libelogind/sd-id128/id128-util.c b/src/libelogind/sd-id128/id128-util.c
index 91c26a0c8..e6e202340 100644
--- a/src/libelogind/sd-id128/id128-util.c
+++ b/src/libelogind/sd-id128/id128-util.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2016 Lennart Poettering
***/
diff --git a/src/libelogind/sd-id128/id128-util.h b/src/libelogind/sd-id128/id128-util.h
index a8b106044..5f026a272 100644
--- a/src/libelogind/sd-id128/id128-util.h
+++ b/src/libelogind/sd-id128/id128-util.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2016 Lennart Poettering
***/
diff --git a/src/libelogind/sd-id128/sd-id128.c b/src/libelogind/sd-id128/sd-id128.c
index 80548fdfc..4a6f2960f 100644
--- a/src/libelogind/sd-id128/sd-id128.c
+++ b/src/libelogind/sd-id128/sd-id128.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2011 Lennart Poettering
***/
diff --git a/src/libelogind/sd-login/sd-login.c b/src/libelogind/sd-login/sd-login.c
index f733fb171..0a9f24648 100644
--- a/src/libelogind/sd-login/sd-login.c
+++ b/src/libelogind/sd-login/sd-login.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2011 Lennart Poettering
***/
diff --git a/src/libelogind/sd-login/test-login.c b/src/libelogind/sd-login/test-login.c
index ac3e1f69b..0d3bd5209 100644
--- a/src/libelogind/sd-login/test-login.c
+++ b/src/libelogind/sd-login/test-login.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2011 Lennart Poettering
***/
diff --git a/src/login/inhibit.c b/src/login/inhibit.c
index aabfdbde4..22509fbb8 100644
--- a/src/login/inhibit.c
+++ b/src/login/inhibit.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2012 Lennart Poettering
***/
diff --git a/src/login/loginctl.c b/src/login/loginctl.c
index f15e0315d..0bf09b204 100644
--- a/src/login/loginctl.c
+++ b/src/login/loginctl.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/login/logind-acl.c b/src/login/logind-acl.c
index af3b4a4d2..b846b2509 100644
--- a/src/login/logind-acl.c
+++ b/src/login/logind-acl.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2011 Lennart Poettering
***/
diff --git a/src/login/logind-acl.h b/src/login/logind-acl.h
index bbe1bb14f..75c1434e9 100644
--- a/src/login/logind-acl.h
+++ b/src/login/logind-acl.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2011 Lennart Poettering
***/
diff --git a/src/login/logind-action.c b/src/login/logind-action.c
index d2fd8ddfb..5c52bcce5 100644
--- a/src/login/logind-action.c
+++ b/src/login/logind-action.c
@@ -1,21 +1,6 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2012 Lennart Poettering
-
- elogind is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as published by
- the Free Software Foundation; either version 2.1 of the License, or
- (at your option) any later version.
-
- elogind is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with elogind; If not, see <http://www.gnu.org/licenses/>.
***/
#include <unistd.h>
diff --git a/src/login/logind-action.h b/src/login/logind-action.h
index 74b1dc88f..2d149fc2c 100644
--- a/src/login/logind-action.h
+++ b/src/login/logind-action.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2012 Lennart Poettering
***/
diff --git a/src/login/logind-button.c b/src/login/logind-button.c
index 39749925c..c1492d67c 100644
--- a/src/login/logind-button.c
+++ b/src/login/logind-button.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2012 Lennart Poettering
***/
diff --git a/src/login/logind-button.h b/src/login/logind-button.h
index 0b3936eb3..2fe81dc2c 100644
--- a/src/login/logind-button.h
+++ b/src/login/logind-button.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2012 Lennart Poettering
***/
diff --git a/src/login/logind-core.c b/src/login/logind-core.c
index 3775c300b..bb0cfd747 100644
--- a/src/login/logind-core.c
+++ b/src/login/logind-core.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2011 Lennart Poettering
***/
diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
index 26a4ed889..4e8aab990 100644
--- a/src/login/logind-dbus.c
+++ b/src/login/logind-dbus.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2011 Lennart Poettering
***/
diff --git a/src/login/logind-device.c b/src/login/logind-device.c
index 69e89ccb5..65a086eac 100644
--- a/src/login/logind-device.c
+++ b/src/login/logind-device.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2011 Lennart Poettering
***/
diff --git a/src/login/logind-device.h b/src/login/logind-device.h
index f6a4fafa6..09bf341ad 100644
--- a/src/login/logind-device.h
+++ b/src/login/logind-device.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2011 Lennart Poettering
***/
diff --git a/src/login/logind-inhibit.c b/src/login/logind-inhibit.c
index 8bf3e72d2..5912f6fee 100644
--- a/src/login/logind-inhibit.c
+++ b/src/login/logind-inhibit.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2012 Lennart Poettering
***/
diff --git a/src/login/logind-inhibit.h b/src/login/logind-inhibit.h
index 712260a5a..bf39955e1 100644
--- a/src/login/logind-inhibit.h
+++ b/src/login/logind-inhibit.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2012 Lennart Poettering
***/
diff --git a/src/login/logind-seat-dbus.c b/src/login/logind-seat-dbus.c
index 720140d6e..93f64d3f8 100644
--- a/src/login/logind-seat-dbus.c
+++ b/src/login/logind-seat-dbus.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2011 Lennart Poettering
***/
diff --git a/src/login/logind-seat.c b/src/login/logind-seat.c
index 233812fe8..edfbf8743 100644
--- a/src/login/logind-seat.c
+++ b/src/login/logind-seat.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2011 Lennart Poettering
***/
diff --git a/src/login/logind-seat.h b/src/login/logind-seat.h
index 439abc0d8..18abb9af2 100644
--- a/src/login/logind-seat.h
+++ b/src/login/logind-seat.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2011 Lennart Poettering
***/
diff --git a/src/login/logind-session-dbus.c b/src/login/logind-session-dbus.c
index 76663c09b..8b2adbf59 100644
--- a/src/login/logind-session-dbus.c
+++ b/src/login/logind-session-dbus.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2011 Lennart Poettering
***/
diff --git a/src/login/logind-session-device.c b/src/login/logind-session-device.c
index b4cea0b62..bf1517a50 100644
--- a/src/login/logind-session-device.c
+++ b/src/login/logind-session-device.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2013 David Herrmann
***/
diff --git a/src/login/logind-session-device.h b/src/login/logind-session-device.h
index e1c0ac38b..a7558e5fa 100644
--- a/src/login/logind-session-device.h
+++ b/src/login/logind-session-device.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2013 David Herrmann
***/
diff --git a/src/login/logind-session.c b/src/login/logind-session.c
index d5f88dbb4..4614cb522 100644
--- a/src/login/logind-session.c
+++ b/src/login/logind-session.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2011 Lennart Poettering
***/
diff --git a/src/login/logind-session.h b/src/login/logind-session.h
index 04a37475e..273aa63ef 100644
--- a/src/login/logind-session.h
+++ b/src/login/logind-session.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2011 Lennart Poettering
***/
diff --git a/src/login/logind-user-dbus.c b/src/login/logind-user-dbus.c
index 48bf2d947..f4bc12a18 100644
--- a/src/login/logind-user-dbus.c
+++ b/src/login/logind-user-dbus.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2011 Lennart Poettering
***/
diff --git a/src/login/logind-user.c b/src/login/logind-user.c
index 57c4b8ca9..981810122 100644
--- a/src/login/logind-user.c
+++ b/src/login/logind-user.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2011 Lennart Poettering
***/
diff --git a/src/login/logind-user.h b/src/login/logind-user.h
index ad830206c..659420583 100644
--- a/src/login/logind-user.h
+++ b/src/login/logind-user.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2011 Lennart Poettering
***/
diff --git a/src/login/logind-utmp.c b/src/login/logind-utmp.c
index 3cc3b210c..1d90083d1 100644
--- a/src/login/logind-utmp.c
+++ b/src/login/logind-utmp.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2015 Daniel Mack
***/
diff --git a/src/login/logind.c b/src/login/logind.c
index aba93fd15..124fea138 100644
--- a/src/login/logind.c
+++ b/src/login/logind.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2011 Lennart Poettering
***/
diff --git a/src/login/logind.h b/src/login/logind.h
index 93760095e..0e5a7de8f 100644
--- a/src/login/logind.h
+++ b/src/login/logind.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2011 Lennart Poettering
***/
diff --git a/src/login/pam_elogind.c b/src/login/pam_elogind.c
index bf5fcf4d4..f472798e1 100644
--- a/src/login/pam_elogind.c
+++ b/src/login/pam_elogind.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/login/pam_elogind.sym b/src/login/pam_elogind.sym
index d48b9e8cc..62d5d26b0 100644
--- a/src/login/pam_elogind.sym
+++ b/src/login/pam_elogind.sym
@@ -1,8 +1,6 @@
/***
SPDX-License-Identifier: LGPL-2.1+
- This file is part of systemd.
-
systemd is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2.1 of the License, or
diff --git a/src/login/sysfs-show.c b/src/login/sysfs-show.c
index a6535389f..64c20b758 100644
--- a/src/login/sysfs-show.c
+++ b/src/login/sysfs-show.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/login/sysfs-show.h b/src/login/sysfs-show.h
index 17963a6fe..38ae91a0c 100644
--- a/src/login/sysfs-show.h
+++ b/src/login/sysfs-show.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2011 Lennart Poettering
***/
diff --git a/src/login/test-inhibit.c b/src/login/test-inhibit.c
index debfc273a..8de6d895f 100644
--- a/src/login/test-inhibit.c
+++ b/src/login/test-inhibit.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2012 Lennart Poettering
***/
diff --git a/src/login/test-login-shared.c b/src/login/test-login-shared.c
index 99bfa17ef..f78f4a4c7 100644
--- a/src/login/test-login-shared.c
+++ b/src/login/test-login-shared.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2013 Zbigniew Jędrzejewski-Szmek
***/
diff --git a/src/login/test-login-tables.c b/src/login/test-login-tables.c
index 8e2f760c9..d05c0b038 100644
--- a/src/login/test-login-tables.c
+++ b/src/login/test-login-tables.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd
-
Copyright 2013 Zbigniew Jędrzejewski-Szmek
***/
diff --git a/src/shared/acl-util.c b/src/shared/acl-util.c
index e6360335d..103c010ec 100644
--- a/src/shared/acl-util.c
+++ b/src/shared/acl-util.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2011,2013 Lennart Poettering
***/
diff --git a/src/shared/acl-util.h b/src/shared/acl-util.h
index 9aa37287d..683119128 100644
--- a/src/shared/acl-util.h
+++ b/src/shared/acl-util.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2011 Lennart Poettering
***/
diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c
index d2768d62b..5865b193c 100644
--- a/src/shared/bus-util.c
+++ b/src/shared/bus-util.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2013 Lennart Poettering
***/
diff --git a/src/shared/bus-util.h b/src/shared/bus-util.h
index 49038f5e0..ac1b79c56 100644
--- a/src/shared/bus-util.h
+++ b/src/shared/bus-util.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2013 Lennart Poettering
***/
diff --git a/src/shared/clean-ipc.c b/src/shared/clean-ipc.c
index 3e30877c0..844dc9db9 100644
--- a/src/shared/clean-ipc.c
+++ b/src/shared/clean-ipc.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2014 Lennart Poettering
***/
diff --git a/src/shared/clean-ipc.h b/src/shared/clean-ipc.h
index 9f0806e44..963765637 100644
--- a/src/shared/clean-ipc.h
+++ b/src/shared/clean-ipc.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2014 Lennart Poettering
***/
diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c
index a150f8940..9116cc8dd 100644
--- a/src/shared/conf-parser.c
+++ b/src/shared/conf-parser.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
@@ -51,6 +49,7 @@
//#include "rlimit-util.h"
//#include "rlimit-util.h"
//#include "rlimit-util.h"
+//#include "rlimit-util.h"
int config_item_table_lookup(
const void *table,
diff --git a/src/shared/conf-parser.h b/src/shared/conf-parser.h
index 64e7f8aab..3c78c4044 100644
--- a/src/shared/conf-parser.h
+++ b/src/shared/conf-parser.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/shared/nsflags.c b/src/shared/nsflags.c
index ae1afc829..3bea3447a 100644
--- a/src/shared/nsflags.c
+++ b/src/shared/nsflags.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2016 Lennart Poettering
***/
diff --git a/src/shared/nsflags.h b/src/shared/nsflags.h
index 509a3240c..86daeaa73 100644
--- a/src/shared/nsflags.h
+++ b/src/shared/nsflags.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2016 Lennart Poettering
***/
diff --git a/src/shared/output-mode.c b/src/shared/output-mode.c
index 1bb161794..e1d7bbfa2 100644
--- a/src/shared/output-mode.c
+++ b/src/shared/output-mode.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2012 Lennart Poettering
***/
diff --git a/src/shared/output-mode.h b/src/shared/output-mode.h
index a44d52867..84f78fe2f 100644
--- a/src/shared/output-mode.h
+++ b/src/shared/output-mode.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2013 Lennart Poettering
***/
diff --git a/src/shared/sleep-config.c b/src/shared/sleep-config.c
index 68dee9ef3..d35c34c47 100644
--- a/src/shared/sleep-config.c
+++ b/src/shared/sleep-config.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2013 Zbigniew Jędrzejewski-Szmek
Copyright 2018 Dell Inc.
***/
diff --git a/src/shared/sleep-config.h b/src/shared/sleep-config.h
index ecce5f6e4..867a7a500 100644
--- a/src/shared/sleep-config.h
+++ b/src/shared/sleep-config.h
@@ -2,15 +2,16 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2013 Zbigniew Jędrzejewski-Szmek
***/
#if 0 /// UNNEEDED by elogind
+//#include <linux/fiemap.h>
//#include "time-util.h"
+int read_fiemap(int fd, struct fiemap **ret);
int parse_sleep_config(const char *verb, char ***modes, char ***states, usec_t *delay);
+int find_hibernate_location(char **device, char **type, size_t *size, size_t *used);
int can_sleep(const char *verb);
int can_sleep_disk(char **types);
diff --git a/src/shared/spawn-polkit-agent.c b/src/shared/spawn-polkit-agent.c
index 062e0210c..03a1faf68 100644
--- a/src/shared/spawn-polkit-agent.c
+++ b/src/shared/spawn-polkit-agent.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2011 Lennart Poettering
***/
diff --git a/src/shared/spawn-polkit-agent.h b/src/shared/spawn-polkit-agent.h
index c4316ea47..cf4a47360 100644
--- a/src/shared/spawn-polkit-agent.h
+++ b/src/shared/spawn-polkit-agent.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2012 Lennart Poettering
***/
diff --git a/src/shared/test-tables.h b/src/shared/test-tables.h
index 59c2c06ec..6a376e6aa 100644
--- a/src/shared/test-tables.h
+++ b/src/shared/test-tables.h
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd
-
Copyright 2013 Zbigniew Jędrzejewski-Szmek
***/
diff --git a/src/shared/udev-util.c b/src/shared/udev-util.c
index b031353c5..8d973a0ce 100644
--- a/src/shared/udev-util.c
+++ b/src/shared/udev-util.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2017 Zbigniew Jędrzejewski-Szmek
***/
diff --git a/src/shared/udev-util.h b/src/shared/udev-util.h
index b91b412b8..d28014fe5 100644
--- a/src/shared/udev-util.h
+++ b/src/shared/udev-util.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2013 Zbigniew Jędrzejewski-Szmek
***/
diff --git a/src/shared/utmp-wtmp.c b/src/shared/utmp-wtmp.c
index 5ecc23f6e..1d58a5a2e 100644
--- a/src/shared/utmp-wtmp.c
+++ b/src/shared/utmp-wtmp.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/shared/utmp-wtmp.h b/src/shared/utmp-wtmp.h
index 23cb03b31..1b7e7eace 100644
--- a/src/shared/utmp-wtmp.h
+++ b/src/shared/utmp-wtmp.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c
index a0a07c134..bec4cb930 100644
--- a/src/sleep/sleep.c
+++ b/src/sleep/sleep.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2012 Lennart Poettering
Copyright 2013 Zbigniew Jędrzejewski-Szmek
Copyright 2010-2017 Canonical
diff --git a/src/systemd/_sd-common.h b/src/systemd/_sd-common.h
index b4400e7b3..4eceb791e 100644
--- a/src/systemd/_sd-common.h
+++ b/src/systemd/_sd-common.h
@@ -3,8 +3,6 @@
#define foosdcommonhfoo
/***
- This file is part of systemd.
-
Copyright 2013 Lennart Poettering
systemd is free software; you can redistribute it and/or modify it
diff --git a/src/systemd/sd-bus-protocol.h b/src/systemd/sd-bus-protocol.h
index 63e3702fb..9cae64c6e 100644
--- a/src/systemd/sd-bus-protocol.h
+++ b/src/systemd/sd-bus-protocol.h
@@ -3,8 +3,6 @@
#define foosdbusprotocolhfoo
/***
- This file is part of systemd.
-
Copyright 2013 Lennart Poettering
systemd is free software; you can redistribute it and/or modify it
diff --git a/src/systemd/sd-bus-vtable.h b/src/systemd/sd-bus-vtable.h
index 425e38e2e..ac2cea0a6 100644
--- a/src/systemd/sd-bus-vtable.h
+++ b/src/systemd/sd-bus-vtable.h
@@ -3,8 +3,6 @@
#define foosdbusvtablehfoo
/***
- This file is part of systemd.
-
Copyright 2013 Lennart Poettering
systemd is free software; you can redistribute it and/or modify it
diff --git a/src/systemd/sd-bus.h b/src/systemd/sd-bus.h
index 2c5756fe7..9dd8cf4c6 100644
--- a/src/systemd/sd-bus.h
+++ b/src/systemd/sd-bus.h
@@ -3,8 +3,6 @@
#define foosdbushfoo
/***
- This file is part of systemd.
-
Copyright 2013 Lennart Poettering
systemd is free software; you can redistribute it and/or modify it
diff --git a/src/systemd/sd-daemon.h b/src/systemd/sd-daemon.h
index 7d4cbf70d..2bb9e7849 100644
--- a/src/systemd/sd-daemon.h
+++ b/src/systemd/sd-daemon.h
@@ -3,8 +3,6 @@
#define foosddaemonhfoo
/***
- This file is part of systemd.
-
Copyright 2013 Lennart Poettering
systemd is free software; you can redistribute it and/or modify it
diff --git a/src/systemd/sd-event.h b/src/systemd/sd-event.h
index e6bea9d40..a6f134d99 100644
--- a/src/systemd/sd-event.h
+++ b/src/systemd/sd-event.h
@@ -3,8 +3,6 @@
#define foosdeventhfoo
/***
- This file is part of systemd.
-
Copyright 2013 Lennart Poettering
systemd is free software; you can redistribute it and/or modify it
diff --git a/src/systemd/sd-id128.h b/src/systemd/sd-id128.h
index 67fc59566..2da9c7ae1 100644
--- a/src/systemd/sd-id128.h
+++ b/src/systemd/sd-id128.h
@@ -3,8 +3,6 @@
#define foosdid128hfoo
/***
- This file is part of systemd.
-
Copyright 2011 Lennart Poettering
systemd is free software; you can redistribute it and/or modify it
diff --git a/src/systemd/sd-login.h b/src/systemd/sd-login.h
index d8e2c6822..b4f064d2d 100644
--- a/src/systemd/sd-login.h
+++ b/src/systemd/sd-login.h
@@ -3,8 +3,6 @@
#define foosdloginhfoo
/***
- This file is part of systemd.
-
Copyright 2011 Lennart Poettering
systemd is free software; you can redistribute it and/or modify it
diff --git a/src/systemd/sd-messages.h b/src/systemd/sd-messages.h
index 5a3f78bdb..d090c1e54 100644
--- a/src/systemd/sd-messages.h
+++ b/src/systemd/sd-messages.h
@@ -3,8 +3,6 @@
#define foosdmessageshfoo
/***
- This file is part of systemd.
-
Copyright 2012 Lennart Poettering
systemd is free software; you can redistribute it and/or modify it
diff --git a/src/test/test-alloc-util.c b/src/test/test-alloc-util.c
index 88670ae9e..d38416a36 100644
--- a/src/test/test-alloc-util.c
+++ b/src/test/test-alloc-util.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/test/test-cgroup.c b/src/test/test-cgroup.c
index fbf3beb97..4321c27ab 100644
--- a/src/test/test-cgroup.c
+++ b/src/test/test-cgroup.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/test/test-conf-files.c b/src/test/test-conf-files.c
index 6604f4c9a..0223141f8 100644
--- a/src/test/test-conf-files.c
+++ b/src/test/test-conf-files.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2014 Michael Marineau
***/
diff --git a/src/test/test-conf-parser.c b/src/test/test-conf-parser.c
index 0e531bb21..fd6975c3c 100644
--- a/src/test/test-conf-parser.c
+++ b/src/test/test-conf-parser.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2015 Ronny Chevalier
***/
diff --git a/src/test/test-copy.c b/src/test/test-copy.c
index 9dc0ddf95..94d3485db 100644
--- a/src/test/test-copy.c
+++ b/src/test/test-copy.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd
-
Copyright 2014 Ronny Chevalier
***/
@@ -242,26 +240,7 @@ static void test_copy_bytes_regular_file(const char *src, bool try_reflink, uint
unlink(fn3);
}
-static void test_copy_atomic(void) {
- _cleanup_(rm_rf_physical_and_freep) char *p = NULL;
- const char *q;
- int r;
-
- assert_se(mkdtemp_malloc(NULL, &p) >= 0);
-
- q = strjoina(p, "/fstab");
-
- r = copy_file_atomic("/etc/fstab", q, 0644, 0, COPY_REFLINK);
- if (r == -ENOENT)
- return;
-
- assert_se(copy_file_atomic("/etc/fstab", q, 0644, 0, COPY_REFLINK) == -EEXIST);
-
- assert_se(copy_file_atomic("/etc/fstab", q, 0644, 0, COPY_REPLACE) >= 0);
-}
-
int main(int argc, char *argv[]) {
- log_set_max_level(LOG_DEBUG);
#if 0 /// UNNEEDED by elogind
test_copy_file();
@@ -275,7 +254,6 @@ int main(int argc, char *argv[]) {
test_copy_bytes_regular_file(argv[0], true, 1000);
test_copy_bytes_regular_file(argv[0], false, 32000); /* larger than copy buffer size */
test_copy_bytes_regular_file(argv[0], true, 32000);
- test_copy_atomic();
return 0;
}
diff --git a/src/test/test-dlopen.c b/src/test/test-dlopen.c
index febfc60e0..56419c403 100644
--- a/src/test/test-dlopen.c
+++ b/src/test/test-dlopen.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2016 Zbigniew Jędrzejewski-Szmek
***/
diff --git a/src/test/test-ellipsize.c b/src/test/test-ellipsize.c
index c9cdd887e..91189e71e 100644
--- a/src/test/test-ellipsize.c
+++ b/src/test/test-ellipsize.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2013 Shawn Landden
***/
diff --git a/src/test/test-escape.c b/src/test/test-escape.c
index 839c33d5d..f06418c9d 100644
--- a/src/test/test-escape.c
+++ b/src/test/test-escape.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/test/test-exec-util.c b/src/test/test-exec-util.c
index 0138af7d8..b1c140514 100644
--- a/src/test/test-exec-util.c
+++ b/src/test/test-exec-util.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
Copyright 2013 Thomas H.P. Andersen
***/
diff --git a/src/test/test-extract-word.c b/src/test/test-extract-word.c
index 16c265549..5aec73421 100644
--- a/src/test/test-extract-word.c
+++ b/src/test/test-extract-word.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
Copyright 2013 Thomas H.P. Andersen
***/
diff --git a/src/test/test-fd-util.c b/src/test/test-fd-util.c
index d50810c01..4e0086410 100644
--- a/src/test/test-fd-util.c
+++ b/src/test/test-fd-util.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/test/test-fs-util.c b/src/test/test-fs-util.c
index 9b74a2b8c..1e2a71c83 100644
--- a/src/test/test-fs-util.c
+++ b/src/test/test-fs-util.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/test/test-hash.c b/src/test/test-hash.c
index 79d9668a1..5b842bc6f 100644
--- a/src/test/test-hash.c
+++ b/src/test/test-hash.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2016 Lennart Poettering
***/
diff --git a/src/test/test-hashmap-plain.c b/src/test/test-hashmap-plain.c
index cbcdf4e84..e86987247 100644
--- a/src/test/test-hashmap-plain.c
+++ b/src/test/test-hashmap-plain.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd
-
Copyright 2013 Daniel Buch
***/
diff --git a/src/test/test-hashmap.c b/src/test/test-hashmap.c
index 50fcb364f..7dbd9636c 100644
--- a/src/test/test-hashmap.c
+++ b/src/test/test-hashmap.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd
-
Copyright 2013 Daniel Buch
***/
diff --git a/src/test/test-helper.h b/src/test/test-helper.h
index 01674e6d4..0320a2363 100644
--- a/src/test/test-helper.h
+++ b/src/test/test-helper.h
@@ -2,8 +2,6 @@
#pragma once
/***
- This file is part of systemd.
-
Copyright 2013 Holger Hans Peter Freyther
***/
diff --git a/src/test/test-hexdecoct.c b/src/test/test-hexdecoct.c
index 13b1fb7e3..2f6f39f15 100644
--- a/src/test/test-hexdecoct.c
+++ b/src/test/test-hexdecoct.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/test/test-id128.c b/src/test/test-id128.c
index 8ea805315..7c38385a0 100644
--- a/src/test/test-id128.c
+++ b/src/test/test-id128.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2011 Lennart Poettering
***/
diff --git a/src/test/test-io-util.c b/src/test/test-io-util.c
index c553729f4..b0d004eb3 100644
--- a/src/test/test-io-util.c
+++ b/src/test/test-io-util.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/test/test-ipcrm.c b/src/test/test-ipcrm.c
index 3a00c9354..8bda62aec 100644
--- a/src/test/test-ipcrm.c
+++ b/src/test/test-ipcrm.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2014 Lennart Poettering
***/
diff --git a/src/test/test-list.c b/src/test/test-list.c
index c30803b55..a1345d740 100644
--- a/src/test/test-list.c
+++ b/src/test/test-list.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd
-
Copyright 2013 Jan Janssen
***/
diff --git a/src/test/test-locale-util.c b/src/test/test-locale-util.c
index d26e63346..4d34a12e1 100644
--- a/src/test/test-locale-util.c
+++ b/src/test/test-locale-util.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd
-
Copyright 2014 Ronny Chevalier
***/
diff --git a/src/test/test-log.c b/src/test/test-log.c
index a09439c79..f58bea80d 100644
--- a/src/test/test-log.c
+++ b/src/test/test-log.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2012 Lennart Poettering
***/
diff --git a/src/test/test-parse-util.c b/src/test/test-parse-util.c
index 5a6af9ba8..671eea165 100644
--- a/src/test/test-parse-util.c
+++ b/src/test/test-parse-util.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
Copyright 2013 Thomas H.P. Andersen
***/
diff --git a/src/test/test-path-util.c b/src/test/test-path-util.c
index d0f7a5772..137b53658 100644
--- a/src/test/test-path-util.c
+++ b/src/test/test-path-util.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2013 Zbigniew Jędrzejewski-Szmek
***/
diff --git a/src/test/test-prioq.c b/src/test/test-prioq.c
index e88166ee2..c6686f60f 100644
--- a/src/test/test-prioq.c
+++ b/src/test/test-prioq.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2013 Lennart Poettering
***/
diff --git a/src/test/test-proc-cmdline.c b/src/test/test-proc-cmdline.c
index f3cf12114..4d2f0283d 100644
--- a/src/test/test-proc-cmdline.c
+++ b/src/test/test-proc-cmdline.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/test/test-process-util.c b/src/test/test-process-util.c
index 78048a571..bc505ae29 100644
--- a/src/test/test-process-util.c
+++ b/src/test/test-process-util.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
Copyright 2013 Thomas H.P. Andersen
***/
diff --git a/src/test/test-random-util.c b/src/test/test-random-util.c
index 386249883..3db7039b9 100644
--- a/src/test/test-random-util.c
+++ b/src/test/test-random-util.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2017 Zbigniew Jędrzejewski-Szmek
***/
diff --git a/src/test/test-selinux.c b/src/test/test-selinux.c
index d760e9687..d320a9925 100644
--- a/src/test/test-selinux.c
+++ b/src/test/test-selinux.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2016 Zbigniew Jędrzejewski-Szmek
***/
diff --git a/src/test/test-set.c b/src/test/test-set.c
index 9774fbb38..dbca23dd4 100644
--- a/src/test/test-set.c
+++ b/src/test/test-set.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd
-
Copyright 2014 Zbigniew Jędrzejewski-Szmek
***/
diff --git a/src/test/test-signal-util.c b/src/test/test-signal-util.c
index 2e89701f1..9680a5346 100644
--- a/src/test/test-signal-util.c
+++ b/src/test/test-signal-util.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2016 Lennart Poettering
***/
@@ -18,6 +16,8 @@
//#include "string-util.h"
//#include "stdio-util.h"
//#include "string-util.h"
+//#include "stdio-util.h"
+//#include "string-util.h"
#include "process-util.h"
#define info(sig) log_info(#sig " = " STRINGIFY(sig) " = %d", sig)
diff --git a/src/test/test-siphash24.c b/src/test/test-siphash24.c
index 47bf28ff0..333096a2a 100644
--- a/src/test/test-siphash24.c
+++ b/src/test/test-siphash24.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2015 Tom Gundersen
***/
diff --git a/src/test/test-sizeof.c b/src/test/test-sizeof.c
index 4cb67ecaf..f545ae888 100644
--- a/src/test/test-sizeof.c
+++ b/src/test/test-sizeof.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2016 Zbigniew Jędrzejewski-Szmek
***/
diff --git a/src/test/test-stat-util.c b/src/test/test-stat-util.c
index 52142a53f..2afc973c2 100644
--- a/src/test/test-stat-util.c
+++ b/src/test/test-stat-util.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
diff --git a/src/test/test-string-util.c b/src/test/test-string-util.c
index 5df49ab07..3a2709210 100644
--- a/src/test/test-string-util.c
+++ b/src/test/test-string-util.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2015 Lennart Poettering
***/
diff --git a/src/test/test-strip-tab-ansi.c b/src/test/test-strip-tab-ansi.c
index 1b5e040a8..20c5c79c2 100644
--- a/src/test/test-strip-tab-ansi.c
+++ b/src/test/test-strip-tab-ansi.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2012 Lennart Poettering
***/
diff --git a/src/test/test-unaligned.c b/src/test/test-unaligned.c
index a39480341..73ab2a306 100644
--- a/src/test/test-unaligned.c
+++ b/src/test/test-unaligned.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd
-
Copyright 2014 Tom Gundersen
***/
diff --git a/src/test/test-user-util.c b/src/test/test-user-util.c
index 0b5dc945a..6c4e02aa6 100644
--- a/src/test/test-user-util.c
+++ b/src/test/test-user-util.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2015 Lennart Poettering
***/
diff --git a/src/test/test-utf8.c b/src/test/test-utf8.c
index d645dc958..faa26bde8 100644
--- a/src/test/test-utf8.c
+++ b/src/test/test-utf8.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2013 Dave Reisner
***/
diff --git a/src/test/test-util.c b/src/test/test-util.c
index d82580079..a79d5f28d 100644
--- a/src/test/test-util.c
+++ b/src/test/test-util.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
Copyright 2013 Thomas H.P. Andersen
***/
diff --git a/src/test/test-verbs.c b/src/test/test-verbs.c
index fb1bbf341..02f0a26d8 100644
--- a/src/test/test-verbs.c
+++ b/src/test/test-verbs.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2014 systemd developers
***/
diff --git a/src/update-utmp/update-utmp.c b/src/update-utmp/update-utmp.c
index 175cc5d7c..db6df9023 100644
--- a/src/update-utmp/update-utmp.c
+++ b/src/update-utmp/update-utmp.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/