diff options
author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-07 00:05:00 -0400 |
---|---|---|
committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-07 00:05:00 -0400 |
commit | 5c2a4ec88de774007b939796823adc4d7cb3c8dd (patch) | |
tree | aa2724fd2bdeb2d1cb0501f05eddc463f3eec563 /src | |
parent | ce3326f10b8522ff1b1d2d55c76910a67897dbce (diff) |
./move.sh
Diffstat (limited to 'src')
l--------- | src/ac-power/Makefile | 1 | ||||
l--------- | src/activate/Makefile | 1 | ||||
l--------- | src/analyze/Makefile | 1 | ||||
l--------- | src/ask-password/Makefile | 1 | ||||
l--------- | src/backlight/Makefile | 1 | ||||
l--------- | src/basic/Makefile | 1 | ||||
l--------- | src/basic/linux/Makefile | 1 | ||||
l--------- | src/binfmt/Makefile | 1 | ||||
l--------- | src/boot/Makefile | 1 | ||||
l--------- | src/bootchart/Makefile | 1 | ||||
l--------- | src/bus-proxyd/Makefile | 1 | ||||
-rw-r--r-- | src/busctl/Makefile | 38 | ||||
-rw-r--r-- | src/busctl/busctl-introspect.c (renamed from src/libsystemd/sd-bus/busctl-introspect.c) | 2 | ||||
-rw-r--r-- | src/busctl/busctl-introspect.h (renamed from src/libsystemd/sd-bus/busctl-introspect.h) | 0 | ||||
-rw-r--r-- | src/busctl/busctl.c (renamed from src/libsystemd/sd-bus/busctl.c) | 2 | ||||
l--------- | src/cgls/Makefile | 1 | ||||
l--------- | src/cgroups-agent/Makefile | 1 | ||||
l--------- | src/cgtop/Makefile | 1 | ||||
l--------- | src/core/Makefile | 1 | ||||
l--------- | src/coredump/Makefile | 1 | ||||
l--------- | src/cryptsetup/Makefile | 1 | ||||
l--------- | src/dbus1-generator/Makefile | 1 | ||||
l--------- | src/debug-generator/Makefile | 1 | ||||
l--------- | src/delta/Makefile | 1 | ||||
l--------- | src/detect-virt/Makefile | 1 | ||||
l--------- | src/escape/Makefile | 1 | ||||
l--------- | src/firstboot/Makefile | 1 | ||||
l--------- | src/fsck/Makefile | 1 | ||||
l--------- | src/fstab-generator/Makefile | 1 | ||||
l--------- | src/getty-generator/Makefile | 1 | ||||
l--------- | src/gpt-auto-generator/Makefile | 1 | ||||
-rw-r--r-- | src/grp-boot/bootctl/Makefile | 55 | ||||
-rw-r--r-- | src/grp-boot/bootctl/bootctl.c (renamed from src/boot/bootctl.c) | 0 | ||||
-rw-r--r-- | src/grp-boot/systemd-boot/.gitignore (renamed from src/boot/efi/.gitignore) | 0 | ||||
-rw-r--r-- | src/grp-boot/systemd-boot/Makefile | 191 | ||||
-rw-r--r-- | src/grp-boot/systemd-boot/boot.c (renamed from src/boot/efi/boot.c) | 0 | ||||
-rw-r--r-- | src/grp-boot/systemd-boot/console.c (renamed from src/boot/efi/console.c) | 0 | ||||
-rw-r--r-- | src/grp-boot/systemd-boot/console.h (renamed from src/boot/efi/console.h) | 0 | ||||
-rw-r--r-- | src/grp-boot/systemd-boot/disk.c (renamed from src/boot/efi/disk.c) | 0 | ||||
-rw-r--r-- | src/grp-boot/systemd-boot/disk.h (renamed from src/boot/efi/disk.h) | 0 | ||||
-rw-r--r-- | src/grp-boot/systemd-boot/graphics.c (renamed from src/boot/efi/graphics.c) | 0 | ||||
-rw-r--r-- | src/grp-boot/systemd-boot/graphics.h (renamed from src/boot/efi/graphics.h) | 0 | ||||
-rw-r--r-- | src/grp-boot/systemd-boot/linux.c (renamed from src/boot/efi/linux.c) | 0 | ||||
-rw-r--r-- | src/grp-boot/systemd-boot/linux.h (renamed from src/boot/efi/linux.h) | 0 | ||||
-rw-r--r-- | src/grp-boot/systemd-boot/pefile.c (renamed from src/boot/efi/pefile.c) | 0 | ||||
-rw-r--r-- | src/grp-boot/systemd-boot/pefile.h (renamed from src/boot/efi/pefile.h) | 0 | ||||
-rw-r--r-- | src/grp-boot/systemd-boot/splash.c (renamed from src/boot/efi/splash.c) | 0 | ||||
-rw-r--r-- | src/grp-boot/systemd-boot/splash.h (renamed from src/boot/efi/splash.h) | 0 | ||||
-rw-r--r-- | src/grp-boot/systemd-boot/stub.c (renamed from src/boot/efi/stub.c) | 0 | ||||
-rw-r--r-- | src/grp-boot/systemd-boot/util.c (renamed from src/boot/efi/util.c) | 0 | ||||
-rw-r--r-- | src/grp-boot/systemd-boot/util.h (renamed from src/boot/efi/util.h) | 0 | ||||
-rw-r--r-- | src/grp-coredump/coredumpctl/Makefile | 42 | ||||
-rw-r--r-- | src/grp-coredump/coredumpctl/coredumpctl.c (renamed from src/coredump/coredumpctl.c) | 2 | ||||
-rw-r--r-- | src/grp-coredump/systemd-coredump/Makefile | 82 | ||||
-rw-r--r-- | src/grp-coredump/systemd-coredump/coredump-vacuum.c (renamed from src/coredump/coredump-vacuum.c) | 0 | ||||
-rw-r--r-- | src/grp-coredump/systemd-coredump/coredump-vacuum.h (renamed from src/coredump/coredump-vacuum.h) | 0 | ||||
-rw-r--r-- | src/grp-coredump/systemd-coredump/coredump.c (renamed from src/coredump/coredump.c) | 6 | ||||
-rw-r--r-- | src/grp-coredump/systemd-coredump/coredump.conf (renamed from src/coredump/coredump.conf) | 0 | ||||
-rw-r--r-- | src/grp-coredump/systemd-coredump/stacktrace.c (renamed from src/coredump/stacktrace.c) | 0 | ||||
-rw-r--r-- | src/grp-coredump/systemd-coredump/stacktrace.h (renamed from src/coredump/stacktrace.h) | 0 | ||||
-rw-r--r-- | src/grp-coredump/systemd-coredump/test-coredump-vacuum.c (renamed from src/coredump/test-coredump-vacuum.c) | 0 | ||||
-rw-r--r-- | src/grp-machine/nss-mymachines/Makefile | 49 | ||||
-rw-r--r-- | src/grp-machine/nss-mymachines/nss-mymachines.c (renamed from src/nss-mymachines/nss-mymachines.c) | 4 | ||||
-rw-r--r-- | src/grp-machine/nss-mymachines/nss-mymachines.sym (renamed from src/nss-mymachines/nss-mymachines.sym) | 0 | ||||
-rw-r--r-- | src/grp-machine/systemd-machined/.gitignore (renamed from src/machine/.gitignore) | 0 | ||||
-rw-r--r-- | src/grp-machine/systemd-machined/Makefile | 110 | ||||
-rw-r--r-- | src/grp-machine/systemd-machined/image-dbus.c (renamed from src/machine/image-dbus.c) | 0 | ||||
-rw-r--r-- | src/grp-machine/systemd-machined/image-dbus.h (renamed from src/machine/image-dbus.h) | 0 | ||||
-rw-r--r-- | src/grp-machine/systemd-machined/machine-dbus.c (renamed from src/machine/machine-dbus.c) | 0 | ||||
-rw-r--r-- | src/grp-machine/systemd-machined/machine-dbus.h (renamed from src/machine/machine-dbus.h) | 2 | ||||
-rw-r--r-- | src/grp-machine/systemd-machined/machine.c (renamed from src/machine/machine.c) | 2 | ||||
-rw-r--r-- | src/grp-machine/systemd-machined/machine.h (renamed from src/machine/machine.h) | 0 | ||||
-rw-r--r-- | src/grp-machine/systemd-machined/machinectl.c (renamed from src/machine/machinectl.c) | 2 | ||||
-rw-r--r-- | src/grp-machine/systemd-machined/machined-dbus.c (renamed from src/machine/machined-dbus.c) | 2 | ||||
-rw-r--r-- | src/grp-machine/systemd-machined/machined.c (renamed from src/machine/machined.c) | 2 | ||||
-rw-r--r-- | src/grp-machine/systemd-machined/machined.h (renamed from src/machine/machined.h) | 4 | ||||
-rw-r--r-- | src/grp-machine/systemd-machined/org.freedesktop.machine1.conf (renamed from src/machine/org.freedesktop.machine1.conf) | 0 | ||||
-rw-r--r-- | src/grp-machine/systemd-machined/org.freedesktop.machine1.policy.in (renamed from src/machine/org.freedesktop.machine1.policy.in) | 0 | ||||
-rw-r--r-- | src/grp-machine/systemd-machined/org.freedesktop.machine1.service (renamed from src/machine/org.freedesktop.machine1.service) | 0 | ||||
-rw-r--r-- | src/grp-machine/systemd-machined/test-machine-tables.c (renamed from src/machine/test-machine-tables.c) | 0 | ||||
-rw-r--r-- | src/grp-resolve/nss-resolve/nss-resolve.c (renamed from src/nss-resolve/nss-resolve.c) | 2 | ||||
-rw-r--r-- | src/grp-resolve/nss-resolve/nss-resolve.sym (renamed from src/nss-resolve/nss-resolve.sym) | 0 | ||||
-rw-r--r-- | src/grp-resolve/systemd-resolved/.gitignore (renamed from src/resolve/.gitignore) | 0 | ||||
-rw-r--r-- | src/grp-resolve/systemd-resolved/Makefile | 209 | ||||
-rw-r--r-- | src/grp-resolve/systemd-resolved/RFCs (renamed from src/resolve/RFCs) | 0 | ||||
-rw-r--r-- | src/grp-resolve/systemd-resolved/dns-type.c (renamed from src/resolve/dns-type.c) | 0 | ||||
-rw-r--r-- | src/grp-resolve/systemd-resolved/dns-type.h (renamed from src/resolve/dns-type.h) | 0 | ||||
-rw-r--r-- | src/grp-resolve/systemd-resolved/org.freedesktop.resolve1.conf (renamed from src/resolve/org.freedesktop.resolve1.conf) | 0 | ||||
-rw-r--r-- | src/grp-resolve/systemd-resolved/org.freedesktop.resolve1.service (renamed from src/resolve/org.freedesktop.resolve1.service) | 0 | ||||
-rw-r--r-- | src/grp-resolve/systemd-resolved/resolve-tool.c (renamed from src/resolve/resolve-tool.c) | 2 | ||||
-rw-r--r-- | src/grp-resolve/systemd-resolved/resolved-bus.c (renamed from src/resolve/resolved-bus.c) | 0 | ||||
-rw-r--r-- | src/grp-resolve/systemd-resolved/resolved-bus.h (renamed from src/resolve/resolved-bus.h) | 0 | ||||
-rw-r--r-- | src/grp-resolve/systemd-resolved/resolved-conf.c (renamed from src/resolve/resolved-conf.c) | 0 | ||||
-rw-r--r-- | src/grp-resolve/systemd-resolved/resolved-conf.h (renamed from src/resolve/resolved-conf.h) | 0 | ||||
-rw-r--r-- | src/grp-resolve/systemd-resolved/resolved-def.h (renamed from src/resolve/resolved-def.h) | 0 | ||||
-rw-r--r-- | src/grp-resolve/systemd-resolved/resolved-dns-answer.c (renamed from src/resolve/resolved-dns-answer.c) | 0 | ||||
-rw-r--r-- | src/grp-resolve/systemd-resolved/resolved-dns-answer.h (renamed from src/resolve/resolved-dns-answer.h) | 0 | ||||
-rw-r--r-- | src/grp-resolve/systemd-resolved/resolved-dns-cache.c (renamed from src/resolve/resolved-dns-cache.c) | 0 | ||||
-rw-r--r-- | src/grp-resolve/systemd-resolved/resolved-dns-cache.h (renamed from src/resolve/resolved-dns-cache.h) | 0 | ||||
-rw-r--r-- | src/grp-resolve/systemd-resolved/resolved-dns-dnssec.c (renamed from src/resolve/resolved-dns-dnssec.c) | 0 | ||||
-rw-r--r-- | src/grp-resolve/systemd-resolved/resolved-dns-dnssec.h (renamed from src/resolve/resolved-dns-dnssec.h) | 0 | ||||
-rw-r--r-- | src/grp-resolve/systemd-resolved/resolved-dns-packet.c (renamed from src/resolve/resolved-dns-packet.c) | 0 | ||||
-rw-r--r-- | src/grp-resolve/systemd-resolved/resolved-dns-packet.h (renamed from src/resolve/resolved-dns-packet.h) | 0 | ||||
-rw-r--r-- | src/grp-resolve/systemd-resolved/resolved-dns-query.c (renamed from src/resolve/resolved-dns-query.c) | 0 | ||||
-rw-r--r-- | src/grp-resolve/systemd-resolved/resolved-dns-query.h (renamed from src/resolve/resolved-dns-query.h) | 2 | ||||
-rw-r--r-- | src/grp-resolve/systemd-resolved/resolved-dns-question.c (renamed from src/resolve/resolved-dns-question.c) | 0 | ||||
-rw-r--r-- | src/grp-resolve/systemd-resolved/resolved-dns-question.h (renamed from src/resolve/resolved-dns-question.h) | 0 | ||||
-rw-r--r-- | src/grp-resolve/systemd-resolved/resolved-dns-rr.c (renamed from src/resolve/resolved-dns-rr.c) | 0 | ||||
-rw-r--r-- | src/grp-resolve/systemd-resolved/resolved-dns-rr.h (renamed from src/resolve/resolved-dns-rr.h) | 0 | ||||
-rw-r--r-- | src/grp-resolve/systemd-resolved/resolved-dns-scope.c (renamed from src/resolve/resolved-dns-scope.c) | 0 | ||||
-rw-r--r-- | src/grp-resolve/systemd-resolved/resolved-dns-scope.h (renamed from src/resolve/resolved-dns-scope.h) | 0 | ||||
-rw-r--r-- | src/grp-resolve/systemd-resolved/resolved-dns-search-domain.c (renamed from src/resolve/resolved-dns-search-domain.c) | 0 | ||||
-rw-r--r-- | src/grp-resolve/systemd-resolved/resolved-dns-search-domain.h (renamed from src/resolve/resolved-dns-search-domain.h) | 0 | ||||
-rw-r--r-- | src/grp-resolve/systemd-resolved/resolved-dns-server.c (renamed from src/resolve/resolved-dns-server.c) | 0 | ||||
-rw-r--r-- | src/grp-resolve/systemd-resolved/resolved-dns-server.h (renamed from src/resolve/resolved-dns-server.h) | 0 | ||||
-rw-r--r-- | src/grp-resolve/systemd-resolved/resolved-dns-stream.c (renamed from src/resolve/resolved-dns-stream.c) | 0 | ||||
-rw-r--r-- | src/grp-resolve/systemd-resolved/resolved-dns-stream.h (renamed from src/resolve/resolved-dns-stream.h) | 0 | ||||
-rw-r--r-- | src/grp-resolve/systemd-resolved/resolved-dns-synthesize.c (renamed from src/resolve/resolved-dns-synthesize.c) | 0 | ||||
-rw-r--r-- | src/grp-resolve/systemd-resolved/resolved-dns-synthesize.h (renamed from src/resolve/resolved-dns-synthesize.h) | 0 | ||||
-rw-r--r-- | src/grp-resolve/systemd-resolved/resolved-dns-transaction.c (renamed from src/resolve/resolved-dns-transaction.c) | 0 | ||||
-rw-r--r-- | src/grp-resolve/systemd-resolved/resolved-dns-transaction.h (renamed from src/resolve/resolved-dns-transaction.h) | 0 | ||||
-rw-r--r-- | src/grp-resolve/systemd-resolved/resolved-dns-trust-anchor.c (renamed from src/resolve/resolved-dns-trust-anchor.c) | 0 | ||||
-rw-r--r-- | src/grp-resolve/systemd-resolved/resolved-dns-trust-anchor.h (renamed from src/resolve/resolved-dns-trust-anchor.h) | 0 | ||||
-rw-r--r-- | src/grp-resolve/systemd-resolved/resolved-dns-zone.c (renamed from src/resolve/resolved-dns-zone.c) | 0 | ||||
-rw-r--r-- | src/grp-resolve/systemd-resolved/resolved-dns-zone.h (renamed from src/resolve/resolved-dns-zone.h) | 0 | ||||
-rw-r--r-- | src/grp-resolve/systemd-resolved/resolved-etc-hosts.c (renamed from src/resolve/resolved-etc-hosts.c) | 0 | ||||
-rw-r--r-- | src/grp-resolve/systemd-resolved/resolved-etc-hosts.h (renamed from src/resolve/resolved-etc-hosts.h) | 0 | ||||
-rw-r--r-- | src/grp-resolve/systemd-resolved/resolved-gperf.gperf (renamed from src/resolve/resolved-gperf.gperf) | 0 | ||||
-rw-r--r-- | src/grp-resolve/systemd-resolved/resolved-link-bus.c (renamed from src/resolve/resolved-link-bus.c) | 0 | ||||
-rw-r--r-- | src/grp-resolve/systemd-resolved/resolved-link-bus.h (renamed from src/resolve/resolved-link-bus.h) | 2 | ||||
-rw-r--r-- | src/grp-resolve/systemd-resolved/resolved-link.c (renamed from src/resolve/resolved-link.c) | 2 | ||||
-rw-r--r-- | src/grp-resolve/systemd-resolved/resolved-link.h (renamed from src/resolve/resolved-link.h) | 0 | ||||
-rw-r--r-- | src/grp-resolve/systemd-resolved/resolved-llmnr.c (renamed from src/resolve/resolved-llmnr.c) | 0 | ||||
-rw-r--r-- | src/grp-resolve/systemd-resolved/resolved-llmnr.h (renamed from src/resolve/resolved-llmnr.h) | 0 | ||||
-rw-r--r-- | src/grp-resolve/systemd-resolved/resolved-manager.c (renamed from src/resolve/resolved-manager.c) | 0 | ||||
-rw-r--r-- | src/grp-resolve/systemd-resolved/resolved-manager.h (renamed from src/resolve/resolved-manager.h) | 6 | ||||
-rw-r--r-- | src/grp-resolve/systemd-resolved/resolved-mdns.c (renamed from src/resolve/resolved-mdns.c) | 0 | ||||
-rw-r--r-- | src/grp-resolve/systemd-resolved/resolved-mdns.h (renamed from src/resolve/resolved-mdns.h) | 0 | ||||
-rw-r--r-- | src/grp-resolve/systemd-resolved/resolved-resolv-conf.c (renamed from src/resolve/resolved-resolv-conf.c) | 0 | ||||
-rw-r--r-- | src/grp-resolve/systemd-resolved/resolved-resolv-conf.h (renamed from src/resolve/resolved-resolv-conf.h) | 0 | ||||
-rw-r--r-- | src/grp-resolve/systemd-resolved/resolved.c (renamed from src/resolve/resolved.c) | 4 | ||||
-rw-r--r-- | src/grp-resolve/systemd-resolved/resolved.conf.in (renamed from src/resolve/resolved.conf.in) | 0 | ||||
-rw-r--r-- | src/grp-resolve/systemd-resolved/test-dnssec-complex.c (renamed from src/resolve/test-dnssec-complex.c) | 2 | ||||
-rw-r--r-- | src/grp-resolve/systemd-resolved/test-dnssec.c (renamed from src/resolve/test-dnssec.c) | 0 | ||||
-rw-r--r-- | src/grp-resolve/systemd-resolved/test-resolve-tables.c (renamed from src/resolve/test-resolve-tables.c) | 0 | ||||
-rw-r--r-- | src/grp-system/systemctl/Makefile | 33 | ||||
-rw-r--r-- | src/grp-system/systemctl/systemctl.c (renamed from src/systemctl/systemctl.c) | 6 | ||||
-rwxr-xr-x | src/grp-system/systemctl/systemd-sysv-install.SKELETON (renamed from src/systemctl/systemd-sysv-install.SKELETON) | 0 | ||||
-rw-r--r-- | src/grp-system/systemd/Makefile | 68 | ||||
-rw-r--r-- | src/grp-system/systemd/macros.systemd.in (renamed from src/core/macros.systemd.in) | 0 | ||||
-rw-r--r-- | src/grp-system/systemd/main.c (renamed from src/core/main.c) | 4 | ||||
-rw-r--r-- | src/grp-system/systemd/org.freedesktop.systemd1.conf (renamed from src/core/org.freedesktop.systemd1.conf) | 0 | ||||
-rw-r--r-- | src/grp-system/systemd/org.freedesktop.systemd1.policy.in.in (renamed from src/core/org.freedesktop.systemd1.policy.in.in) | 0 | ||||
-rw-r--r-- | src/grp-system/systemd/org.freedesktop.systemd1.service (renamed from src/core/org.freedesktop.systemd1.service) | 0 | ||||
-rw-r--r-- | src/grp-system/systemd/system.conf (renamed from src/core/system.conf) | 0 | ||||
-rw-r--r-- | src/grp-system/systemd/systemd.pc.in (renamed from src/core/systemd.pc.in) | 0 | ||||
-rw-r--r-- | src/grp-system/systemd/triggers.systemd.in (renamed from src/core/triggers.systemd.in) | 0 | ||||
-rw-r--r-- | src/grp-system/systemd/user.conf (renamed from src/core/user.conf) | 0 | ||||
-rw-r--r-- | src/grp-timedate/systemd-timedated/.gitignore (renamed from src/timedate/.gitignore) | 0 | ||||
-rw-r--r-- | src/grp-timedate/systemd-timedated/Makefile | 66 | ||||
-rw-r--r-- | src/grp-timedate/systemd-timedated/org.freedesktop.timedate1.conf (renamed from src/timedate/org.freedesktop.timedate1.conf) | 0 | ||||
-rw-r--r-- | src/grp-timedate/systemd-timedated/org.freedesktop.timedate1.policy.in (renamed from src/timedate/org.freedesktop.timedate1.policy.in) | 0 | ||||
-rw-r--r-- | src/grp-timedate/systemd-timedated/org.freedesktop.timedate1.service (renamed from src/timedate/org.freedesktop.timedate1.service) | 0 | ||||
-rw-r--r-- | src/grp-timedate/systemd-timedated/timedated.c (renamed from src/timedate/timedated.c) | 6 | ||||
-rw-r--r-- | src/grp-timedate/timedatectl/Makefile | 43 | ||||
-rw-r--r-- | src/grp-timedate/timedatectl/timedatectl.c (renamed from src/timedate/timedatectl.c) | 2 | ||||
l--------- | src/hibernate-resume/Makefile | 1 | ||||
-rw-r--r--[l---------] | src/hostname/Makefile | 81 | ||||
-rw-r--r-- | src/hostname/hostnamectl.c | 4 | ||||
l--------- | src/hwdb/Makefile | 1 | ||||
-rw-r--r--[l---------] | src/import/Makefile | 196 | ||||
-rw-r--r-- | src/import/curl-util.h | 2 | ||||
-rw-r--r-- | src/import/export-raw.c | 2 | ||||
-rw-r--r-- | src/import/export-raw.h | 2 | ||||
-rw-r--r-- | src/import/export-tar.c | 2 | ||||
-rw-r--r-- | src/import/export-tar.h | 2 | ||||
-rw-r--r-- | src/import/export.c | 2 | ||||
-rw-r--r-- | src/import/import-raw.c | 4 | ||||
-rw-r--r-- | src/import/import-raw.h | 2 | ||||
-rw-r--r-- | src/import/import-tar.c | 4 | ||||
-rw-r--r-- | src/import/import-tar.h | 2 | ||||
-rw-r--r-- | src/import/import.c | 2 | ||||
-rw-r--r-- | src/import/importd.c | 2 | ||||
-rw-r--r-- | src/import/pull-raw.c | 2 | ||||
-rw-r--r-- | src/import/pull-raw.h | 2 | ||||
-rw-r--r-- | src/import/pull-tar.c | 2 | ||||
-rw-r--r-- | src/import/pull-tar.h | 2 | ||||
-rw-r--r-- | src/import/pull.c | 2 | ||||
-rw-r--r--[l---------] | src/initctl/Makefile | 34 | ||||
-rw-r--r-- | src/initctl/initctl.c | 4 | ||||
-rw-r--r--[l---------] | src/journal-remote/Makefile | 115 | ||||
-rw-r--r-- | src/journal-remote/journal-gatewayd.c | 6 | ||||
-rw-r--r-- | src/journal-remote/journal-remote-parse.h | 2 | ||||
-rw-r--r-- | src/journal-remote/journal-remote.c | 2 | ||||
-rw-r--r-- | src/journal-remote/journal-remote.h | 2 | ||||
-rw-r--r-- | src/journal-remote/journal-upload.c | 2 | ||||
-rw-r--r-- | src/journal-remote/journal-upload.h | 4 | ||||
-rw-r--r--[l---------] | src/journal/Makefile | 350 | ||||
-rw-r--r-- | src/journal/cat.c | 2 | ||||
-rw-r--r-- | src/journal/catalog/systemd.be.catalog | 260 | ||||
-rw-r--r-- | src/journal/catalog/systemd.be@latin.catalog | 260 | ||||
-rw-r--r-- | src/journal/catalog/systemd.catalog | 334 | ||||
-rw-r--r-- | src/journal/catalog/systemd.da.catalog | 261 | ||||
-rw-r--r-- | src/journal/catalog/systemd.fr.catalog | 260 | ||||
-rw-r--r-- | src/journal/catalog/systemd.hu.catalog | 262 | ||||
-rw-r--r-- | src/journal/catalog/systemd.it.catalog | 254 | ||||
-rw-r--r-- | src/journal/catalog/systemd.ko.catalog | 264 | ||||
-rw-r--r-- | src/journal/catalog/systemd.pl.catalog | 261 | ||||
-rw-r--r-- | src/journal/catalog/systemd.pt_BR.catalog | 264 | ||||
-rw-r--r-- | src/journal/catalog/systemd.ru.catalog | 354 | ||||
-rw-r--r-- | src/journal/catalog/systemd.sr.catalog | 262 | ||||
-rw-r--r-- | src/journal/catalog/systemd.zh_CN.catalog | 253 | ||||
-rw-r--r-- | src/journal/catalog/systemd.zh_TW.catalog | 263 | ||||
-rw-r--r-- | src/journal/journal-qrcode.h | 2 | ||||
-rw-r--r-- | src/journal/journalctl.c | 4 | ||||
-rw-r--r-- | src/journal/journald-kmsg.c | 2 | ||||
-rw-r--r-- | src/journal/journald-server.c | 6 | ||||
-rw-r--r-- | src/journal/journald-server.h | 2 | ||||
-rw-r--r-- | src/journal/journald-stream.c | 4 | ||||
-rw-r--r-- | src/journal/journald-syslog.c | 2 | ||||
-rw-r--r-- | src/journal/journald.c | 4 | ||||
-rw-r--r-- | src/journal/test-catalog.c | 2 | ||||
-rw-r--r-- | src/journal/test-journal-enum.c | 2 | ||||
-rw-r--r-- | src/journal/test-journal-flush.c | 2 | ||||
-rw-r--r-- | src/journal/test-journal-init.c | 2 | ||||
-rw-r--r-- | src/journal/test-journal-interleaving.c | 2 | ||||
-rw-r--r-- | src/journal/test-journal-match.c | 2 | ||||
-rw-r--r-- | src/journal/test-journal-send.c | 2 | ||||
-rw-r--r-- | src/journal/test-journal-stream.c | 2 | ||||
-rw-r--r--[l---------] | src/kernel-install/Makefile | 35 | ||||
-rw-r--r-- | src/kernel-install/bash-completion_kernel-install | 50 | ||||
-rw-r--r-- | src/kernel-install/kernel-install.xml | 192 | ||||
-rw-r--r-- | src/kernel-install/zsh-completion_kernel-install | 26 | ||||
-rw-r--r-- | src/libbasic/.gitignore (renamed from src/basic/.gitignore) | 0 | ||||
-rw-r--r-- | src/libbasic/Makefile | 281 | ||||
-rw-r--r-- | src/libbasic/MurmurHash2.c (renamed from src/basic/MurmurHash2.c) | 0 | ||||
-rw-r--r-- | src/libbasic/MurmurHash2.h (renamed from src/basic/MurmurHash2.h) | 0 | ||||
-rw-r--r-- | src/libbasic/af-list.c (renamed from src/basic/af-list.c) | 0 | ||||
-rw-r--r-- | src/libbasic/af-list.h (renamed from src/basic/af-list.h) | 0 | ||||
-rw-r--r-- | src/libbasic/alloc-util.c (renamed from src/basic/alloc-util.c) | 0 | ||||
-rw-r--r-- | src/libbasic/alloc-util.h (renamed from src/basic/alloc-util.h) | 0 | ||||
-rw-r--r-- | src/libbasic/arphrd-list.c (renamed from src/basic/arphrd-list.c) | 0 | ||||
-rw-r--r-- | src/libbasic/arphrd-list.h (renamed from src/basic/arphrd-list.h) | 0 | ||||
-rw-r--r-- | src/libbasic/async.c (renamed from src/basic/async.c) | 0 | ||||
-rw-r--r-- | src/libbasic/async.h (renamed from src/basic/async.h) | 0 | ||||
-rw-r--r-- | src/libbasic/audit-util.c (renamed from src/basic/audit-util.c) | 0 | ||||
-rw-r--r-- | src/libbasic/audit-util.h (renamed from src/basic/audit-util.h) | 0 | ||||
-rw-r--r-- | src/libbasic/barrier.c (renamed from src/basic/barrier.c) | 0 | ||||
-rw-r--r-- | src/libbasic/barrier.h (renamed from src/basic/barrier.h) | 0 | ||||
-rw-r--r-- | src/libbasic/bitmap.c (renamed from src/basic/bitmap.c) | 0 | ||||
-rw-r--r-- | src/libbasic/bitmap.h (renamed from src/basic/bitmap.h) | 0 | ||||
-rw-r--r-- | src/libbasic/blkid-util.h (renamed from src/basic/blkid-util.h) | 0 | ||||
-rw-r--r-- | src/libbasic/btrfs-ctree.h (renamed from src/basic/btrfs-ctree.h) | 0 | ||||
-rw-r--r-- | src/libbasic/btrfs-util.c (renamed from src/basic/btrfs-util.c) | 0 | ||||
-rw-r--r-- | src/libbasic/btrfs-util.h (renamed from src/basic/btrfs-util.h) | 2 | ||||
-rw-r--r-- | src/libbasic/build.h (renamed from src/basic/build.h) | 0 | ||||
-rw-r--r-- | src/libbasic/bus-label.c (renamed from src/basic/bus-label.c) | 0 | ||||
-rw-r--r-- | src/libbasic/bus-label.h (renamed from src/basic/bus-label.h) | 0 | ||||
-rw-r--r-- | src/libbasic/c-rbtree.c (renamed from src/basic/c-rbtree.c) | 0 | ||||
-rw-r--r-- | src/libbasic/c-rbtree.h (renamed from src/basic/c-rbtree.h) | 0 | ||||
-rw-r--r-- | src/libbasic/calendarspec.c (renamed from src/basic/calendarspec.c) | 0 | ||||
-rw-r--r-- | src/libbasic/calendarspec.h (renamed from src/basic/calendarspec.h) | 0 | ||||
-rw-r--r-- | src/libbasic/cap-list.c (renamed from src/basic/cap-list.c) | 0 | ||||
-rw-r--r-- | src/libbasic/cap-list.h (renamed from src/basic/cap-list.h) | 0 | ||||
-rw-r--r-- | src/libbasic/capability-util.c (renamed from src/basic/capability-util.c) | 0 | ||||
-rw-r--r-- | src/libbasic/capability-util.h (renamed from src/basic/capability-util.h) | 0 | ||||
-rw-r--r-- | src/libbasic/cgroup-util.c (renamed from src/basic/cgroup-util.c) | 0 | ||||
-rw-r--r-- | src/libbasic/cgroup-util.h (renamed from src/basic/cgroup-util.h) | 0 | ||||
-rw-r--r-- | src/libbasic/chattr-util.c (renamed from src/basic/chattr-util.c) | 0 | ||||
-rw-r--r-- | src/libbasic/chattr-util.h (renamed from src/basic/chattr-util.h) | 0 | ||||
-rw-r--r-- | src/libbasic/clock-util.c (renamed from src/basic/clock-util.c) | 0 | ||||
-rw-r--r-- | src/libbasic/clock-util.h (renamed from src/basic/clock-util.h) | 0 | ||||
-rw-r--r-- | src/libbasic/conf-files.c (renamed from src/basic/conf-files.c) | 0 | ||||
-rw-r--r-- | src/libbasic/conf-files.h (renamed from src/basic/conf-files.h) | 0 | ||||
-rw-r--r-- | src/libbasic/copy.c (renamed from src/basic/copy.c) | 0 | ||||
-rw-r--r-- | src/libbasic/copy.h (renamed from src/basic/copy.h) | 0 | ||||
-rw-r--r-- | src/libbasic/cpu-set-util.c (renamed from src/basic/cpu-set-util.c) | 0 | ||||
-rw-r--r-- | src/libbasic/cpu-set-util.h (renamed from src/basic/cpu-set-util.h) | 0 | ||||
-rw-r--r-- | src/libbasic/def.h (renamed from src/basic/def.h) | 0 | ||||
-rw-r--r-- | src/libbasic/device-nodes.c (renamed from src/basic/device-nodes.c) | 0 | ||||
-rw-r--r-- | src/libbasic/device-nodes.h (renamed from src/basic/device-nodes.h) | 0 | ||||
-rw-r--r-- | src/libbasic/dirent-util.c (renamed from src/basic/dirent-util.c) | 0 | ||||
-rw-r--r-- | src/libbasic/dirent-util.h (renamed from src/basic/dirent-util.h) | 0 | ||||
-rw-r--r-- | src/libbasic/env-util.c (renamed from src/basic/env-util.c) | 0 | ||||
-rw-r--r-- | src/libbasic/env-util.h (renamed from src/basic/env-util.h) | 0 | ||||
-rw-r--r-- | src/libbasic/errno-list.c (renamed from src/basic/errno-list.c) | 0 | ||||
-rw-r--r-- | src/libbasic/errno-list.h (renamed from src/basic/errno-list.h) | 0 | ||||
-rw-r--r-- | src/libbasic/escape.c (renamed from src/basic/escape.c) | 0 | ||||
-rw-r--r-- | src/libbasic/escape.h (renamed from src/basic/escape.h) | 0 | ||||
-rw-r--r-- | src/libbasic/ether-addr-util.c (renamed from src/basic/ether-addr-util.c) | 0 | ||||
-rw-r--r-- | src/libbasic/ether-addr-util.h (renamed from src/basic/ether-addr-util.h) | 0 | ||||
-rw-r--r-- | src/libbasic/exit-status.c (renamed from src/basic/exit-status.c) | 0 | ||||
-rw-r--r-- | src/libbasic/exit-status.h (renamed from src/basic/exit-status.h) | 0 | ||||
-rw-r--r-- | src/libbasic/extract-word.c (renamed from src/basic/extract-word.c) | 0 | ||||
-rw-r--r-- | src/libbasic/extract-word.h (renamed from src/basic/extract-word.h) | 0 | ||||
-rw-r--r-- | src/libbasic/fd-util.c (renamed from src/basic/fd-util.c) | 0 | ||||
-rw-r--r-- | src/libbasic/fd-util.h (renamed from src/basic/fd-util.h) | 0 | ||||
-rw-r--r-- | src/libbasic/fdset.c (renamed from src/basic/fdset.c) | 2 | ||||
-rw-r--r-- | src/libbasic/fdset.h (renamed from src/basic/fdset.h) | 0 | ||||
-rw-r--r-- | src/libbasic/fileio-label.c (renamed from src/basic/fileio-label.c) | 0 | ||||
-rw-r--r-- | src/libbasic/fileio-label.h (renamed from src/basic/fileio-label.h) | 0 | ||||
-rw-r--r-- | src/libbasic/fileio.c (renamed from src/basic/fileio.c) | 0 | ||||
-rw-r--r-- | src/libbasic/fileio.h (renamed from src/basic/fileio.h) | 0 | ||||
-rw-r--r-- | src/libbasic/formats-util.h (renamed from src/basic/formats-util.h) | 0 | ||||
-rw-r--r-- | src/libbasic/fs-util.c (renamed from src/basic/fs-util.c) | 0 | ||||
-rw-r--r-- | src/libbasic/fs-util.h (renamed from src/basic/fs-util.h) | 0 | ||||
-rw-r--r-- | src/libbasic/glob-util.c (renamed from src/basic/glob-util.c) | 0 | ||||
-rw-r--r-- | src/libbasic/glob-util.h (renamed from src/basic/glob-util.h) | 0 | ||||
-rw-r--r-- | src/libbasic/gunicode.c (renamed from src/basic/gunicode.c) | 0 | ||||
-rw-r--r-- | src/libbasic/gunicode.h (renamed from src/basic/gunicode.h) | 0 | ||||
-rw-r--r-- | src/libbasic/hash-funcs.c (renamed from src/basic/hash-funcs.c) | 0 | ||||
-rw-r--r-- | src/libbasic/hash-funcs.h (renamed from src/basic/hash-funcs.h) | 0 | ||||
-rw-r--r-- | src/libbasic/hashmap.c (renamed from src/basic/hashmap.c) | 0 | ||||
-rw-r--r-- | src/libbasic/hashmap.h (renamed from src/basic/hashmap.h) | 0 | ||||
-rw-r--r-- | src/libbasic/hexdecoct.c (renamed from src/basic/hexdecoct.c) | 0 | ||||
-rw-r--r-- | src/libbasic/hexdecoct.h (renamed from src/basic/hexdecoct.h) | 0 | ||||
-rw-r--r-- | src/libbasic/hostname-util.c (renamed from src/basic/hostname-util.c) | 0 | ||||
-rw-r--r-- | src/libbasic/hostname-util.h (renamed from src/basic/hostname-util.h) | 0 | ||||
-rw-r--r-- | src/libbasic/in-addr-util.c (renamed from src/basic/in-addr-util.c) | 0 | ||||
-rw-r--r-- | src/libbasic/in-addr-util.h (renamed from src/basic/in-addr-util.h) | 0 | ||||
-rw-r--r-- | src/libbasic/io-util.c (renamed from src/basic/io-util.c) | 0 | ||||
-rw-r--r-- | src/libbasic/io-util.h (renamed from src/basic/io-util.h) | 0 | ||||
-rw-r--r-- | src/libbasic/ioprio.h (renamed from src/basic/ioprio.h) | 0 | ||||
-rw-r--r-- | src/libbasic/json.c (renamed from src/basic/json.c) | 0 | ||||
-rw-r--r-- | src/libbasic/json.h (renamed from src/basic/json.h) | 0 | ||||
-rw-r--r-- | src/libbasic/label.c (renamed from src/basic/label.c) | 0 | ||||
-rw-r--r-- | src/libbasic/label.h (renamed from src/basic/label.h) | 0 | ||||
-rw-r--r-- | src/libbasic/list.h (renamed from src/basic/list.h) | 0 | ||||
-rw-r--r-- | src/libbasic/locale-util.c (renamed from src/basic/locale-util.c) | 0 | ||||
-rw-r--r-- | src/libbasic/locale-util.h (renamed from src/basic/locale-util.h) | 0 | ||||
-rw-r--r-- | src/libbasic/lockfile-util.c (renamed from src/basic/lockfile-util.c) | 0 | ||||
-rw-r--r-- | src/libbasic/lockfile-util.h (renamed from src/basic/lockfile-util.h) | 0 | ||||
-rw-r--r-- | src/libbasic/log.c (renamed from src/basic/log.c) | 2 | ||||
-rw-r--r-- | src/libbasic/log.h (renamed from src/basic/log.h) | 2 | ||||
-rw-r--r-- | src/libbasic/login-util.c (renamed from src/basic/login-util.c) | 0 | ||||
-rw-r--r-- | src/libbasic/login-util.h (renamed from src/basic/login-util.h) | 0 | ||||
-rw-r--r-- | src/libbasic/macro.h (renamed from src/basic/macro.h) | 0 | ||||
-rw-r--r-- | src/libbasic/memfd-util.c (renamed from src/basic/memfd-util.c) | 0 | ||||
-rw-r--r-- | src/libbasic/memfd-util.h (renamed from src/basic/memfd-util.h) | 0 | ||||
-rw-r--r-- | src/libbasic/mempool.c (renamed from src/basic/mempool.c) | 0 | ||||
-rw-r--r-- | src/libbasic/mempool.h (renamed from src/basic/mempool.h) | 0 | ||||
-rw-r--r-- | src/libbasic/missing.h (renamed from src/basic/missing.h) | 0 | ||||
-rw-r--r-- | src/libbasic/mkdir-label.c (renamed from src/basic/mkdir-label.c) | 0 | ||||
-rw-r--r-- | src/libbasic/mkdir.c (renamed from src/basic/mkdir.c) | 0 | ||||
-rw-r--r-- | src/libbasic/mkdir.h (renamed from src/basic/mkdir.h) | 0 | ||||
-rw-r--r-- | src/libbasic/mount-util.c (renamed from src/basic/mount-util.c) | 0 | ||||
-rw-r--r-- | src/libbasic/mount-util.h (renamed from src/basic/mount-util.h) | 0 | ||||
-rw-r--r-- | src/libbasic/nss-util.h (renamed from src/basic/nss-util.h) | 0 | ||||
-rw-r--r-- | src/libbasic/ordered-set.c (renamed from src/basic/ordered-set.c) | 0 | ||||
-rw-r--r-- | src/libbasic/ordered-set.h (renamed from src/basic/ordered-set.h) | 0 | ||||
-rw-r--r-- | src/libbasic/parse-util.c (renamed from src/basic/parse-util.c) | 0 | ||||
-rw-r--r-- | src/libbasic/parse-util.h (renamed from src/basic/parse-util.h) | 0 | ||||
-rw-r--r-- | src/libbasic/path-util.c (renamed from src/basic/path-util.c) | 0 | ||||
-rw-r--r-- | src/libbasic/path-util.h (renamed from src/basic/path-util.h) | 0 | ||||
-rw-r--r-- | src/libbasic/prioq.c (renamed from src/basic/prioq.c) | 0 | ||||
-rw-r--r-- | src/libbasic/prioq.h (renamed from src/basic/prioq.h) | 0 | ||||
-rw-r--r-- | src/libbasic/proc-cmdline.c (renamed from src/basic/proc-cmdline.c) | 0 | ||||
-rw-r--r-- | src/libbasic/proc-cmdline.h (renamed from src/basic/proc-cmdline.h) | 0 | ||||
-rw-r--r-- | src/libbasic/process-util.c (renamed from src/basic/process-util.c) | 0 | ||||
-rw-r--r-- | src/libbasic/process-util.h (renamed from src/basic/process-util.h) | 0 | ||||
-rw-r--r-- | src/libbasic/random-util.c (renamed from src/basic/random-util.c) | 0 | ||||
-rw-r--r-- | src/libbasic/random-util.h (renamed from src/basic/random-util.h) | 0 | ||||
-rw-r--r-- | src/libbasic/ratelimit.c (renamed from src/basic/ratelimit.c) | 0 | ||||
-rw-r--r-- | src/libbasic/ratelimit.h (renamed from src/basic/ratelimit.h) | 0 | ||||
-rw-r--r-- | src/libbasic/refcnt.h (renamed from src/basic/refcnt.h) | 0 | ||||
-rw-r--r-- | src/libbasic/replace-var.c (renamed from src/basic/replace-var.c) | 0 | ||||
-rw-r--r-- | src/libbasic/replace-var.h (renamed from src/basic/replace-var.h) | 0 | ||||
-rw-r--r-- | src/libbasic/rlimit-util.c (renamed from src/basic/rlimit-util.c) | 0 | ||||
-rw-r--r-- | src/libbasic/rlimit-util.h (renamed from src/basic/rlimit-util.h) | 0 | ||||
-rw-r--r-- | src/libbasic/rm-rf.c (renamed from src/basic/rm-rf.c) | 0 | ||||
-rw-r--r-- | src/libbasic/rm-rf.h (renamed from src/basic/rm-rf.h) | 0 | ||||
-rw-r--r-- | src/libbasic/securebits.h (renamed from src/basic/securebits.h) | 0 | ||||
-rw-r--r-- | src/libbasic/selinux-util.c (renamed from src/basic/selinux-util.c) | 0 | ||||
-rw-r--r-- | src/libbasic/selinux-util.h (renamed from src/basic/selinux-util.h) | 0 | ||||
-rw-r--r-- | src/libbasic/set.h (renamed from src/basic/set.h) | 0 | ||||
-rw-r--r-- | src/libbasic/sigbus.c (renamed from src/basic/sigbus.c) | 0 | ||||
-rw-r--r-- | src/libbasic/sigbus.h (renamed from src/basic/sigbus.h) | 0 | ||||
-rw-r--r-- | src/libbasic/signal-util.c (renamed from src/basic/signal-util.c) | 0 | ||||
-rw-r--r-- | src/libbasic/signal-util.h (renamed from src/basic/signal-util.h) | 0 | ||||
-rw-r--r-- | src/libbasic/siphash24.c (renamed from src/basic/siphash24.c) | 0 | ||||
-rw-r--r-- | src/libbasic/siphash24.h (renamed from src/basic/siphash24.h) | 0 | ||||
-rw-r--r-- | src/libbasic/smack-util.c (renamed from src/basic/smack-util.c) | 0 | ||||
-rw-r--r-- | src/libbasic/smack-util.h (renamed from src/basic/smack-util.h) | 0 | ||||
-rw-r--r-- | src/libbasic/socket-label.c (renamed from src/basic/socket-label.c) | 0 | ||||
-rw-r--r-- | src/libbasic/socket-util.c (renamed from src/basic/socket-util.c) | 0 | ||||
-rw-r--r-- | src/libbasic/socket-util.h (renamed from src/basic/socket-util.h) | 0 | ||||
-rw-r--r-- | src/libbasic/sparse-endian.h (renamed from src/basic/sparse-endian.h) | 0 | ||||
-rw-r--r-- | src/libbasic/special.h (renamed from src/basic/special.h) | 0 | ||||
-rw-r--r-- | src/libbasic/stat-util.c (renamed from src/basic/stat-util.c) | 0 | ||||
-rw-r--r-- | src/libbasic/stat-util.h (renamed from src/basic/stat-util.h) | 0 | ||||
-rw-r--r-- | src/libbasic/stdio-util.h (renamed from src/basic/stdio-util.h) | 0 | ||||
-rw-r--r-- | src/libbasic/strbuf.c (renamed from src/basic/strbuf.c) | 0 | ||||
-rw-r--r-- | src/libbasic/strbuf.h (renamed from src/basic/strbuf.h) | 0 | ||||
-rw-r--r-- | src/libbasic/string-table.c (renamed from src/basic/string-table.c) | 0 | ||||
-rw-r--r-- | src/libbasic/string-table.h (renamed from src/basic/string-table.h) | 0 | ||||
-rw-r--r-- | src/libbasic/string-util.c (renamed from src/basic/string-util.c) | 0 | ||||
-rw-r--r-- | src/libbasic/string-util.h (renamed from src/basic/string-util.h) | 0 | ||||
-rw-r--r-- | src/libbasic/strv.c (renamed from src/basic/strv.c) | 0 | ||||
-rw-r--r-- | src/libbasic/strv.h (renamed from src/basic/strv.h) | 0 | ||||
-rw-r--r-- | src/libbasic/strxcpyx.c (renamed from src/basic/strxcpyx.c) | 0 | ||||
-rw-r--r-- | src/libbasic/strxcpyx.h (renamed from src/basic/strxcpyx.h) | 0 | ||||
-rw-r--r-- | src/libbasic/syslog-util.c (renamed from src/basic/syslog-util.c) | 0 | ||||
-rw-r--r-- | src/libbasic/syslog-util.h (renamed from src/basic/syslog-util.h) | 0 | ||||
-rw-r--r-- | src/libbasic/terminal-util.c (renamed from src/basic/terminal-util.c) | 0 | ||||
-rw-r--r-- | src/libbasic/terminal-util.h (renamed from src/basic/terminal-util.h) | 0 | ||||
-rw-r--r-- | src/libbasic/time-util.c (renamed from src/basic/time-util.c) | 0 | ||||
-rw-r--r-- | src/libbasic/time-util.h (renamed from src/basic/time-util.h) | 0 | ||||
-rw-r--r-- | src/libbasic/umask-util.h (renamed from src/basic/umask-util.h) | 0 | ||||
-rw-r--r-- | src/libbasic/unaligned.h (renamed from src/basic/unaligned.h) | 0 | ||||
-rw-r--r-- | src/libbasic/unit-name.c (renamed from src/basic/unit-name.c) | 0 | ||||
-rw-r--r-- | src/libbasic/unit-name.h (renamed from src/basic/unit-name.h) | 0 | ||||
-rw-r--r-- | src/libbasic/user-util.c (renamed from src/basic/user-util.c) | 0 | ||||
-rw-r--r-- | src/libbasic/user-util.h (renamed from src/basic/user-util.h) | 0 | ||||
-rw-r--r-- | src/libbasic/utf8.c (renamed from src/basic/utf8.c) | 0 | ||||
-rw-r--r-- | src/libbasic/utf8.h (renamed from src/basic/utf8.h) | 0 | ||||
-rw-r--r-- | src/libbasic/util.c (renamed from src/basic/util.c) | 0 | ||||
-rw-r--r-- | src/libbasic/util.h (renamed from src/basic/util.h) | 0 | ||||
-rw-r--r-- | src/libbasic/verbs.c (renamed from src/basic/verbs.c) | 0 | ||||
-rw-r--r-- | src/libbasic/verbs.h (renamed from src/basic/verbs.h) | 0 | ||||
-rw-r--r-- | src/libbasic/virt.c (renamed from src/basic/virt.c) | 0 | ||||
-rw-r--r-- | src/libbasic/virt.h (renamed from src/basic/virt.h) | 0 | ||||
-rw-r--r-- | src/libbasic/web-util.c (renamed from src/basic/web-util.c) | 0 | ||||
-rw-r--r-- | src/libbasic/web-util.h (renamed from src/basic/web-util.h) | 0 | ||||
-rw-r--r-- | src/libbasic/xattr-util.c (renamed from src/basic/xattr-util.c) | 0 | ||||
-rw-r--r-- | src/libbasic/xattr-util.h (renamed from src/basic/xattr-util.h) | 0 | ||||
-rw-r--r-- | src/libbasic/xml.c (renamed from src/basic/xml.c) | 0 | ||||
-rw-r--r-- | src/libbasic/xml.h (renamed from src/basic/xml.h) | 0 | ||||
-rw-r--r-- | src/libbus-proxy-core/Makefile | 43 | ||||
-rw-r--r-- | src/libbus-proxy-core/bus-xml-policy.c (renamed from src/bus-proxyd/bus-xml-policy.c) | 2 | ||||
-rw-r--r-- | src/libbus-proxy-core/bus-xml-policy.h (renamed from src/bus-proxyd/bus-xml-policy.h) | 0 | ||||
-rw-r--r-- | src/libbus-proxy-core/driver.c (renamed from src/bus-proxyd/driver.c) | 2 | ||||
-rw-r--r-- | src/libbus-proxy-core/driver.h (renamed from src/bus-proxyd/driver.h) | 2 | ||||
-rw-r--r-- | src/libbus-proxy-core/proxy.c (renamed from src/bus-proxyd/proxy.c) | 4 | ||||
-rw-r--r-- | src/libbus-proxy-core/proxy.h (renamed from src/bus-proxyd/proxy.h) | 2 | ||||
-rw-r--r-- | src/libbus-proxy-core/synthesize.c (renamed from src/bus-proxyd/synthesize.c) | 2 | ||||
-rw-r--r-- | src/libbus-proxy-core/synthesize.h (renamed from src/bus-proxyd/synthesize.h) | 2 | ||||
-rw-r--r-- | src/libbus-proxy-core/test-bus-xml-policy.c (renamed from src/bus-proxyd/test-bus-xml-policy.c) | 2 | ||||
-rw-r--r-- | src/libcore/.gitignore (renamed from src/core/.gitignore) | 0 | ||||
-rw-r--r-- | src/libcore/Makefile | 173 | ||||
-rw-r--r-- | src/libcore/audit-fd.c (renamed from src/core/audit-fd.c) | 0 | ||||
-rw-r--r-- | src/libcore/audit-fd.h (renamed from src/core/audit-fd.h) | 0 | ||||
-rw-r--r-- | src/libcore/automount.c (renamed from src/core/automount.c) | 0 | ||||
-rw-r--r-- | src/libcore/automount.h (renamed from src/core/automount.h) | 0 | ||||
-rw-r--r-- | src/libcore/bus-endpoint.c (renamed from src/core/bus-endpoint.c) | 0 | ||||
-rw-r--r-- | src/libcore/bus-endpoint.h (renamed from src/core/bus-endpoint.h) | 0 | ||||
-rw-r--r-- | src/libcore/bus-policy.c (renamed from src/core/bus-policy.c) | 0 | ||||
-rw-r--r-- | src/libcore/bus-policy.h (renamed from src/core/bus-policy.h) | 0 | ||||
-rw-r--r-- | src/libcore/busname.c (renamed from src/core/busname.c) | 0 | ||||
-rw-r--r-- | src/libcore/busname.h (renamed from src/core/busname.h) | 0 | ||||
-rw-r--r-- | src/libcore/cgroup.c (renamed from src/core/cgroup.c) | 0 | ||||
-rw-r--r-- | src/libcore/cgroup.h (renamed from src/core/cgroup.h) | 0 | ||||
-rw-r--r-- | src/libcore/dbus-automount.c (renamed from src/core/dbus-automount.c) | 0 | ||||
-rw-r--r-- | src/libcore/dbus-automount.h (renamed from src/core/dbus-automount.h) | 0 | ||||
-rw-r--r-- | src/libcore/dbus-busname.c (renamed from src/core/dbus-busname.c) | 0 | ||||
-rw-r--r-- | src/libcore/dbus-busname.h (renamed from src/core/dbus-busname.h) | 0 | ||||
-rw-r--r-- | src/libcore/dbus-cgroup.c (renamed from src/core/dbus-cgroup.c) | 0 | ||||
-rw-r--r-- | src/libcore/dbus-cgroup.h (renamed from src/core/dbus-cgroup.h) | 2 | ||||
-rw-r--r-- | src/libcore/dbus-device.c (renamed from src/core/dbus-device.c) | 0 | ||||
-rw-r--r-- | src/libcore/dbus-device.h (renamed from src/core/dbus-device.h) | 0 | ||||
-rw-r--r-- | src/libcore/dbus-execute.c (renamed from src/core/dbus-execute.c) | 0 | ||||
-rw-r--r-- | src/libcore/dbus-execute.h (renamed from src/core/dbus-execute.h) | 2 | ||||
-rw-r--r-- | src/libcore/dbus-job.c (renamed from src/core/dbus-job.c) | 2 | ||||
-rw-r--r-- | src/libcore/dbus-job.h (renamed from src/core/dbus-job.h) | 2 | ||||
-rw-r--r-- | src/libcore/dbus-kill.c (renamed from src/core/dbus-kill.c) | 0 | ||||
-rw-r--r-- | src/libcore/dbus-kill.h (renamed from src/core/dbus-kill.h) | 2 | ||||
-rw-r--r-- | src/libcore/dbus-manager.c (renamed from src/core/dbus-manager.c) | 0 | ||||
-rw-r--r-- | src/libcore/dbus-manager.h (renamed from src/core/dbus-manager.h) | 0 | ||||
-rw-r--r-- | src/libcore/dbus-mount.c (renamed from src/core/dbus-mount.c) | 0 | ||||
-rw-r--r-- | src/libcore/dbus-mount.h (renamed from src/core/dbus-mount.h) | 2 | ||||
-rw-r--r-- | src/libcore/dbus-path.c (renamed from src/core/dbus-path.c) | 0 | ||||
-rw-r--r-- | src/libcore/dbus-path.h (renamed from src/core/dbus-path.h) | 0 | ||||
-rw-r--r-- | src/libcore/dbus-scope.c (renamed from src/core/dbus-scope.c) | 0 | ||||
-rw-r--r-- | src/libcore/dbus-scope.h (renamed from src/core/dbus-scope.h) | 2 | ||||
-rw-r--r-- | src/libcore/dbus-service.c (renamed from src/core/dbus-service.c) | 0 | ||||
-rw-r--r-- | src/libcore/dbus-service.h (renamed from src/core/dbus-service.h) | 2 | ||||
-rw-r--r-- | src/libcore/dbus-slice.c (renamed from src/core/dbus-slice.c) | 0 | ||||
-rw-r--r-- | src/libcore/dbus-slice.h (renamed from src/core/dbus-slice.h) | 2 | ||||
-rw-r--r-- | src/libcore/dbus-socket.c (renamed from src/core/dbus-socket.c) | 0 | ||||
-rw-r--r-- | src/libcore/dbus-socket.h (renamed from src/core/dbus-socket.h) | 2 | ||||
-rw-r--r-- | src/libcore/dbus-swap.c (renamed from src/core/dbus-swap.c) | 0 | ||||
-rw-r--r-- | src/libcore/dbus-swap.h (renamed from src/core/dbus-swap.h) | 2 | ||||
-rw-r--r-- | src/libcore/dbus-target.c (renamed from src/core/dbus-target.c) | 0 | ||||
-rw-r--r-- | src/libcore/dbus-target.h (renamed from src/core/dbus-target.h) | 2 | ||||
-rw-r--r-- | src/libcore/dbus-timer.c (renamed from src/core/dbus-timer.c) | 0 | ||||
-rw-r--r-- | src/libcore/dbus-timer.h (renamed from src/core/dbus-timer.h) | 2 | ||||
-rw-r--r-- | src/libcore/dbus-unit.c (renamed from src/core/dbus-unit.c) | 2 | ||||
-rw-r--r-- | src/libcore/dbus-unit.h (renamed from src/core/dbus-unit.h) | 2 | ||||
-rw-r--r-- | src/libcore/dbus.c (renamed from src/core/dbus.c) | 2 | ||||
-rw-r--r-- | src/libcore/dbus.h (renamed from src/core/dbus.h) | 0 | ||||
-rw-r--r-- | src/libcore/device.c (renamed from src/core/device.c) | 0 | ||||
-rw-r--r-- | src/libcore/device.h (renamed from src/core/device.h) | 0 | ||||
-rw-r--r-- | src/libcore/execute.c (renamed from src/core/execute.c) | 2 | ||||
-rw-r--r-- | src/libcore/execute.h (renamed from src/core/execute.h) | 0 | ||||
-rw-r--r-- | src/libcore/failure-action.c (renamed from src/core/failure-action.c) | 0 | ||||
-rw-r--r-- | src/libcore/failure-action.h (renamed from src/core/failure-action.h) | 0 | ||||
-rw-r--r-- | src/libcore/hostname-setup.c (renamed from src/core/hostname-setup.c) | 0 | ||||
-rw-r--r-- | src/libcore/hostname-setup.h (renamed from src/core/hostname-setup.h) | 0 | ||||
-rw-r--r-- | src/libcore/ima-setup.c (renamed from src/core/ima-setup.c) | 0 | ||||
-rw-r--r-- | src/libcore/ima-setup.h (renamed from src/core/ima-setup.h) | 0 | ||||
-rw-r--r-- | src/libcore/job.c (renamed from src/core/job.c) | 4 | ||||
-rw-r--r-- | src/libcore/job.h (renamed from src/core/job.h) | 2 | ||||
-rw-r--r-- | src/libcore/kill.c (renamed from src/core/kill.c) | 0 | ||||
-rw-r--r-- | src/libcore/kill.h (renamed from src/core/kill.h) | 0 | ||||
-rw-r--r-- | src/libcore/killall.c (renamed from src/core/killall.c) | 0 | ||||
-rw-r--r-- | src/libcore/killall.h (renamed from src/core/killall.h) | 0 | ||||
-rw-r--r-- | src/libcore/kmod-setup.c (renamed from src/core/kmod-setup.c) | 0 | ||||
-rw-r--r-- | src/libcore/kmod-setup.h (renamed from src/core/kmod-setup.h) | 0 | ||||
-rw-r--r-- | src/libcore/linux/auto_dev-ioctl.h (renamed from src/shared/linux/auto_dev-ioctl.h) | 0 | ||||
-rw-r--r-- | src/libcore/load-dropin.c (renamed from src/core/load-dropin.c) | 0 | ||||
-rw-r--r-- | src/libcore/load-dropin.h (renamed from src/core/load-dropin.h) | 0 | ||||
-rw-r--r-- | src/libcore/load-fragment-gperf.gperf.m4 (renamed from src/core/load-fragment-gperf.gperf.m4) | 0 | ||||
-rw-r--r-- | src/libcore/load-fragment.c (renamed from src/core/load-fragment.c) | 0 | ||||
-rw-r--r-- | src/libcore/load-fragment.h (renamed from src/core/load-fragment.h) | 0 | ||||
-rw-r--r-- | src/libcore/locale-setup.c (renamed from src/core/locale-setup.c) | 0 | ||||
-rw-r--r-- | src/libcore/locale-setup.h (renamed from src/core/locale-setup.h) | 0 | ||||
-rw-r--r-- | src/libcore/loopback-setup.c (renamed from src/core/loopback-setup.c) | 2 | ||||
-rw-r--r-- | src/libcore/loopback-setup.h (renamed from src/core/loopback-setup.h) | 0 | ||||
-rw-r--r-- | src/libcore/machine-id-setup.c (renamed from src/core/machine-id-setup.c) | 2 | ||||
-rw-r--r-- | src/libcore/machine-id-setup.h (renamed from src/core/machine-id-setup.h) | 0 | ||||
-rw-r--r-- | src/libcore/manager.c (renamed from src/core/manager.c) | 4 | ||||
-rw-r--r-- | src/libcore/manager.h (renamed from src/core/manager.h) | 4 | ||||
-rw-r--r-- | src/libcore/mount-setup.c (renamed from src/core/mount-setup.c) | 0 | ||||
-rw-r--r-- | src/libcore/mount-setup.h (renamed from src/core/mount-setup.h) | 0 | ||||
-rw-r--r-- | src/libcore/mount.c (renamed from src/core/mount.c) | 2 | ||||
-rw-r--r-- | src/libcore/mount.h (renamed from src/core/mount.h) | 0 | ||||
-rw-r--r-- | src/libcore/namespace.c (renamed from src/core/namespace.c) | 0 | ||||
-rw-r--r-- | src/libcore/namespace.h (renamed from src/core/namespace.h) | 0 | ||||
-rw-r--r-- | src/libcore/path.c (renamed from src/core/path.c) | 0 | ||||
-rw-r--r-- | src/libcore/path.h (renamed from src/core/path.h) | 0 | ||||
-rw-r--r-- | src/libcore/scope.c (renamed from src/core/scope.c) | 0 | ||||
-rw-r--r-- | src/libcore/scope.h (renamed from src/core/scope.h) | 0 | ||||
-rw-r--r-- | src/libcore/selinux-access.c (renamed from src/core/selinux-access.c) | 2 | ||||
-rw-r--r-- | src/libcore/selinux-access.h (renamed from src/core/selinux-access.h) | 2 | ||||
-rw-r--r-- | src/libcore/selinux-setup.c (renamed from src/core/selinux-setup.c) | 0 | ||||
-rw-r--r-- | src/libcore/selinux-setup.h (renamed from src/core/selinux-setup.h) | 0 | ||||
-rw-r--r-- | src/libcore/service.c (renamed from src/core/service.c) | 0 | ||||
-rw-r--r-- | src/libcore/service.h (renamed from src/core/service.h) | 0 | ||||
-rw-r--r-- | src/libcore/show-status.c (renamed from src/core/show-status.c) | 0 | ||||
-rw-r--r-- | src/libcore/show-status.h (renamed from src/core/show-status.h) | 0 | ||||
-rw-r--r-- | src/libcore/shutdown.c (renamed from src/core/shutdown.c) | 0 | ||||
-rw-r--r-- | src/libcore/slice.c (renamed from src/core/slice.c) | 0 | ||||
-rw-r--r-- | src/libcore/slice.h (renamed from src/core/slice.h) | 0 | ||||
-rw-r--r-- | src/libcore/smack-setup.c (renamed from src/core/smack-setup.c) | 0 | ||||
-rw-r--r-- | src/libcore/smack-setup.h (renamed from src/core/smack-setup.h) | 0 | ||||
-rw-r--r-- | src/libcore/socket.c (renamed from src/core/socket.c) | 2 | ||||
-rw-r--r-- | src/libcore/socket.h (renamed from src/core/socket.h) | 0 | ||||
-rw-r--r-- | src/libcore/swap.c (renamed from src/core/swap.c) | 0 | ||||
-rw-r--r-- | src/libcore/swap.h (renamed from src/core/swap.h) | 0 | ||||
-rw-r--r-- | src/libcore/target.c (renamed from src/core/target.c) | 0 | ||||
-rw-r--r-- | src/libcore/target.h (renamed from src/core/target.h) | 0 | ||||
-rw-r--r-- | src/libcore/timer.c (renamed from src/core/timer.c) | 0 | ||||
-rw-r--r-- | src/libcore/timer.h (renamed from src/core/timer.h) | 0 | ||||
-rw-r--r-- | src/libcore/transaction.c (renamed from src/core/transaction.c) | 0 | ||||
-rw-r--r-- | src/libcore/transaction.h (renamed from src/core/transaction.h) | 0 | ||||
-rw-r--r-- | src/libcore/umount.c (renamed from src/core/umount.c) | 0 | ||||
-rw-r--r-- | src/libcore/umount.h (renamed from src/core/umount.h) | 0 | ||||
-rw-r--r-- | src/libcore/unit-printf.c (renamed from src/core/unit-printf.c) | 0 | ||||
-rw-r--r-- | src/libcore/unit-printf.h (renamed from src/core/unit-printf.h) | 0 | ||||
-rw-r--r-- | src/libcore/unit.c (renamed from src/core/unit.c) | 4 | ||||
-rw-r--r-- | src/libcore/unit.h (renamed from src/core/unit.h) | 0 | ||||
-rw-r--r-- | src/libfirewall/Makefile | 43 | ||||
-rw-r--r-- | src/libfirewall/firewall-util.c (renamed from src/shared/firewall-util.c) | 0 | ||||
-rw-r--r-- | src/libfirewall/firewall-util.h (renamed from src/shared/firewall-util.h) | 0 | ||||
-rw-r--r-- | src/libshared/Makefile | 141 | ||||
-rw-r--r-- | src/libshared/acl-util.c (renamed from src/shared/acl-util.c) | 0 | ||||
-rw-r--r-- | src/libshared/acl-util.h (renamed from src/shared/acl-util.h) | 0 | ||||
-rw-r--r-- | src/libshared/acpi-fpdt.c (renamed from src/shared/acpi-fpdt.c) | 0 | ||||
-rw-r--r-- | src/libshared/acpi-fpdt.h (renamed from src/shared/acpi-fpdt.h) | 0 | ||||
-rw-r--r-- | src/libshared/apparmor-util.c (renamed from src/shared/apparmor-util.c) | 0 | ||||
-rw-r--r-- | src/libshared/apparmor-util.h (renamed from src/shared/apparmor-util.h) | 0 | ||||
-rw-r--r-- | src/libshared/architecture.c (renamed from src/shared/architecture.c) | 0 | ||||
-rw-r--r-- | src/libshared/architecture.h (renamed from src/shared/architecture.h) | 0 | ||||
-rw-r--r-- | src/libshared/ask-password-api.c (renamed from src/shared/ask-password-api.c) | 0 | ||||
-rw-r--r-- | src/libshared/ask-password-api.h (renamed from src/shared/ask-password-api.h) | 0 | ||||
-rw-r--r-- | src/libshared/base-filesystem.c (renamed from src/shared/base-filesystem.c) | 0 | ||||
-rw-r--r-- | src/libshared/base-filesystem.h (renamed from src/shared/base-filesystem.h) | 0 | ||||
-rw-r--r-- | src/libshared/boot-timestamps.c (renamed from src/shared/boot-timestamps.c) | 0 | ||||
-rw-r--r-- | src/libshared/boot-timestamps.h (renamed from src/shared/boot-timestamps.h) | 0 | ||||
-rw-r--r-- | src/libshared/bus-util.c (renamed from src/shared/bus-util.c) | 10 | ||||
-rw-r--r-- | src/libshared/bus-util.h (renamed from src/shared/bus-util.h) | 6 | ||||
-rw-r--r-- | src/libshared/cgroup-show.c (renamed from src/shared/cgroup-show.c) | 0 | ||||
-rw-r--r-- | src/libshared/cgroup-show.h (renamed from src/shared/cgroup-show.h) | 0 | ||||
-rw-r--r-- | src/libshared/clean-ipc.c (renamed from src/shared/clean-ipc.c) | 0 | ||||
-rw-r--r-- | src/libshared/clean-ipc.h (renamed from src/shared/clean-ipc.h) | 0 | ||||
-rw-r--r-- | src/libshared/condition.c (renamed from src/shared/condition.c) | 2 | ||||
-rw-r--r-- | src/libshared/condition.h (renamed from src/shared/condition.h) | 0 | ||||
-rw-r--r-- | src/libshared/conf-parser.c (renamed from src/shared/conf-parser.c) | 0 | ||||
-rw-r--r-- | src/libshared/conf-parser.h (renamed from src/shared/conf-parser.h) | 0 | ||||
-rw-r--r-- | src/libshared/dev-setup.c (renamed from src/shared/dev-setup.c) | 0 | ||||
-rw-r--r-- | src/libshared/dev-setup.h (renamed from src/shared/dev-setup.h) | 0 | ||||
-rw-r--r-- | src/libshared/dns-domain.c (renamed from src/shared/dns-domain.c) | 0 | ||||
-rw-r--r-- | src/libshared/dns-domain.h (renamed from src/shared/dns-domain.h) | 0 | ||||
-rw-r--r-- | src/libshared/dropin.c (renamed from src/shared/dropin.c) | 0 | ||||
-rw-r--r-- | src/libshared/dropin.h (renamed from src/shared/dropin.h) | 0 | ||||
-rw-r--r-- | src/libshared/efivars.c (renamed from src/shared/efivars.c) | 2 | ||||
-rw-r--r-- | src/libshared/efivars.h (renamed from src/shared/efivars.h) | 2 | ||||
-rw-r--r-- | src/libshared/fstab-util.c (renamed from src/shared/fstab-util.c) | 0 | ||||
-rw-r--r-- | src/libshared/fstab-util.h (renamed from src/shared/fstab-util.h) | 0 | ||||
-rw-r--r-- | src/libshared/generator.c (renamed from src/shared/generator.c) | 0 | ||||
-rw-r--r-- | src/libshared/generator.h (renamed from src/shared/generator.h) | 0 | ||||
-rw-r--r-- | src/libshared/gpt.h (renamed from src/shared/gpt.h) | 2 | ||||
-rw-r--r-- | src/libshared/ima-util.c (renamed from src/shared/ima-util.c) | 0 | ||||
-rw-r--r-- | src/libshared/ima-util.h (renamed from src/shared/ima-util.h) | 0 | ||||
-rw-r--r-- | src/libshared/import-util.c (renamed from src/shared/import-util.c) | 0 | ||||
-rw-r--r-- | src/libshared/import-util.h (renamed from src/shared/import-util.h) | 0 | ||||
-rw-r--r-- | src/libshared/initreq.h (renamed from src/shared/initreq.h) | 0 | ||||
-rw-r--r-- | src/libshared/install-printf.c (renamed from src/shared/install-printf.c) | 0 | ||||
-rw-r--r-- | src/libshared/install-printf.h (renamed from src/shared/install-printf.h) | 0 | ||||
-rw-r--r-- | src/libshared/install.c (renamed from src/shared/install.c) | 0 | ||||
-rw-r--r-- | src/libshared/install.h (renamed from src/shared/install.h) | 0 | ||||
-rw-r--r-- | src/libshared/logs-show.c (renamed from src/shared/logs-show.c) | 4 | ||||
-rw-r--r-- | src/libshared/logs-show.h (renamed from src/shared/logs-show.h) | 2 | ||||
-rw-r--r-- | src/libshared/machine-image.c (renamed from src/shared/machine-image.c) | 0 | ||||
-rw-r--r-- | src/libshared/machine-image.h (renamed from src/shared/machine-image.h) | 0 | ||||
-rw-r--r-- | src/libshared/machine-pool.c (renamed from src/shared/machine-pool.c) | 4 | ||||
-rw-r--r-- | src/libshared/machine-pool.h (renamed from src/shared/machine-pool.h) | 2 | ||||
-rw-r--r-- | src/libshared/output-mode.h (renamed from src/shared/output-mode.h) | 0 | ||||
-rw-r--r-- | src/libshared/pager.c (renamed from src/shared/pager.c) | 0 | ||||
-rw-r--r-- | src/libshared/pager.h (renamed from src/shared/pager.h) | 0 | ||||
-rw-r--r-- | src/libshared/path-lookup.c (renamed from src/shared/path-lookup.c) | 0 | ||||
-rw-r--r-- | src/libshared/path-lookup.h (renamed from src/shared/path-lookup.h) | 0 | ||||
-rw-r--r-- | src/libshared/ptyfwd.c (renamed from src/shared/ptyfwd.c) | 2 | ||||
-rw-r--r-- | src/libshared/ptyfwd.h (renamed from src/shared/ptyfwd.h) | 2 | ||||
-rw-r--r-- | src/libshared/resolve-util.c (renamed from src/shared/resolve-util.c) | 0 | ||||
-rw-r--r-- | src/libshared/resolve-util.h (renamed from src/shared/resolve-util.h) | 0 | ||||
-rw-r--r-- | src/libshared/seccomp-util.c (renamed from src/shared/seccomp-util.c) | 0 | ||||
-rw-r--r-- | src/libshared/seccomp-util.h (renamed from src/shared/seccomp-util.h) | 0 | ||||
-rw-r--r-- | src/libshared/sleep-config.c (renamed from src/shared/sleep-config.c) | 0 | ||||
-rw-r--r-- | src/libshared/sleep-config.h (renamed from src/shared/sleep-config.h) | 0 | ||||
-rw-r--r-- | src/libshared/spawn-ask-password-agent.c (renamed from src/shared/spawn-ask-password-agent.c) | 0 | ||||
-rw-r--r-- | src/libshared/spawn-ask-password-agent.h (renamed from src/shared/spawn-ask-password-agent.h) | 0 | ||||
-rw-r--r-- | src/libshared/spawn-polkit-agent.c (renamed from src/shared/spawn-polkit-agent.c) | 0 | ||||
-rw-r--r-- | src/libshared/spawn-polkit-agent.h (renamed from src/shared/spawn-polkit-agent.h) | 0 | ||||
-rw-r--r-- | src/libshared/specifier.c (renamed from src/shared/specifier.c) | 2 | ||||
-rw-r--r-- | src/libshared/specifier.h (renamed from src/shared/specifier.h) | 0 | ||||
-rw-r--r-- | src/libshared/switch-root.c (renamed from src/shared/switch-root.c) | 0 | ||||
-rw-r--r-- | src/libshared/switch-root.h (renamed from src/shared/switch-root.h) | 0 | ||||
-rw-r--r-- | src/libshared/sysctl-util.c (renamed from src/shared/sysctl-util.c) | 0 | ||||
-rw-r--r-- | src/libshared/sysctl-util.h (renamed from src/shared/sysctl-util.h) | 0 | ||||
-rw-r--r-- | src/libshared/test-tables.h (renamed from src/shared/test-tables.h) | 0 | ||||
-rw-r--r-- | src/libshared/udev-util.h (renamed from src/shared/udev-util.h) | 0 | ||||
-rw-r--r-- | src/libshared/uid-range.c (renamed from src/shared/uid-range.c) | 0 | ||||
-rw-r--r-- | src/libshared/uid-range.h (renamed from src/shared/uid-range.h) | 0 | ||||
-rw-r--r-- | src/libshared/utmp-wtmp.c (renamed from src/shared/utmp-wtmp.c) | 0 | ||||
-rw-r--r-- | src/libshared/utmp-wtmp.h (renamed from src/shared/utmp-wtmp.h) | 0 | ||||
-rw-r--r-- | src/libshared/watchdog.c (renamed from src/shared/watchdog.c) | 0 | ||||
-rw-r--r-- | src/libshared/watchdog.h (renamed from src/shared/watchdog.h) | 0 | ||||
-rw-r--r--[l---------] | src/libsystemd-network/Makefile | 182 | ||||
-rw-r--r-- | src/libsystemd-network/dhcp-identifier.c | 2 | ||||
-rw-r--r-- | src/libsystemd-network/dhcp-identifier.h | 2 | ||||
-rw-r--r-- | src/libsystemd-network/dhcp-internal.h | 2 | ||||
-rw-r--r-- | src/libsystemd-network/dhcp-lease-internal.h | 2 | ||||
-rw-r--r-- | src/libsystemd-network/dhcp-server-internal.h | 4 | ||||
-rw-r--r-- | src/libsystemd-network/dhcp6-internal.h | 2 | ||||
-rw-r--r-- | src/libsystemd-network/dhcp6-lease-internal.h | 2 | ||||
-rw-r--r-- | src/libsystemd-network/dhcp6-option.c | 2 | ||||
-rw-r--r-- | src/libsystemd-network/lldp-internal.c | 2 | ||||
-rw-r--r-- | src/libsystemd-network/lldp-internal.h | 2 | ||||
-rw-r--r-- | src/libsystemd-network/lldp-network.h | 2 | ||||
-rw-r--r-- | src/libsystemd-network/lldp-port.h | 4 | ||||
-rw-r--r-- | src/libsystemd-network/lldp-tlv.h | 2 | ||||
-rw-r--r-- | src/libsystemd-network/network-internal.c | 2 | ||||
-rw-r--r-- | src/libsystemd-network/network-internal.h | 2 | ||||
-rw-r--r-- | src/libsystemd-network/sd-dhcp-client.c | 2 | ||||
-rw-r--r-- | src/libsystemd-network/sd-dhcp-lease.c | 2 | ||||
-rw-r--r-- | src/libsystemd-network/sd-dhcp-server.c | 2 | ||||
-rw-r--r-- | src/libsystemd-network/sd-dhcp6-client.c | 2 | ||||
-rw-r--r-- | src/libsystemd-network/sd-ipv4acd.c | 2 | ||||
-rw-r--r-- | src/libsystemd-network/sd-ipv4ll.c | 4 | ||||
-rw-r--r-- | src/libsystemd-network/sd-lldp.c | 2 | ||||
-rw-r--r-- | src/libsystemd-network/sd-ndisc.c | 2 | ||||
-rw-r--r-- | src/libsystemd-network/test-acd.c | 6 | ||||
-rw-r--r-- | src/libsystemd-network/test-dhcp-client.c | 4 | ||||
-rw-r--r-- | src/libsystemd-network/test-dhcp-server.c | 4 | ||||
-rw-r--r-- | src/libsystemd-network/test-dhcp6-client.c | 4 | ||||
-rw-r--r-- | src/libsystemd-network/test-ipv4ll-manual.c | 6 | ||||
-rw-r--r-- | src/libsystemd-network/test-ipv4ll.c | 2 | ||||
-rw-r--r-- | src/libsystemd-network/test-lldp.c | 4 | ||||
-rw-r--r-- | src/libsystemd-network/test-ndisc-rs.c | 2 | ||||
-rw-r--r--[l---------] | src/libsystemd/Makefile | 131 | ||||
-rw-r--r-- | src/libsystemd/compat-libs/.gitignore (renamed from src/compat-libs/.gitignore) | 0 | ||||
-rw-r--r-- | src/libsystemd/compat-libs/Makefile | 147 | ||||
-rw-r--r-- | src/libsystemd/compat-libs/libsystemd-daemon.pc.in (renamed from src/compat-libs/libsystemd-daemon.pc.in) | 0 | ||||
-rw-r--r-- | src/libsystemd/compat-libs/libsystemd-daemon.sym (renamed from src/compat-libs/libsystemd-daemon.sym) | 0 | ||||
-rw-r--r-- | src/libsystemd/compat-libs/libsystemd-id128.pc.in (renamed from src/compat-libs/libsystemd-id128.pc.in) | 0 | ||||
-rw-r--r-- | src/libsystemd/compat-libs/libsystemd-id128.sym (renamed from src/compat-libs/libsystemd-id128.sym) | 0 | ||||
-rw-r--r-- | src/libsystemd/compat-libs/libsystemd-journal.pc.in (renamed from src/compat-libs/libsystemd-journal.pc.in) | 0 | ||||
-rw-r--r-- | src/libsystemd/compat-libs/libsystemd-journal.sym (renamed from src/compat-libs/libsystemd-journal.sym) | 0 | ||||
-rw-r--r-- | src/libsystemd/compat-libs/libsystemd-login.pc.in (renamed from src/compat-libs/libsystemd-login.pc.in) | 0 | ||||
-rw-r--r-- | src/libsystemd/compat-libs/libsystemd-login.sym (renamed from src/compat-libs/libsystemd-login.sym) | 0 | ||||
-rw-r--r-- | src/libsystemd/compat-libs/linkwarning.h (renamed from src/compat-libs/linkwarning.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/include/systemd/_sd-common.h (renamed from src/systemd/_sd-common.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/include/systemd/sd-bus-protocol.h (renamed from src/systemd/sd-bus-protocol.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/include/systemd/sd-bus-vtable.h (renamed from src/systemd/sd-bus-vtable.h) | 2 | ||||
-rw-r--r-- | src/libsystemd/include/systemd/sd-bus.h (renamed from src/systemd/sd-bus.h) | 8 | ||||
-rw-r--r-- | src/libsystemd/include/systemd/sd-daemon.h (renamed from src/systemd/sd-daemon.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/include/systemd/sd-device.h (renamed from src/systemd/sd-device.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/include/systemd/sd-dhcp-client.h (renamed from src/systemd/sd-dhcp-client.h) | 4 | ||||
-rw-r--r-- | src/libsystemd/include/systemd/sd-dhcp-lease.h (renamed from src/systemd/sd-dhcp-lease.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/include/systemd/sd-dhcp-server.h (renamed from src/systemd/sd-dhcp-server.h) | 2 | ||||
-rw-r--r-- | src/libsystemd/include/systemd/sd-dhcp6-client.h (renamed from src/systemd/sd-dhcp6-client.h) | 4 | ||||
-rw-r--r-- | src/libsystemd/include/systemd/sd-dhcp6-lease.h (renamed from src/systemd/sd-dhcp6-lease.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/include/systemd/sd-event.h (renamed from src/systemd/sd-event.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/include/systemd/sd-hwdb.h (renamed from src/systemd/sd-hwdb.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/include/systemd/sd-id128.h (renamed from src/systemd/sd-id128.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/include/systemd/sd-ipv4acd.h (renamed from src/systemd/sd-ipv4acd.h) | 2 | ||||
-rw-r--r-- | src/libsystemd/include/systemd/sd-ipv4ll.h (renamed from src/systemd/sd-ipv4ll.h) | 2 | ||||
-rw-r--r-- | src/libsystemd/include/systemd/sd-journal.h (renamed from src/systemd/sd-journal.h) | 2 | ||||
-rw-r--r-- | src/libsystemd/include/systemd/sd-lldp.h (renamed from src/systemd/sd-lldp.h) | 2 | ||||
-rw-r--r-- | src/libsystemd/include/systemd/sd-login.h (renamed from src/systemd/sd-login.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/include/systemd/sd-messages.h (renamed from src/systemd/sd-messages.h) | 2 | ||||
-rw-r--r-- | src/libsystemd/include/systemd/sd-ndisc.h (renamed from src/systemd/sd-ndisc.h) | 2 | ||||
-rw-r--r-- | src/libsystemd/include/systemd/sd-netlink.h (renamed from src/systemd/sd-netlink.h) | 2 | ||||
-rw-r--r-- | src/libsystemd/include/systemd/sd-network.h (renamed from src/systemd/sd-network.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/include/systemd/sd-path.h (renamed from src/systemd/sd-path.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/include/systemd/sd-resolve.h (renamed from src/systemd/sd-resolve.h) | 2 | ||||
-rw-r--r-- | src/libsystemd/include/systemd/sd-utf8.h (renamed from src/systemd/sd-utf8.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/Makefile | 260 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/DIFFERENCES (renamed from src/libsystemd/sd-bus/DIFFERENCES) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/GVARIANT-SERIALIZATION (renamed from src/libsystemd/sd-bus/GVARIANT-SERIALIZATION) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/PORTING-DBUS1 (renamed from src/libsystemd/sd-bus/PORTING-DBUS1) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/bus-bloom.c (renamed from src/libsystemd/sd-bus/bus-bloom.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/bus-bloom.h (renamed from src/libsystemd/sd-bus/bus-bloom.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/bus-common-errors.c (renamed from src/libsystemd/sd-bus/bus-common-errors.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/bus-common-errors.h (renamed from src/libsystemd/sd-bus/bus-common-errors.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/bus-container.c (renamed from src/libsystemd/sd-bus/bus-container.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/bus-container.h (renamed from src/libsystemd/sd-bus/bus-container.h) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/bus-control.c (renamed from src/libsystemd/sd-bus/bus-control.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/bus-control.h (renamed from src/libsystemd/sd-bus/bus-control.h) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/bus-convenience.c (renamed from src/libsystemd/sd-bus/bus-convenience.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/bus-creds.c (renamed from src/libsystemd/sd-bus/bus-creds.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/bus-creds.h (renamed from src/libsystemd/sd-bus/bus-creds.h) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/bus-dump.c (renamed from src/libsystemd/sd-bus/bus-dump.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/bus-dump.h (renamed from src/libsystemd/sd-bus/bus-dump.h) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/bus-error.c (renamed from src/libsystemd/sd-bus/bus-error.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/bus-error.h (renamed from src/libsystemd/sd-bus/bus-error.h) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/bus-gvariant.c (renamed from src/libsystemd/sd-bus/bus-gvariant.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/bus-gvariant.h (renamed from src/libsystemd/sd-bus/bus-gvariant.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/bus-internal.c (renamed from src/libsystemd/sd-bus/bus-internal.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/bus-internal.h (renamed from src/libsystemd/sd-bus/bus-internal.h) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/bus-introspect.c (renamed from src/libsystemd/sd-bus/bus-introspect.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/bus-introspect.h (renamed from src/libsystemd/sd-bus/bus-introspect.h) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/bus-kernel.c (renamed from src/libsystemd/sd-bus/bus-kernel.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/bus-kernel.h (renamed from src/libsystemd/sd-bus/bus-kernel.h) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/bus-match.c (renamed from src/libsystemd/sd-bus/bus-match.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/bus-match.h (renamed from src/libsystemd/sd-bus/bus-match.h) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/bus-message.c (renamed from src/libsystemd/sd-bus/bus-message.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/bus-message.h (renamed from src/libsystemd/sd-bus/bus-message.h) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/bus-objects.c (renamed from src/libsystemd/sd-bus/bus-objects.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/bus-objects.h (renamed from src/libsystemd/sd-bus/bus-objects.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/bus-protocol.h (renamed from src/libsystemd/sd-bus/bus-protocol.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/bus-signature.c (renamed from src/libsystemd/sd-bus/bus-signature.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/bus-signature.h (renamed from src/libsystemd/sd-bus/bus-signature.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/bus-slot.c (renamed from src/libsystemd/sd-bus/bus-slot.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/bus-slot.h (renamed from src/libsystemd/sd-bus/bus-slot.h) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/bus-socket.c (renamed from src/libsystemd/sd-bus/bus-socket.c) | 4 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/bus-socket.h (renamed from src/libsystemd/sd-bus/bus-socket.h) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/bus-track.c (renamed from src/libsystemd/sd-bus/bus-track.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/bus-track.h (renamed from src/libsystemd/sd-bus/bus-track.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/bus-type.c (renamed from src/libsystemd/sd-bus/bus-type.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/bus-type.h (renamed from src/libsystemd/sd-bus/bus-type.h) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/kdbus.h (renamed from src/libsystemd/sd-bus/kdbus.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/sd-bus.c (renamed from src/libsystemd/sd-bus/sd-bus.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/test-bus-benchmark.c (renamed from src/libsystemd/sd-bus/test-bus-benchmark.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/test-bus-chat.c (renamed from src/libsystemd/sd-bus/test-bus-chat.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/test-bus-cleanup.c (renamed from src/libsystemd/sd-bus/test-bus-cleanup.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/test-bus-creds.c (renamed from src/libsystemd/sd-bus/test-bus-creds.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/test-bus-error.c (renamed from src/libsystemd/sd-bus/test-bus-error.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/test-bus-gvariant.c (renamed from src/libsystemd/sd-bus/test-bus-gvariant.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/test-bus-introspect.c (renamed from src/libsystemd/sd-bus/test-bus-introspect.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/test-bus-kernel-bloom.c (renamed from src/libsystemd/sd-bus/test-bus-kernel-bloom.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/test-bus-kernel.c (renamed from src/libsystemd/sd-bus/test-bus-kernel.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/test-bus-marshal.c (renamed from src/libsystemd/sd-bus/test-bus-marshal.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/test-bus-match.c (renamed from src/libsystemd/sd-bus/test-bus-match.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/test-bus-objects.c (renamed from src/libsystemd/sd-bus/test-bus-objects.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/test-bus-proxy.c (renamed from src/libsystemd/sd-bus/test-bus-proxy.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/test-bus-server.c (renamed from src/libsystemd/sd-bus/test-bus-server.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/test-bus-signature.c (renamed from src/libsystemd/sd-bus/test-bus-signature.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/test-bus-zero-copy.c (renamed from src/libsystemd/sd-bus/test-bus-zero-copy.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-daemon/sd-daemon.c (renamed from src/libsystemd/sd-daemon/sd-daemon.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-device/device-enumerator-private.h (renamed from src/libsystemd/sd-device/device-enumerator-private.h) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-device/device-enumerator.c (renamed from src/libsystemd/sd-device/device-enumerator.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-device/device-internal.h (renamed from src/libsystemd/sd-device/device-internal.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-device/device-private.c (renamed from src/libsystemd/sd-device/device-private.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-device/device-private.h (renamed from src/libsystemd/sd-device/device-private.h) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-device/device-util.h (renamed from src/libsystemd/sd-device/device-util.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-device/sd-device.c (renamed from src/libsystemd/sd-device/sd-device.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-event/sd-event.c (renamed from src/libsystemd/sd-event/sd-event.c) | 6 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-event/test-event.c (renamed from src/libsystemd/sd-event/test-event.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-hwdb/hwdb-internal.h (renamed from src/libsystemd/sd-hwdb/hwdb-internal.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-hwdb/hwdb-util.h (renamed from src/libsystemd/sd-hwdb/hwdb-util.h) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-hwdb/sd-hwdb.c (renamed from src/libsystemd/sd-hwdb/sd-hwdb.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-id128/sd-id128.c (renamed from src/libsystemd/sd-id128/sd-id128.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-login/sd-login.c (renamed from src/libsystemd/sd-login/sd-login.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-login/test-login.c (renamed from src/libsystemd/sd-login/test-login.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-netlink/local-addresses.c (renamed from src/libsystemd/sd-netlink/local-addresses.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-netlink/local-addresses.h (renamed from src/libsystemd/sd-netlink/local-addresses.h) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-netlink/netlink-internal.h (renamed from src/libsystemd/sd-netlink/netlink-internal.h) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-netlink/netlink-message.c (renamed from src/libsystemd/sd-netlink/netlink-message.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-netlink/netlink-socket.c (renamed from src/libsystemd/sd-netlink/netlink-socket.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-netlink/netlink-types.c (renamed from src/libsystemd/sd-netlink/netlink-types.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-netlink/netlink-types.h (renamed from src/libsystemd/sd-netlink/netlink-types.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-netlink/netlink-util.c (renamed from src/libsystemd/sd-netlink/netlink-util.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-netlink/netlink-util.h (renamed from src/libsystemd/sd-netlink/netlink-util.h) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-netlink/rtnl-message.c (renamed from src/libsystemd/sd-netlink/rtnl-message.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-netlink/sd-netlink.c (renamed from src/libsystemd/sd-netlink/sd-netlink.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-netlink/test-local-addresses.c (renamed from src/libsystemd/sd-netlink/test-local-addresses.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-netlink/test-netlink.c (renamed from src/libsystemd/sd-netlink/test-netlink.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-network/network-util.c (renamed from src/libsystemd/sd-network/network-util.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-network/network-util.h (renamed from src/libsystemd/sd-network/network-util.h) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-network/sd-network.c (renamed from src/libsystemd/sd-network/sd-network.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-path/sd-path.c (renamed from src/libsystemd/sd-path/sd-path.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-resolve/sd-resolve.c (renamed from src/libsystemd/sd-resolve/sd-resolve.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-resolve/test-resolve.c (renamed from src/libsystemd/sd-resolve/test-resolve.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-utf8/sd-utf8.c (renamed from src/libsystemd/sd-utf8/sd-utf8.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-journal-internal/Makefile | 112 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-journal-internal/audit-type.c (renamed from src/journal/audit-type.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-journal-internal/audit-type.h (renamed from src/journal/audit-type.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-journal-internal/catalog.c (renamed from src/journal/catalog.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-journal-internal/catalog.h (renamed from src/journal/catalog.h) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-journal-internal/compress.c (renamed from src/journal/compress.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-journal-internal/compress.h (renamed from src/journal/compress.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-journal-internal/fsprg.c (renamed from src/journal/fsprg.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-journal-internal/fsprg.h (renamed from src/journal/fsprg.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-journal-internal/journal-authenticate.c (renamed from src/journal/journal-authenticate.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-journal-internal/journal-authenticate.h (renamed from src/journal/journal-authenticate.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-journal-internal/journal-def.h (renamed from src/journal/journal-def.h) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-journal-internal/journal-file.c (renamed from src/journal/journal-file.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-journal-internal/journal-file.h (renamed from src/journal/journal-file.h) | 4 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-journal-internal/journal-internal.h (renamed from src/journal/journal-internal.h) | 4 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-journal-internal/journal-send.c (renamed from src/journal/journal-send.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-journal-internal/journal-vacuum.c (renamed from src/journal/journal-vacuum.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-journal-internal/journal-vacuum.h (renamed from src/journal/journal-vacuum.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-journal-internal/journal-verify.c (renamed from src/journal/journal-verify.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-journal-internal/journal-verify.h (renamed from src/journal/journal-verify.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-journal-internal/lookup3.c (renamed from src/journal/lookup3.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-journal-internal/lookup3.h (renamed from src/journal/lookup3.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-journal-internal/mmap-cache.c (renamed from src/journal/mmap-cache.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-journal-internal/mmap-cache.h (renamed from src/journal/mmap-cache.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-journal-internal/sd-journal.c (renamed from src/journal/sd-journal.c) | 2 | ||||
l--------- | src/libsystemd/sd-bus/Makefile | 1 | ||||
l--------- | src/libsystemd/sd-daemon/Makefile | 1 | ||||
l--------- | src/libsystemd/sd-device/Makefile | 1 | ||||
l--------- | src/libsystemd/sd-event/Makefile | 1 | ||||
l--------- | src/libsystemd/sd-hwdb/Makefile | 1 | ||||
l--------- | src/libsystemd/sd-id128/Makefile | 1 | ||||
l--------- | src/libsystemd/sd-login/Makefile | 1 | ||||
l--------- | src/libsystemd/sd-netlink/Makefile | 1 | ||||
l--------- | src/libsystemd/sd-network/Makefile | 1 | ||||
l--------- | src/libsystemd/sd-path/Makefile | 1 | ||||
l--------- | src/libsystemd/sd-resolve/Makefile | 1 | ||||
l--------- | src/libsystemd/sd-utf8/Makefile | 1 | ||||
l--------- | src/libudev/Makefile | 1 | ||||
-rw-r--r-- | src/libudev/include/libudev.h (renamed from src/libudev/libudev.h) | 0 | ||||
-rw-r--r-- | src/libudev/src/.gitignore (renamed from src/libudev/.gitignore) | 0 | ||||
-rw-r--r-- | src/libudev/src/Makefile | 78 | ||||
-rw-r--r-- | src/libudev/src/libudev-device-internal.h (renamed from src/libudev/libudev-device-internal.h) | 2 | ||||
-rw-r--r-- | src/libudev/src/libudev-device-private.c (renamed from src/libudev/libudev-device-private.c) | 0 | ||||
-rw-r--r-- | src/libudev/src/libudev-device.c (renamed from src/libudev/libudev-device.c) | 2 | ||||
-rw-r--r-- | src/libudev/src/libudev-enumerate.c (renamed from src/libudev/libudev-enumerate.c) | 2 | ||||
-rw-r--r-- | src/libudev/src/libudev-hwdb.c (renamed from src/libudev/libudev-hwdb.c) | 2 | ||||
-rw-r--r-- | src/libudev/src/libudev-list.c (renamed from src/libudev/libudev-list.c) | 0 | ||||
-rw-r--r-- | src/libudev/src/libudev-monitor.c (renamed from src/libudev/libudev-monitor.c) | 0 | ||||
-rw-r--r-- | src/libudev/src/libudev-private.h (renamed from src/libudev/libudev-private.h) | 0 | ||||
-rw-r--r-- | src/libudev/src/libudev-queue.c (renamed from src/libudev/libudev-queue.c) | 0 | ||||
-rw-r--r-- | src/libudev/src/libudev-util.c (renamed from src/libudev/libudev-util.c) | 0 | ||||
-rw-r--r-- | src/libudev/src/libudev.c (renamed from src/libudev/libudev.c) | 0 | ||||
-rw-r--r-- | src/libudev/src/libudev.pc.in (renamed from src/libudev/libudev.pc.in) | 0 | ||||
-rw-r--r-- | src/libudev/src/libudev.sym (renamed from src/libudev/libudev.sym) | 0 | ||||
-rw-r--r-- | src/libudev/src/udev.h (renamed from src/udev/udev.h) | 2 | ||||
-rw-r--r--[l---------] | src/locale/Makefile | 92 | ||||
-rw-r--r-- | src/locale/localectl.c | 2 | ||||
-rw-r--r-- | src/locale/localed.c | 2 | ||||
-rw-r--r--[l---------] | src/login/Makefile | 245 | ||||
-rw-r--r-- | src/login/inhibit.c | 2 | ||||
-rw-r--r-- | src/login/loginctl.c | 2 | ||||
-rw-r--r-- | src/login/logind-button.c | 2 | ||||
-rw-r--r-- | src/login/logind-dbus.c | 2 | ||||
-rw-r--r-- | src/login/logind-seat.c | 2 | ||||
-rw-r--r-- | src/login/logind-session.c | 2 | ||||
-rw-r--r-- | src/login/logind-utmp.c | 2 | ||||
-rw-r--r-- | src/login/logind.c | 2 | ||||
-rw-r--r-- | src/login/logind.h | 4 | ||||
-rw-r--r-- | src/login/test-inhibit.c | 2 | ||||
-rw-r--r--[l---------] | src/machine-id-setup/Makefile | 39 | ||||
l--------- | src/machine/Makefile | 1 | ||||
-rw-r--r--[l---------] | src/modules-load/Makefile | 62 | ||||
-rw-r--r--[l---------] | src/network/Makefile | 202 | ||||
-rw-r--r-- | src/network/networkctl.c | 8 | ||||
-rw-r--r-- | src/network/networkd-dhcp6.c | 2 | ||||
-rw-r--r-- | src/network/networkd-link.h | 12 | ||||
-rw-r--r-- | src/network/networkd-manager.c | 4 | ||||
-rw-r--r-- | src/network/networkd-ndisc.c | 2 | ||||
-rw-r--r-- | src/network/networkd-netdev-bond.c | 2 | ||||
-rw-r--r-- | src/network/networkd-netdev-tunnel.c | 2 | ||||
-rw-r--r-- | src/network/networkd-netdev-veth.c | 2 | ||||
-rw-r--r-- | src/network/networkd-netdev-vxlan.c | 2 | ||||
-rw-r--r-- | src/network/networkd-wait-online-link.c | 2 | ||||
-rw-r--r-- | src/network/networkd-wait-online.c | 2 | ||||
-rw-r--r-- | src/network/networkd-wait-online.h | 6 | ||||
-rw-r--r-- | src/network/networkd.c | 2 | ||||
-rw-r--r-- | src/network/networkd.h | 6 | ||||
l--------- | src/notify/Makefile | 1 | ||||
l--------- | src/nspawn/Makefile | 1 | ||||
-rw-r--r--[l---------] | src/nss-myhostname/Makefile | 49 | ||||
l--------- | src/nss-mymachines/Makefile | 1 | ||||
l--------- | src/nss-resolve/Makefile | 1 | ||||
l--------- | src/path/Makefile | 1 | ||||
l--------- | src/quotacheck/Makefile | 1 | ||||
l--------- | src/random-seed/Makefile | 1 | ||||
l--------- | src/rc-local-generator/Makefile | 1 | ||||
l--------- | src/remount-fs/Makefile | 1 | ||||
l--------- | src/reply-password/Makefile | 1 | ||||
l--------- | src/resolve/Makefile | 1 | ||||
l--------- | src/rfkill/Makefile | 1 | ||||
l--------- | src/run/Makefile | 1 | ||||
l--------- | src/shared/Makefile | 1 | ||||
-rw-r--r--[l---------] | src/sleep/Makefile | 34 | ||||
-rw-r--r-- | src/sleep/sleep.c | 2 | ||||
-rw-r--r--[l---------] | src/socket-proxy/Makefile | 35 | ||||
-rw-r--r-- | src/socket-proxy/socket-proxyd.c | 6 | ||||
-rw-r--r--[l---------] | src/sysctl/Makefile | 34 | ||||
l--------- | src/system-update-generator/Makefile | 1 | ||||
l--------- | src/systemctl/Makefile | 1 | ||||
-rw-r--r-- | src/systemd-ac-power/Makefile | 33 | ||||
-rw-r--r-- | src/systemd-ac-power/ac-power.c (renamed from src/ac-power/ac-power.c) | 0 | ||||
-rw-r--r-- | src/systemd-activate/Makefile | 37 | ||||
-rw-r--r-- | src/systemd-activate/activate.c (renamed from src/activate/activate.c) | 2 | ||||
-rw-r--r-- | src/systemd-activate/systemd-activate.xml | 204 | ||||
-rw-r--r-- | src/systemd-analyze/.gitignore (renamed from src/analyze/.gitignore) | 0 | ||||
-rw-r--r-- | src/systemd-analyze/Makefile | 40 | ||||
-rw-r--r-- | src/systemd-analyze/analyze-verify.c (renamed from src/analyze/analyze-verify.c) | 0 | ||||
-rw-r--r-- | src/systemd-analyze/analyze-verify.h (renamed from src/analyze/analyze-verify.h) | 0 | ||||
-rw-r--r-- | src/systemd-analyze/analyze.c (renamed from src/analyze/analyze.c) | 2 | ||||
-rw-r--r-- | src/systemd-ask-password/Makefile | 33 | ||||
-rw-r--r-- | src/systemd-ask-password/ask-password.c (renamed from src/ask-password/ask-password.c) | 0 | ||||
-rw-r--r-- | src/systemd-backlight/Makefile | 44 | ||||
-rw-r--r-- | src/systemd-backlight/backlight.c (renamed from src/backlight/backlight.c) | 0 | ||||
-rw-r--r-- | src/systemd-binfmt/Makefile | 57 | ||||
-rw-r--r-- | src/systemd-binfmt/binfmt.c (renamed from src/binfmt/binfmt.c) | 0 | ||||
-rw-r--r-- | src/systemd-bootchart/Makefile | 52 | ||||
-rw-r--r-- | src/systemd-bootchart/bootchart.c (renamed from src/bootchart/bootchart.c) | 2 | ||||
-rw-r--r-- | src/systemd-bootchart/bootchart.conf (renamed from src/bootchart/bootchart.conf) | 0 | ||||
-rw-r--r-- | src/systemd-bootchart/bootchart.h (renamed from src/bootchart/bootchart.h) | 0 | ||||
-rw-r--r-- | src/systemd-bootchart/store.c (renamed from src/bootchart/store.c) | 0 | ||||
-rw-r--r-- | src/systemd-bootchart/store.h (renamed from src/bootchart/store.h) | 0 | ||||
-rw-r--r-- | src/systemd-bootchart/svg.c (renamed from src/bootchart/svg.c) | 0 | ||||
-rw-r--r-- | src/systemd-bootchart/svg.h (renamed from src/bootchart/svg.h) | 0 | ||||
-rw-r--r-- | src/systemd-bus-proxyd/Makefile | 57 | ||||
-rw-r--r-- | src/systemd-bus-proxyd/bus-proxyd.c (renamed from src/bus-proxyd/bus-proxyd.c) | 2 | ||||
-rw-r--r-- | src/systemd-cgls/Makefile | 33 | ||||
-rw-r--r-- | src/systemd-cgls/cgls.c (renamed from src/cgls/cgls.c) | 2 | ||||
-rw-r--r-- | src/systemd-cgroups-agent/Makefile | 33 | ||||
-rw-r--r-- | src/systemd-cgroups-agent/cgroups-agent.c (renamed from src/cgroups-agent/cgroups-agent.c) | 2 | ||||
-rw-r--r-- | src/systemd-cgtop/Makefile | 33 | ||||
-rw-r--r-- | src/systemd-cgtop/cgtop.c (renamed from src/cgtop/cgtop.c) | 2 | ||||
-rw-r--r-- | src/systemd-cryptsetup/Makefile | 60 | ||||
-rw-r--r-- | src/systemd-cryptsetup/cryptsetup-generator.c (renamed from src/cryptsetup/cryptsetup-generator.c) | 0 | ||||
-rw-r--r-- | src/systemd-cryptsetup/cryptsetup.c (renamed from src/cryptsetup/cryptsetup.c) | 2 | ||||
-rw-r--r-- | src/systemd-dbus1-generator/Makefile | 50 | ||||
-rw-r--r-- | src/systemd-dbus1-generator/dbus1-generator.c (renamed from src/dbus1-generator/dbus1-generator.c) | 0 | ||||
-rw-r--r-- | src/systemd-debug-generator/Makefile | 33 | ||||
-rw-r--r-- | src/systemd-debug-generator/debug-generator.c (renamed from src/debug-generator/debug-generator.c) | 0 | ||||
-rw-r--r-- | src/systemd-delta/Makefile | 33 | ||||
-rw-r--r-- | src/systemd-delta/delta.c (renamed from src/delta/delta.c) | 0 | ||||
-rw-r--r-- | src/systemd-detect-virt/Makefile | 36 | ||||
-rw-r--r-- | src/systemd-detect-virt/detect-virt.c (renamed from src/detect-virt/detect-virt.c) | 0 | ||||
-rw-r--r-- | src/systemd-escape/Makefile | 33 | ||||
-rw-r--r-- | src/systemd-escape/escape.c (renamed from src/escape/escape.c) | 0 | ||||
-rw-r--r-- | src/systemd-firstboot/Makefile | 48 | ||||
-rw-r--r-- | src/systemd-firstboot/firstboot.c (renamed from src/firstboot/firstboot.c) | 0 | ||||
-rw-r--r-- | src/systemd-fsck/Makefile | 33 | ||||
-rw-r--r-- | src/systemd-fsck/fsck.c (renamed from src/fsck/fsck.c) | 4 | ||||
-rw-r--r-- | src/systemd-fstab-generator/Makefile | 34 | ||||
-rw-r--r-- | src/systemd-fstab-generator/fstab-generator.c (renamed from src/fstab-generator/fstab-generator.c) | 0 | ||||
-rw-r--r-- | src/systemd-getty-generator/Makefile | 33 | ||||
-rw-r--r-- | src/systemd-getty-generator/getty-generator.c (renamed from src/getty-generator/getty-generator.c) | 0 | ||||
-rw-r--r-- | src/systemd-gpt-auto-generator/Makefile | 44 | ||||
-rw-r--r-- | src/systemd-gpt-auto-generator/gpt-auto-generator.c (renamed from src/gpt-auto-generator/gpt-auto-generator.c) | 2 | ||||
-rw-r--r-- | src/systemd-hibernate-resume/Makefile | 61 | ||||
-rw-r--r-- | src/systemd-hibernate-resume/hibernate-resume-generator.c (renamed from src/hibernate-resume/hibernate-resume-generator.c) | 0 | ||||
-rw-r--r-- | src/systemd-hibernate-resume/hibernate-resume.c (renamed from src/hibernate-resume/hibernate-resume.c) | 0 | ||||
-rw-r--r-- | src/systemd-hwdb/Makefile | 77 | ||||
-rw-r--r-- | src/systemd-hwdb/hwdb.c (renamed from src/hwdb/hwdb.c) | 0 | ||||
-rw-r--r-- | src/systemd-notify/Makefile | 33 | ||||
-rw-r--r-- | src/systemd-notify/notify.c (renamed from src/notify/notify.c) | 2 | ||||
-rw-r--r-- | src/systemd-nspawn/.gitignore (renamed from src/nspawn/.gitignore) | 0 | ||||
-rw-r--r-- | src/systemd-nspawn/Makefile | 70 | ||||
-rw-r--r-- | src/systemd-nspawn/nspawn-cgroup.c (renamed from src/nspawn/nspawn-cgroup.c) | 0 | ||||
-rw-r--r-- | src/systemd-nspawn/nspawn-cgroup.h (renamed from src/nspawn/nspawn-cgroup.h) | 0 | ||||
-rw-r--r-- | src/systemd-nspawn/nspawn-expose-ports.c (renamed from src/nspawn/nspawn-expose-ports.c) | 2 | ||||
-rw-r--r-- | src/systemd-nspawn/nspawn-expose-ports.h (renamed from src/nspawn/nspawn-expose-ports.h) | 4 | ||||
-rw-r--r-- | src/systemd-nspawn/nspawn-gperf.gperf (renamed from src/nspawn/nspawn-gperf.gperf) | 0 | ||||
-rw-r--r-- | src/systemd-nspawn/nspawn-mount.c (renamed from src/nspawn/nspawn-mount.c) | 0 | ||||
-rw-r--r-- | src/systemd-nspawn/nspawn-mount.h (renamed from src/nspawn/nspawn-mount.h) | 0 | ||||
-rw-r--r-- | src/systemd-nspawn/nspawn-network.c (renamed from src/nspawn/nspawn-network.c) | 4 | ||||
-rw-r--r-- | src/systemd-nspawn/nspawn-network.h (renamed from src/nspawn/nspawn-network.h) | 0 | ||||
-rw-r--r-- | src/systemd-nspawn/nspawn-register.c (renamed from src/nspawn/nspawn-register.c) | 2 | ||||
-rw-r--r-- | src/systemd-nspawn/nspawn-register.h (renamed from src/nspawn/nspawn-register.h) | 2 | ||||
-rw-r--r-- | src/systemd-nspawn/nspawn-settings.c (renamed from src/nspawn/nspawn-settings.c) | 0 | ||||
-rw-r--r-- | src/systemd-nspawn/nspawn-settings.h (renamed from src/nspawn/nspawn-settings.h) | 0 | ||||
-rw-r--r-- | src/systemd-nspawn/nspawn-setuid.c (renamed from src/nspawn/nspawn-setuid.c) | 0 | ||||
-rw-r--r-- | src/systemd-nspawn/nspawn-setuid.h (renamed from src/nspawn/nspawn-setuid.h) | 0 | ||||
-rw-r--r-- | src/systemd-nspawn/nspawn-stub-pid1.c (renamed from src/nspawn/nspawn-stub-pid1.c) | 0 | ||||
-rw-r--r-- | src/systemd-nspawn/nspawn-stub-pid1.h (renamed from src/nspawn/nspawn-stub-pid1.h) | 0 | ||||
-rw-r--r-- | src/systemd-nspawn/nspawn.c (renamed from src/nspawn/nspawn.c) | 4 | ||||
-rw-r--r-- | src/systemd-path/Makefile | 33 | ||||
-rw-r--r-- | src/systemd-path/path.c (renamed from src/path/path.c) | 2 | ||||
-rw-r--r-- | src/systemd-quotacheck/Makefile | 47 | ||||
-rw-r--r-- | src/systemd-quotacheck/quotacheck.c (renamed from src/quotacheck/quotacheck.c) | 0 | ||||
-rw-r--r-- | src/systemd-random-seed/Makefile | 48 | ||||
-rw-r--r-- | src/systemd-random-seed/random-seed.c (renamed from src/random-seed/random-seed.c) | 0 | ||||
-rw-r--r-- | src/systemd-rc-local-generator/Makefile | 33 | ||||
-rw-r--r-- | src/systemd-rc-local-generator/rc-local-generator.c (renamed from src/rc-local-generator/rc-local-generator.c) | 0 | ||||
-rw-r--r-- | src/systemd-remount-fs/Makefile | 35 | ||||
-rw-r--r-- | src/systemd-remount-fs/remount-fs.c (renamed from src/remount-fs/remount-fs.c) | 0 | ||||
-rw-r--r-- | src/systemd-reply-password/Makefile | 33 | ||||
-rw-r--r-- | src/systemd-reply-password/reply-password.c (renamed from src/reply-password/reply-password.c) | 0 | ||||
-rw-r--r-- | src/systemd-rfkill/Makefile | 47 | ||||
-rw-r--r-- | src/systemd-rfkill/rfkill.c (renamed from src/rfkill/rfkill.c) | 2 | ||||
-rw-r--r-- | src/systemd-run/Makefile (renamed from src/Makefile) | 25 | ||||
-rw-r--r-- | src/systemd-run/run.c (renamed from src/run/run.c) | 4 | ||||
-rw-r--r-- | src/systemd-shutdown/Makefile | 39 | ||||
-rw-r--r-- | src/systemd-stdio-bridge/Makefile | 34 | ||||
-rw-r--r-- | src/systemd-stdio-bridge/stdio-bridge.c (renamed from src/bus-proxyd/stdio-bridge.c) | 4 | ||||
-rw-r--r-- | src/systemd-system-update-generator/Makefile | 33 | ||||
-rw-r--r-- | src/systemd-system-update-generator/system-update-generator.c (renamed from src/system-update-generator/system-update-generator.c) | 0 | ||||
-rw-r--r-- | src/systemd-sysv-generator/Makefile | 33 | ||||
-rw-r--r-- | src/systemd-sysv-generator/sysv-generator.c (renamed from src/sysv-generator/sysv-generator.c) | 0 | ||||
-rw-r--r-- | src/systemd-timesync/.gitignore (renamed from src/timesync/.gitignore) | 0 | ||||
-rw-r--r-- | src/systemd-timesync/Makefile | 65 | ||||
-rw-r--r-- | src/systemd-timesync/timesyncd-conf.c (renamed from src/timesync/timesyncd-conf.c) | 0 | ||||
-rw-r--r-- | src/systemd-timesync/timesyncd-conf.h (renamed from src/timesync/timesyncd-conf.h) | 0 | ||||
-rw-r--r-- | src/systemd-timesync/timesyncd-gperf.gperf (renamed from src/timesync/timesyncd-gperf.gperf) | 0 | ||||
-rw-r--r-- | src/systemd-timesync/timesyncd-manager.c (renamed from src/timesync/timesyncd-manager.c) | 2 | ||||
-rw-r--r-- | src/systemd-timesync/timesyncd-manager.h (renamed from src/timesync/timesyncd-manager.h) | 6 | ||||
-rw-r--r-- | src/systemd-timesync/timesyncd-server.c (renamed from src/timesync/timesyncd-server.c) | 0 | ||||
-rw-r--r-- | src/systemd-timesync/timesyncd-server.h (renamed from src/timesync/timesyncd-server.h) | 0 | ||||
-rw-r--r-- | src/systemd-timesync/timesyncd.c (renamed from src/timesync/timesyncd.c) | 4 | ||||
-rw-r--r-- | src/systemd-timesync/timesyncd.conf.in (renamed from src/timesync/timesyncd.conf.in) | 0 | ||||
-rw-r--r-- | src/systemd-tmpfiles/Makefile | 85 | ||||
-rw-r--r-- | src/systemd-tmpfiles/tmpfiles.c (renamed from src/tmpfiles/tmpfiles.c) | 0 | ||||
-rw-r--r-- | src/systemd-tty-ask-password-agent/Makefile | 33 | ||||
-rw-r--r-- | src/systemd-tty-ask-password-agent/tty-ask-password-agent.c (renamed from src/tty-ask-password-agent/tty-ask-password-agent.c) | 0 | ||||
-rw-r--r-- | src/systemd-update-done/Makefile | 33 | ||||
-rw-r--r-- | src/systemd-update-done/update-done.c (renamed from src/update-done/update-done.c) | 0 | ||||
-rw-r--r-- | src/systemd-update-utmp/Makefile | 38 | ||||
-rw-r--r-- | src/systemd-update-utmp/update-utmp.c (renamed from src/update-utmp/update-utmp.c) | 2 | ||||
-rw-r--r-- | src/systemd-user-sessions/user-sessions.c (renamed from src/user-sessions/user-sessions.c) | 0 | ||||
-rw-r--r-- | src/systemd-vconsole/.gitignore (renamed from src/vconsole/.gitignore) | 0 | ||||
-rw-r--r-- | src/systemd-vconsole/90-vconsole.rules.in (renamed from src/vconsole/90-vconsole.rules.in) | 0 | ||||
-rw-r--r-- | src/systemd-vconsole/Makefile | 51 | ||||
-rw-r--r-- | src/systemd-vconsole/vconsole-setup.c (renamed from src/vconsole/vconsole-setup.c) | 0 | ||||
l--------- | src/systemd/Makefile | 1 | ||||
-rw-r--r--[l---------] | src/sysusers/Makefile | 63 | ||||
l--------- | src/sysv-generator/Makefile | 1 | ||||
-rw-r--r--[l---------] | src/test/Makefile | 37 | ||||
-rw-r--r-- | src/test/test-condition.c | 2 | ||||
-rw-r--r-- | src/test/test-daemon.c | 2 | ||||
-rw-r--r-- | src/test/test-helper.h | 2 | ||||
-rw-r--r-- | src/test/test-id128.c | 4 | ||||
-rw-r--r-- | src/test/test-netlink-manual.c | 2 | ||||
l--------- | src/timedate/Makefile | 1 | ||||
l--------- | src/timesync/Makefile | 1 | ||||
l--------- | src/tmpfiles/Makefile | 1 | ||||
l--------- | src/tty-ask-password-agent/Makefile | 1 | ||||
-rw-r--r--[l---------] | src/udev/Makefile | 183 | ||||
-rw-r--r--[l---------] | src/udev/ata_id/Makefile | 37 | ||||
-rw-r--r--[l---------] | src/udev/cdrom_id/Makefile | 40 | ||||
-rw-r--r--[l---------] | src/udev/collect/Makefile | 37 | ||||
-rw-r--r--[l---------] | src/udev/mtd_probe/Makefile | 39 | ||||
l--------- | src/udev/net/Makefile | 1 | ||||
-rw-r--r-- | src/udev/net/link-config.c | 2 | ||||
-rw-r--r--[l---------] | src/udev/scsi_id/Makefile | 43 | ||||
-rw-r--r-- | src/udev/udev-builtin-blkid.c | 2 | ||||
-rw-r--r-- | src/udev/udev-builtin-hwdb.c | 2 | ||||
-rw-r--r-- | src/udev/udev-builtin-uaccess.c | 2 | ||||
-rw-r--r-- | src/udev/udevd.c | 4 | ||||
-rw-r--r--[l---------] | src/udev/v4l_id/Makefile | 40 | ||||
l--------- | src/update-done/Makefile | 1 | ||||
l--------- | src/update-utmp/Makefile | 1 | ||||
l--------- | src/user-sessions/Makefile | 1 | ||||
l--------- | src/vconsole/Makefile | 1 |
1083 files changed, 11209 insertions, 493 deletions
diff --git a/src/ac-power/Makefile b/src/ac-power/Makefile deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/ac-power/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile
\ No newline at end of file diff --git a/src/activate/Makefile b/src/activate/Makefile deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/activate/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile
\ No newline at end of file diff --git a/src/analyze/Makefile b/src/analyze/Makefile deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/analyze/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile
\ No newline at end of file diff --git a/src/ask-password/Makefile b/src/ask-password/Makefile deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/ask-password/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile
\ No newline at end of file diff --git a/src/backlight/Makefile b/src/backlight/Makefile deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/backlight/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile
\ No newline at end of file diff --git a/src/basic/Makefile b/src/basic/Makefile deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/basic/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile
\ No newline at end of file diff --git a/src/basic/linux/Makefile b/src/basic/linux/Makefile deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/basic/linux/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile
\ No newline at end of file diff --git a/src/binfmt/Makefile b/src/binfmt/Makefile deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/binfmt/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile
\ No newline at end of file diff --git a/src/boot/Makefile b/src/boot/Makefile deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/boot/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile
\ No newline at end of file diff --git a/src/bootchart/Makefile b/src/bootchart/Makefile deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/bootchart/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile
\ No newline at end of file diff --git a/src/bus-proxyd/Makefile b/src/bus-proxyd/Makefile deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/bus-proxyd/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile
\ No newline at end of file diff --git a/src/busctl/Makefile b/src/busctl/Makefile new file mode 100644 index 0000000000..d09dd022a6 --- /dev/null +++ b/src/busctl/Makefile @@ -0,0 +1,38 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +bin_PROGRAMS += \ + busctl + +busctl_SOURCES = \ + src/libsystemd/sd-bus/busctl.c \ + src/libsystemd/sd-bus/busctl-introspect.c \ + src/libsystemd/sd-bus/busctl-introspect.h + +busctl_LDADD = \ + libshared.la + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/libsystemd/sd-bus/busctl-introspect.c b/src/busctl/busctl-introspect.c index b09509f8e1..3c49ad5c57 100644 --- a/src/libsystemd/sd-bus/busctl-introspect.c +++ b/src/busctl/busctl-introspect.c @@ -17,7 +17,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "alloc-util.h" #include "busctl-introspect.h" diff --git a/src/libsystemd/sd-bus/busctl-introspect.h b/src/busctl/busctl-introspect.h index d922e352db..d922e352db 100644 --- a/src/libsystemd/sd-bus/busctl-introspect.h +++ b/src/busctl/busctl-introspect.h diff --git a/src/libsystemd/sd-bus/busctl.c b/src/busctl/busctl.c index 35fabf038c..fd3b241aad 100644 --- a/src/libsystemd/sd-bus/busctl.c +++ b/src/busctl/busctl.c @@ -19,7 +19,7 @@ #include <getopt.h> -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "alloc-util.h" #include "bus-dump.h" diff --git a/src/cgls/Makefile b/src/cgls/Makefile deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/cgls/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile
\ No newline at end of file diff --git a/src/cgroups-agent/Makefile b/src/cgroups-agent/Makefile deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/cgroups-agent/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile
\ No newline at end of file diff --git a/src/cgtop/Makefile b/src/cgtop/Makefile deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/cgtop/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile
\ No newline at end of file diff --git a/src/core/Makefile b/src/core/Makefile deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/core/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile
\ No newline at end of file diff --git a/src/coredump/Makefile b/src/coredump/Makefile deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/coredump/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile
\ No newline at end of file diff --git a/src/cryptsetup/Makefile b/src/cryptsetup/Makefile deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/cryptsetup/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile
\ No newline at end of file diff --git a/src/dbus1-generator/Makefile b/src/dbus1-generator/Makefile deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/dbus1-generator/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile
\ No newline at end of file diff --git a/src/debug-generator/Makefile b/src/debug-generator/Makefile deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/debug-generator/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile
\ No newline at end of file diff --git a/src/delta/Makefile b/src/delta/Makefile deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/delta/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile
\ No newline at end of file diff --git a/src/detect-virt/Makefile b/src/detect-virt/Makefile deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/detect-virt/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile
\ No newline at end of file diff --git a/src/escape/Makefile b/src/escape/Makefile deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/escape/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile
\ No newline at end of file diff --git a/src/firstboot/Makefile b/src/firstboot/Makefile deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/firstboot/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile
\ No newline at end of file diff --git a/src/fsck/Makefile b/src/fsck/Makefile deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/fsck/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile
\ No newline at end of file diff --git a/src/fstab-generator/Makefile b/src/fstab-generator/Makefile deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/fstab-generator/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile
\ No newline at end of file diff --git a/src/getty-generator/Makefile b/src/getty-generator/Makefile deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/getty-generator/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile
\ No newline at end of file diff --git a/src/gpt-auto-generator/Makefile b/src/gpt-auto-generator/Makefile deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/gpt-auto-generator/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile
\ No newline at end of file diff --git a/src/grp-boot/bootctl/Makefile b/src/grp-boot/bootctl/Makefile new file mode 100644 index 0000000000..cc886b6cc4 --- /dev/null +++ b/src/grp-boot/bootctl/Makefile @@ -0,0 +1,55 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +ifneq ($(ENABLE_EFI),) +ifneq ($(HAVE_BLKID),) +bootctl_SOURCES = \ + src/boot/bootctl.c + +bootctl_CPPFLAGS = \ + $(AM_CPPFLAGS) \ + -DEFI_MACHINE_TYPE_NAME=\"$(EFI_MACHINE_TYPE_NAME)\" \ + -DBOOTLIBDIR=\"$(bootlibdir)\" + +bootctl_CFLAGS = \ + $(AM_CFLAGS) \ + $(BLKID_CFLAGS) + +bootctl_LDADD = \ + libshared.la \ + $(BLKID_LIBS) + +bin_PROGRAMS += \ + bootctl + +dist_bashcompletion_data += \ + shell-completion/bash/bootctl + +dist_zshcompletion_data += \ + shell-completion/zsh/_bootctl +endif # HAVE_BLKID +endif # ENABLE_EFI +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/boot/bootctl.c b/src/grp-boot/bootctl/bootctl.c index e9baf69f6a..e9baf69f6a 100644 --- a/src/boot/bootctl.c +++ b/src/grp-boot/bootctl/bootctl.c diff --git a/src/boot/efi/.gitignore b/src/grp-boot/systemd-boot/.gitignore index e193acbe12..e193acbe12 100644 --- a/src/boot/efi/.gitignore +++ b/src/grp-boot/systemd-boot/.gitignore diff --git a/src/grp-boot/systemd-boot/Makefile b/src/grp-boot/systemd-boot/Makefile new file mode 100644 index 0000000000..8caa8cef84 --- /dev/null +++ b/src/grp-boot/systemd-boot/Makefile @@ -0,0 +1,191 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +ifneq ($(ENABLE_EFI),) +ifneq ($(HAVE_GNUEFI),) +efi_cppflags = \ + $(EFI_CPPFLAGS) \ + -I$(top_builddir) -include config.h \ + -I$(EFI_INC_DIR)/efi \ + -I$(EFI_INC_DIR)/efi/$(EFI_ARCH) \ + -DEFI_MACHINE_TYPE_NAME=\"$(EFI_MACHINE_TYPE_NAME)\" + +efi_cflags = \ + $(EFI_CFLAGS) \ + -Wall \ + -Wextra \ + -std=gnu90 \ + -nostdinc \ + -ggdb -O0 \ + -fpic \ + -fshort-wchar \ + -nostdinc \ + -ffreestanding \ + -fno-strict-aliasing \ + -fno-stack-protector \ + -Wsign-compare \ + -Wno-missing-field-initializers + +ifneq ($(ARCH_X86_64),) +efi_cflags += \ + -mno-red-zone \ + -mno-sse \ + -mno-mmx \ + -DEFI_FUNCTION_WRAPPER \ + -DGNU_EFI_USE_MS_ABI +endif # ARCH_X86_64 + +ifneq ($(ARCH_IA32),) +efi_cflags += \ + -mno-sse \ + -mno-mmx +endif # ARCH_IA32 + +efi_ldflags = \ + $(EFI_LDFLAGS) \ + -T $(EFI_LDS_DIR)/elf_$(EFI_ARCH)_efi.lds \ + -shared \ + -Bsymbolic \ + -nostdlib \ + -znocombreloc \ + -L $(EFI_LIB_DIR) \ + $(EFI_LDS_DIR)/crt0-efi-$(EFI_ARCH).o + +# Aarch64 and ARM32 don't have an EFI capable objcopy. Use 'binary' instead, +# and add required symbols manually. +ifneq ($(ARCH_AARCH64),) +efi_ldflags += --defsym=EFI_SUBSYSTEM=0xa +EFI_FORMAT = -O binary +else +EFI_FORMAT = --target=efi-app-$(EFI_ARCH) +endif # ARCH_AARCH64 +endif # HAVE_GNUEFI +endif # ENABLE_EFI + +# ------------------------------------------------------------------------------ +systemd_boot_headers = \ + src/boot/efi/util.h \ + src/boot/efi/console.h \ + src/boot/efi/graphics.h \ + src/boot/efi/pefile.h \ + src/boot/efi/disk.h + +systemd_boot_sources = \ + src/boot/efi/util.c \ + src/boot/efi/console.c \ + src/boot/efi/graphics.c \ + src/boot/efi/pefile.c \ + src/boot/efi/disk.c \ + src/boot/efi/boot.c + +EXTRA_DIST += $(systemd_boot_sources) $(systemd_boot_headers) + +systemd_boot_objects = $(addprefix $(top_builddir)/,$(systemd_boot_sources:.c=.o)) +systemd_boot_solib = $(top_builddir)/src/boot/efi/systemd_boot.so +systemd_boot = systemd-boot$(EFI_MACHINE_TYPE_NAME).efi + +ifneq ($(ENABLE_EFI),) +ifneq ($(HAVE_GNUEFI),) +bootlib_DATA = $(systemd_boot) + +$(outdir)/%.o: $(top_srcdir)/src/boot/efi/%.c $(addprefix $(top_srcdir)/,$(systemd_boot_headers)) + @$(MKDIR_P) $(top_builddir)/src/boot/efi/ + $(AM_V_CC)$(EFI_CC) $(efi_cppflags) $(efi_cflags) -c $< -o $@ + +$(systemd_boot_solib): $(systemd_boot_objects) + $(AM_V_CCLD)$(LD) $(efi_ldflags) $(systemd_boot_objects) \ + -o $@ -lefi -lgnuefi $(shell $(CC) -print-libgcc-file-name); \ + nm -D -u $@ | grep ' U ' && exit 1 || : + +$(systemd_boot): $(systemd_boot_solib) + $(AM_V_GEN)$(OBJCOPY) -j .text -j .sdata -j .data -j .dynamic \ + -j .dynsym -j .rel -j .rela -j .reloc $(EFI_FORMAT) $< $@ +endif # HAVE_GNUEFI +endif # ENABLE_EFI + +CLEANFILES += $(systemd_boot_objects) $(systemd_boot_solib) $(systemd_boot) + +# ------------------------------------------------------------------------------ +stub_headers = \ + src/boot/efi/util.h \ + src/boot/efi/pefile.h \ + src/boot/efi/disk.h \ + src/boot/efi/graphics.h \ + src/boot/efi/splash.h \ + src/boot/efi/linux.h + +stub_sources = \ + src/boot/efi/util.c \ + src/boot/efi/pefile.c \ + src/boot/efi/disk.c \ + src/boot/efi/graphics.c \ + src/boot/efi/splash.c \ + src/boot/efi/linux.c \ + src/boot/efi/stub.c + +EXTRA_DIST += \ + $(stub_sources) \ + $(stub_headers) \ + test/splash.bmp + +stub_objects = $(addprefix $(top_builddir)/,$(stub_sources:.c=.o)) +stub_solib = $(top_builddir)/src/boot/efi/stub.so +stub = linux$(EFI_MACHINE_TYPE_NAME).efi.stub + +ifneq ($(ENABLE_EFI),) +ifneq ($(HAVE_GNUEFI),) +bootlib_DATA += $(stub) + +$(outdir)/%.o: $(top_srcdir)/src/boot/efi/%.c $(addprefix $(top_srcdir)/,$(stub_headers)) + @$(MKDIR_P) $(top_builddir)/src/boot/efi/ + $(AM_V_CC)$(EFI_CC) $(efi_cppflags) $(efi_cflags) -c $< -o $@ + +$(stub_solib): $(stub_objects) + $(AM_V_CCLD)$(LD) $(efi_ldflags) $(stub_objects) \ + -o $@ -lefi -lgnuefi $(shell $(CC) -print-libgcc-file-name); \ + nm -D -u $@ | grep ' U ' && exit 1 || : + +$(stub): $(stub_solib) + $(AM_V_GEN)$(OBJCOPY) -j .text -j .sdata -j .data -j .dynamic \ + -j .dynsym -j .rel -j .rela -j .reloc $(EFI_FORMAT) $< $@ +endif # HAVE_GNUEFI +endif # ENABLE_EFI + +CLEANFILES += $(stub_objects) $(stub_solib) $(stub) + + +# ------------------------------------------------------------------------------ +CLEANFILES += test-efi-disk.img + +test-efi-disk.img: $(systemd_boot) $(stub) test/test-efi-create-disk.sh + $(AM_V_GEN)test/test-efi-create-disk.sh + +test-efi: test-efi-disk.img + $(QEMU) -machine accel=kvm -m 1024 -bios $(QEMU_BIOS) -snapshot test-efi-disk.img + +EXTRA_DIST += test/test-efi-create-disk.sh + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/boot/efi/boot.c b/src/grp-boot/systemd-boot/boot.c index 893980071f..893980071f 100644 --- a/src/boot/efi/boot.c +++ b/src/grp-boot/systemd-boot/boot.c diff --git a/src/boot/efi/console.c b/src/grp-boot/systemd-boot/console.c index c436f8b476..c436f8b476 100644 --- a/src/boot/efi/console.c +++ b/src/grp-boot/systemd-boot/console.c diff --git a/src/boot/efi/console.h b/src/grp-boot/systemd-boot/console.h index 3fe0ce5ec4..3fe0ce5ec4 100644 --- a/src/boot/efi/console.h +++ b/src/grp-boot/systemd-boot/console.h diff --git a/src/boot/efi/disk.c b/src/grp-boot/systemd-boot/disk.c index 3e3b5b224a..3e3b5b224a 100644 --- a/src/boot/efi/disk.c +++ b/src/grp-boot/systemd-boot/disk.c diff --git a/src/boot/efi/disk.h b/src/grp-boot/systemd-boot/disk.h index af91a9c674..af91a9c674 100644 --- a/src/boot/efi/disk.h +++ b/src/grp-boot/systemd-boot/disk.h diff --git a/src/boot/efi/graphics.c b/src/grp-boot/systemd-boot/graphics.c index 4854baf874..4854baf874 100644 --- a/src/boot/efi/graphics.c +++ b/src/grp-boot/systemd-boot/graphics.c diff --git a/src/boot/efi/graphics.h b/src/grp-boot/systemd-boot/graphics.h index cf48e647e7..cf48e647e7 100644 --- a/src/boot/efi/graphics.h +++ b/src/grp-boot/systemd-boot/graphics.h diff --git a/src/boot/efi/linux.c b/src/grp-boot/systemd-boot/linux.c index 0dc99a6c53..0dc99a6c53 100644 --- a/src/boot/efi/linux.c +++ b/src/grp-boot/systemd-boot/linux.c diff --git a/src/boot/efi/linux.h b/src/grp-boot/systemd-boot/linux.h index d9e6ed7955..d9e6ed7955 100644 --- a/src/boot/efi/linux.h +++ b/src/grp-boot/systemd-boot/linux.h diff --git a/src/boot/efi/pefile.c b/src/grp-boot/systemd-boot/pefile.c index 77fff77b69..77fff77b69 100644 --- a/src/boot/efi/pefile.c +++ b/src/grp-boot/systemd-boot/pefile.c diff --git a/src/boot/efi/pefile.h b/src/grp-boot/systemd-boot/pefile.h index 2e445ede17..2e445ede17 100644 --- a/src/boot/efi/pefile.h +++ b/src/grp-boot/systemd-boot/pefile.h diff --git a/src/boot/efi/splash.c b/src/grp-boot/systemd-boot/splash.c index b1cc2c0b72..b1cc2c0b72 100644 --- a/src/boot/efi/splash.c +++ b/src/grp-boot/systemd-boot/splash.c diff --git a/src/boot/efi/splash.h b/src/grp-boot/systemd-boot/splash.h index 09b543fb47..09b543fb47 100644 --- a/src/boot/efi/splash.h +++ b/src/grp-boot/systemd-boot/splash.h diff --git a/src/boot/efi/stub.c b/src/grp-boot/systemd-boot/stub.c index 9633bc1792..9633bc1792 100644 --- a/src/boot/efi/stub.c +++ b/src/grp-boot/systemd-boot/stub.c diff --git a/src/boot/efi/util.c b/src/grp-boot/systemd-boot/util.c index 98c5be74ce..98c5be74ce 100644 --- a/src/boot/efi/util.c +++ b/src/grp-boot/systemd-boot/util.c diff --git a/src/boot/efi/util.h b/src/grp-boot/systemd-boot/util.h index e673cdf9a0..e673cdf9a0 100644 --- a/src/boot/efi/util.h +++ b/src/grp-boot/systemd-boot/util.h diff --git a/src/grp-coredump/coredumpctl/Makefile b/src/grp-coredump/coredumpctl/Makefile new file mode 100644 index 0000000000..c300710492 --- /dev/null +++ b/src/grp-coredump/coredumpctl/Makefile @@ -0,0 +1,42 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +coredumpctl_SOURCES = \ + src/coredump/coredumpctl.c + +coredumpctl_LDADD = \ + libshared.la + +bin_PROGRAMS += \ + coredumpctl + +dist_bashcompletion_data += \ + shell-completion/bash/coredumpctl + +dist_zshcompletion_data += \ + shell-completion/zsh/_coredumpctl + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/coredump/coredumpctl.c b/src/grp-coredump/coredumpctl/coredumpctl.c index 0034a1a0ac..5f4f710a0c 100644 --- a/src/coredump/coredumpctl.c +++ b/src/grp-coredump/coredumpctl/coredumpctl.c @@ -24,7 +24,7 @@ #include <string.h> #include <unistd.h> -#include "sd-journal.h" +#include <systemd/sd-journal.h> #include "alloc-util.h" #include "compress.h" diff --git a/src/grp-coredump/systemd-coredump/Makefile b/src/grp-coredump/systemd-coredump/Makefile new file mode 100644 index 0000000000..23f2747683 --- /dev/null +++ b/src/grp-coredump/systemd-coredump/Makefile @@ -0,0 +1,82 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +ifneq ($(ENABLE_COREDUMP),) +systemd_coredump_SOURCES = \ + src/coredump/coredump.c \ + src/coredump/coredump-vacuum.c \ + src/coredump/coredump-vacuum.h + +systemd_coredump_LDADD = \ + libshared.la + +ifneq ($(HAVE_ELFUTILS),) +systemd_coredump_SOURCES += \ + src/coredump/stacktrace.c \ + src/coredump/stacktrace.h + +systemd_coredump_LDADD += \ + $(ELFUTILS_LIBS) +endif # HAVE_ELFUTILS + +nodist_systemunit_DATA += \ + units/systemd-coredump@.service + +dist_systemunit_DATA += \ + units/systemd-coredump.socket + +SOCKETS_TARGET_WANTS += \ + systemd-coredump.socket + +libexec_PROGRAMS += \ + systemd-coredump + +dist_pkgsysconf_DATA += \ + src/coredump/coredump.conf + +manual_tests += \ + test-coredump-vacuum + +test_coredump_vacuum_SOURCES = \ + src/coredump/test-coredump-vacuum.c \ + src/coredump/coredump-vacuum.c \ + src/coredump/coredump-vacuum.h + +test_coredump_vacuum_LDADD = \ + libshared.la + +nodist_sysctl_DATA = \ + sysctl.d/50-coredump.conf + +CLEANFILES += \ + sysctl.d/50-coredump.conf +endif # ENABLE_COREDUMP + +EXTRA_DIST += \ + sysctl.d/50-coredump.conf.in \ + units/systemd-coredump@.service.in + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/coredump/coredump-vacuum.c b/src/grp-coredump/systemd-coredump/coredump-vacuum.c index f02b6dbd87..f02b6dbd87 100644 --- a/src/coredump/coredump-vacuum.c +++ b/src/grp-coredump/systemd-coredump/coredump-vacuum.c diff --git a/src/coredump/coredump-vacuum.h b/src/grp-coredump/systemd-coredump/coredump-vacuum.h index 4b7b9f2d98..4b7b9f2d98 100644 --- a/src/coredump/coredump-vacuum.h +++ b/src/grp-coredump/systemd-coredump/coredump-vacuum.h diff --git a/src/coredump/coredump.c b/src/grp-coredump/systemd-coredump/coredump.c index 085909c20c..64ce54d97f 100644 --- a/src/coredump/coredump.c +++ b/src/grp-coredump/systemd-coredump/coredump.c @@ -28,9 +28,9 @@ #include <elfutils/libdwfl.h> #endif -#include "sd-journal.h" -#include "sd-login.h" -#include "sd-daemon.h" +#include <systemd/sd-journal.h> +#include <systemd/sd-login.h> +#include <systemd/sd-daemon.h> #include "acl-util.h" #include "alloc-util.h" diff --git a/src/coredump/coredump.conf b/src/grp-coredump/systemd-coredump/coredump.conf index c2f0643e03..c2f0643e03 100644 --- a/src/coredump/coredump.conf +++ b/src/grp-coredump/systemd-coredump/coredump.conf diff --git a/src/coredump/stacktrace.c b/src/grp-coredump/systemd-coredump/stacktrace.c index 68806992fc..68806992fc 100644 --- a/src/coredump/stacktrace.c +++ b/src/grp-coredump/systemd-coredump/stacktrace.c diff --git a/src/coredump/stacktrace.h b/src/grp-coredump/systemd-coredump/stacktrace.h index 15e9c04465..15e9c04465 100644 --- a/src/coredump/stacktrace.h +++ b/src/grp-coredump/systemd-coredump/stacktrace.h diff --git a/src/coredump/test-coredump-vacuum.c b/src/grp-coredump/systemd-coredump/test-coredump-vacuum.c index 70a57f183f..70a57f183f 100644 --- a/src/coredump/test-coredump-vacuum.c +++ b/src/grp-coredump/systemd-coredump/test-coredump-vacuum.c diff --git a/src/grp-machine/nss-mymachines/Makefile b/src/grp-machine/nss-mymachines/Makefile new file mode 100644 index 0000000000..4becf7900a --- /dev/null +++ b/src/grp-machine/nss-mymachines/Makefile @@ -0,0 +1,49 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +ifneq ($(ENABLE_MACHINED),) + +libnss_mymachines_la_SOURCES = \ + src/nss-mymachines/nss-mymachines.sym \ + src/nss-mymachines/nss-mymachines.c + +libnss_mymachines_la_LDFLAGS = \ + $(AM_LDFLAGS) \ + -module \ + -export-dynamic \ + -avoid-version \ + -shared \ + -shrext .so.2 \ + -Wl,--version-script=$(top_srcdir)/src/nss-mymachines/nss-mymachines.sym + +libnss_mymachines_la_LIBADD = \ + libsystemd-internal.la + +lib_LTLIBRARIES += \ + libnss_mymachines.la + +endif # ENABLE_MACHINED +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/nss-mymachines/nss-mymachines.c b/src/grp-machine/nss-mymachines/nss-mymachines.c index 1582d702f8..9d401b39dd 100644 --- a/src/nss-mymachines/nss-mymachines.c +++ b/src/grp-machine/nss-mymachines/nss-mymachines.c @@ -20,8 +20,8 @@ #include <netdb.h> #include <nss.h> -#include "sd-bus.h" -#include "sd-login.h" +#include <systemd/sd-bus.h> +#include <systemd/sd-login.h> #include "alloc-util.h" #include "bus-common-errors.h" diff --git a/src/nss-mymachines/nss-mymachines.sym b/src/grp-machine/nss-mymachines/nss-mymachines.sym index 0728ac3ba7..0728ac3ba7 100644 --- a/src/nss-mymachines/nss-mymachines.sym +++ b/src/grp-machine/nss-mymachines/nss-mymachines.sym diff --git a/src/machine/.gitignore b/src/grp-machine/systemd-machined/.gitignore index e1065b5894..e1065b5894 100644 --- a/src/machine/.gitignore +++ b/src/grp-machine/systemd-machined/.gitignore diff --git a/src/grp-machine/systemd-machined/Makefile b/src/grp-machine/systemd-machined/Makefile new file mode 100644 index 0000000000..2f6e745c53 --- /dev/null +++ b/src/grp-machine/systemd-machined/Makefile @@ -0,0 +1,110 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +ifneq ($(ENABLE_MACHINED),) +systemd_machined_SOURCES = \ + src/machine/machined.c \ + src/machine/machined.h + +systemd_machined_LDADD = \ + libmachine-core.la + +libexec_PROGRAMS += \ + systemd-machined + +libmachine_core_la_SOURCES = \ + src/machine/machine.c \ + src/machine/machine.h \ + src/machine/machined-dbus.c \ + src/machine/machine-dbus.c \ + src/machine/machine-dbus.h \ + src/machine/image-dbus.c \ + src/machine/image-dbus.h + +libmachine_core_la_LIBADD = \ + libshared.la + +noinst_LTLIBRARIES += \ + libmachine-core.la + +machinectl_SOURCES = \ + src/machine/machinectl.c + +machinectl_LDADD = \ + libshared.la + +bin_PROGRAMS += \ + machinectl + +test_machine_tables_SOURCES = \ + src/machine/test-machine-tables.c + +test_machine_tables_LDADD = \ + libmachine-core.la + +tests += \ + test-machine-tables + +nodist_systemunit_DATA += \ + units/systemd-machined.service + +dist_systemunit_DATA += \ + units/machine.slice + +dist_systemunit_DATA_busnames += \ + units/org.freedesktop.machine1.busname + +dist_dbussystemservice_DATA += \ + src/machine/org.freedesktop.machine1.service + +dist_dbuspolicy_DATA += \ + src/machine/org.freedesktop.machine1.conf + +polkitpolicy_files += \ + src/machine/org.freedesktop.machine1.policy + +dist_bashcompletion_data += \ + shell-completion/bash/machinectl + +dist_zshcompletion_data += \ + shell-completion/zsh/_machinectl \ + shell-completion/zsh/_sd_machines + +SYSTEM_UNIT_ALIASES += \ + systemd-machined.service dbus-org.freedesktop.machine1.service + +BUSNAMES_TARGET_WANTS += \ + org.freedesktop.machine1.busname + +endif # ENABLE_MACHINED + +polkitpolicy_in_files += \ + src/machine/org.freedesktop.machine1.policy.in + +EXTRA_DIST += \ + units/systemd-machined.service.in + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/machine/image-dbus.c b/src/grp-machine/systemd-machined/image-dbus.c index 73f5112c4d..73f5112c4d 100644 --- a/src/machine/image-dbus.c +++ b/src/grp-machine/systemd-machined/image-dbus.c diff --git a/src/machine/image-dbus.h b/src/grp-machine/systemd-machined/image-dbus.h index b62da996c6..b62da996c6 100644 --- a/src/machine/image-dbus.h +++ b/src/grp-machine/systemd-machined/image-dbus.h diff --git a/src/machine/machine-dbus.c b/src/grp-machine/systemd-machined/machine-dbus.c index 71f20b3f07..71f20b3f07 100644 --- a/src/machine/machine-dbus.c +++ b/src/grp-machine/systemd-machined/machine-dbus.c diff --git a/src/machine/machine-dbus.h b/src/grp-machine/systemd-machined/machine-dbus.h index 3a8162b171..224f36529f 100644 --- a/src/machine/machine-dbus.h +++ b/src/grp-machine/systemd-machined/machine-dbus.h @@ -19,7 +19,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "machine.h" diff --git a/src/machine/machine.c b/src/grp-machine/systemd-machined/machine.c index 406d5a4b85..468fc1fecf 100644 --- a/src/machine/machine.c +++ b/src/grp-machine/systemd-machined/machine.c @@ -21,7 +21,7 @@ #include <string.h> #include <unistd.h> -#include "sd-messages.h" +#include <systemd/sd-messages.h> #include "alloc-util.h" #include "bus-error.h" diff --git a/src/machine/machine.h b/src/grp-machine/systemd-machined/machine.h index 1d8cc5911a..1d8cc5911a 100644 --- a/src/machine/machine.h +++ b/src/grp-machine/systemd-machined/machine.h diff --git a/src/machine/machinectl.c b/src/grp-machine/systemd-machined/machinectl.c index 4853139321..fb743ab6cb 100644 --- a/src/machine/machinectl.c +++ b/src/grp-machine/systemd-machined/machinectl.c @@ -29,7 +29,7 @@ #include <sys/socket.h> #include <unistd.h> -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "alloc-util.h" #include "bus-error.h" diff --git a/src/machine/machined-dbus.c b/src/grp-machine/systemd-machined/machined-dbus.c index b933099330..96f2c4769e 100644 --- a/src/machine/machined-dbus.c +++ b/src/grp-machine/systemd-machined/machined-dbus.c @@ -21,7 +21,7 @@ #include <string.h> #include <unistd.h> -#include "sd-id128.h" +#include <systemd/sd-id128.h> #include "alloc-util.h" #include "btrfs-util.h" diff --git a/src/machine/machined.c b/src/grp-machine/systemd-machined/machined.c index f2c1966a6b..6ada8671f8 100644 --- a/src/machine/machined.c +++ b/src/grp-machine/systemd-machined/machined.c @@ -21,7 +21,7 @@ #include <string.h> #include <unistd.h> -#include "sd-daemon.h" +#include <systemd/sd-daemon.h> #include "alloc-util.h" #include "bus-error.h" diff --git a/src/machine/machined.h b/src/grp-machine/systemd-machined/machined.h index e7d7dfdceb..0fe50aaa66 100644 --- a/src/machine/machined.h +++ b/src/grp-machine/systemd-machined/machined.h @@ -21,8 +21,8 @@ #include <stdbool.h> -#include "sd-bus.h" -#include "sd-event.h" +#include <systemd/sd-bus.h> +#include <systemd/sd-event.h> #include "hashmap.h" #include "list.h" diff --git a/src/machine/org.freedesktop.machine1.conf b/src/grp-machine/systemd-machined/org.freedesktop.machine1.conf index 9d40b90151..9d40b90151 100644 --- a/src/machine/org.freedesktop.machine1.conf +++ b/src/grp-machine/systemd-machined/org.freedesktop.machine1.conf diff --git a/src/machine/org.freedesktop.machine1.policy.in b/src/grp-machine/systemd-machined/org.freedesktop.machine1.policy.in index 69f78a5c25..69f78a5c25 100644 --- a/src/machine/org.freedesktop.machine1.policy.in +++ b/src/grp-machine/systemd-machined/org.freedesktop.machine1.policy.in diff --git a/src/machine/org.freedesktop.machine1.service b/src/grp-machine/systemd-machined/org.freedesktop.machine1.service index d3dc99852b..d3dc99852b 100644 --- a/src/machine/org.freedesktop.machine1.service +++ b/src/grp-machine/systemd-machined/org.freedesktop.machine1.service diff --git a/src/machine/test-machine-tables.c b/src/grp-machine/systemd-machined/test-machine-tables.c index f851a4d37d..f851a4d37d 100644 --- a/src/machine/test-machine-tables.c +++ b/src/grp-machine/systemd-machined/test-machine-tables.c diff --git a/src/nss-resolve/nss-resolve.c b/src/grp-resolve/nss-resolve/nss-resolve.c index 69c0d9bdc1..d369f1b0c8 100644 --- a/src/nss-resolve/nss-resolve.c +++ b/src/grp-resolve/nss-resolve/nss-resolve.c @@ -24,7 +24,7 @@ #include <stdlib.h> #include <string.h> -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "bus-common-errors.h" #include "in-addr-util.h" diff --git a/src/nss-resolve/nss-resolve.sym b/src/grp-resolve/nss-resolve/nss-resolve.sym index df8dff2a20..df8dff2a20 100644 --- a/src/nss-resolve/nss-resolve.sym +++ b/src/grp-resolve/nss-resolve/nss-resolve.sym diff --git a/src/resolve/.gitignore b/src/grp-resolve/systemd-resolved/.gitignore index f0835923b7..f0835923b7 100644 --- a/src/resolve/.gitignore +++ b/src/grp-resolve/systemd-resolved/.gitignore diff --git a/src/grp-resolve/systemd-resolved/Makefile b/src/grp-resolve/systemd-resolved/Makefile new file mode 100644 index 0000000000..49a995bd75 --- /dev/null +++ b/src/grp-resolve/systemd-resolved/Makefile @@ -0,0 +1,209 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +ifneq ($(ENABLE_RESOLVED),) + +systemd_resolved_SOURCES = \ + src/resolve/resolved.c \ + src/resolve/resolved-manager.c \ + src/resolve/resolved-manager.h \ + src/resolve/resolved-conf.c \ + src/resolve/resolved-conf.h \ + src/resolve/resolved-resolv-conf.c \ + src/resolve/resolved-resolv-conf.h \ + src/resolve/resolved-bus.c \ + src/resolve/resolved-bus.h \ + src/resolve/resolved-link.h \ + src/resolve/resolved-link.c \ + src/resolve/resolved-link-bus.c \ + src/resolve/resolved-link-bus.h \ + src/resolve/resolved-llmnr.h \ + src/resolve/resolved-llmnr.c \ + src/resolve/resolved-mdns.h \ + src/resolve/resolved-mdns.c \ + src/resolve/resolved-def.h \ + src/resolve/resolved-dns-rr.h \ + src/resolve/resolved-dns-rr.c \ + src/resolve/resolved-dns-question.h \ + src/resolve/resolved-dns-question.c \ + src/resolve/resolved-dns-answer.h \ + src/resolve/resolved-dns-answer.c \ + src/resolve/resolved-dns-packet.h \ + src/resolve/resolved-dns-packet.c \ + src/resolve/resolved-dns-query.h \ + src/resolve/resolved-dns-query.c \ + src/resolve/resolved-dns-synthesize.h \ + src/resolve/resolved-dns-synthesize.c \ + src/resolve/resolved-dns-transaction.h \ + src/resolve/resolved-dns-transaction.c \ + src/resolve/resolved-dns-scope.h \ + src/resolve/resolved-dns-scope.c \ + src/resolve/resolved-dns-server.h \ + src/resolve/resolved-dns-server.c \ + src/resolve/resolved-dns-search-domain.h \ + src/resolve/resolved-dns-search-domain.c \ + src/resolve/resolved-dns-cache.h \ + src/resolve/resolved-dns-cache.c \ + src/resolve/resolved-dns-zone.h \ + src/resolve/resolved-dns-zone.c \ + src/resolve/resolved-dns-stream.h \ + src/resolve/resolved-dns-stream.c \ + src/resolve/resolved-dns-dnssec.h \ + src/resolve/resolved-dns-dnssec.c \ + src/resolve/resolved-dns-trust-anchor.h \ + src/resolve/resolved-dns-trust-anchor.c \ + src/resolve/resolved-etc-hosts.h \ + src/resolve/resolved-etc-hosts.c \ + src/resolve/dns-type.c \ + src/resolve/dns-type.h + +nodist_systemd_resolved_SOURCES = \ + src/resolve/dns_type-from-name.h \ + src/resolve/dns_type-to-name.h \ + src/resolve/resolved-gperf.c + +systemd_resolved_LDADD = \ + libsystemd-network.la \ + libshared.la + +libexec_PROGRAMS += \ + systemd-resolved + +nodist_systemunit_DATA += \ + units/systemd-resolved.service + +dist_systemunit_DATA_busnames += \ + units/org.freedesktop.resolve1.busname + +dist_dbuspolicy_DATA += \ + src/resolve/org.freedesktop.resolve1.conf + +dist_dbussystemservice_DATA += \ + src/resolve/org.freedesktop.resolve1.service + +SYSTEM_UNIT_ALIASES += \ + systemd-resolved.service dbus-org.freedesktop.resolve1.service + +BUSNAMES_TARGET_WANTS += \ + org.freedesktop.resolve1.busname + +GENERAL_ALIASES += \ + $(systemunitdir)/systemd-resolved.service $(pkgsysconfdir)/system/multi-user.target.wants/systemd-resolved.service + +nodist_pkgsysconf_DATA += \ + src/resolve/resolved.conf + +libnss_resolve_la_SOURCES = \ + src/nss-resolve/nss-resolve.sym \ + src/nss-resolve/nss-resolve.c + +libnss_resolve_la_LDFLAGS = \ + $(AM_LDFLAGS) \ + -module \ + -export-dynamic \ + -avoid-version \ + -shared \ + -shrext .so.2 \ + -Wl,--version-script=$(top_srcdir)/src/nss-resolve/nss-resolve.sym + +libnss_resolve_la_LIBADD = \ + libsystemd-internal.la \ + -ldl + +lib_LTLIBRARIES += \ + libnss_resolve.la + +systemd_resolve_SOURCES = \ + src/resolve/resolve-tool.c \ + src/resolve/resolved-dns-dnssec.c \ + src/resolve/resolved-dns-dnssec.h \ + src/resolve/resolved-dns-packet.c \ + src/resolve/resolved-dns-packet.h \ + src/resolve/resolved-dns-rr.c \ + src/resolve/resolved-dns-rr.h \ + src/resolve/resolved-dns-answer.c \ + src/resolve/resolved-dns-answer.h \ + src/resolve/resolved-dns-question.c \ + src/resolve/resolved-dns-question.h \ + src/resolve/dns-type.c \ + src/resolve/dns-type.h + +nodist_systemd_resolve_SOURCES = \ + src/resolve/dns_type-from-name.h \ + src/resolve/dns_type-to-name.h + +systemd_resolve_LDADD = \ + libshared.la + +bin_PROGRAMS += \ + systemd-resolve + +tests += \ + test-dns-domain \ + test-dnssec + +manual_tests += \ + test-dnssec-complex + +test_dnssec_SOURCES = \ + src/resolve/test-dnssec.c \ + src/resolve/resolved-dns-packet.c \ + src/resolve/resolved-dns-packet.h \ + src/resolve/resolved-dns-rr.c \ + src/resolve/resolved-dns-rr.h \ + src/resolve/resolved-dns-answer.c \ + src/resolve/resolved-dns-answer.h \ + src/resolve/resolved-dns-question.c \ + src/resolve/resolved-dns-question.h \ + src/resolve/resolved-dns-dnssec.c \ + src/resolve/resolved-dns-dnssec.h \ + src/resolve/dns-type.c \ + src/resolve/dns-type.h + +test_dnssec_LDADD = \ + libshared.la + +test_dnssec_complex_SOURCES = \ + src/resolve/test-dnssec-complex.c \ + src/resolve/dns-type.c \ + src/resolve/dns-type.h + +test_dnssec_complex_LDADD = \ + libshared.la + +endif # ENABLE_RESOLVED + +gperf_txt_sources += \ + src/resolve/dns_type-list.txt + +gperf_gperf_sources += \ + src/resolve/resolved-gperf.gperf + +EXTRA_DIST += \ + units/systemd-resolved.service.m4.in \ + src/resolve/resolved.conf.in + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/resolve/RFCs b/src/grp-resolve/systemd-resolved/RFCs index 22004a00cd..22004a00cd 100644 --- a/src/resolve/RFCs +++ b/src/grp-resolve/systemd-resolved/RFCs diff --git a/src/resolve/dns-type.c b/src/grp-resolve/systemd-resolved/dns-type.c index b2f479cae5..b2f479cae5 100644 --- a/src/resolve/dns-type.c +++ b/src/grp-resolve/systemd-resolved/dns-type.c diff --git a/src/resolve/dns-type.h b/src/grp-resolve/systemd-resolved/dns-type.h index a6c1630021..a6c1630021 100644 --- a/src/resolve/dns-type.h +++ b/src/grp-resolve/systemd-resolved/dns-type.h diff --git a/src/resolve/org.freedesktop.resolve1.conf b/src/grp-resolve/systemd-resolved/org.freedesktop.resolve1.conf index 25b09774e5..25b09774e5 100644 --- a/src/resolve/org.freedesktop.resolve1.conf +++ b/src/grp-resolve/systemd-resolved/org.freedesktop.resolve1.conf diff --git a/src/resolve/org.freedesktop.resolve1.service b/src/grp-resolve/systemd-resolved/org.freedesktop.resolve1.service index 7ac5c323f0..7ac5c323f0 100644 --- a/src/resolve/org.freedesktop.resolve1.service +++ b/src/grp-resolve/systemd-resolved/org.freedesktop.resolve1.service diff --git a/src/resolve/resolve-tool.c b/src/grp-resolve/systemd-resolved/resolve-tool.c index 824cb267b5..3f1b6e32f1 100644 --- a/src/resolve/resolve-tool.c +++ b/src/grp-resolve/systemd-resolved/resolve-tool.c @@ -20,7 +20,7 @@ #include <getopt.h> #include <net/if.h> -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "af-list.h" #include "alloc-util.h" diff --git a/src/resolve/resolved-bus.c b/src/grp-resolve/systemd-resolved/resolved-bus.c index fc5e6beca0..fc5e6beca0 100644 --- a/src/resolve/resolved-bus.c +++ b/src/grp-resolve/systemd-resolved/resolved-bus.c diff --git a/src/resolve/resolved-bus.h b/src/grp-resolve/systemd-resolved/resolved-bus.h index f49e1337d2..f49e1337d2 100644 --- a/src/resolve/resolved-bus.h +++ b/src/grp-resolve/systemd-resolved/resolved-bus.h diff --git a/src/resolve/resolved-conf.c b/src/grp-resolve/systemd-resolved/resolved-conf.c index bb93fbfda2..bb93fbfda2 100644 --- a/src/resolve/resolved-conf.c +++ b/src/grp-resolve/systemd-resolved/resolved-conf.c diff --git a/src/resolve/resolved-conf.h b/src/grp-resolve/systemd-resolved/resolved-conf.h index e1fd2cceec..e1fd2cceec 100644 --- a/src/resolve/resolved-conf.h +++ b/src/grp-resolve/systemd-resolved/resolved-conf.h diff --git a/src/resolve/resolved-def.h b/src/grp-resolve/systemd-resolved/resolved-def.h index c4c1915b18..c4c1915b18 100644 --- a/src/resolve/resolved-def.h +++ b/src/grp-resolve/systemd-resolved/resolved-def.h diff --git a/src/resolve/resolved-dns-answer.c b/src/grp-resolve/systemd-resolved/resolved-dns-answer.c index 7eb303ab95..7eb303ab95 100644 --- a/src/resolve/resolved-dns-answer.c +++ b/src/grp-resolve/systemd-resolved/resolved-dns-answer.c diff --git a/src/resolve/resolved-dns-answer.h b/src/grp-resolve/systemd-resolved/resolved-dns-answer.h index 8f9c15eab4..8f9c15eab4 100644 --- a/src/resolve/resolved-dns-answer.h +++ b/src/grp-resolve/systemd-resolved/resolved-dns-answer.h diff --git a/src/resolve/resolved-dns-cache.c b/src/grp-resolve/systemd-resolved/resolved-dns-cache.c index 9bcc71724e..9bcc71724e 100644 --- a/src/resolve/resolved-dns-cache.c +++ b/src/grp-resolve/systemd-resolved/resolved-dns-cache.c diff --git a/src/resolve/resolved-dns-cache.h b/src/grp-resolve/systemd-resolved/resolved-dns-cache.h index 2293718e86..2293718e86 100644 --- a/src/resolve/resolved-dns-cache.h +++ b/src/grp-resolve/systemd-resolved/resolved-dns-cache.h diff --git a/src/resolve/resolved-dns-dnssec.c b/src/grp-resolve/systemd-resolved/resolved-dns-dnssec.c index 7123d2d3a8..7123d2d3a8 100644 --- a/src/resolve/resolved-dns-dnssec.c +++ b/src/grp-resolve/systemd-resolved/resolved-dns-dnssec.c diff --git a/src/resolve/resolved-dns-dnssec.h b/src/grp-resolve/systemd-resolved/resolved-dns-dnssec.h index 77bd4d71bf..77bd4d71bf 100644 --- a/src/resolve/resolved-dns-dnssec.h +++ b/src/grp-resolve/systemd-resolved/resolved-dns-dnssec.h diff --git a/src/resolve/resolved-dns-packet.c b/src/grp-resolve/systemd-resolved/resolved-dns-packet.c index c940dd8929..c940dd8929 100644 --- a/src/resolve/resolved-dns-packet.c +++ b/src/grp-resolve/systemd-resolved/resolved-dns-packet.c diff --git a/src/resolve/resolved-dns-packet.h b/src/grp-resolve/systemd-resolved/resolved-dns-packet.h index 0bf34d270c..0bf34d270c 100644 --- a/src/resolve/resolved-dns-packet.h +++ b/src/grp-resolve/systemd-resolved/resolved-dns-packet.h diff --git a/src/resolve/resolved-dns-query.c b/src/grp-resolve/systemd-resolved/resolved-dns-query.c index a378b2b7f7..a378b2b7f7 100644 --- a/src/resolve/resolved-dns-query.c +++ b/src/grp-resolve/systemd-resolved/resolved-dns-query.c diff --git a/src/resolve/resolved-dns-query.h b/src/grp-resolve/systemd-resolved/resolved-dns-query.h index c2ac02f68b..7f7c76ff20 100644 --- a/src/resolve/resolved-dns-query.h +++ b/src/grp-resolve/systemd-resolved/resolved-dns-query.h @@ -20,7 +20,7 @@ ***/ -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "set.h" diff --git a/src/resolve/resolved-dns-question.c b/src/grp-resolve/systemd-resolved/resolved-dns-question.c index 8e452e79a4..8e452e79a4 100644 --- a/src/resolve/resolved-dns-question.c +++ b/src/grp-resolve/systemd-resolved/resolved-dns-question.c diff --git a/src/resolve/resolved-dns-question.h b/src/grp-resolve/systemd-resolved/resolved-dns-question.h index ea41478975..ea41478975 100644 --- a/src/resolve/resolved-dns-question.h +++ b/src/grp-resolve/systemd-resolved/resolved-dns-question.h diff --git a/src/resolve/resolved-dns-rr.c b/src/grp-resolve/systemd-resolved/resolved-dns-rr.c index 40f8e28dfd..40f8e28dfd 100644 --- a/src/resolve/resolved-dns-rr.c +++ b/src/grp-resolve/systemd-resolved/resolved-dns-rr.c diff --git a/src/resolve/resolved-dns-rr.h b/src/grp-resolve/systemd-resolved/resolved-dns-rr.h index 2e0dfbaba3..2e0dfbaba3 100644 --- a/src/resolve/resolved-dns-rr.h +++ b/src/grp-resolve/systemd-resolved/resolved-dns-rr.h diff --git a/src/resolve/resolved-dns-scope.c b/src/grp-resolve/systemd-resolved/resolved-dns-scope.c index a406872a38..a406872a38 100644 --- a/src/resolve/resolved-dns-scope.c +++ b/src/grp-resolve/systemd-resolved/resolved-dns-scope.c diff --git a/src/resolve/resolved-dns-scope.h b/src/grp-resolve/systemd-resolved/resolved-dns-scope.h index 291e5817d0..291e5817d0 100644 --- a/src/resolve/resolved-dns-scope.h +++ b/src/grp-resolve/systemd-resolved/resolved-dns-scope.h diff --git a/src/resolve/resolved-dns-search-domain.c b/src/grp-resolve/systemd-resolved/resolved-dns-search-domain.c index 732471027b..732471027b 100644 --- a/src/resolve/resolved-dns-search-domain.c +++ b/src/grp-resolve/systemd-resolved/resolved-dns-search-domain.c diff --git a/src/resolve/resolved-dns-search-domain.h b/src/grp-resolve/systemd-resolved/resolved-dns-search-domain.h index eaacef4edc..eaacef4edc 100644 --- a/src/resolve/resolved-dns-search-domain.h +++ b/src/grp-resolve/systemd-resolved/resolved-dns-search-domain.h diff --git a/src/resolve/resolved-dns-server.c b/src/grp-resolve/systemd-resolved/resolved-dns-server.c index 27342a0e04..27342a0e04 100644 --- a/src/resolve/resolved-dns-server.c +++ b/src/grp-resolve/systemd-resolved/resolved-dns-server.c diff --git a/src/resolve/resolved-dns-server.h b/src/grp-resolve/systemd-resolved/resolved-dns-server.h index 9f4a69c37a..9f4a69c37a 100644 --- a/src/resolve/resolved-dns-server.h +++ b/src/grp-resolve/systemd-resolved/resolved-dns-server.h diff --git a/src/resolve/resolved-dns-stream.c b/src/grp-resolve/systemd-resolved/resolved-dns-stream.c index a1040aeff4..a1040aeff4 100644 --- a/src/resolve/resolved-dns-stream.c +++ b/src/grp-resolve/systemd-resolved/resolved-dns-stream.c diff --git a/src/resolve/resolved-dns-stream.h b/src/grp-resolve/systemd-resolved/resolved-dns-stream.h index 5ccc842249..5ccc842249 100644 --- a/src/resolve/resolved-dns-stream.h +++ b/src/grp-resolve/systemd-resolved/resolved-dns-stream.h diff --git a/src/resolve/resolved-dns-synthesize.c b/src/grp-resolve/systemd-resolved/resolved-dns-synthesize.c index f4a43dee8c..f4a43dee8c 100644 --- a/src/resolve/resolved-dns-synthesize.c +++ b/src/grp-resolve/systemd-resolved/resolved-dns-synthesize.c diff --git a/src/resolve/resolved-dns-synthesize.h b/src/grp-resolve/systemd-resolved/resolved-dns-synthesize.h index 5d829bb2e7..5d829bb2e7 100644 --- a/src/resolve/resolved-dns-synthesize.h +++ b/src/grp-resolve/systemd-resolved/resolved-dns-synthesize.h diff --git a/src/resolve/resolved-dns-transaction.c b/src/grp-resolve/systemd-resolved/resolved-dns-transaction.c index d48fdd1281..d48fdd1281 100644 --- a/src/resolve/resolved-dns-transaction.c +++ b/src/grp-resolve/systemd-resolved/resolved-dns-transaction.c diff --git a/src/resolve/resolved-dns-transaction.h b/src/grp-resolve/systemd-resolved/resolved-dns-transaction.h index 4617194711..4617194711 100644 --- a/src/resolve/resolved-dns-transaction.h +++ b/src/grp-resolve/systemd-resolved/resolved-dns-transaction.h diff --git a/src/resolve/resolved-dns-trust-anchor.c b/src/grp-resolve/systemd-resolved/resolved-dns-trust-anchor.c index a75337eb6a..a75337eb6a 100644 --- a/src/resolve/resolved-dns-trust-anchor.c +++ b/src/grp-resolve/systemd-resolved/resolved-dns-trust-anchor.c diff --git a/src/resolve/resolved-dns-trust-anchor.h b/src/grp-resolve/systemd-resolved/resolved-dns-trust-anchor.h index 635c75fde5..635c75fde5 100644 --- a/src/resolve/resolved-dns-trust-anchor.h +++ b/src/grp-resolve/systemd-resolved/resolved-dns-trust-anchor.h diff --git a/src/resolve/resolved-dns-zone.c b/src/grp-resolve/systemd-resolved/resolved-dns-zone.c index f52383cfd1..f52383cfd1 100644 --- a/src/resolve/resolved-dns-zone.c +++ b/src/grp-resolve/systemd-resolved/resolved-dns-zone.c diff --git a/src/resolve/resolved-dns-zone.h b/src/grp-resolve/systemd-resolved/resolved-dns-zone.h index 408833c359..408833c359 100644 --- a/src/resolve/resolved-dns-zone.h +++ b/src/grp-resolve/systemd-resolved/resolved-dns-zone.h diff --git a/src/resolve/resolved-etc-hosts.c b/src/grp-resolve/systemd-resolved/resolved-etc-hosts.c index ee82c96822..ee82c96822 100644 --- a/src/resolve/resolved-etc-hosts.c +++ b/src/grp-resolve/systemd-resolved/resolved-etc-hosts.c diff --git a/src/resolve/resolved-etc-hosts.h b/src/grp-resolve/systemd-resolved/resolved-etc-hosts.h index 9d5a175f18..9d5a175f18 100644 --- a/src/resolve/resolved-etc-hosts.h +++ b/src/grp-resolve/systemd-resolved/resolved-etc-hosts.h diff --git a/src/resolve/resolved-gperf.gperf b/src/grp-resolve/systemd-resolved/resolved-gperf.gperf index 82f26215df..82f26215df 100644 --- a/src/resolve/resolved-gperf.gperf +++ b/src/grp-resolve/systemd-resolved/resolved-gperf.gperf diff --git a/src/resolve/resolved-link-bus.c b/src/grp-resolve/systemd-resolved/resolved-link-bus.c index df7516f4f4..df7516f4f4 100644 --- a/src/resolve/resolved-link-bus.c +++ b/src/grp-resolve/systemd-resolved/resolved-link-bus.c diff --git a/src/resolve/resolved-link-bus.h b/src/grp-resolve/systemd-resolved/resolved-link-bus.h index 31e6cd2b45..5a8ee08ec7 100644 --- a/src/resolve/resolved-link-bus.h +++ b/src/grp-resolve/systemd-resolved/resolved-link-bus.h @@ -19,7 +19,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "resolved-link.h" diff --git a/src/resolve/resolved-link.c b/src/grp-resolve/systemd-resolved/resolved-link.c index c5863b3aa2..65df95bb1f 100644 --- a/src/resolve/resolved-link.c +++ b/src/grp-resolve/systemd-resolved/resolved-link.c @@ -19,7 +19,7 @@ #include <net/if.h> -#include "sd-network.h" +#include <systemd/sd-network.h> #include "alloc-util.h" #include "missing.h" diff --git a/src/resolve/resolved-link.h b/src/grp-resolve/systemd-resolved/resolved-link.h index f534c12824..f534c12824 100644 --- a/src/resolve/resolved-link.h +++ b/src/grp-resolve/systemd-resolved/resolved-link.h diff --git a/src/resolve/resolved-llmnr.c b/src/grp-resolve/systemd-resolved/resolved-llmnr.c index ef12abfbb5..ef12abfbb5 100644 --- a/src/resolve/resolved-llmnr.c +++ b/src/grp-resolve/systemd-resolved/resolved-llmnr.c diff --git a/src/resolve/resolved-llmnr.h b/src/grp-resolve/systemd-resolved/resolved-llmnr.h index 8133582fa7..8133582fa7 100644 --- a/src/resolve/resolved-llmnr.h +++ b/src/grp-resolve/systemd-resolved/resolved-llmnr.h diff --git a/src/resolve/resolved-manager.c b/src/grp-resolve/systemd-resolved/resolved-manager.c index e82c6ec563..e82c6ec563 100644 --- a/src/resolve/resolved-manager.c +++ b/src/grp-resolve/systemd-resolved/resolved-manager.c diff --git a/src/resolve/resolved-manager.h b/src/grp-resolve/systemd-resolved/resolved-manager.h index e82a824f29..8bef2d2b28 100644 --- a/src/resolve/resolved-manager.h +++ b/src/grp-resolve/systemd-resolved/resolved-manager.h @@ -19,9 +19,9 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-event.h" -#include "sd-netlink.h" -#include "sd-network.h" +#include <systemd/sd-event.h> +#include <systemd/sd-netlink.h> +#include <systemd/sd-network.h> #include "hashmap.h" #include "list.h" diff --git a/src/resolve/resolved-mdns.c b/src/grp-resolve/systemd-resolved/resolved-mdns.c index bc8b8b809b..bc8b8b809b 100644 --- a/src/resolve/resolved-mdns.c +++ b/src/grp-resolve/systemd-resolved/resolved-mdns.c diff --git a/src/resolve/resolved-mdns.h b/src/grp-resolve/systemd-resolved/resolved-mdns.h index 5d274648f4..5d274648f4 100644 --- a/src/resolve/resolved-mdns.h +++ b/src/grp-resolve/systemd-resolved/resolved-mdns.h diff --git a/src/resolve/resolved-resolv-conf.c b/src/grp-resolve/systemd-resolved/resolved-resolv-conf.c index 065427b690..065427b690 100644 --- a/src/resolve/resolved-resolv-conf.c +++ b/src/grp-resolve/systemd-resolved/resolved-resolv-conf.c diff --git a/src/resolve/resolved-resolv-conf.h b/src/grp-resolve/systemd-resolved/resolved-resolv-conf.h index 75fa080e4c..75fa080e4c 100644 --- a/src/resolve/resolved-resolv-conf.h +++ b/src/grp-resolve/systemd-resolved/resolved-resolv-conf.h diff --git a/src/resolve/resolved.c b/src/grp-resolve/systemd-resolved/resolved.c index c7e2ab14d6..07e6bfb54a 100644 --- a/src/resolve/resolved.c +++ b/src/grp-resolve/systemd-resolved/resolved.c @@ -17,8 +17,8 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-daemon.h" -#include "sd-event.h" +#include <systemd/sd-daemon.h> +#include <systemd/sd-event.h> #include "capability-util.h" #include "mkdir.h" diff --git a/src/resolve/resolved.conf.in b/src/grp-resolve/systemd-resolved/resolved.conf.in index efc9c6733a..efc9c6733a 100644 --- a/src/resolve/resolved.conf.in +++ b/src/grp-resolve/systemd-resolved/resolved.conf.in diff --git a/src/resolve/test-dnssec-complex.c b/src/grp-resolve/systemd-resolved/test-dnssec-complex.c index 58c089eb40..568400ac77 100644 --- a/src/resolve/test-dnssec-complex.c +++ b/src/grp-resolve/systemd-resolved/test-dnssec-complex.c @@ -19,7 +19,7 @@ #include <netinet/ip.h> -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "af-list.h" #include "alloc-util.h" diff --git a/src/resolve/test-dnssec.c b/src/grp-resolve/systemd-resolved/test-dnssec.c index a093d86a91..a093d86a91 100644 --- a/src/resolve/test-dnssec.c +++ b/src/grp-resolve/systemd-resolved/test-dnssec.c diff --git a/src/resolve/test-resolve-tables.c b/src/grp-resolve/systemd-resolved/test-resolve-tables.c index 63660afc87..63660afc87 100644 --- a/src/resolve/test-resolve-tables.c +++ b/src/grp-resolve/systemd-resolved/test-resolve-tables.c diff --git a/src/grp-system/systemctl/Makefile b/src/grp-system/systemctl/Makefile new file mode 100644 index 0000000000..a83c552a06 --- /dev/null +++ b/src/grp-system/systemctl/Makefile @@ -0,0 +1,33 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +systemctl_SOURCES = \ + src/systemctl/systemctl.c + +systemctl_LDADD = \ + libshared.la + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/systemctl/systemctl.c b/src/grp-system/systemctl/systemctl.c index 908ccabf8a..c03fca06c8 100644 --- a/src/systemctl/systemctl.c +++ b/src/grp-system/systemctl/systemctl.c @@ -31,9 +31,9 @@ #include <sys/socket.h> #include <unistd.h> -#include "sd-bus.h" -#include "sd-daemon.h" -#include "sd-login.h" +#include <systemd/sd-bus.h> +#include <systemd/sd-daemon.h> +#include <systemd/sd-login.h> #include "alloc-util.h" #include "bus-common-errors.h" diff --git a/src/systemctl/systemd-sysv-install.SKELETON b/src/grp-system/systemctl/systemd-sysv-install.SKELETON index a53a3e6221..a53a3e6221 100755 --- a/src/systemctl/systemd-sysv-install.SKELETON +++ b/src/grp-system/systemctl/systemd-sysv-install.SKELETON diff --git a/src/grp-system/systemd/Makefile b/src/grp-system/systemd/Makefile new file mode 100644 index 0000000000..e77395c7cf --- /dev/null +++ b/src/grp-system/systemd/Makefile @@ -0,0 +1,68 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +systemd_SOURCES = \ + src/core/main.c + +systemd_CFLAGS = \ + $(AM_CFLAGS) \ + $(SECCOMP_CFLAGS) \ + $(MOUNT_CFLAGS) + +systemd_LDADD = \ + libcore.la + +dist_pkgsysconf_DATA += \ + src/core/system.conf \ + src/core/user.conf + +dist_dbuspolicy_DATA += \ + src/core/org.freedesktop.systemd1.conf + +dist_dbussystemservice_DATA += \ + src/core/org.freedesktop.systemd1.service + +polkitpolicy_in_in_files += \ + src/core/org.freedesktop.systemd1.policy.in.in + +pkgconfigdata_DATA += \ + src/core/systemd.pc + +nodist_rpmmacros_DATA = \ + src/core/macros.systemd + +EXTRA_DIST += \ + src/core/systemd.pc.in \ + src/core/macros.systemd.in \ + src/core/triggers.systemd.in + +dist_systemunit_DATA_busnames += \ + units/org.freedesktop.systemd1.busname + +BUSNAMES_TARGET_WANTS += \ + org.freedesktop.systemd1.busname + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/core/macros.systemd.in b/src/grp-system/systemd/macros.systemd.in index 2cace3d3ba..2cace3d3ba 100644 --- a/src/core/macros.systemd.in +++ b/src/grp-system/systemd/macros.systemd.in diff --git a/src/core/main.c b/src/grp-system/systemd/main.c index 5346392d73..bc151cde85 100644 --- a/src/core/main.c +++ b/src/grp-system/systemd/main.c @@ -35,8 +35,8 @@ #include <valgrind/valgrind.h> #endif -#include "sd-bus.h" -#include "sd-daemon.h" +#include <systemd/sd-bus.h> +#include <systemd/sd-daemon.h> #include "alloc-util.h" #include "architecture.h" diff --git a/src/core/org.freedesktop.systemd1.conf b/src/grp-system/systemd/org.freedesktop.systemd1.conf index 6a7a37ee92..6a7a37ee92 100644 --- a/src/core/org.freedesktop.systemd1.conf +++ b/src/grp-system/systemd/org.freedesktop.systemd1.conf diff --git a/src/core/org.freedesktop.systemd1.policy.in.in b/src/grp-system/systemd/org.freedesktop.systemd1.policy.in.in index cc39a9e1c3..cc39a9e1c3 100644 --- a/src/core/org.freedesktop.systemd1.policy.in.in +++ b/src/grp-system/systemd/org.freedesktop.systemd1.policy.in.in diff --git a/src/core/org.freedesktop.systemd1.service b/src/grp-system/systemd/org.freedesktop.systemd1.service index d4df3e93a2..d4df3e93a2 100644 --- a/src/core/org.freedesktop.systemd1.service +++ b/src/grp-system/systemd/org.freedesktop.systemd1.service diff --git a/src/core/system.conf b/src/grp-system/systemd/system.conf index e2ded27333..e2ded27333 100644 --- a/src/core/system.conf +++ b/src/grp-system/systemd/system.conf diff --git a/src/core/systemd.pc.in b/src/grp-system/systemd/systemd.pc.in index ac52b30dd3..ac52b30dd3 100644 --- a/src/core/systemd.pc.in +++ b/src/grp-system/systemd/systemd.pc.in diff --git a/src/core/triggers.systemd.in b/src/grp-system/systemd/triggers.systemd.in index 9e18a39a67..9e18a39a67 100644 --- a/src/core/triggers.systemd.in +++ b/src/grp-system/systemd/triggers.systemd.in diff --git a/src/core/user.conf b/src/grp-system/systemd/user.conf index 87c8164378..87c8164378 100644 --- a/src/core/user.conf +++ b/src/grp-system/systemd/user.conf diff --git a/src/timedate/.gitignore b/src/grp-timedate/systemd-timedated/.gitignore index 48757f0968..48757f0968 100644 --- a/src/timedate/.gitignore +++ b/src/grp-timedate/systemd-timedated/.gitignore diff --git a/src/grp-timedate/systemd-timedated/Makefile b/src/grp-timedate/systemd-timedated/Makefile new file mode 100644 index 0000000000..0224793a47 --- /dev/null +++ b/src/grp-timedate/systemd-timedated/Makefile @@ -0,0 +1,66 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +ifneq ($(ENABLE_TIMEDATED),) +systemd_timedated_SOURCES = \ + src/timedate/timedated.c + +systemd_timedated_LDADD = \ + libshared.la + +libexec_PROGRAMS += \ + systemd-timedated + +dist_dbussystemservice_DATA += \ + src/timedate/org.freedesktop.timedate1.service + +dist_dbuspolicy_DATA += \ + src/timedate/org.freedesktop.timedate1.conf + +nodist_systemunit_DATA += \ + units/systemd-timedated.service + +dist_systemunit_DATA_busnames += \ + units/org.freedesktop.timedate1.busname + +polkitpolicy_files += \ + src/timedate/org.freedesktop.timedate1.policy + +SYSTEM_UNIT_ALIASES += \ + systemd-timedated.service dbus-org.freedesktop.timedate1.service + +BUSNAMES_TARGET_WANTS += \ + org.freedesktop.timedate1.busname + +endif # ENABLE_TIMEDATED + +polkitpolicy_in_files += \ + src/timedate/org.freedesktop.timedate1.policy.in + +EXTRA_DIST += \ + units/systemd-timedated.service.in + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/timedate/org.freedesktop.timedate1.conf b/src/grp-timedate/systemd-timedated/org.freedesktop.timedate1.conf index 36557d5841..36557d5841 100644 --- a/src/timedate/org.freedesktop.timedate1.conf +++ b/src/grp-timedate/systemd-timedated/org.freedesktop.timedate1.conf diff --git a/src/timedate/org.freedesktop.timedate1.policy.in b/src/grp-timedate/systemd-timedated/org.freedesktop.timedate1.policy.in index aa30b70831..aa30b70831 100644 --- a/src/timedate/org.freedesktop.timedate1.policy.in +++ b/src/grp-timedate/systemd-timedated/org.freedesktop.timedate1.policy.in diff --git a/src/timedate/org.freedesktop.timedate1.service b/src/grp-timedate/systemd-timedated/org.freedesktop.timedate1.service index 875f4bec78..875f4bec78 100644 --- a/src/timedate/org.freedesktop.timedate1.service +++ b/src/grp-timedate/systemd-timedated/org.freedesktop.timedate1.service diff --git a/src/timedate/timedated.c b/src/grp-timedate/systemd-timedated/timedated.c index 2a10135fba..f5ca319640 100644 --- a/src/timedate/timedated.c +++ b/src/grp-timedate/systemd-timedated/timedated.c @@ -21,9 +21,9 @@ #include <string.h> #include <unistd.h> -#include "sd-bus.h" -#include "sd-event.h" -#include "sd-messages.h" +#include <systemd/sd-bus.h> +#include <systemd/sd-event.h> +#include <systemd/sd-messages.h> #include "alloc-util.h" #include "bus-common-errors.h" diff --git a/src/grp-timedate/timedatectl/Makefile b/src/grp-timedate/timedatectl/Makefile new file mode 100644 index 0000000000..c05838c944 --- /dev/null +++ b/src/grp-timedate/timedatectl/Makefile @@ -0,0 +1,43 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +ifneq ($(ENABLE_TIMEDATED),) +timedatectl_SOURCES = \ + src/timedate/timedatectl.c + +timedatectl_LDADD = \ + libshared.la + +bin_PROGRAMS += \ + timedatectl + +dist_bashcompletion_data += \ + shell-completion/bash/timedatectl + +dist_zshcompletion_data += \ + shell-completion/zsh/_timedatectl +endif # ENABLE_TIMEDATED +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/timedate/timedatectl.c b/src/grp-timedate/timedatectl/timedatectl.c index 097963b41b..28546a0ad1 100644 --- a/src/timedate/timedatectl.c +++ b/src/grp-timedate/timedatectl/timedatectl.c @@ -23,7 +23,7 @@ #include <stdbool.h> #include <stdlib.h> -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "bus-error.h" #include "bus-util.h" diff --git a/src/hibernate-resume/Makefile b/src/hibernate-resume/Makefile deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/hibernate-resume/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile
\ No newline at end of file diff --git a/src/hostname/Makefile b/src/hostname/Makefile index d0b0e8e008..f0215ee0cc 120000..100644 --- a/src/hostname/Makefile +++ b/src/hostname/Makefile @@ -1 +1,80 @@ -../Makefile
\ No newline at end of file +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +ifneq ($(ENABLE_HOSTNAMED),) +systemd_hostnamed_SOURCES = \ + src/hostname/hostnamed.c + +systemd_hostnamed_LDADD = \ + libshared.la + +libexec_PROGRAMS += \ + systemd-hostnamed + +nodist_systemunit_DATA += \ + units/systemd-hostnamed.service + +dist_systemunit_DATA_busnames += \ + units/org.freedesktop.hostname1.busname + +dist_dbuspolicy_DATA += \ + src/hostname/org.freedesktop.hostname1.conf + +dist_dbussystemservice_DATA += \ + src/hostname/org.freedesktop.hostname1.service + +polkitpolicy_files += \ + src/hostname/org.freedesktop.hostname1.policy + +SYSTEM_UNIT_ALIASES += \ + systemd-hostnamed.service dbus-org.freedesktop.hostname1.service + +BUSNAMES_TARGET_WANTS += \ + org.freedesktop.hostname1.busname + +hostnamectl_SOURCES = \ + src/hostname/hostnamectl.c + +hostnamectl_LDADD = \ + libshared.la + +bin_PROGRAMS += \ + hostnamectl + +dist_bashcompletion_data += \ + shell-completion/bash/hostnamectl + +dist_zshcompletion_data += \ + shell-completion/zsh/_hostnamectl +endif # ENABLE_HOSTNAMED + +polkitpolicy_in_files += \ + src/hostname/org.freedesktop.hostname1.policy.in + +EXTRA_DIST += \ + units/systemd-hostnamed.service.in + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/hostname/hostnamectl.c b/src/hostname/hostnamectl.c index c16a324232..aabc3b30c0 100644 --- a/src/hostname/hostnamectl.c +++ b/src/hostname/hostnamectl.c @@ -23,8 +23,8 @@ #include <stdlib.h> #include <string.h> -#include "sd-bus.h" -#include "sd-id128.h" +#include <systemd/sd-bus.h> +#include <systemd/sd-id128.h> #include "alloc-util.h" #include "architecture.h" diff --git a/src/hwdb/Makefile b/src/hwdb/Makefile deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/hwdb/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile
\ No newline at end of file diff --git a/src/import/Makefile b/src/import/Makefile index d0b0e8e008..019350e9bb 120000..100644 --- a/src/import/Makefile +++ b/src/import/Makefile @@ -1 +1,195 @@ -../Makefile
\ No newline at end of file +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +ifneq ($(ENABLE_IMPORTD),) + +ifneq ($(HAVE_LIBCURL),) +ifneq ($(HAVE_XZ),) +ifneq ($(HAVE_ZLIB),) +ifneq ($(HAVE_BZIP2),) +ifneq ($(HAVE_GCRYPT),) + +libexec_PROGRAMS += \ + systemd-importd \ + systemd-pull \ + systemd-import \ + systemd-export + +systemd_importd_SOURCES = \ + src/import/importd.c + +systemd_importd_CFLAGS = \ + $(AM_CFLAGS) \ + -D SYSTEMD_PULL_PATH=\"$(libexecdir)/systemd-pull\" \ + -D SYSTEMD_IMPORT_PATH=\"$(libexecdir)/systemd-import\" \ + -D SYSTEMD_EXPORT_PATH=\"$(libexecdir)/systemd-export\" + +systemd_importd_LDADD = \ + libshared.la + +systemd_pull_SOURCES = \ + src/import/pull.c \ + src/import/pull-raw.c \ + src/import/pull-raw.h \ + src/import/pull-tar.c \ + src/import/pull-tar.h \ + src/import/pull-job.c \ + src/import/pull-job.h \ + src/import/pull-common.c \ + src/import/pull-common.h \ + src/import/import-common.c \ + src/import/import-common.h \ + src/import/import-compress.c \ + src/import/import-compress.h \ + src/import/curl-util.c \ + src/import/curl-util.h \ + src/import/aufs-util.c \ + src/import/aufs-util.h \ + src/import/qcow2-util.c \ + src/import/qcow2-util.h + +systemd_pull_CFLAGS = \ + $(AM_CFLAGS) \ + $(LIBCURL_CFLAGS) \ + $(XZ_CFLAGS) \ + $(ZLIB_CFLAGS) \ + $(BZIP2_CFLAGS) \ + $(GCRYPT_CFLAGS) \ + -D VENDOR_KEYRING_PATH=\"$(libexecdir)/import-pubring.gpg\" \ + -D USER_KEYRING_PATH=\"$(pkgsysconfdir)/import-pubring.gpg\" + +systemd_pull_LDADD = \ + libshared.la \ + $(LIBCURL_LIBS) \ + $(XZ_LIBS) \ + $(ZLIB_LIBS) \ + $(BZIP2_LIBS) \ + $(GCRYPT_LIBS) + +systemd_import_SOURCES = \ + src/import/import.c \ + src/import/import-raw.c \ + src/import/import-raw.h \ + src/import/import-tar.c \ + src/import/import-tar.h \ + src/import/import-common.c \ + src/import/import-common.h \ + src/import/import-compress.c \ + src/import/import-compress.h \ + src/import/qcow2-util.c \ + src/import/qcow2-util.h + +systemd_import_CFLAGS = \ + $(AM_CFLAGS) \ + $(XZ_CFLAGS) \ + $(ZLIB_CFLAGS) \ + $(BZIP2_CFLAGS) + +systemd_import_LDADD = \ + libshared.la \ + $(XZ_LIBS) \ + $(ZLIB_LIBS) \ + $(BZIP2_LIBS) + +systemd_export_SOURCES = \ + src/import/export.c \ + src/import/export-tar.c \ + src/import/export-tar.h \ + src/import/export-raw.c \ + src/import/export-raw.h \ + src/import/import-common.c \ + src/import/import-common.h \ + src/import/import-compress.c \ + src/import/import-compress.h + +systemd_export_CFLAGS = \ + $(AM_CFLAGS) \ + $(XZ_CFLAGS) \ + $(ZLIB_CFLAGS) \ + $(BZIP2_CFLAGS) + +systemd_export_LDADD = \ + libshared.la \ + $(XZ_LIBS) \ + $(ZLIB_LIBS) \ + $(BZIP2_LIBS) + +dist_libexec_DATA = \ + src/import/import-pubring.gpg + +nodist_systemunit_DATA += \ + units/systemd-importd.service + +dist_systemunit_DATA_busnames += \ + units/org.freedesktop.import1.busname + +BUSNAMES_TARGET_WANTS += \ + org.freedesktop.import1.busname + +SYSTEM_UNIT_ALIASES += \ + systemd-importd.service dbus-org.freedesktop.import1.service + +dist_dbussystemservice_DATA += \ + src/import/org.freedesktop.import1.service + +dist_dbuspolicy_DATA += \ + src/import/org.freedesktop.import1.conf + +polkitpolicy_files += \ + src/import/org.freedesktop.import1.policy + +manual_tests += \ + test-qcow2 + +test_qcow2_SOURCES = \ + src/import/test-qcow2.c \ + src/import/qcow2-util.c \ + src/import/qcow2-util.h + +test_qcow2_CFLAGS = \ + $(AM_CFLAGS) \ + $(ZLIB_CFLAGS) + +test_qcow2_LDADD = \ + libshared.la \ + $(ZLIB_LIBS) + +endif # HAVE_GCRYPT +endif # HAVE_BZIP2 +endif # HAVE_ZLIB +endif # HAVE_XZ +endif # HAVE_LIBCURL + +endif # ENABLE_IMPORTD + +polkitpolicy_in_files += \ + src/import/org.freedesktop.import1.policy.in + +EXTRA_DIST += \ + units/systemd-importd.service.in + + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/import/curl-util.h b/src/import/curl-util.h index a758cc5640..2e71bd3b5d 100644 --- a/src/import/curl-util.h +++ b/src/import/curl-util.h @@ -22,7 +22,7 @@ #include <curl/curl.h> #include <sys/types.h> -#include "sd-event.h" +#include <systemd/sd-event.h> #include "hashmap.h" diff --git a/src/import/export-raw.c b/src/import/export-raw.c index db06e11b87..658f835132 100644 --- a/src/import/export-raw.c +++ b/src/import/export-raw.c @@ -25,7 +25,7 @@ #include <libgen.h> #undef basename -#include "sd-daemon.h" +#include <systemd/sd-daemon.h> #include "alloc-util.h" #include "btrfs-util.h" diff --git a/src/import/export-raw.h b/src/import/export-raw.h index 8e723d4908..c7ac134603 100644 --- a/src/import/export-raw.h +++ b/src/import/export-raw.h @@ -19,7 +19,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-event.h" +#include <systemd/sd-event.h> #include "import-compress.h" #include "macro.h" diff --git a/src/import/export-tar.c b/src/import/export-tar.c index d79c27f2d0..9c511984c1 100644 --- a/src/import/export-tar.c +++ b/src/import/export-tar.c @@ -17,7 +17,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-daemon.h" +#include <systemd/sd-daemon.h> #include "alloc-util.h" #include "btrfs-util.h" diff --git a/src/import/export-tar.h b/src/import/export-tar.h index 1e3c8bb80c..50206cabb3 100644 --- a/src/import/export-tar.h +++ b/src/import/export-tar.h @@ -19,7 +19,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-event.h" +#include <systemd/sd-event.h> #include "import-compress.h" #include "macro.h" diff --git a/src/import/export.c b/src/import/export.c index cc98c33ef6..0a5efe5476 100644 --- a/src/import/export.c +++ b/src/import/export.c @@ -19,7 +19,7 @@ #include <getopt.h> -#include "sd-event.h" +#include <systemd/sd-event.h> #include "alloc-util.h" #include "export-raw.h" diff --git a/src/import/import-raw.c b/src/import/import-raw.c index fd6b9f7703..ce37392707 100644 --- a/src/import/import-raw.c +++ b/src/import/import-raw.c @@ -19,8 +19,8 @@ #include <linux/fs.h> -#include "sd-daemon.h" -#include "sd-event.h" +#include <systemd/sd-daemon.h> +#include <systemd/sd-event.h> #include "alloc-util.h" #include "btrfs-util.h" diff --git a/src/import/import-raw.h b/src/import/import-raw.h index 4f543e0883..f0a315c088 100644 --- a/src/import/import-raw.h +++ b/src/import/import-raw.h @@ -19,7 +19,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-event.h" +#include <systemd/sd-event.h> #include "import-util.h" #include "macro.h" diff --git a/src/import/import-tar.c b/src/import/import-tar.c index 8b81324fde..016d05e77d 100644 --- a/src/import/import-tar.c +++ b/src/import/import-tar.c @@ -19,8 +19,8 @@ #include <linux/fs.h> -#include "sd-daemon.h" -#include "sd-event.h" +#include <systemd/sd-daemon.h> +#include <systemd/sd-event.h> #include "alloc-util.h" #include "btrfs-util.h" diff --git a/src/import/import-tar.h b/src/import/import-tar.h index 24abe06c8f..b66b00ddfd 100644 --- a/src/import/import-tar.h +++ b/src/import/import-tar.h @@ -19,7 +19,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-event.h" +#include <systemd/sd-event.h> #include "import-util.h" #include "macro.h" diff --git a/src/import/import.c b/src/import/import.c index 4e442ee84a..338847dbc2 100644 --- a/src/import/import.c +++ b/src/import/import.c @@ -19,7 +19,7 @@ #include <getopt.h> -#include "sd-event.h" +#include <systemd/sd-event.h> #include "alloc-util.h" #include "fd-util.h" diff --git a/src/import/importd.c b/src/import/importd.c index d2a5867a6e..b44d0525ae 100644 --- a/src/import/importd.c +++ b/src/import/importd.c @@ -19,7 +19,7 @@ #include <sys/prctl.h> -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "alloc-util.h" #include "bus-common-errors.h" diff --git a/src/import/pull-raw.c b/src/import/pull-raw.c index 8a16602c3e..ca49f0c7d7 100644 --- a/src/import/pull-raw.c +++ b/src/import/pull-raw.c @@ -21,7 +21,7 @@ #include <linux/fs.h> #include <sys/xattr.h> -#include "sd-daemon.h" +#include <systemd/sd-daemon.h> #include "alloc-util.h" #include "btrfs-util.h" diff --git a/src/import/pull-raw.h b/src/import/pull-raw.h index 8f6d16eb3a..6bafa6dafd 100644 --- a/src/import/pull-raw.h +++ b/src/import/pull-raw.h @@ -19,7 +19,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-event.h" +#include <systemd/sd-event.h> #include "import-util.h" #include "macro.h" diff --git a/src/import/pull-tar.c b/src/import/pull-tar.c index afb13366f0..1fed468b7e 100644 --- a/src/import/pull-tar.c +++ b/src/import/pull-tar.c @@ -20,7 +20,7 @@ #include <curl/curl.h> #include <sys/prctl.h> -#include "sd-daemon.h" +#include <systemd/sd-daemon.h> #include "alloc-util.h" #include "btrfs-util.h" diff --git a/src/import/pull-tar.h b/src/import/pull-tar.h index 7e63e496d8..9ff5bd5953 100644 --- a/src/import/pull-tar.h +++ b/src/import/pull-tar.h @@ -19,7 +19,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-event.h" +#include <systemd/sd-event.h> #include "import-util.h" #include "macro.h" diff --git a/src/import/pull.c b/src/import/pull.c index 72604a6a74..74df24f993 100644 --- a/src/import/pull.c +++ b/src/import/pull.c @@ -19,7 +19,7 @@ #include <getopt.h> -#include "sd-event.h" +#include <systemd/sd-event.h> #include "alloc-util.h" #include "hostname-util.h" diff --git a/src/initctl/Makefile b/src/initctl/Makefile index d0b0e8e008..05349ba24f 120000..100644 --- a/src/initctl/Makefile +++ b/src/initctl/Makefile @@ -1 +1,33 @@ -../Makefile
\ No newline at end of file +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +systemd_initctl_SOURCES = \ + src/initctl/initctl.c + +systemd_initctl_LDADD = \ + libshared.la + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/initctl/initctl.c b/src/initctl/initctl.c index 3e57afb997..27f1fd04a1 100644 --- a/src/initctl/initctl.c +++ b/src/initctl/initctl.c @@ -23,8 +23,8 @@ #include <sys/epoll.h> #include <unistd.h> -#include "sd-bus.h" -#include "sd-daemon.h" +#include <systemd/sd-bus.h> +#include <systemd/sd-daemon.h> #include "alloc-util.h" #include "bus-error.h" diff --git a/src/journal-remote/Makefile b/src/journal-remote/Makefile index d0b0e8e008..150e326a78 120000..100644 --- a/src/journal-remote/Makefile +++ b/src/journal-remote/Makefile @@ -1 +1,114 @@ -../Makefile
\ No newline at end of file +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +ifneq ($(HAVE_MICROHTTPD),) +libexec_PROGRAMS += \ + systemd-journal-remote + +systemd_journal_remote_SOURCES = \ + src/journal-remote/journal-remote-parse.h \ + src/journal-remote/journal-remote-parse.c \ + src/journal-remote/journal-remote-write.h \ + src/journal-remote/journal-remote-write.c \ + src/journal-remote/journal-remote.h \ + src/journal-remote/journal-remote.c + +systemd_journal_remote_LDADD = \ + libjournal-core.la + +systemd_journal_remote_SOURCES += \ + src/journal-remote/microhttpd-util.h \ + src/journal-remote/microhttpd-util.c + +systemd_journal_remote_CFLAGS = \ + $(AM_CFLAGS) \ + $(MICROHTTPD_CFLAGS) + +systemd_journal_remote_LDADD += \ + $(MICROHTTPD_LIBS) + +ifneq ($(ENABLE_TMPFILES),) +dist_tmpfiles_DATA += \ + tmpfiles.d/systemd-remote.conf +endif # ENABLE_TMPFILES + +ifneq ($(HAVE_GNUTLS),) +systemd_journal_remote_LDADD += \ + $(GNUTLS_LIBS) +endif # HAVE_GNUTLS + +# systemd-journal-remote make sense mostly with full crypto stack +dist_systemunit_DATA += \ + units/systemd-journal-remote.socket + +nodist_systemunit_DATA += \ + units/systemd-journal-remote.service + +journal-remote-install-hook: journal-install-hook + -$(MKDIR_P) $(DESTDIR)/var/log/journal/remote + -chown 0:0 $(DESTDIR)/var/log/journal/remote + -chmod 755 $(DESTDIR)/var/log/journal/remote + +INSTALL_EXEC_HOOKS += journal-remote-install-hook + +nodist_pkgsysconf_DATA += \ + src/journal-remote/journal-remote.conf + +EXTRA_DIST += \ + units/systemd-journal-remote.service.in \ + src/journal-remote/journal-remote.conf.in \ + src/journal-remote/log-generator.py +endif # HAVE_MICROHTTPD + +ifneq ($(HAVE_LIBCURL),) +libexec_PROGRAMS += \ + systemd-journal-upload + +systemd_journal_upload_SOURCES = \ + src/journal-remote/journal-upload.h \ + src/journal-remote/journal-upload.c \ + src/journal-remote/journal-upload-journal.c + +systemd_journal_upload_CFLAGS = \ + $(AM_CFLAGS) \ + $(LIBCURL_CFLAGS) + +systemd_journal_upload_LDADD = \ + libshared.la \ + $(LIBCURL_LIBS) + +nodist_systemunit_DATA += \ + units/systemd-journal-upload.service + +nodist_pkgsysconf_DATA += \ + src/journal-remote/journal-upload.conf +endif # HAVE_LIBCURL + +EXTRA_DIST += \ + units/systemd-journal-upload.service.in \ + src/journal-remote/journal-upload.conf.in + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/journal-remote/journal-gatewayd.c b/src/journal-remote/journal-gatewayd.c index 3b9adb53e1..0e27a80cf2 100644 --- a/src/journal-remote/journal-gatewayd.c +++ b/src/journal-remote/journal-gatewayd.c @@ -27,9 +27,9 @@ #include <string.h> #include <unistd.h> -#include "sd-bus.h" -#include "sd-daemon.h" -#include "sd-journal.h" +#include <systemd/sd-bus.h> +#include <systemd/sd-daemon.h> +#include <systemd/sd-journal.h> #include "alloc-util.h" #include "bus-util.h" diff --git a/src/journal-remote/journal-remote-parse.h b/src/journal-remote/journal-remote-parse.h index 0b8b6af736..91c5650798 100644 --- a/src/journal-remote/journal-remote-parse.h +++ b/src/journal-remote/journal-remote-parse.h @@ -19,7 +19,7 @@ #pragma once -#include "sd-event.h" +#include <systemd/sd-event.h> #include "journal-remote-write.h" diff --git a/src/journal-remote/journal-remote.c b/src/journal-remote/journal-remote.c index 3ce6fe27b3..db8772d3e6 100644 --- a/src/journal-remote/journal-remote.c +++ b/src/journal-remote/journal-remote.c @@ -31,7 +31,7 @@ #include <gnutls/gnutls.h> #endif -#include "sd-daemon.h" +#include <systemd/sd-daemon.h> #include "alloc-util.h" #include "conf-parser.h" diff --git a/src/journal-remote/journal-remote.h b/src/journal-remote/journal-remote.h index 6466a1c101..de83388eef 100644 --- a/src/journal-remote/journal-remote.h +++ b/src/journal-remote/journal-remote.h @@ -20,7 +20,7 @@ #pragma once -#include "sd-event.h" +#include <systemd/sd-event.h> #include "hashmap.h" #include "journal-remote-parse.h" diff --git a/src/journal-remote/journal-upload.c b/src/journal-remote/journal-upload.c index 440563e7d3..be3012209c 100644 --- a/src/journal-remote/journal-upload.c +++ b/src/journal-remote/journal-upload.c @@ -23,7 +23,7 @@ #include <stdio.h> #include <sys/stat.h> -#include "sd-daemon.h" +#include <systemd/sd-daemon.h> #include "alloc-util.h" #include "conf-parser.h" diff --git a/src/journal-remote/journal-upload.h b/src/journal-remote/journal-upload.h index b8cd04d527..40f64dfc60 100644 --- a/src/journal-remote/journal-upload.h +++ b/src/journal-remote/journal-upload.h @@ -2,8 +2,8 @@ #include <inttypes.h> -#include "sd-event.h" -#include "sd-journal.h" +#include <systemd/sd-event.h> +#include <systemd/sd-journal.h> typedef enum { ENTRY_CURSOR = 0, /* Nothing actually written yet. */ diff --git a/src/journal/Makefile b/src/journal/Makefile index d0b0e8e008..17f2c5e859 120000..100644 --- a/src/journal/Makefile +++ b/src/journal/Makefile @@ -1 +1,349 @@ -../Makefile
\ No newline at end of file +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + + +$(outdir)/dns_type-list.txt: src/resolve/dns-type.h + $(AM_V_at)$(MKDIR_P) $(dir $@) + $(AM_V_GEN)$(SED) -n -r 's/.* DNS_TYPE_(\w+).*/\1/p' <$< >$@ + +$(outdir)/dns_type-to-name.h: src/resolve/dns_type-list.txt + $(AM_V_at)$(MKDIR_P) $(dir $@) + $(AM_V_GEN)$(AWK) 'BEGIN{ print "const char *dns_type_to_string(int type) {\n\tswitch(type) {" } {printf " case DNS_TYPE_%s: return ", $$1; sub(/_/, "-"); printf "\"%s\";\n", $$1 } END{ print " default: return NULL;\n\t}\n}\n" }' <$< >$@ + +$(outdir)/dns_type-from-name.gperf: src/resolve/dns_type-list.txt + $(AM_V_at)$(MKDIR_P) $(dir $@) + $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct dns_type_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { s=$$1; sub(/_/, "-", s); printf "%s, ", $$s; printf "DNS_TYPE_%s\n", $$1 }' <$< >$@ + +systemd_journald_SOURCES = \ + src/journal/journald.c \ + src/journal/journald-server.h + +systemd_journald_LDADD = \ + libjournal-core.la \ + libshared.la + +systemd_cat_SOURCES = \ + src/journal/cat.c + +systemd_cat_LDADD = \ + libjournal-core.la + +# using _CFLAGS = in the conditional below would suppress AM_CFLAGS +journalctl_CFLAGS = \ + $(AM_CFLAGS) + +journalctl_SOURCES = \ + src/journal/journalctl.c + +journalctl_LDADD = \ + libshared.la \ + libudev-core.la + +ifneq ($(HAVE_QRENCODE),) +journalctl_SOURCES += \ + src/journal/journal-qrcode.c \ + src/journal/journal-qrcode.h + +journalctl_CFLAGS += \ + $(QRENCODE_CFLAGS) + +journalctl_LDADD += \ + $(QRENCODE_LIBS) +endif # HAVE_QRENCODE + +test_journal_SOURCES = \ + src/journal/test-journal.c + +test_journal_LDADD = \ + libjournal-core.la + +test_journal_send_SOURCES = \ + src/journal/test-journal-send.c + +test_journal_send_LDADD = \ + libjournal-core.la + +test_journal_syslog_SOURCES = \ + src/journal/test-journal-syslog.c + +test_journal_syslog_LDADD = \ + libjournal-core.la + +test_journal_match_SOURCES = \ + src/journal/test-journal-match.c + +test_journal_match_LDADD = \ + libjournal-core.la + +test_journal_enum_SOURCES = \ + src/journal/test-journal-enum.c + +test_journal_enum_LDADD = \ + libjournal-core.la + +test_journal_stream_SOURCES = \ + src/journal/test-journal-stream.c + +test_journal_stream_LDADD = \ + libjournal-core.la + +test_journal_flush_SOURCES = \ + src/journal/test-journal-flush.c + +test_journal_flush_LDADD = \ + libjournal-core.la + +test_journal_init_SOURCES = \ + src/journal/test-journal-init.c + +test_journal_init_LDADD = \ + libjournal-core.la + +test_journal_verify_SOURCES = \ + src/journal/test-journal-verify.c + +test_journal_verify_LDADD = \ + libjournal-core.la + +test_journal_interleaving_SOURCES = \ + src/journal/test-journal-interleaving.c + +test_journal_interleaving_LDADD = \ + libjournal-core.la + +test_mmap_cache_SOURCES = \ + src/journal/test-mmap-cache.c + +test_mmap_cache_LDADD = \ + libjournal-core.la + +test_catalog_SOURCES = \ + src/journal/test-catalog.c + +test_catalog_CPPFLAGS = \ + $(AM_CPPFLAGS) \ + -DCATALOG_DIR=\"$(abs_top_srcdir)/catalog\" + +test_catalog_LDADD = \ + libjournal-core.la + +test_compress_SOURCES = \ + src/journal/test-compress.c + +test_compress_LDADD = \ + libshared.la + +test_compress_benchmark_SOURCES = \ + src/journal/test-compress-benchmark.c + +test_compress_benchmark_LDADD = \ + libshared.la + +test_audit_type_SOURCES = \ + src/journal/test-audit-type.c + +test_audit_type_LDADD = \ + libjournal-core.la + +libjournal_core_la_SOURCES = \ + src/journal/journald-kmsg.c \ + src/journal/journald-kmsg.h \ + src/journal/journald-syslog.c \ + src/journal/journald-syslog.h \ + src/journal/journald-stream.c \ + src/journal/journald-stream.h \ + src/journal/journald-server.c \ + src/journal/journald-server.h \ + src/journal/journald-console.c \ + src/journal/journald-console.h \ + src/journal/journald-wall.c \ + src/journal/journald-wall.h \ + src/journal/journald-native.c \ + src/journal/journald-native.h \ + src/journal/journald-audit.c \ + src/journal/journald-audit.h \ + src/journal/journald-rate-limit.c \ + src/journal/journald-rate-limit.h \ + src/journal/journal-internal.h + +nodist_libjournal_core_la_SOURCES = \ + src/journal/journald-gperf.c + +libjournal_core_la_LIBADD = \ + libshared.la + +noinst_LTLIBRARIES += \ + libjournal-core.la + +journal-install-hook: + -$(MKDIR_P) $(DESTDIR)/var/log/journal + -chown 0:0 $(DESTDIR)/var/log/journal + -chmod 755 $(DESTDIR)/var/log/journal + -setfacl -nm g:adm:rx,d:g:adm:rx $(DESTDIR)/var/log/journal/ + -setfacl -nm g:wheel:rx,d:g:wheel:rx $(DESTDIR)/var/log/journal/ + +journal-uninstall-hook: + -rmdir $(DESTDIR)/var/log/journal/remote + -rmdir $(DESTDIR)/var/log/journal/ + +INSTALL_EXEC_HOOKS += journal-install-hook +UNINSTALL_EXEC_HOOKS += journal-uninstall-hook + +# ------------------------------------------------------------------------------ +# Update catalog on installation. Do not bother if installing +# in DESTDIR, since this is likely for packaging purposes. +catalog-update-hook: + -test -n "$(DESTDIR)" || $(bindir)/journalctl --update-catalog + +INSTALL_DATA_HOOKS += \ + catalog-update-hook + +catalog-remove-hook: + -test -n "$(DESTDIR)" || rm -f $(catalogstatedir)/database + +UNINSTALL_DATA_HOOKS += \ + catalog-remove-hook + +manual_tests += \ + test-journal-enum + +tests += \ + test-journal \ + test-journal-send \ + test-journal-syslog \ + test-journal-match \ + test-journal-stream \ + test-journal-init \ + test-journal-verify \ + test-journal-interleaving \ + test-journal-flush \ + test-mmap-cache \ + test-catalog \ + test-audit-type + +ifneq ($(HAVE_COMPRESSION),) +tests += \ + test-compress \ + test-compress-benchmark +endif # HAVE_COMPRESSION + + +libexec_PROGRAMS += \ + systemd-journald + +bin_PROGRAMS += \ + journalctl + +bin_PROGRAMS += \ + systemd-cat + +dist_systemunit_DATA += \ + units/systemd-journald.socket \ + units/systemd-journald-dev-log.socket \ + units/systemd-journald-audit.socket + +nodist_systemunit_DATA += \ + units/systemd-journald.service \ + units/systemd-journal-flush.service \ + units/systemd-journal-catalog-update.service + +dist_pkgsysconf_DATA += \ + src/journal/journald.conf + +dist_catalog_DATA = \ + catalog/systemd.be.catalog \ + catalog/systemd.be@latin.catalog \ + catalog/systemd.fr.catalog \ + catalog/systemd.it.catalog \ + catalog/systemd.pl.catalog \ + catalog/systemd.pt_BR.catalog \ + catalog/systemd.ru.catalog \ + catalog/systemd.zh_CN.catalog \ + catalog/systemd.zh_TW.catalog \ + catalog/systemd.catalog + +SOCKETS_TARGET_WANTS += \ + systemd-journald.socket \ + systemd-journald-dev-log.socket \ + systemd-journald-audit.socket + +SYSINIT_TARGET_WANTS += \ + systemd-journald.service \ + systemd-journal-flush.service \ + systemd-journal-catalog-update.service + +EXTRA_DIST += \ + units/systemd-journald.service.in \ + units/systemd-journal-flush.service.in \ + units/systemd-journal-catalog-update.service.in + +gperf_gperf_sources += \ + src/journal/journald-gperf.gperf + +# ------------------------------------------------------------------------------ +ifneq ($(HAVE_MICROHTTPD),) +gatewayddocumentrootdir=$(pkgdatadir)/gatewayd + +libexec_PROGRAMS += \ + systemd-journal-gatewayd + +systemd_journal_gatewayd_SOURCES = \ + src/journal-remote/journal-gatewayd.c \ + src/journal-remote/microhttpd-util.h \ + src/journal-remote/microhttpd-util.c + +systemd_journal_gatewayd_LDADD = \ + libshared.la \ + $(MICROHTTPD_LIBS) + +ifneq ($(HAVE_GNUTLS),) +systemd_journal_gatewayd_LDADD += \ + $(GNUTLS_LIBS) +endif # HAVE_GNUTLS + +systemd_journal_gatewayd_CFLAGS = \ + $(AM_CFLAGS) \ + $(MICROHTTPD_CFLAGS) + +systemd_journal_gatewayd_CPPFLAGS = \ + $(AM_CPPFLAGS) \ + -DDOCUMENT_ROOT=\"$(gatewayddocumentrootdir)\" + +dist_systemunit_DATA += \ + units/systemd-journal-gatewayd.socket + +nodist_systemunit_DATA += \ + units/systemd-journal-gatewayd.service + +dist_gatewayddocumentroot_DATA = \ + src/journal-remote/browse.html + +endif # HAVE_MICROHTTPD + +EXTRA_DIST += \ + units/systemd-journal-gatewayd.service.in + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/journal/cat.c b/src/journal/cat.c index 08c844d44f..93ab6e7f96 100644 --- a/src/journal/cat.c +++ b/src/journal/cat.c @@ -24,7 +24,7 @@ #include <stdlib.h> #include <unistd.h> -#include "sd-journal.h" +#include <systemd/sd-journal.h> #include "fd-util.h" #include "parse-util.h" diff --git a/src/journal/catalog/systemd.be.catalog b/src/journal/catalog/systemd.be.catalog new file mode 100644 index 0000000000..be081d6efc --- /dev/null +++ b/src/journal/catalog/systemd.be.catalog @@ -0,0 +1,260 @@ +# This file is part of systemd. +# +# Copyright 2012 Lennart Poettering +# Copyright 2015 Viktar Vaŭčkievič +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. + +# Message catalog for systemd's own messages +# Belarusian translation + +# The catalog format is documented on +# Фармат каталога апісаны на старонцы +# http://www.freedesktop.org/wiki/Software/systemd/catalog + +# For an explanation why we do all this, see https://xkcd.com/1024/ + +-- f77379a8490b408bbe5f6940505a777b +Subject: Сэрвіс журналявання запусціўся +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Працэс сістэмнага журналявання запусціўся, адкрыў файлы для +запісу і гатовы апрацоўваць запыты. + +-- d93fb3c9c24d451a97cea615ce59c00b +Subject: Сэрвіс журналявання спыніўся +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Працэс сістэмнага журналявання спыніўся і закрыў усе файлы. + +-- a596d6fe7bfa4994828e72309e95d61e +Subject: Паведамленні з сэрвісу адкінуты +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: man:journald.conf(5) + +Сэрвіс адправіў занадта штат паведамленняў за кароткі прамежак часу. +Частка паведамленняў была адкінута. + +Майце на ўвазе, што былі адкінуты паведамлення толькі гэтага сэрвісу. +Паведамленні іншых сэрвісаў засталіся. + +Мяжа, пасля якой паведамленні будуць адкінуты, наладжваецца з +дапамогай RateLimitInterval= і RateLimitBurst= у файле +/etc/systemd/journald.conf. Глядзіце journald.conf(5) для дэталей. + +-- e9bf28e6e834481bb6f48f548ad13606 +Subject: Паведамленні страчаны +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Паведамленні ядра былі страчаны, так як сістэма журналявання не паспела +іх апрацаваць. + +-- fc2e22bc6ee647b6b90729ab34a250b1 +Subject: Працэс @COREDUMP_PID@ (@COREDUMP_COMM@) скінуў дамп памяці +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: man:core(5) + +Працэс @COREDUMP_PID@ (@COREDUMP_COMM@) разбіўся і скінуў дамп памяці. + +Звычайна гэта сведчыць аб памылцы ў праграмным кодзе. +Рэкамендуецца паведаміць аб гэтым распрацоўнікам. + +-- 8d45620c1a4348dbb17410da57c60c66 +Subject: Новая сесія № @SESSION_ID@ створана для карыстальніка @USER_ID@ +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat + +Новая сесія з № @SESSION_ID@ створана для карыстальніка @USER_ID@. + +Лідар гэтай сесіі пад № @LEADER@. + +-- 3354939424b4456d9802ca8333ed424a +Subject: Сесія № @SESSION_ID@ спынена +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat + +Сесія № @SESSION_ID@ спынена. + +-- fcbefc5da23d428093f97c82a9290f7b +Subject: Даступна новае працоўнае месца № @SEAT_ID@ +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat + +Новае працоўнае месца № @SEAT_ID@ наладжана і даступна для выкарыстання. + +-- e7852bfe46784ed0accde04bc864c2d5 +Subject: Працоўнае месца № @SEAT_ID@ выдалена +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat + +Працоўнае месца № @SEAT_ID@ выдалена і больш не даступна. + +-- c7a787079b354eaaa9e77b371893cd27 +Subject: Час зменены +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Сістэмны гадзіннік зменены на @REALTIME@ мікрасекунд ад 1 студзеня 1970. + +-- 45f82f4aef7a4bbf942ce861d1f20990 +Subject: Часавы пояс зменены на @TIMEZONE@ +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Сістэмны часавы пояс зменены на @TIMEZONE@. + +-- b07a249cd024414a82dd00cd181378ff +Subject: Запуск сістэмы завяршыўся +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Усе сістэмныя сэрвісы, неабходныя для загрузкі сістэмы, паспяхова +запусціліся. Майце на ўвазе, што гэта не значыць, што машына нічога не +робіць. Магчыма, некаторыя сэрвісы яшчэ ініцыялізіруюцца. + +На запуск ядра спатрэбілася @KERNEL_USEC@ мікрасекунд. + +На запуск пачатковага RAM-дыска спатрэбілася @INITRD_USEC@ мікрасекунд. + +На запуск сістэмных сэрвісаў спатрэбілася @USERSPACE_USEC@ мікрасекунд. + +-- 6bbd95ee977941e497c48be27c254128 +Subject: Сістэма перайшла ў стан сну @SLEEP@ +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Цяпер сістэма перайшла у стан сну @SLEEP@. + +-- 8811e6df2a8e40f58a94cea26f8ebf14 +Subject: Сістэма выйшла са стана сну @SLEEP@ +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Цяпер сістэма выйшла са стана сну @SLEEP@. + +-- 98268866d1d54a499c4e98921d93bc40 +Subject: Сістэма завяршае работу +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Пачаўся працэс выключэння сістэмы. +Спыняюцца ўсе сістэмныя сэрвісы і дэмантуюцца файлавыя сістэмы. + +-- 7d4958e842da4a758f6c1cdc7b36dcc5 +Subject: Юніт @UNIT@ запускаецца +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Пачаўся працэс запуску юніта @UNIT@. + +-- 39f53479d3a045ac8e11786248231fbf +Subject: Юніт @UNIT@ запусціўся +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Працэс запуску юніта @UNIT@ завершаны. + +Вынік: @RESULT@. + +-- de5b426a63be47a7b6ac3eaac82e2f6f +Subject: Юніт @UNIT@ спыняецца +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Пачаўся працэс спынення юніта @UNIT@. + +-- 9d1aaa27d60140bd96365438aad20286 +Subject: Юніт @UNIT@ спынены +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Працэс спынення юніта @UNIT@ завершаны. + +-- be02cf6855d2428ba40df7e9d022f03d +Subject: Збой юніта @UNIT@ +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Збой юніта @UNIT@. + +Вынік: @RESULT@. + +-- d34d037fff1847e6ae669a370e694725 +Subject: Юніт @UNIT@ перачытвае сваю канфігурацыю +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Юніт @UNIT@ пачаў перачытваць сваю канфігурацыю. + +-- 7b05ebc668384222baa8881179cfda54 +Subject: Юніт @UNIT@ перачытаў сваю канфігурацыю +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Юніт @UNIT@ перачытаў сваю канфігурацыю. + +Вынік: @RESULT@. + +-- 641257651c1b4ec9a8624d7a40a9e1e7 +Subject: Працэс @EXECUTABLE@ не можа быць выкананы +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Працэс @EXECUTABLE@ не можа быць выкананы ў выніку збою. + +Ён вярнуў памылку нумар @ERRNO@. + +-- 0027229ca0644181a76c4e92458afa2e +Sibject: Адно ці больш паведамленняў не былі накіраваны ў syslog +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Адно ці больш паведамленняў не былі накіраваны ў syslog сэрвіс, які +выконваецца паралельна з journald. Звычайна гэта значыць, што +рэалізацыя syslog не паспявае апрацаваць паведамленні з неабходнай +хуткасцю. + +-- 1dee0369c7fc4736b7099b38ecb46ee7 +Subject: Кропка мантавання не пустая +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Каталог @WHERE@ указаны як кропка мантавання (другое поле ў /etc/fstab +ці Where= поле ў файле юніта systemd) і не пусты. Гэта не перашкаджае +мантаванню, але існуючыя ў ім файлы будуць недаступны. Для доступу да +іх, калі ласка, змантуйце гэтую файлавую сістэму ў іншае месца. + +-- 24d8d4452573402496068381a6312df2 +Subject: Віртуальная машына або кантэйнер запусціўся +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Віртуальная машына @NAME@ з лідарам № @LEADER@ запусцілася і +гатова для выкарыстання. + +-- 58432bd3bace477cb514b56381b8a758 +Subject: Віртуальная машына або кантэйнер спынены +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Віртуальная машына @NAME@ з лідарам № @LEADER@ спынена. diff --git a/src/journal/catalog/systemd.be@latin.catalog b/src/journal/catalog/systemd.be@latin.catalog new file mode 100644 index 0000000000..382fdb8b04 --- /dev/null +++ b/src/journal/catalog/systemd.be@latin.catalog @@ -0,0 +1,260 @@ +# This file is part of systemd. +# +# Copyright 2012 Lennart Poettering +# Copyright 2015 Viktar Vaŭčkievič +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. + +# Message catalog for systemd's own messages +# Belarusian Latin translation + +# The catalog format is documented on +# Farmat kataloha apisany na staroncy +# http://www.freedesktop.org/wiki/Software/systemd/catalog + +# For an explanation why we do all this, see https://xkcd.com/1024/ + +-- f77379a8490b408bbe5f6940505a777b +Subject: Servis žurnaliavannia zapusciŭsia +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Praces sistemnaha žurnaliavannia zapusciŭsia, adkryŭ fajly dlia +zapisu i hatovy apracoŭvać zapyty. + +-- d93fb3c9c24d451a97cea615ce59c00b +Subject: Servis žurnaliavannia spyniŭsia +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Praces sistemnaha žurnaliavannia spyniŭsia i zakryŭ usie fajly. + +-- a596d6fe7bfa4994828e72309e95d61e +Subject: Paviedamlienni z servisu adkinuty +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: man:journald.conf(5) + +Servis adpraviŭ zanadta štat paviedamlienniaŭ za karotki pramiežak času. +Častka paviedamlienniaŭ byla adkinuta. + +Majcie na ŭvazie, što byli adkinuty paviedamliennia toĺki hetaha servisu. +Paviedamlienni inšych servisaŭ zastalisia. + +Miaža, paslia jakoj paviedamlienni buduć adkinuty, naladžvajecca z +dapamohaj RateLimitInterval= i RateLimitBurst= u fajlie +/etc/systemd/journald.conf. Hliadzicie journald.conf(5) dlia detaliej. + +-- e9bf28e6e834481bb6f48f548ad13606 +Subject: Paviedamlienni stračany +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Paviedamlienni jadra byli stračany, tak jak sistema žurnaliavannia nie paspiela +ich apracavać. + +-- fc2e22bc6ee647b6b90729ab34a250b1 +Subject: Praces @COREDUMP_PID@ (@COREDUMP_COMM@) skinuŭ damp pamiaci +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: man:core(5) + +Praces @COREDUMP_PID@ (@COREDUMP_COMM@) razbiŭsia i skinuŭ damp pamiaci. + +Zvyčajna heta sviedčyć ab pamylcy ŭ prahramnym kodzie. +Rekamiendujecca paviedamić ab hetym raspracoŭnikam. + +-- 8d45620c1a4348dbb17410da57c60c66 +Subject: Novaja siesija № @SESSION_ID@ stvorana dlia karystaĺnika @USER_ID@ +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat + +Novaja siesija z № @SESSION_ID@ stvorana dlia karystaĺnika @USER_ID@. + +Lidar hetaj siesii pad № @LEADER@. + +-- 3354939424b4456d9802ca8333ed424a +Subject: Siesija № @SESSION_ID@ spyniena +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat + +Siesija № @SESSION_ID@ spyniena. + +-- fcbefc5da23d428093f97c82a9290f7b +Subject: Dastupna novaje pracoŭnaje miesca № @SEAT_ID@ +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat + +Novaje pracoŭnaje miesca № @SEAT_ID@ naladžana i dastupna dlia vykarystannia. + +-- e7852bfe46784ed0accde04bc864c2d5 +Subject: Pracoŭnaje miesca № @SEAT_ID@ vydaliena +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat + +Pracoŭnaje miesca № @SEAT_ID@ vydaliena i boĺš nie dastupna. + +-- c7a787079b354eaaa9e77b371893cd27 +Subject: Čas zmienieny +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Sistemny hadzinnik zmienieny na @REALTIME@ mikrasiekund ad 1 studzienia 1970. + +-- 45f82f4aef7a4bbf942ce861d1f20990 +Subject: Časavy pojas zmienieny na @TIMEZONE@ +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Sistemny časavy pojas zmienieny na @TIMEZONE@. + +-- b07a249cd024414a82dd00cd181378ff +Subject: Zapusk sistemy zaviaršyŭsia +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Usie sistemnyja servisy, nieabchodnyja dlia zahruzki sistemy, paspiachova +zapuscilisia. Majcie na ŭvazie, što heta nie značyć, što mašyna ničoha nie +robić. Mahčyma, niekatoryja servisy jašče inicyjalizirujucca. + +Na zapusk jadra spatrebilasia @KERNEL_USEC@ mikrasiekund. + +Na zapusk pačatkovaha RAM-dyska spatrebilasia @INITRD_USEC@ mikrasiekund. + +Na zapusk sistemnych servisaŭ spatrebilasia @USERSPACE_USEC@ mikrasiekund. + +-- 6bbd95ee977941e497c48be27c254128 +Subject: Sistema pierajšla ŭ stan snu @SLEEP@ +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Ciapier sistema pierajšla u stan snu @SLEEP@. + +-- 8811e6df2a8e40f58a94cea26f8ebf14 +Subject: Sistema vyjšla sa stana snu @SLEEP@ +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Ciapier sistema vyjšla sa stana snu @SLEEP@. + +-- 98268866d1d54a499c4e98921d93bc40 +Subject: Sistema zaviaršaje rabotu +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Pačaŭsia praces vykliučennia sistemy. +Spyniajucca ŭsie sistemnyja servisy i demantujucca fajlavyja sistemy. + +-- 7d4958e842da4a758f6c1cdc7b36dcc5 +Subject: Junit @UNIT@ zapuskajecca +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Pačaŭsia praces zapusku junita @UNIT@. + +-- 39f53479d3a045ac8e11786248231fbf +Subject: Junit @UNIT@ zapusciŭsia +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Praces zapusku junita @UNIT@ zavieršany. + +Vynik: @RESULT@. + +-- de5b426a63be47a7b6ac3eaac82e2f6f +Subject: Junit @UNIT@ spyniajecca +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Pačaŭsia praces spyniennia junita @UNIT@. + +-- 9d1aaa27d60140bd96365438aad20286 +Subject: Junit @UNIT@ spynieny +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Praces spyniennia junita @UNIT@ zavieršany. + +-- be02cf6855d2428ba40df7e9d022f03d +Subject: Zboj junita @UNIT@ +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Zboj junita @UNIT@. + +Vynik: @RESULT@. + +-- d34d037fff1847e6ae669a370e694725 +Subject: Junit @UNIT@ pieračytvaje svaju kanfihuracyju +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Junit @UNIT@ pačaŭ pieračytvać svaju kanfihuracyju. + +-- 7b05ebc668384222baa8881179cfda54 +Subject: Junit @UNIT@ pieračytaŭ svaju kanfihuracyju +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Junit @UNIT@ pieračytaŭ svaju kanfihuracyju. + +Vynik: @RESULT@. + +-- 641257651c1b4ec9a8624d7a40a9e1e7 +Subject: Praces @EXECUTABLE@ nie moža być vykanany +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Praces @EXECUTABLE@ nie moža być vykanany ŭ vyniku zboju. + +Jon viarnuŭ pamylku numar @ERRNO@. + +-- 0027229ca0644181a76c4e92458afa2e +Sibject: Adno ci boĺš paviedamlienniaŭ nie byli nakiravany ŭ syslog +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Adno ci boĺš paviedamlienniaŭ nie byli nakiravany ŭ syslog servis, jaki +vykonvajecca paralieĺna z journald. Zvyčajna heta značyć, što +realizacyja syslog nie paspiavaje apracavać paviedamlienni z nieabchodnaj +chutkasciu. + +-- 1dee0369c7fc4736b7099b38ecb46ee7 +Subject: Kropka mantavannia nie pustaja +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Kataloh @WHERE@ ukazany jak kropka mantavannia (druhoje polie ŭ /etc/fstab +ci Where= polie ŭ fajlie junita systemd) i nie pusty. Heta nie pieraškadžaje +mantavanniu, alie isnujučyja ŭ im fajly buduć niedastupny. Dlia dostupu da +ich, kali laska, zmantujcie hetuju fajlavuju sistemu ŭ inšaje miesca. + +-- 24d8d4452573402496068381a6312df2 +Subject: Virtuaĺnaja mašyna abo kantejnier zapusciŭsia +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Virtuaĺnaja mašyna @NAME@ z lidaram № @LEADER@ zapuscilasia i +hatova dlia vykarystannia. + +-- 58432bd3bace477cb514b56381b8a758 +Subject: Virtuaĺnaja mašyna abo kantejnier spynieny +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Virtuaĺnaja mašyna @NAME@ z lidaram № @LEADER@ spyniena. diff --git a/src/journal/catalog/systemd.catalog b/src/journal/catalog/systemd.catalog new file mode 100644 index 0000000000..077f182a5a --- /dev/null +++ b/src/journal/catalog/systemd.catalog @@ -0,0 +1,334 @@ +# This file is part of systemd. +# +# Copyright 2012 Lennart Poettering +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. + +# Message catalog for systemd's own messages + +# The catalog format is documented on +# http://www.freedesktop.org/wiki/Software/systemd/catalog + +# For an explanation why we do all this, see https://xkcd.com/1024/ + +-- f77379a8490b408bbe5f6940505a777b +Subject: The journal has been started +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +The system journal process has started up, opened the journal +files for writing and is now ready to process requests. + +-- d93fb3c9c24d451a97cea615ce59c00b +Subject: The journal has been stopped +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +The system journal process has shut down and closed all currently +active journal files. + +-- ec387f577b844b8fa948f33cad9a75e6 +Subject: Disk space used by the journal +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +@JOURNAL_NAME@ (@JOURNAL_PATH@) is currently using @CURRENT_USE_PRETTY@. +Maximum allowed usage is set to @MAX_USE_PRETTY@. +Leaving at least @DISK_KEEP_FREE_PRETTY@ free (of currently available @DISK_AVAILABLE_PRETTY@ of disk space). +Enforced usage limit is thus @LIMIT_PRETTY@, of which @AVAILABLE_PRETTY@ are still available. + +The limits controlling how much disk space is used by the journal may +be configured with SystemMaxUse=, SystemKeepFree=, SystemMaxFileSize=, +RuntimeMaxUse=, RuntimeKeepFree=, RuntimeMaxFileSize= settings in +/etc/systemd/journald.conf. See journald.conf(5) for details. + +-- a596d6fe7bfa4994828e72309e95d61e +Subject: Messages from a service have been suppressed +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: man:journald.conf(5) + +A service has logged too many messages within a time period. Messages +from the service have been dropped. + +Note that only messages from the service in question have been +dropped, other services' messages are unaffected. + +The limits controlling when messages are dropped may be configured +with RateLimitInterval= and RateLimitBurst= in +/etc/systemd/journald.conf. See journald.conf(5) for details. + +-- e9bf28e6e834481bb6f48f548ad13606 +Subject: Journal messages have been missed +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Kernel messages have been lost as the journal system has been unable +to process them quickly enough. + +-- fc2e22bc6ee647b6b90729ab34a250b1 +Subject: Process @COREDUMP_PID@ (@COREDUMP_COMM@) dumped core +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: man:core(5) + +Process @COREDUMP_PID@ (@COREDUMP_COMM@) crashed and dumped core. + +This usually indicates a programming error in the crashing program and +should be reported to its vendor as a bug. + +-- fc2e22bc6ee647b6b90729ab34a250b1 de +Subject: Speicherabbild für Prozess @COREDUMP_PID@ (@COREDUMP_COMM) generiert +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: man:core(5) + +Prozess @COREDUMP_PID@ (@COREDUMP_COMM@) ist abgebrochen worden und +ein Speicherabbild wurde generiert. + +Üblicherweise ist dies ein Hinweis auf einen Programmfehler und sollte +als Fehler dem jeweiligen Hersteller gemeldet werden. + +-- 8d45620c1a4348dbb17410da57c60c66 +Subject: A new session @SESSION_ID@ has been created for user @USER_ID@ +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat + +A new session with the ID @SESSION_ID@ has been created for the user @USER_ID@. + +The leading process of the session is @LEADER@. + +-- 3354939424b4456d9802ca8333ed424a +Subject: Session @SESSION_ID@ has been terminated +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat + +A session with the ID @SESSION_ID@ has been terminated. + +-- fcbefc5da23d428093f97c82a9290f7b +Subject: A new seat @SEAT_ID@ is now available +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat + +A new seat @SEAT_ID@ has been configured and is now available. + +-- e7852bfe46784ed0accde04bc864c2d5 +Subject: Seat @SEAT_ID@ has now been removed +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat + +A seat @SEAT_ID@ has been removed and is no longer available. + +-- c7a787079b354eaaa9e77b371893cd27 +Subject: Time change +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +The system clock has been changed to @REALTIME@ microseconds after January 1st, 1970. + +-- c7a787079b354eaaa9e77b371893cd27 de +Subject: Zeitänderung +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Die System-Zeit wurde geändert auf @REALTIME@ Mikrosekunden nach dem 1. Januar 1970. + +-- 45f82f4aef7a4bbf942ce861d1f20990 +Subject: Time zone change to @TIMEZONE@ +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +The system timezone has been changed to @TIMEZONE@. + +-- b07a249cd024414a82dd00cd181378ff +Subject: System start-up is now complete +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +All system services necessary queued for starting at boot have been +successfully started. Note that this does not mean that the machine is +now idle as services might still be busy with completing start-up. + +Kernel start-up required @KERNEL_USEC@ microseconds. + +Initial RAM disk start-up required @INITRD_USEC@ microseconds. + +Userspace start-up required @USERSPACE_USEC@ microseconds. + +-- 6bbd95ee977941e497c48be27c254128 +Subject: System sleep state @SLEEP@ entered +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +The system has now entered the @SLEEP@ sleep state. + +-- 8811e6df2a8e40f58a94cea26f8ebf14 +Subject: System sleep state @SLEEP@ left +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +The system has now left the @SLEEP@ sleep state. + +-- 98268866d1d54a499c4e98921d93bc40 +Subject: System shutdown initiated +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Systemd shutdown has been initiated. The shutdown has now begun and +all system services are terminated and all file systems unmounted. + +-- 7d4958e842da4a758f6c1cdc7b36dcc5 +Subject: Unit @UNIT@ has begun start-up +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Unit @UNIT@ has begun starting up. + +-- 39f53479d3a045ac8e11786248231fbf +Subject: Unit @UNIT@ has finished start-up +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Unit @UNIT@ has finished starting up. + +The start-up result is @RESULT@. + +-- de5b426a63be47a7b6ac3eaac82e2f6f +Subject: Unit @UNIT@ has begun shutting down +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Unit @UNIT@ has begun shutting down. + +-- 9d1aaa27d60140bd96365438aad20286 +Subject: Unit @UNIT@ has finished shutting down +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Unit @UNIT@ has finished shutting down. + +-- be02cf6855d2428ba40df7e9d022f03d +Subject: Unit @UNIT@ has failed +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Unit @UNIT@ has failed. + +The result is @RESULT@. + +-- d34d037fff1847e6ae669a370e694725 +Subject: Unit @UNIT@ has begun reloading its configuration +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Unit @UNIT@ has begun reloading its configuration + +-- 7b05ebc668384222baa8881179cfda54 +Subject: Unit @UNIT@ has finished reloading its configuration +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Unit @UNIT@ has finished reloading its configuration + +The result is @RESULT@. + +-- 641257651c1b4ec9a8624d7a40a9e1e7 +Subject: Process @EXECUTABLE@ could not be executed +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +The process @EXECUTABLE@ could not be executed and failed. + +The error number returned by this process is @ERRNO@. + +-- 0027229ca0644181a76c4e92458afa2e +Subject: One or more messages could not be forwarded to syslog +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +One or more messages could not be forwarded to the syslog service +running side-by-side with journald. This usually indicates that the +syslog implementation has not been able to keep up with the speed of +messages queued. + +-- 1dee0369c7fc4736b7099b38ecb46ee7 +Subject: Mount point is not empty +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +The directory @WHERE@ is specified as the mount point (second field in +/etc/fstab or Where= field in systemd unit file) and is not empty. +This does not interfere with mounting, but the pre-exisiting files in +this directory become inaccessible. To see those over-mounted files, +please manually mount the underlying file system to a secondary +location. + +-- 24d8d4452573402496068381a6312df2 +Subject: A virtual machine or container has been started +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +The virtual machine @NAME@ with its leader PID @LEADER@ has been +started is now ready to use. + +-- 58432bd3bace477cb514b56381b8a758 +Subject: A virtual machine or container has been terminated +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +The virtual machine @NAME@ with its leader PID @LEADER@ has been +shut down. + +-- 36db2dfa5a9045e1bd4af5f93e1cf057 +Subject: DNSSEC mode has been turned off, as server doesn't support it +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: man:systemd-resolved.service(8) resolved.conf(5) + +The resolver service (systemd-resolved.service) has detected that the +configured DNS server does not support DNSSEC, and DNSSEC validation has been +turned off as result. + +This event will take place if DNSSEC=allow-downgrade is configured in +resolved.conf and the configured DNS server is incompatible with DNSSEC. Note +that using this mode permits DNSSEC downgrade attacks, as an attacker might be +able turn off DNSSEC validation on the system by inserting DNS replies in the +communication channel that result in a downgrade like this. + +This event might be indication that the DNS server is indeed incompatible with +DNSSEC or that an attacker has successfully managed to stage such a downgrade +attack. + +-- 1675d7f172174098b1108bf8c7dc8f5d +Subject: DNSSEC validation failed +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: man:systemd-resolved.service(8) + +A DNS query or resource record set failed DNSSEC validation. This is usually +indication that the communication channel used was tampered with. + +-- 4d4408cfd0d144859184d1e65d7c8a65 +Subject: A DNSSEC trust anchor has been revoked +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: man:systemd-resolved.service(8) + +A DNSSEC trust anchor has been revoked. A new trust anchor has to be +configured, or the operating system needs to be updated, to provide an updated +DNSSEC trust anchor. diff --git a/src/journal/catalog/systemd.da.catalog b/src/journal/catalog/systemd.da.catalog new file mode 100644 index 0000000000..bd4d742d8a --- /dev/null +++ b/src/journal/catalog/systemd.da.catalog @@ -0,0 +1,261 @@ +# This file is part of systemd. +# +# Copyright 2012 Lennart Poettering +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. + +# Message catalog for systemd's own messages +# Danish translation + +# The catalog format is documented on +# http://www.freedesktop.org/wiki/Software/systemd/catalog + +# For an explanation why we do all this, see https://xkcd.com/1024/ + +-- f77379a8490b408bbe5f6940505a777b +Subject: Journalen er blevet startet +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +System-journal processen har startet op, åbnet journal filerne for +tilskrivning og er nu klar til at modtage anmodninger. + +-- d93fb3c9c24d451a97cea615ce59c00b +Subject: Journalen er blevet stoppet +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +System-journal processen er stoppet og har lukket alle aktive journal +filer. + +-- a596d6fe7bfa4994828e72309e95d61e +Subject: Beskeder fra en service er blevet undertrykt +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: man:journald.conf(5) + +En service har logget for mange beskeder inden for en given tidsperiode. +Beskeder fra omtalte service er blevet smidt væk. + +Kun beskeder fra omtalte service er smidt væk. Beskeder fra andre +services er ikke påvirket. + +Grænsen for hvornår beskeder bliver smidt væk kan konfigureres +med RateLimitInterval= og RateLimitBurst= i +/etc/systemd/journald.conf. Se journald.conf(5) for detaljer herom. + +-- e9bf28e6e834481bb6f48f548ad13606 +Subject: Journal beskeder er gået tabt +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Kernel beskeder er gået tabt da journal systemet ikke har været i stand +til at håndtere dem hurtigt nok. + +-- fc2e22bc6ee647b6b90729ab34a250b1 +Subject: Fejl-fil genereret for process @COREDUMP_PID@ (@COREDUMP_COMM@) +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: man:core(5) + +Process @COREDUMP_PID@ (@COREDUMP_COMM@) har lukket ned og genereret en +fejl-fil. + +Dette indikerer som regel en programmeringsfejl i det nedlukkede program +og burde blive reporteret som en bug til folkene bag + +-- 8d45620c1a4348dbb17410da57c60c66 +Subject: En ny session @SESSION_ID@ er blevet lavet for bruger @USER_ID@ +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat + +En ny session med ID @SESSION_ID@ er blevet lavet for brugeren @USER_ID@. + +Den ledende process for sessionen er @LEADER@. + +-- 3354939424b4456d9802ca8333ed424a +Subject: Session @SESSION_ID@ er blevet lukket ned +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat + +En session med ID @SESSION_ID@ er blevet lukket ned. + +-- fcbefc5da23d428093f97c82a9290f7b +Subject: En ny arbejdsstation $SEAT_ID@ er nu tilgængelig +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat + +En ny arbejdsstation @SEAT_ID@ er blevet konfigureret og er nu tilgængelig. + +-- e7852bfe46784ed0accde04bc864c2d5 +Subject: Arbejdsstation @SEAT_ID@ er nu blevet fjernet +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat + +En arbejdsstation @SEAT_ID@ er blevet fjernet og er ikke længere tilgængelig. + +-- c7a787079b354eaaa9e77b371893cd27 +Subject: Tidsændring +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Systemtiden er blevet ændret til @REALTIME@ mikrosekunder efter d. 1. Januar 1970. + +-- 45f82f4aef7a4bbf942ce861d1f20990 +Subject: Tidszoneændring til @TIMEZONE@ +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Tidszonen for systemet er blevet ændret til @TIMEZONE@. + +-- b07a249cd024414a82dd00cd181378ff +Subject: Opstart af systemet er nu fuldført +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Alle system services i kø til at køre ved opstart, er blevet startet +med success. Bemærk at dette ikke betyder at maskinen er i dvale, da +services stadig kan være i gang med at færdiggøre deres opstart. + +Opstart af kernel tog @KERNEL_USEC@ mikrosekunder. + +Opstart af initrd tog @INITRD_USEC@ mikrosekunder. + +Opstart af userspace tog @USERSPACE_USEC@ mikrosekunder. + +-- 6bbd95ee977941e497c48be27c254128 +Subject: System slumretilstand @SLEEP@ trådt i kraft +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +System er nu gået i @SLEEP@ slumretilstand. + +-- 8811e6df2a8e40f58a94cea26f8ebf14 +Subject: System slumretilstand @SLEEP@ forladt +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Systemet har nu forladt @SLEEP@ slumretilstand. + +-- 98268866d1d54a499c4e98921d93bc40 +Subject: Systemnedlukning påbegyndt +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Systemnedlukning er blevet påbegyndt. Nedlukningen er nu begyndt og +alle system services er blevet afbrudt og alle filsystemer afmonteret. + +-- 7d4958e842da4a758f6c1cdc7b36dcc5 +Subject: Enhed @UNIT@ har påbegyndt opstart +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Enhed @UNIT@ er begyndt at starte op. + +-- 39f53479d3a045ac8e11786248231fbf +Subject: Enhed @UNIT har færdiggjort opstart +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Enhed @UNIT@ er færdig med at starte op. + +Resultat for opstart er @RESULT@. + +-- de5b426a63be47a7b6ac3eaac82e2f6f +Subject: Enhed @UNIT@ har påbegyndt nedlukning +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Enhed @UNIT@ har påbegyndt nedlukning. + +-- 9d1aaa27d60140bd96365438aad20286 +Subject: Enhed @UNIT@ har færdiggjort nedlukning +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Enhed @UNIT@ har færdiggjort nedlukning. + +-- be02cf6855d2428ba40df7e9d022f03d +Subject: Enhed @UNIT@ har fejlet +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Enhed @UNIT@ har fejlet. + +Resultatet er @RESULT@ + +-- d34d037fff1847e6ae669a370e694725 +Subject: Enhed @UNIT@ har påbegyndt genindlæsning af sin konfiguration +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Enhed @UNIT@ er begyndt at genindlæse sin konfiguration + +-- 7b05ebc668384222baa8881179cfda54 +Subject: Enhed @UNIT@ har færdiggjort genindlæsning af sin konfiguration +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Enhed @UNIT@ er færdig med at genindlæse sin konfiguration + +Resultatet er: @RESULT@. + +-- 641257651c1b4ec9a8624d7a40a9e1e7 +Subject: Process @EXECUTABLE@ kunne ikke eksekveres +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Processen @EXECUTABLE@ kunne ikke eksekveres og fejlede. + +Processens returnerede fejlkode er @ERRNO@. + +-- 0027229ca0644181a76c4e92458afa2e +Subject: Èn eller flere beskeder kunne ikke videresendes til syslog +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Èn eller flere beskeder kunne ikke videresendes til syslog servicen +der kører side-om-side med journald. Dette indikerer typisk at syslog +implementationen ikke har kunnet følge med mængden af ventende beskeder. + +-- 1dee0369c7fc4736b7099b38ecb46ee7 +Subject: Monteringspunkt er ikke tomt +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Folderen @WHERE@ er specificeret som monteringspunkt (andet felt i +/etc/fstab eller Where= feltet i systemd enhedsfil) men er ikke tom. +Dette forstyrrer ikke monteringen, men de pre-eksisterende filer i folderen +bliver utilgængelige. For at se de over-monterede filer; montér det +underlæggende filsystem til en anden lokation. + +-- 24d8d4452573402496068381a6312df2 +Subject: En virtuel maskine eller container er blevet startet +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Den virtuelle maskine @NAME@ med dens leder PID @LEADER@ er blevet +startet og er klar til brug. + +-- 58432bd3bace477cb514b56381b8a758 +Subject: En virtuel maskine eller container er blevet afbrudt +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Den virtuelle maskine @NAME@ med dens leder PID @LEADER@ er blevet +nedlukket. diff --git a/src/journal/catalog/systemd.fr.catalog b/src/journal/catalog/systemd.fr.catalog new file mode 100644 index 0000000000..03a457786f --- /dev/null +++ b/src/journal/catalog/systemd.fr.catalog @@ -0,0 +1,260 @@ +# This file is part of systemd. +# +# Copyright 2012 Lennart Poettering +# Copyright 2013-2015 Sylvain Plantefève +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. + +# Message catalog for systemd's own messages +# French translation + +# Le format du catalogue de messages est décrit (en anglais) içi : +# http://www.freedesktop.org/wiki/Software/systemd/catalog + +-- f77379a8490b408bbe5f6940505a777b +Subject: Le journal a été démarré +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Le processus du journal système a démarré, ouvert ses fichiers en écriture +et est prêt à traiter les requêtes. + +-- d93fb3c9c24d451a97cea615ce59c00b +Subject: Le journal a été arrêté +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Le processus du journal système a été arrêté et tous ses fichiers actifs +ont été fermés. + +-- a596d6fe7bfa4994828e72309e95d61e +Subject: Des messages d'un service ont été supprimés +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: man:journald.conf(5) + +Un service a essayé d'enregistrer un trop grand nombre de messages sur un +intervalle de temps donné. Des messages de ce service ont été évincés. + +Notez que seuls des messages de ce service ont été évincés, les messages des +autres services ne sont pas affectés. + +Les limites définissant ce comportement peuvent être configurées avec les +paramètres RateLimitInterval= et RateLimitBurst= dans le fichier +/etc/systemd/journald.conf. Voir journald.conf(5) pour plus de détails. + +-- e9bf28e6e834481bb6f48f548ad13606 +Subject: Des messages du journal ont été manqués +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Des messages du noyau ont été manqués car le journal système n'a pas été +capable de les traiter suffisamment vite. + +-- fc2e22bc6ee647b6b90729ab34a250b1 +Subject: Le processus @COREDUMP_PID@ (@COREDUMP_COMM@) a généré un fichier « core » +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: man:core(5) + +Le processus @COREDUMP_PID@ (@COREDUMP_COMM@) a planté et généré un fichier « core ». + +Cela indique généralement une erreur de programmation dans le programme +incriminé, et cela devrait être notifié à son concepteur comme un défaut (bug). + +-- 8d45620c1a4348dbb17410da57c60c66 +Subject: Une nouvelle session @SESSION_ID@ a été créée pour l'utilisateur @USER_ID@ +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat + +Une nouvelle session a été créée pour l'utilisateur @USER_ID@ avec +l'identifiant (ID) @SESSION_ID@. + +Le processus maître de la session est @LEADER@. + +-- 3354939424b4456d9802ca8333ed424a +Subject: La session @SESSION_ID@ s'est terminée +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat + +La session d'identifiant (ID) @SESSION_ID@ s'est terminée. + +-- fcbefc5da23d428093f97c82a9290f7b +Subject: Un nouveau poste (seat) @SEAT_ID@ est disponible +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat + +Un nouveau poste (seat) @SEAT_ID@ a été configuré et est maintenant disponible. + +-- e7852bfe46784ed0accde04bc864c2d5 +Subject: Le poste (seat) @SEAT_ID@ a été retiré +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat + +Le poste (seat) @SEAT_ID@ a été retiré et n'est plus disponible. + +-- c7a787079b354eaaa9e77b371893cd27 +Subject: Changement d'heure +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +L'horloge système a été modifiée et positionnée à @REALTIME@ microsecondes +après le 1er janvier 1970. + +-- 45f82f4aef7a4bbf942ce861d1f20990 +Subject: Fuseau horaire modifié en @TIMEZONE@ +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Le fuseau horaire du système a été modifié et positionné à @TIMEZONE@. + +-- b07a249cd024414a82dd00cd181378ff +Subject: Le démarrage du système est terminé +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Tous les services nécessaires au démarrage du système ont été lancés avec +succès. Notez que cela ne signifie pas que le système est maintenant au +repos, car des services peuvent encore être en train de terminer leur +démarrage. + +Le chargement du noyau a nécessité @KERNEL_USEC@ microsecondes. + +Le chargement du « RAM disk » initial a nécessité @INITRD_USEC@ microsecondes. + +Le chargement de l'espace utilisateur a nécessité @USERSPACE_USEC@ microsecondes. + +-- 6bbd95ee977941e497c48be27c254128 +Subject: Le système entre dans l'état de repos (sleep state) @SLEEP@ +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Le système est maintenant à l'état de repos (sleep state) @SLEEP@. + +-- 8811e6df2a8e40f58a94cea26f8ebf14 +Subject: Le système sorti de l'état de repos (sleep state) @SLEEP@ +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Le système est maintenant sorti de l'état de repos (sleep state) @SLEEP@. + +-- 98268866d1d54a499c4e98921d93bc40 +Subject: Arrêt du système amorcé +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +L'arrêt du système a été amorcé. L'arrêt a maintenant commencé, tous les +services du système sont terminés et tous les systèmes de fichiers sont +démontés. + +-- 7d4958e842da4a758f6c1cdc7b36dcc5 +Subject: L'unité (unit) @UNIT@ a commencé à démarrer +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +L'unité (unit) @UNIT@ a commencé à démarrer. + +-- 39f53479d3a045ac8e11786248231fbf +Subject: L'unité (unit) @UNIT@ a terminé son démarrage +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +L'unité (unit) @UNIT@ a terminé son démarrage, avec le résultat @RESULT@. + +-- de5b426a63be47a7b6ac3eaac82e2f6f +Subject: L'unité (unit) @UNIT@ a commencé à s'arrêter +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +L'unité (unit) @UNIT@ a commencé à s'arrêter. + +-- 9d1aaa27d60140bd96365438aad20286 +Subject: L'unité (unit) @UNIT@ a terminé son arrêt +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +L'unité (unit) @UNIT@ a terminé son arrêt. + +-- be02cf6855d2428ba40df7e9d022f03d +Subject: L'unité (unit) @UNIT@ a échoué +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +L'unité (unit) @UNIT@ a échoué, avec le résultat @RESULT@. + +-- d34d037fff1847e6ae669a370e694725 +Subject: L'unité (unit) @UNIT@ a commencé à recharger sa configuration +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +L'unité (unit) @UNIT@ a commencé à recharger sa configuration. + +-- 7b05ebc668384222baa8881179cfda54 +Subject: L'unité (unit) @UNIT@ a terminé de recharger configuration +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +L'unité (unit) @UNIT@ a terminé de recharger configuration, +avec le résultat @RESULT@. + +-- 641257651c1b4ec9a8624d7a40a9e1e7 +Subject: Le processus @EXECUTABLE@ n'a pas pu être exécuté +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Le processus @EXECUTABLE@ n'a pas pu être exécuté, et a donc échoué. + +Le code d'erreur renvoyé est @ERRNO@. + +-- 0027229ca0644181a76c4e92458afa2e +Subject: Un ou plusieurs messages n'ont pas pu être transmis à syslog +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Un ou plusieurs messages n'ont pas pu être transmis au service syslog +s'exécutant conjointement avec journald. Cela indique généralement que +l'implémentation de syslog utilisée n'a pas été capable de suivre la cadence +du flux de messages. + +-- 1dee0369c7fc4736b7099b38ecb46ee7 +Subject: Le point de montage n'est pas vide +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Le répertoire @WHERE@ est spécifié comme point de montage (second champ du +fichier /etc/fstab, ou champ Where= dans une unité (unit) systemd) et n'est pas +vide. +Cela ne perturbe pas le montage du système de fichiers, mais les fichiers +préalablement présents dans ce répertoire sont devenus inaccessibles. +Pour atteindre ces fichiers, veuillez monter manuellement le système de +fichiers sous-jacent à un autre emplacement. + +-- 24d8d4452573402496068381a6312df2 +Subject: Une machine virtuelle ou un conteneur (container) a été démarré +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +La machine virtuelle @NAME@ a été démarrée avec le PID maître @LEADER@, +et est maintenant prête à l'emploi. + +-- 58432bd3bace477cb514b56381b8a758 +Subject: Une machine virtuelle ou un conteneur (container) a été arrêté +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +La machine virtuelle @NAME@ avec le PID maître @LEADER@ a été arrêtée. diff --git a/src/journal/catalog/systemd.hu.catalog b/src/journal/catalog/systemd.hu.catalog new file mode 100644 index 0000000000..30d76916cc --- /dev/null +++ b/src/journal/catalog/systemd.hu.catalog @@ -0,0 +1,262 @@ +# This file is part of systemd. +# +# Copyright 2012 Lennart Poettering +# Copyright 2016 Gabor Kelemen +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. + +# Message catalog for systemd's own messages + +# The catalog format is documented on +# http://www.freedesktop.org/wiki/Software/systemd/catalog + +# For an explanation why we do all this, see https://xkcd.com/1024/ + +-- f77379a8490b408bbe5f6940505a777b +Subject: A napló elindult +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +A rendszernapló folyamat elindult, megnyitotta írásra a naplófájlokat, +és most készen áll kérések feldolgozására. + +-- d93fb3c9c24d451a97cea615ce59c00b +Subject: A napló leállt +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +A rendszernapló folyamat leállt, és bezárt minden jelenleg aktív naplófájlt. + +-- a596d6fe7bfa4994828e72309e95d61e +Subject: Egy szolgáltatás üzenetei elnémítva +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: man:journald.conf(5) + +Egy szolgáltatás túl sok üzenetet naplózott adott idő alatt. A +szolgáltatástól származó üzenetek eldobásra kerültek. + +Ne feledje, hogy csak a kérdéses szolgáltatás üzenetei kerültek eldobásra, + más szolgáltatások üzeneteit ez nem befolyásolja. + +Az üzenetek eldobását vezérlő korlátok az /etc/systemd/journald.conf +RateLimitInterval= és RateLimitBurst= beállításaival adhatók meg. +Részletekért lásd a journald.conf(5) man oldalt. + +-- e9bf28e6e834481bb6f48f548ad13606 +Subject: Naplóüzenetek vesztek el +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Kernelüzenetek vesztek el, mert a naplózó rendszer nem tudta elég gyorsan +feldolgozni azokat. + +-- fc2e22bc6ee647b6b90729ab34a250b1 +Subject: Egy folyamat összeomlott: @COREDUMP_PID@ (@COREDUMP_COMM@) +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: man:core(5) + +Ez a folyamat: @COREDUMP_PID@ (@COREDUMP_COMM@) összeomlott, és core fájlt + írt ki. + +Ez általában programozási hibát jelez az összeomló programban, és +a szállítója felé kell bejelenteni. + +-- 8d45620c1a4348dbb17410da57c60c66 +Subject: Új munkamenet (@SESSION_ID@) létrehozva, felhasználója: @USER_ID@ +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat + +Létrejött egy új munkamenet @SESSION_ID@ azonosítóval ezen felhasználóhoz: +@USER_ID@. + +A munkamenet vezető folyamata: @LEADER@. + +-- 3354939424b4456d9802ca8333ed424a +Subject: Munkamenet (@SESSION_ID@) befejezve +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat + +A következő azonosítójú munkamenet befejeződött: @SESSION_ID@. + +-- fcbefc5da23d428093f97c82a9290f7b +Subject: Elérhető egy új munkaállomás: @SEAT_ID@ +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat + +Beállításra kerül és használható egy új munkaállomás: @SEAT_ID@. + +-- e7852bfe46784ed0accde04bc864c2d5 +Subject: A munkaállomás eltávolítva: @SEAT_ID@ +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat + +A munkaállomás el lett távolítva, és már nem érhető el: @SEAT_ID@ + +-- c7a787079b354eaaa9e77b371893cd27 +Subject: Időmódosítás +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +A rendszeróra beállítva @REALTIME@ ezredmásodpercre 1970. január 1. után. + +-- 45f82f4aef7a4bbf942ce861d1f20990 +Subject: Időzóna-módosítás erre: @TIMEZONE@ +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +A rendszer időzónája módosítva lett erre: @TIMEZONE@. + +-- b07a249cd024414a82dd00cd181378ff +Subject: A rendszer indítása kész +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +A rendszerindításkor szükséges indításhoz sorba állított összes +rendszerszolgáltatás elindult. Ne feledje, hogy ez nem jelenti, hogy a +gép üresjáratban van, mivel egyes szolgáltatások még az indítás +befejezésével lehetnek elfoglalva. + +A kernel indítása @KERNEL_USEC@ ezredmásodpercet igényelt. + +A kiinduló RAM lemez indítása @INITRD_USEC@ ezredmásodpercet igényelt. + +A felhasználói programok indítása @USERSPACE_USEC@ ezredmásodpercet igényelt. + +-- 6bbd95ee977941e497c48be27c254128 +Subject: A rendszer „@SLEEP@” alvási állapotba lépett +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +A rendszer belépett ebbe az alvási állapotba: @SLEEP@. + +-- 8811e6df2a8e40f58a94cea26f8ebf14 +Subject: A rendszer „@SLEEP@” alvási állapotból kilépett +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +A rendszer kilépett ebből az alvási állapotból: @SLEEP@. + +-- 98268866d1d54a499c4e98921d93bc40 +Subject: Rendszer leállítása kezdeményezve +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +A systemd leállítása kezdeményezve. A leállítás megkezdődött, minden +rendszerszolgáltatás befejeződik, minden fájlrendszer leválasztásra kerül. + +-- 7d4958e842da4a758f6c1cdc7b36dcc5 +Subject: A(z) @UNIT@ egység indítása megkezdődött +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +A(z) @UNIT@ egység megkezdte az indulást. + +-- 39f53479d3a045ac8e11786248231fbf +Subject: A(z) @UNIT@ egység befejezte az indulást +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +A(z) @UNIT@ egység befejezte az indulást + +Az indítás eredménye: @RESULT@. + +-- de5b426a63be47a7b6ac3eaac82e2f6f +Subject: A(z) @UNIT@ egység megkezdte a leállást +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +A(z) @UNIT@ egység megkezdte a leállást. + +-- 9d1aaa27d60140bd96365438aad20286 +Subject: A(z) @UNIT@ egység befejezte a leállást +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +A(z) @UNIT@ egység befejezte a leállást. + +-- be02cf6855d2428ba40df7e9d022f03d +Subject: A(z) @UNIT@ egység hibát jelzett +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +A(z) @UNIT@ egység hibát jelzett. + +Az eredmény: @RESULT@. + +-- d34d037fff1847e6ae669a370e694725 +Subject: A(z) @UNIT@ egység megkezdte a beállításainak újratöltését +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +A(z) @UNIT@ egység megkezdte a beállításainak újratöltését. + +-- 7b05ebc668384222baa8881179cfda54 +Subject: A(z) @UNIT@ egység befejezte a beállításainak újratöltését +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +A(z) @UNIT@ egység befejezte a beállításainak újratöltését. + +Az eredmény: @RESULT@. + +-- 641257651c1b4ec9a8624d7a40a9e1e7 +Subject: A folyamat végrehajtása sikertelen: @EXECUTABLE@ +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +A folyamat végrehajtása sikertelen volt, és hibát jelzett: @EXECUTABLE@. + +A folyamat által visszaadott hibaszám: @ERRNO@. + +-- 0027229ca0644181a76c4e92458afa2e +Subject: Legalább egy üzenet nem továbbítható a rendszernaplónak +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Legalább egy üzenet nem volt továbbítható a journald-vel párhuzamosan futó +syslog szolgáltatásnak. Ez általában azt jelenti, hogy a syslog +megvalósítás nem volt képes lépést tartani a sorba állított +üzenetek sebességével. + +-- 1dee0369c7fc4736b7099b38ecb46ee7 +Subject: A csatolási pont nem üres +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +A csatolási pontként megadott @WHERE@ könyvtár (második mező az /etc/fstab +fájlban, vagy a Where= sor a systemd egységfájlban) nem üres. Ez nem +akadályozza meg a csatolást, de a könyvtárban már meglévő fájlok +elérhetetlenné válnak. A fájlok láthatóvá tételéhez csatolja +az azokat tartalmazó fájlrendszert egy másodlagos helyre. + +-- 24d8d4452573402496068381a6312df2 +Subject: Egy virtuális gép vagy konténer elindult +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +A(z) @NAME@ nevű virtuális gép (vezető PID: @LEADER@) elindult, és +használatra kész. + +-- 58432bd3bace477cb514b56381b8a758 +Subject: Egy virtuális gép vagy konténer befejeződött +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +A(z) @NAME@ nevű virtuális gép (vezető PID: @LEADER@) leállt. diff --git a/src/journal/catalog/systemd.it.catalog b/src/journal/catalog/systemd.it.catalog new file mode 100644 index 0000000000..861b92b74a --- /dev/null +++ b/src/journal/catalog/systemd.it.catalog @@ -0,0 +1,254 @@ +# This file is part of systemd. +# +# Copyright 2013 Daniele Medri +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. + +# Message catalog for systemd's own messages + +-- f77379a8490b408bbe5f6940505a777b +Subject: Il registro è stato avviato +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Il processo relativo al registro di sistema è stato avviato, ha aperto i +file in scrittura ed è ora pronto a gestire richieste. + +-- d93fb3c9c24d451a97cea615ce59c00b +Subject: Il registro è stato terminato +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Il processo relativo al registro di sistema è stato terminato e ha chiuso +tutti i file attivi. + +-- a596d6fe7bfa4994828e72309e95d61e +Subject: I messaggi di un servizio sono stati soppressi +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: man:journald.conf(5) + +Un servizio ha registrato troppi messaggi in un dato periodo di tempo. +I messaggi del servizio sono stati eliminati. + +Solo i messaggi del servizio indicato sono stati +eliminati, i messaggi degli altri servizi rimangono invariati. + +I limiti oltre i quali i messaggi si eliminano si configurano +con RateLimitInterval= e RateLimitBurst= in +/etc/systemd/journald.conf. Vedi journald.conf(5) per maggiori informazioni. + +-- e9bf28e6e834481bb6f48f548ad13606 +Subject: I messaggi di un servizio sono stati perduti +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +I messaggi del kernel sono stati perduti perché, il registro di sistema +non è stato in grado di gestirli abbastanza velocemente. + +-- fc2e22bc6ee647b6b90729ab34a250b1 +Subject: Il processo @COREDUMP_PID@ (@COREDUMP_COMM@) ha generato un dump. +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: man:core(5) + +Il processo @COREDUMP_PID@ (@COREDUMP_COMM@) si è bloccato generando un dump. + +Questo di solito capita per un errore di programmazione nell'applicazione e +dovrebbe essere segnalato al vendor come un bug. + +-- 8d45620c1a4348dbb17410da57c60c66 +Subject: La nuova sessione @SESSION_ID@ è stata creata per l'utente @USER_ID@ +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat + +Una nuova sessione con ID @SESSION_ID@ è stata creata per l'utente @USER_ID@. + +Il processo primario della sessione è @LEADER@. + +-- 3354939424b4456d9802ca8333ed424a +Subject: La sessione @SESSION_ID@ è terminata +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat + +La sessione con ID @SESSION_ID@ è terminata. + +-- fcbefc5da23d428093f97c82a9290f7b +Subject: La nuova postazione @SEAT_ID@ è ora disponibile +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat + +La nuova postazione @SEAT_ID@ è stata configurata ed è ora disponibile. + +-- e7852bfe46784ed0accde04bc864c2d5 +Subject: La postazione @SEAT_ID@ è stata rimossa +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat + +La postazione @SEAT_ID@ è stata rimossa e non è più disponibile. + +-- c7a787079b354eaaa9e77b371893cd27 +Subject: Cambio d'orario +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +L'orologio di sistema è cambiato in @REALTIME@ microsecondi dal 1 gennaio, 1970. + +-- 45f82f4aef7a4bbf942ce861d1f20990 +Subject: Il fuso orario è cambiato in @TIMEZONE@ +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Il fuso orario di sistema è cambiato in @TIMEZONE@. + +-- b07a249cd024414a82dd00cd181378ff +Subject: Avvio del sistema completato. +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Tutti i servizi di sistema richiesti per la fase di avvio sono stati eseguiti +con successo. Nota che la macchina potrebbe non essere ancora pronta in quanto +i servizi attivati sono in fase di completamento. + +L'avvio del kernel ha richiesto @KERNEL_USEC@ microsecondi. + +L'avvio del disco RAM ha richiesto @INITRD_USEC@ microsecondi. + +L'avvio dello userspace ha richiesto @USERSPACE_USEC@ microsecondi. + +-- 6bbd95ee977941e497c48be27c254128 +Subject: Il sistema è entrato in fase di pausa @SLEEP@ +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Il sistema è entrato nello stato di pausa @SLEEP@. + +-- 8811e6df2a8e40f58a94cea26f8ebf14 +Subject: Il sistema è uscito dalla fase di pausa @SLEEP@ +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Il sistema è uscito dallo stato di pausa @SLEEP@. + +-- 98268866d1d54a499c4e98921d93bc40 +Subject: Il sistema è in fase di spegnimento +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Systemd è in fase di spegnimento. Tutti i servizi di sistema +saranno terminati e tutti i file systems smontati. + +-- 7d4958e842da4a758f6c1cdc7b36dcc5 +Subject: L'unità @UNIT@ inizia la fase di avvio +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +L'unità @UNIT@ ha iniziato la fase di avvio. + +-- 39f53479d3a045ac8e11786248231fbf +Subject: L'unità @UNIT@ termina la fase di avvio +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +L'unità @UNIT@ ha terminato la fase di avvio. + +La fase di avvio è @RESULT@. + +-- de5b426a63be47a7b6ac3eaac82e2f6f +Subject: L'unità @UNIT@ inizia la fase di spegnimento +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +L'unità @UNIT@ ha iniziato la fase di spegnimento. + +-- 9d1aaa27d60140bd96365438aad20286 +Subject: L'unità @UNIT@ termina la fase di spegnimento +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +L'unità @UNIT@ ha terminato la fase di spegnimento. + +-- be02cf6855d2428ba40df7e9d022f03d +Subject: L'unità @UNIT@ è fallita +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +L'unità @UNIT@ è fallita. + +Il risultato è @RESULT@. + +-- d34d037fff1847e6ae669a370e694725 +Subject: L'unità @UNIT@ inizia a caricare la propria configurazione +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +L'unità @UNIT@ è iniziata ricaricando la propria configurazione + +-- 7b05ebc668384222baa8881179cfda54 +Subject: L'unità @UNIT@ termina il caricamento della propria configurazione +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +L'unità @UNIT@ è terminata ricaricando la propria configurazione + +Il risultato è @RESULT@. + +-- 641257651c1b4ec9a8624d7a40a9e1e7 +Subject: Il processo @EXECUTABLE@ non può essere eseguito +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Il processo @EXECUTABLE@ non può essere eseguito e termina. + +Il numero di errore restituito durante l'esecuzione del processo è @ERRNO@. + +-- 0027229ca0644181a76c4e92458afa2e +Subject: Uno o più messaggi non possono essere inoltrati a syslog +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Uno o più messaggi non possono essere inviati al servizio syslog +eseguito in parallelo a journald. Questo di solito capita perché, +l'implementazione di syslog non sta al passo con la +velocità dei messaggi accodati. + +-- 1dee0369c7fc4736b7099b38ecb46ee7 +Subject: Il punto di montaggio non è vuoto +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +La directory @WHERE@ è specificata come punto di montaggio (secondo campo +in /etc/fstab o nel campo Where= del file unità di systemd) e non è vuoto. +Questo non interferisce con il montaggio, ma i file pre-esistenti in questa +directory diventano inaccessibili. Per visualizzare i file, si suggerisce +di montare manualmente il file system indicato in una posizione secondaria. + +-- 24d8d4452573402496068381a6312df2 +Subject: Avviata macchina virtuale o container +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +La macchina virtuale @NAME@ con PID primario @LEADER@ è stata +avviata ed è pronta all'uso. + +-- 58432bd3bace477cb514b56381b8a758 +Subject: Terminata macchina virtuale o container +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +La macchina virtuale @NAME@ con PID primario @LEADER@ è stata spenta. diff --git a/src/journal/catalog/systemd.ko.catalog b/src/journal/catalog/systemd.ko.catalog new file mode 100644 index 0000000000..3c3535a94c --- /dev/null +++ b/src/journal/catalog/systemd.ko.catalog @@ -0,0 +1,264 @@ +# This file is part of systemd. +# +# Copyright 2012 Lennart Poettering +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. + +# Message catalog for systemd's own messages +# Korean translation + +# The catalog format is documented on +# http://www.freedesktop.org/wiki/Software/systemd/catalog + +# For an explanation why we do all this, see https://xkcd.com/1024/ +# +# Translator : +# Seong-ho Cho <darkcircle.0426@gmail.com>, 2015. + +-- f77379a8490b408bbe5f6940505a777b +Subject: 저널 시작 +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +시스템 저널 프로세스를 시작했고 기록목적으로 저널 파일을 열었으며, +프로세스 요청을 기다리고 있습니다. + +-- d93fb3c9c24d451a97cea615ce59c00b +Subject: 저널 멈춤 +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +시스템 저널 프로세스를 껐고 현재 활성화 중인 저널 파일을 모두 +닫았습니다. + +-- a596d6fe7bfa4994828e72309e95d61e +Subject: 서비스의 메시지를 거절함 +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: man:journald.conf(5) + +일정 시간동안 서비스에서 너무 많은 메시지를 기록했습니다. +서비스에서 오는 메시지를 거절했습니다. + +의문점이 있는 서비스로부터 오는 메시지만 거절했음을 참고하십시오 +다른 서비스의 메시지에는 영향을 주지 않습니다. + +메시지 거절 제어 제한 값은 /etc/systemd/journald.conf 의 +RateLimitInterval= 변수와 RateLimitBurst= 변수로 설정합니다. +자세한 내용은 ournald.conf(5)를 살펴보십시오. + +-- e9bf28e6e834481bb6f48f548ad13606 +Subject: 저널 메시지 놓침 +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +저널 시스템에서 커널 메시지를 충분히 빠르게 처리할 수 없어 커널 + 메시지를 잃었습니다. + +-- fc2e22bc6ee647b6b90729ab34a250b1 +Subject: 프로세스 @COREDUMP_PID@번 코어 덤프(@COREDUMP_COMM@) 생성함 +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: man:core(5) + +프로세스 @COREDUMP_PID@번 (@COREDUMP_COMM@)이 비정상적으로 끝나 +코어 덤프를 생성했습니다. + +보통 비정상 종료 관리 프로그램에서 프로그래밍 오류를 나타내며, +제작자에게 버그로 보고해야합니다. + +-- 8d45620c1a4348dbb17410da57c60c66 +Subject: @USER_ID@ 사용자의 새 @SESSION_ID@ 세션 만듦 +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat + +@USER_ID@ 사용자의 새 @SESSION_ID@ 세션을 만들었습니다. + +이 세션의 관리 프로세스는 @LEADER@ 입니다. + +-- 3354939424b4456d9802ca8333ed424a +Subject: @SESSION_ID@ 세션 마침 +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat + +@SESSION_ID@ 세션을 끝냈습니다. + +-- fcbefc5da23d428093f97c82a9290f7b +Subject: 새 @SEAT_ID@ 시트 사용할 수 있음 +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat + +새 @SEAT_ID@ 시트를 설정했고 사용할 수 있습니다. + +-- e7852bfe46784ed0accde04bc864c2d5 +Subject: @SEAT_ID@ 시트 제거함 +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat + +@SEAT_ID@ 시트를 제거했으며 더이상 사용할 수 없습니다. + +-- c7a787079b354eaaa9e77b371893cd27 +Subject: 시간 바꿈 +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +시스템 시계를 1970년 1월 1일 이후로 @REALTIME@ 마이크로초 지난 값으로 +설정했습니다. + +-- 45f82f4aef7a4bbf942ce861d1f20990 +Subject: @TIMEZONE@ 시간대로 시간대 바꿈 +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +시스템 시간대를 @TIMEZONE@ 시간대로 바꾸었습니다. + +-- b07a249cd024414a82dd00cd181378ff +Subject: 시스템 시동 마침 +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +부팅 과정에 시작하려고 준비한 모든 시스템 서비스를 성공적으로 + 시작했습니다. 머신이 서비스처럼 대기중이라는 의미는 아니며 +지동을 완전히 마칠 때까지 사용중일 수도 있는 점 참고하십시오. + +커널 시동에 @KERNEL_USEC@ 마이크로초가 걸립니다. + +초기 램 디스크 시동에 @INITRD_USEC@ 마이크로초가 걸립니다. + +사용자 영역 시동에 @USERSPACE_USEC@ 마이크로초가 걸립니다. + +-- 6bbd95ee977941e497c48be27c254128 +Subject: @SLEEP@ 대기 상태 진입 +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +@SLEEP@ 대기 상태로 진입했습니다. + +-- 8811e6df2a8e40f58a94cea26f8ebf14 +Subject: @SLEEP@ 대기 상태 마침 +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +@SLEEP@ 대기 상태를 마쳤습니다. + +-- 98268866d1d54a499c4e98921d93bc40 +Subject: 컴퓨터 끄기 시작 +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +컴퓨터 끄기 동작을 시작했습니다. 모든 시스템 동작을 멈추고 +모든 파일 시스템의 마운트를 해제합니다. + +-- 7d4958e842da4a758f6c1cdc7b36dcc5 +Subject: @UNIT@ 유닛 시작 +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +@UNIT@ 유닛을 시작했습니다. + +-- 39f53479d3a045ac8e11786248231fbf +Subject: @UNIT@ 유닛 시동 마침 +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +@UNIT@ 유닛 시동을 마쳤습니다. + +시동 결과는 @RESULT@ 입니다. + +-- de5b426a63be47a7b6ac3eaac82e2f6f +Subject: @UNIT@ 유닛 끝내기 동작 시작 +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +@UNIT@ 유닛 끝내기 동작을 시작했습니다. + +-- 9d1aaa27d60140bd96365438aad20286 +Subject: @UNIT@ 유닛 끝내기 동작 마침 +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +@UNIT@ 유닛 끝내기 동작을 마쳤습니다. + +-- be02cf6855d2428ba40df7e9d022f03d +Subject: @UNIT@ 유닛 동작 실패 +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +@UNIT@ 유닛 동작에 실패했습니다. + +결과는 @RESULT@ 입니다. + +-- d34d037fff1847e6ae669a370e694725 +Subject: @UNIT@ 유닛 설정 다시 읽기 시작 +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +@UNIT@ 유닛의 설정 다시 읽기를 시작했습니다 + +-- 7b05ebc668384222baa8881179cfda54 +Subject: @UNIT@ 유닛 설정 다시 읽기 완료 +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +@UNIT@ 유닛의 설정 다시 읽기 동작을 끝냈습니다. + +결과는 @RESULT@ 입니다. + +-- 641257651c1b4ec9a8624d7a40a9e1e7 +Subject: @EXECUTABLE@ 프로세스 시작할 수 없음 +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +@EXECUTABLE@ 프로세스를 시작할 수 없어 실행에 실패했습니다. + +이 프로세스에서 반환한 오류 번호는 @ERRNO@번 입니다. + +-- 0027229ca0644181a76c4e92458afa2e +Subject: 하나 이상의 메시지를 syslog에 전달할 수 없음 +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +journald 서비스와 동시에 실행중인 syslog 서비스에 하나 이상의 메시지를 +전달할 수 없습니다. 보통 순차적으로 오는 메시지의 속도를 syslog 구현체가 +따라가지 못함을 의미합니다. + +-- 1dee0369c7fc4736b7099b38ecb46ee7 +Subject: 마운트 지점 비어있지 않음 +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +@WHERE@ 디렉터리를 마운트 지점으로 지정했으며 (/etc/fstab 파일의 + 두번째 필드 또는 systemd 유닛 파일의 Where= 필드) 비어있지 않습니다. +마운트 과정에 방해가 되진 않지만 이전에 이 디렉터리에 존재하는 파일에 + 접근할 수 없게 됩니다. 중복으로 마운트한 파일을 보려면, 근본 파일 +시스템의 다음 위치에 직접 마운트하십시오. + +-- 24d8d4452573402496068381a6312df2 +Subject: 가상 머신 또는 컨테이너 시작 +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +@LEADER@ 프로세스 ID로 동작하는 @NAME@ 가상 머신을 시작했으며, +이제부터 사용할 수 있습니다. + +-- 58432bd3bace477cb514b56381b8a758 +Subject: 가상 머신 또는 컨테이너 마침 +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +@LEADER@ 프로세스 ID로 동작하는 @NAME@ 가상 머신을 껐습니다. diff --git a/src/journal/catalog/systemd.pl.catalog b/src/journal/catalog/systemd.pl.catalog new file mode 100644 index 0000000000..6b8a31d8c4 --- /dev/null +++ b/src/journal/catalog/systemd.pl.catalog @@ -0,0 +1,261 @@ +# This file is part of systemd. +# +# Copyright 2012 Lennart Poettering +# Copyright 2014, 2015 Piotr Drąg +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. + +# Message catalog for systemd's own messages +# Polish translation + +# The catalog format is documented on +# http://www.freedesktop.org/wiki/Software/systemd/catalog + +# For an explanation why we do all this, see https://xkcd.com/1024/ + +-- f77379a8490b408bbe5f6940505a777b +Subject: Uruchomiono dziennik +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Systemowy proces dziennika został uruchomiony, otworzył pliki dziennika do +zapisu i jest gotowy do przetwarzania żądań. + +-- d93fb3c9c24d451a97cea615ce59c00b +Subject: Zatrzymano dziennik +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Systemowy proces dziennika został wyłączony i zamknął wszystkie obecnie +aktywne pliki dziennika. + +-- a596d6fe7bfa4994828e72309e95d61e +Subject: Ograniczono komunikaty z usługi +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: man:journald.conf(5) + +Usługa zapisała za dużo komunikatów w określonym czasie. Komunikaty z usługi +zostały pominięte. + +Proszę zauważyć, że tylko komunikaty z danej usługi zostały pominięte. Nie ma +to wpływu na komunikaty innych usług. + +Ograniczenia kontrolujące pomijanie komunikatów mogą być konfigurowane +za pomocą opcji RateLimitInterval= i RateLimitBurst= w pliku +/etc/systemd/journald.conf. Strona journald.conf(5) zawiera więcej informacji. + +-- e9bf28e6e834481bb6f48f548ad13606 +Subject: Utracono komunikaty dziennika +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Komunikaty jądra zostały utracone, ponieważ system dziennika nie mógł +przetworzyć ich odpowiednio szybko. + +-- fc2e22bc6ee647b6b90729ab34a250b1 +Subject: Proces @COREDUMP_PID@ (@COREDUMP_COMM@) zrzucił plik core +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: man:core(5) + +Proces @COREDUMP_PID@ (@COREDUMP_COMM@) uległ awarii i zrzucił plik core. + +Zwykle wskazuje to na błąd programistyczny w danym programie i powinno zostać zgłoszone jego producentowi jako błąd. + +-- 8d45620c1a4348dbb17410da57c60c66 +Subject: Utworzono nową sesję @SESSION_ID@ dla użytkownika @USER_ID@ +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat + +Nowa sesja o identyfikatorze @SESSION_ID@ została utworzona dla użytkownika +@USER_ID@. + +Proces prowadzący sesji: @LEADER@. + +-- 3354939424b4456d9802ca8333ed424a +Subject: Zakończono sesję @SESSION_ID@ +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat + +Sesja o identyfikatorze @SESSION_ID@ została zakończona. + +-- fcbefc5da23d428093f97c82a9290f7b +Subject: Dostępne jest nowe stanowisko @SEAT_ID@ +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat + +Nowe stanowisko @SEAT_ID@ zostało skonfigurowane i jest teraz dostępne. + +-- e7852bfe46784ed0accde04bc864c2d5 +Subject: Usunięto stanowisko @SEAT_ID@ +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat + +Stanowisko @SEAT_ID@ zostało usunięte i nie jest już dostępne. + +-- c7a787079b354eaaa9e77b371893cd27 +Subject: Zmiana czasu +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Zegar systemowy został zmieniony na @REALTIME@ μs po 1 stycznia 1970. + +-- 45f82f4aef7a4bbf942ce861d1f20990 +Subject: Zmiana strefy czasowej na @TIMEZONE@ +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Systemowa strefa czasowa została zmieniona na @TIMEZONE@. + +-- b07a249cd024414a82dd00cd181378ff +Subject: Ukończono uruchamianie systemu +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Wszystkie usługi systemowe obowiązkowo zakolejkowane do włączenia podczas +uruchamiania systemu zostały pomyślnie uruchomione. Proszę zauważyć, że nie +oznacza to, że komputer jest bezczynny, jako że usługi mogą wciąż kończyć +proces uruchamiania. + +Uruchamianie jądra zajęło @KERNEL_USEC@ μs. + +Uruchamianie początkowego dysku RAM zajęło @INITRD_USEC@ μs. + +Uruchamianie przestrzeni użytkownika zajęło @USERSPACE_USEC@ μs. + +-- 6bbd95ee977941e497c48be27c254128 +Subject: Przejście do stanu uśpienia @SLEEP@ +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +System przeszedł do stanu uśpienia @SLEEP@. + +-- 8811e6df2a8e40f58a94cea26f8ebf14 +Subject: Wyjście ze stanu uśpienia @SLEEP@ +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +System wyszedł ze stanu uśpienia @SLEEP@. + +-- 98268866d1d54a499c4e98921d93bc40 +Subject: Zainicjowano wyłączenie systemu +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Zainicjowano wyłączenie systemd. Wyłączenie zostało rozpoczęte i wszystkie +usługi systemowe zostały zakończone, a wszystkie systemy plików odmontowane. + +-- 7d4958e842da4a758f6c1cdc7b36dcc5 +Subject: Rozpoczęto uruchamianie jednostki @UNIT@ +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Jednostka @UNIT@ rozpoczęła uruchamianie. + +-- 39f53479d3a045ac8e11786248231fbf +Subject: Ukończono uruchamianie jednostki @UNIT@ +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Jednostka @UNIT@ ukończyła uruchamianie. + +Wynik uruchamiania: @RESULT@. + +-- de5b426a63be47a7b6ac3eaac82e2f6f +Subject: Rozpoczęto wyłączanie jednostki @UNIT@ +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Jednostka @UNIT@ rozpoczęła wyłączanie. + +-- 9d1aaa27d60140bd96365438aad20286 +Subject: Ukończono wyłączanie jednostki @UNIT@ +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Jednostka @UNIT@ ukończyła wyłączanie. + +-- be02cf6855d2428ba40df7e9d022f03d +Subject: Jednostka @UNIT@ się nie powiodła +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Jednostka @UNIT@ się nie powiodła. + +Wynik: @RESULT@. + +-- d34d037fff1847e6ae669a370e694725 +Subject: Rozpoczęto ponowne wczytywanie konfiguracji jednostki @UNIT@ +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Jednostka @UNIT@ rozpoczęła ponowne wczytywanie swojej konfiguracji. + +-- 7b05ebc668384222baa8881179cfda54 +Subject: Ukończono ponowne wczytywanie konfiguracji jednostki @UNIT@ +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Jednostka @UNIT@ ukończyła ponowne wczytywanie swojej konfiguracji. + +Wynik: @RESULT@. + +-- 641257651c1b4ec9a8624d7a40a9e1e7 +Subject: Nie można wykonać procesu @EXECUTABLE@ +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Proces @EXECUTABLE@ nie mógł zostać wykonany i się nie powiódł. + +Numer błędu zwrócony przez ten proces: @ERRNO@. + +-- 0027229ca0644181a76c4e92458afa2e +Subject: Nie można przekazać jednego lub więcej komunikatów do syslog +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Jeden lub więcej komunikatów nie może zostać przekazanych do usługi syslog +uruchomionej obok journald. Zwykle oznacza to, że implementacja syslog nie +jest w stanie nadążyć za prędkością kolejki komunikatów. + +-- 1dee0369c7fc4736b7099b38ecb46ee7 +Subject: Punkt montowania nie jest pusty +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Katalog @WHERE@ został podany jako punkt montowania (drugie pole w pliku +/etc/fstab lub pole Where= w pliku jednostki systemd) i nie jest pusty. Nie +wpływa to na montowanie, ale wcześniej istniejące pliki w tym katalogu stają +się niedostępne. Aby zobaczyć te pliki, proszę ręcznie zamontować system +plików w innym położeniu. + +-- 24d8d4452573402496068381a6312df2 +Subject: Uruchomiono maszynę wirtualną lub kontener +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Maszyna wirtualna @NAME@ (PID prowadzący @LEADER@) została uruchomiona i jest +gotowa do użycia. + +-- 58432bd3bace477cb514b56381b8a758 +Subject: Zakończono maszynę wirtualną lub kontener +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Maszyna wirtualna @NAME@ (PID prowadzący @LEADER@) została wyłączona. diff --git a/src/journal/catalog/systemd.pt_BR.catalog b/src/journal/catalog/systemd.pt_BR.catalog new file mode 100644 index 0000000000..d9716e30f7 --- /dev/null +++ b/src/journal/catalog/systemd.pt_BR.catalog @@ -0,0 +1,264 @@ +# This file is part of systemd. +# +# Copyright 2012 Lennart Poettering +# Copyright 2015 Rafael Ferreira (translation) +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. + +# Catálogo de mensagens para as mensagens do próprio systemd + +# O formato do catálogo está documentado em +# http://www.freedesktop.org/wiki/Software/systemd/catalog + +# Para uma explicação do porquê de fazermos tudo isso, veja +# https://xkcd.com/1024/ + +-- f77379a8490b408bbe5f6940505a777b +Subject: O jornal foi inciado +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +O processo jornal do sistema foi iniciado, arquivos foram abertos e está +pronto para processar requisições. + +-- d93fb3c9c24d451a97cea615ce59c00b +Subject: O jornal foi interrompido +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +O processo do jornal do sistema foi desligado e todos os arquivos de jornal +do sistema foram fechados. + +-- a596d6fe7bfa4994828e72309e95d61e +Subject: Mensagens de um serviço foram suprimidas +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: man:journald.conf(5) + +Um serviço registrou no log um número excessivo de mensagens dentro de um +período de tempo. Mensagens do serviço foram descartadas. + +Note que apenas mensagens de um serviço em questão foram descartadas; outras +mensagens dos serviços não foram afetadas. + +Os controles de limites de quando as mensagens são descartadas pode ser +configurado com RateLimitInterval= e RateLimitBurst= no +/etc/systemd/journald.conf. Veja journald.conf(5) para detalhes. + +-- e9bf28e6e834481bb6f48f548ad13606 +Subject: Mensagens do jornal foram perdidas +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Mensagens do kernel foram perdidas pois o sistema do jornal não pôde +processá-las em velocidade suficiente para a demanda. + +-- fc2e22bc6ee647b6b90729ab34a250b1 +Subject: Processo @COREDUMP_PID@ (@COREDUMP_COMM@) despejou núcleo +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: man:core(5) + +Processo @COREDUMP_PID@ (@COREDUMP_COMM@) travou e despejou o núcleo. + +Isso normalmente indica um erro de programação no programa que travou e +deveria ser relatado para seu fabricante como um erro. + +-- 8d45620c1a4348dbb17410da57c60c66 +Subject: A nova sessão @SESSION_ID@ foi criada para usuário o @USER_ID@ +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat + +Uma nova sessão com o ID @SESSION_ID@ foi criada para o usuário @USER_ID@. + +O processo originador da sessão é @LEADER@. + +-- 3354939424b4456d9802ca8333ed424a +Subject: Sessão @SESSION_ID@ foi terminada +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat + +Um sessão com o ID @SESSION_ID@ foi terminada. + +-- fcbefc5da23d428093f97c82a9290f7b +Subject: Um novo seat @SEAT_ID@ está disponível +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat + +Um novo seat @SEAT_ID@ foi configurado e está disponível. + +-- e7852bfe46784ed0accde04bc864c2d5 +Subject: Seat @SEAT_ID@ foi removido agora +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat + +Um seat @SEAT_ID@ foi removido e não está mais disponível. + +-- c7a787079b354eaaa9e77b371893cd27 +Subject: Time change +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +O relógio do sistema foi alterado para @REALTIME@ microssegundos após 1º de +janeiro de 1970. + +-- 45f82f4aef7a4bbf942ce861d1f20990 +Subject: Fuso horário alterado para @TIMEZONE@ +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +O fuso horário do sistema foi alterado para @TIMEZONE@. + +-- b07a249cd024414a82dd00cd181378ff +Subject: Inicialização do sistema foi concluída +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Todos os serviços do sistema necessários que estão enfileirados para +executar na inicialização do sistema, foram iniciados com sucesso. Note +que isso não significa que a máquina está ociosa, pois os serviços podem +ainda estar ocupados com a inicialização completa. + +Inicialização do kernel precisou @KERNEL_USEC@ microssegundos. + +Disco de RAM inicial precisou de @INITRD_USEC@ microssegundos. + +Inicialização do espaço do usuário precisou de @USERSPACE_USEC@ microssegundos. + +-- 6bbd95ee977941e497c48be27c254128 +Subject: Estado de suspensão do sistema @SLEEP@ iniciado +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +O sistema entrou agora no estado de suspensão @SLEEP@. + +-- 8811e6df2a8e40f58a94cea26f8ebf14 +Subject: Estado de suspensão do sistema @SLEEP@ finalizado +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +O sistema saiu agora do estado de suspensão @SLEEP@. + +-- 98268866d1d54a499c4e98921d93bc40 +Subject: Desligamento do sistema iniciado +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Desligamento do sistema foi inicializado. O desligamento se iniciou e todos +os serviços do sistema foram terminados e todos os sistemas desmontados. + +-- 7d4958e842da4a758f6c1cdc7b36dcc5 +Subject: Unidade @UNIT@ sendo iniciado +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +A unidade @UNIT@ está sendo iniciada. + +-- 39f53479d3a045ac8e11786248231fbf +Subject: Unidade @UNIT@ concluiu a inicialização +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +A unidade @UNIT@ concluiu a inicialização. + +The start-up result is @RESULT@. + +-- de5b426a63be47a7b6ac3eaac82e2f6f +Subject: Unidade @UNIT@ sendo desligado +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +A unidade @UNIT@ está sendo desligada. + +-- 9d1aaa27d60140bd96365438aad20286 +Subject: A unidade @UNIT@ concluiu o desligamento +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +A unidade @UNIT@ concluiu o desligamento. + +-- be02cf6855d2428ba40df7e9d022f03d +Subject: A unidade @UNIT@ falhou +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +A unidade @UNIT@ falhou. + +O resultado é @RESULT@. + +-- d34d037fff1847e6ae669a370e694725 +Subject: Unidade @UNIT@ iniciou recarregamento de sua configuração +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +A unidade @UNIT@ iniciou o recarregamento de sua configuração. + +-- 7b05ebc668384222baa8881179cfda54 +Subject: Unidade @UNIT@ concluiu recarregamento de sua configuração +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +A unidade @UNIT@ concluiu o recarregamento de sua configuração. + +O resultado é @RESULT@. + +-- 641257651c1b4ec9a8624d7a40a9e1e7 +Subject: Processo @EXECUTABLE@ não pôde ser executado +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +O processo @EXECUTABLE@ não pôde ser executado e falhou. + +O número de erro retornado por este processo é @ERRNO@. + +-- 0027229ca0644181a76c4e92458afa2e +Subject: Uma ou mais mensagens não puderam ser encaminhadas para o syslog +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Uma ou mais mensagens não puderam ser encaminhadas para o serviço do syslog +em execução paralela ao journald. Isso normalmente indica que a implementação +do syslog não foi capaz de se manter com a velocidade das mensagens +enfileiradas. + +-- 1dee0369c7fc4736b7099b38ecb46ee7 +Subject: Ponto de montagem não está vazio +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +O diretório @WHERE@ está especificado como ponto de montagem (o segundo campo +no /etc/fstab ou campo Where= no arquivo de unidade do systemd) e não está +vazio. Isso não interfere com a montagem, mas os arquivos pré-existentes +neste diretório se tornaram inacessívels. Para ver aqueles arquivos, sobre os +quais foi realizada a montagem, por favor monte manualmente o sistema de +arquivos subjacente para uma localização secundária. + +-- 24d8d4452573402496068381a6312df2 +Subject: Uma máquina virtual ou contêiner foi iniciado +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +A máquina virtual @NAME@ com seu PID @LEADER@ incial foi iniciada e está +pronto para ser usad. + +-- 58432bd3bace477cb514b56381b8a758 +Subject: Uma máquina virtual ou contêiner foi terminado +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +A máquina virtual @NAME@ com seu PID @LEADER@ incial foi desligada. diff --git a/src/journal/catalog/systemd.ru.catalog b/src/journal/catalog/systemd.ru.catalog new file mode 100644 index 0000000000..eedbb8aa9c --- /dev/null +++ b/src/journal/catalog/systemd.ru.catalog @@ -0,0 +1,354 @@ +# This file is part of systemd. +# +# Copyright 2012 Lennart Poettering +# Copyright 2013-2016 Sergey Ptashnick +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. + +# Message catalog for systemd's own messages +# Russian translation + +# Формат каталога сообщений описан по ссылке +# http://www.freedesktop.org/wiki/Software/systemd/catalog + +# Перед каждым элементом в комментарии указан Subject исходного +# сообщения (на английском). + +# Subject: The Journal has been started +-- f77379a8490b408bbe5f6940505a777b +Subject: Запущена служба журналирования +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Процесс, отвечающий за журналирование системных событий, успешно запустился, +открыл для записи файлы журнала, и готов обрабатывать запросы. + +# Subject: The Journal has been stopped +-- d93fb3c9c24d451a97cea615ce59c00b +Subject: Служба журналирования остановлена +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Процесс, отвечающий за журналирование системных событий, завершил работу и +закрыл все свои файлы. + +# Subject: Disk space used by the journal +-- ec387f577b844b8fa948f33cad9a75e6 +Subject: Место на диске, занятое журналом +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +@JOURNAL_NAME@ (@JOURNAL_PATH@) сейчас занимает @CURRENT_USE_PRETTY@. +Максимальный разрешенный размер составляет @MAX_USE_PRETTY@. +Оставляем свободными как минимум @DISK_KEEP_FREE_PRETTY@ (сейчас на диске +свободно @DISK_AVAILABLE_PRETTY@). +Таким образом, предел использования составляет @LIMIT_PRETTY@, из которых +@AVAILABLE_PRETTY@ пока свободно. + +Ограничения на размер журнала настраиваются при помощи параметров +SystemMaxUse=, SystemKeepFree=, SystemMaxFileSize=, RuntimeMaxUse=, +RuntimeKeepFree=, RuntimeMaxFileSize= в файле /etc/systemd/journald.conf. +Более подробные сведения вы можете получить на справочной странице +journald.conf(5). + +# Subject: Messages from a service have been suppressed +-- a596d6fe7bfa4994828e72309e95d61e +Subject: Часть сообщений от службы пропущена +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: man:journald.conf(5) + +Служба отправила слишком много сообщений за короткий промежуток времени. +Часть сообщений была пропущена. + +Обратите внимание, что были пропущены сообщения только от этой службы, +сообщения других служб не затронуты. + +Предел, после которого служба журнала начинает игнорировать сообщения, +настраивается параметрами RateLimitInterval= и RateLimitBurst= в файле +/etc/systemd/journald.conf. Подробности смотрите на странице руководства +journald.conf(5). + +# Subject: Journal messages have been missed +-- e9bf28e6e834481bb6f48f548ad13606 +Subject: Часть сообщений ядра пропущена +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Часть сообщений, поступивших от ядра, была потеряна, так как служба +журналирования не успела их обработать. + +# Subject: Process @COREDUMP_PID@ (@COREDUMP_COMM@) dumped core +-- fc2e22bc6ee647b6b90729ab34a250b1 +Subject: Процесс @COREDUMP_PID@ (@COREDUMP_COMM@) сбросил дамп памяти +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: man:core(5) + +Процесс @COREDUMP_PID@ (@COREDUMP_COMM@) завершился из-за критической ошибки. +Записан дамп памяти. + +Вероятно, это произошло из-за ошибки, допущенной в коде программы. +Рекомендуется сообщить её разработчикам о возникшей проблеме. + +# Subject: A new session @SESSION_ID@ has been created for user @USER_ID@ +-- 8d45620c1a4348dbb17410da57c60c66 +Subject: Для пользователя @USER_ID@ создан новый сеанс @SESSION_ID@ +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat + +Для пользователя @USER_ID@ создан новый сеанс с идентификатором @SESSION_ID@. + +Главный процесс нового сеанса имеет индентификатор @LEADER@. + +# Subject: A session @SESSION_ID@ has been terminated +-- 3354939424b4456d9802ca8333ed424a +Subject: Сеанс @SESSION_ID@ завершен +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat + +Сеанс с идентификатором @SESSION_ID@ завершился. + +# Subject: A new seat @SEAT_ID@ is now available +-- fcbefc5da23d428093f97c82a9290f7b +Subject: Добавлено новое рабочее место @SEAT_ID@ +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat + +Новое рабочее место (seat) @SEAT_ID@ полностью настроено и готово к +использованию. + +# Subject: A seat @SEAT_ID@ has now been removed +-- e7852bfe46784ed0accde04bc864c2d5 +Subject: Рабочее место @SEAT_ID@ отключено +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat + +Рабочее место (seat) @SEAT_ID@ было отключено. + +# Subject: Time change +-- c7a787079b354eaaa9e77b371893cd27 +Subject: Переведены системные часы +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Системные часы были переведены. Сейчас они показывают @REALTIME@ микросекунд +с момента 00:00:00 1 января 1970 года. + +# Subject: Time zone change to @TIMEZONE@ +-- 45f82f4aef7a4bbf942ce861d1f20990 +Subject: Часовой пояс изменен на @TIMEZONE@ +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Системный часовой пояс был изменен. Новое значение: @TIMEZONE@. + +# Subject: System start-up is now complete +-- b07a249cd024414a82dd00cd181378ff +Subject: Запуск системы завершен +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Все системные службы, запуск которых предписан настройками, были запущены. +Впрочем, это ещё не означает, что система в данный момент ничем не занята, +так как некоторые службы могут продолжать инициализацию даже после того, как +отчитались о своем запуске. + +Запуск ядра занял @KERNEL_USEC@ микросекунд. + +Процессы начального RAM-диска (initrd) отработали за @INITRD_USEC@ микросекунд. + +Запуск системных служб занял @USERSPACE_USEC@ микросекунд. + +# Subject: System sleep state @SLEEP@ entered +-- 6bbd95ee977941e497c48be27c254128 +Subject: Система перешла в состояние сна (@SLEEP@) +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Система была переведена в состояние сна (@SLEEP@). + +# Subject: System sleep state @SLEEP@ left +-- 8811e6df2a8e40f58a94cea26f8ebf14 +Subject: Система вышла из состояния сна (@SLEEP@) +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Система была выведена из состояния сна (@SLEEP@). + +# Subject: System shutdown initiated +-- 98268866d1d54a499c4e98921d93bc40 +Subject: Подготовка системы к выключению +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Начат процесс подготовки к выключению компьютера. Останавливаются все системные +службы, отмонтируются все файловые системы. + +# Subject: Unit @UNIT@ has begun with start-up +-- 7d4958e842da4a758f6c1cdc7b36dcc5 +Subject: Начинается запуск юнита @UNIT@ +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Начат процесс запуска юнита @UNIT@. + +# Subject: Unit @UNIT@ has finished start-up +-- 39f53479d3a045ac8e11786248231fbf +Subject: Запуск юнита @UNIT@ завершен +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Процесс запуска юнита @UNIT@ был завершен. + +Результат: @RESULT@. + +# Subject: Unit @UNIT@ has begun shutting down +-- de5b426a63be47a7b6ac3eaac82e2f6f +Subject: Начинается остановка юнита @UNIT@ +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Начат процесс остановки юнита @UNIT@. + +# Subject: Unit @UNIT@ has finished shutting down +-- 9d1aaa27d60140bd96365438aad20286 +Subject: Завершена остановка юнита @UNIT@. +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Процесс остановки юнита @UNIT@ был завершен. + +# Subject: Unit @UNIT@ has failed +-- be02cf6855d2428ba40df7e9d022f03d +Subject: Ошибка юнита @UNIT@ +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Произошел сбой юнита @UNIT@. + +Результат: @RESULT@. + +# Subject: Unit @UNIT@ has begun with reloading its configuration +-- d34d037fff1847e6ae669a370e694725 +Subject: Юнит @UNIT@ начал перечитывать свои настройки +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Юнит @UNIT@ начал процесс перечитывания своей конфигурации. + +# Subject: Unit @UNIT@ has finished reloading its configuration +-- 7b05ebc668384222baa8881179cfda54 +Subject: Юнит @UNIT@ завершил перечитывание своих настроек +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Юнит @UNIT@ завершил процесс перечитывания своей конфигурации. + +Результат: @RESULT@. + +# Subject: Process @EXECUTABLE@ could not be executed +-- 641257651c1b4ec9a8624d7a40a9e1e7 +Subject: Не удалось запустить процесс @EXECUTABLE@ +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Сбой: не удалось запустить процесс @EXECUTABLE@. + +Код ошибки: @ERRNO@. + +# Subject: One or more messages could not be forwarded to syslog +-- 0027229ca0644181a76c4e92458afa2e +Subject: Часть сообщений не удалось передать процессу syslog +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Не удалось передать некоторые сообщения демону системного лога (syslog), +дублирующему работу службы системного журнала. Скорее всего, причина в том, что +используемая реализация syslog не успевает обрабатывать сообщения с достаточной +скоростью. + +# Subject: Mount point is not empty +-- 1dee0369c7fc4736b7099b38ecb46ee7 +Subject: Каталог, являющийся точкой монтирования, не пуст +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Каталог @WHERE@, который был указан в качестве точки монтирования (во втором +столбце файла /etc/fstab, либо в параметре Where= файла конфигурации юнита), +не является пустым. Это никак не мешает монтированию, однако ранее находившиеся +в нем файлы будут недоступны. Чтобы получить к ним доступ, вы можете вручную +перемонтировать эту файловую систему в другую точку. + +# Subject: A virtual machine or container has been started +-- 24d8d4452573402496068381a6312df2 +Subject: Запущена виртуальная машина/контейнер +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Виртуальная машина @NAME@ (идентификатор главного процесса: @LEADER@) запущена и +готова к работе. + +# Subject: A virtual machine or container has been terminated +-- 58432bd3bace477cb514b56381b8a758 +Subject: Остановлена виртуальная машина/контейнер +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Виртуальная машина @NAME@ (идентификатор главного процесса: @LEADER@) выключена. + +# Subject: DNSSEC mode has been turned off, as server doesn't support it +-- 36db2dfa5a9045e1bd4af5f93e1cf057 +Subject: Механизм DNSSEC был отключен, так как DNS-сервер его не поддерживает +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: man:systemd-resolved.service(8) resolved.conf(5) + +Служба разрешения имен хостов (systemd-resolved.service) определила, что +указанный в настойках DNS-сервер не поддерживает технологию DNSSEC, и +автоматически отключила DNSSEC-проверки. + +Данное событие возникает, если в файле resolved.conf указан параметр +DNSSEC=allow-downgrade, и вышестоящий DNS-сервер не поддерживает DNSSEC. +Обратите внимание, что режим allow-downgrade допускает возможность атаки +"DNSSEC downgrade", в ходе которой атакующий хакер блокирует проверки DNSSEC +путем отправки ложных сообщений от имени DNS-сервера. + +Возникновение данного события может свидетельствовать как о том, что ваш +DNS-сервер не поддерживает DNSSEC, так и о том, что некий хакер успешно провел +против вас атаку, направленную на блокировку DNSSEC-проверок. + +# Subject: DNSSEC validation failed +-- 1675d7f172174098b1108bf8c7dc8f5d +Subject: Проверка DNSSEC провалена +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: man:systemd-resolved.service(8) + +DNS-запрос или отдельная ресурсная запись не прошла проверку DNSSEC. +Как правило, это свидетельствует о постороннем вмешательстве в канал связи. + +# Subject: A DNSSEC trust anchor has been revoked +-- 4d4408cfd0d144859184d1e65d7c8a65 +Subject: Открытый ключ DNSSEC был отозван +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: man:systemd-resolved.service(8) + +Открытый ключ (trust ahcnor) DNSSEC был отозван. Необходимо настроить новый +открытый ключ, либо обновить систему, чтобы получить обновленный открытый ключ. diff --git a/src/journal/catalog/systemd.sr.catalog b/src/journal/catalog/systemd.sr.catalog new file mode 100644 index 0000000000..cf700c477b --- /dev/null +++ b/src/journal/catalog/systemd.sr.catalog @@ -0,0 +1,262 @@ +# This file is part of systemd. +# +# Copyright 2012 Lennart Poettering +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. + +# Message catalog for systemd's own messages +# Serbian translation + +# Формат каталога је документован на +# http://www.freedesktop.org/wiki/Software/systemd/catalog + +# Да бисте видели зашто ово радимо, погледајте https://xkcd.com/1024/ + +-- f77379a8490b408bbe5f6940505a777b +Subject: Журнал је покренут +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Системски журналски процес се покренуо, отворио журналске +датотеке за упис и спреман је за обраду захтева. + +-- d93fb3c9c24d451a97cea615ce59c00b +Subject: Журнал је заустављен +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Системски журналски процес се зауставио и затворио све тренутно +отворене журналске датотеке. + +-- a596d6fe7bfa4994828e72309e95d61e +Subject: Поруке од услуге су утишане +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: man:journald.conf(5) + +Услуга је уписала сувише порука за једно време. Поруке +од услуге су одбачене. + +Знајте да су само поруке од ове услуге одбачене, друге +услуге нису захваћене овим. + +Ограничења која подешавају начин на који се поруке одбацују се могу подесити +помоћу „RateLimitInterval=“ и „RateLimitBurst=“ параметара унутар датотеке +/etc/systemd/journald.conf. Погледајте journald.conf(5) за појединости. + +-- e9bf28e6e834481bb6f48f548ad13606 +Subject: Журналске поруке су изгубљене +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Поруке кернела су изгубљене јер журналски систем није могао да их +обради довољно брзо. + +-- fc2e22bc6ee647b6b90729ab34a250b1 +Subject: Процес @COREDUMP_PID@ (@COREDUMP_COMM@) је избацио своје језгро +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: man:core(5) + +Процес @COREDUMP_PID@ (@COREDUMP_COMM@) је пао и избацио своје језгро. + +Ово обично значи да постоји грешка у програму који је пао и ова +грешка треба да се пријави продавцу. + +-- 8d45620c1a4348dbb17410da57c60c66 +Subject: Нова сесија @SESSION_ID@ је направљена за корисника @USER_ID@ +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat + +Нова сесија са ИБ-ом @SESSION_ID@ је направљена за корисника @USER_ID@. + +Водећи процес сесије је @LEADER@. + +-- 3354939424b4456d9802ca8333ed424a +Subject: Сесија @SESSION_ID@ је окончана +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat + +Сесија са ИБ-ом @SESSION_ID@ је окончана. + +-- fcbefc5da23d428093f97c82a9290f7b +Subject: Ново седиште @SEAT_ID@ је сада доступно +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat + +Ново седиште @SEAT_ID@ је исподешавано и сада је доступно. + +-- e7852bfe46784ed0accde04bc864c2d5 +Subject: Седиште @SEAT_ID@ је сада уклоњено +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat + +Седиште @SEAT_ID@ је сада уклоњено и више није доступно. + +-- c7a787079b354eaaa9e77b371893cd27 +Subject: Време је промењено +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Системски сат је сада подешен на @REALTIME@ микросекунде након 1. јануара 1970. године. + +-- 45f82f4aef7a4bbf942ce861d1f20990 +Subject: Временска зона је промењена на @TIMEZONE@ +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Временска зона је промењена на @TIMEZONE@. + +-- b07a249cd024414a82dd00cd181378ff +Subject: Подизање система је сада готово +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Све системске услуге које су заказане за подизање су успешно покренуте. +Знајте да ово не значи да је машина сада беспослена јер услуге могу +и даље бити заузете завршавањем покретања система. + +Подизање кернела је трајало @KERNEL_USEC@ микросекунде. + +Подизање почетног РАМ диска је трајало @INITRD_USEC@ микросекунде. + +Подизање корисничких програма је трајало @USERSPACE_USEC@ микросекунде. + +-- 6bbd95ee977941e497c48be27c254128 +Subject: Системско стање спавања @SLEEP@ започето +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Систем је сада ушао у @SLEEP@ стање спавања. + +-- 8811e6df2a8e40f58a94cea26f8ebf14 +Subject: Системско стање спавања @SLEEP@ напуштено +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Систем је изашао из @SLEEP@ стања спавања. + +-- 98268866d1d54a499c4e98921d93bc40 +Subject: Гашење система започето +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Систем-де гашење је започето. Гашење је сада почело и све +системске услуге су окончане и сви системи датотека откачени. + +-- 7d4958e842da4a758f6c1cdc7b36dcc5 +Subject: Јединица @UNIT@ је почела са покретањем +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Јединица @UNIT@ је почела са покретањем. + +-- 39f53479d3a045ac8e11786248231fbf +Subject: Јединица @UNIT@ је завршила са покретањем +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Јединица @UNIT@ је завршила са покретањем. + +Исход покретања је @RESULT@. + +-- de5b426a63be47a7b6ac3eaac82e2f6f +Subject: Јединица @UNIT@ је почела са гашењем +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Јединица @UNIT@ је почела са гашењем. + +-- 9d1aaa27d60140bd96365438aad20286 +Subject: Јединица @UNIT@ је завршила са гашењем +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Јединица @UNIT@ је завршила са гашењем. + +-- be02cf6855d2428ba40df7e9d022f03d +Subject: Јединица @UNIT@ је пукла +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Јединица @UNIT@ је пукла. + +Исход је @RESULT@. + +-- d34d037fff1847e6ae669a370e694725 +Subject: Јединица @UNIT@ је почела са поновним учитавањем свог подешавања +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Јединица @UNIT@ је почела са поновним учитавањем свог подешавања + +-- 7b05ebc668384222baa8881179cfda54 +Subject: Јединица @UNIT@ је завршила са поновним учитавањем свог подешавања +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Јединица @UNIT@ је завршила са поновним учитавањем свог подешавања + +Исход је @RESULT@. + +-- 641257651c1b4ec9a8624d7a40a9e1e7 +Subject: Процес @EXECUTABLE@ није могао бити извршен +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Процес @EXECUTABLE@ није могао бити извршен и пукао је. + +Овај процес је вратио број грешке @ERRNO@. + +-- 0027229ca0644181a76c4e92458afa2e +Subject: Једна или више порука није могло бити прослеђено системском записнику +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Једна или више порука није могло бити прослеђено „syslog“ услузи +која ради упоредно са журнал-деом. Ово обично значи да спроведена +„syslog“ услуга није могла да издржи брзину свих надолазећих +порука у реду. + +-- 1dee0369c7fc4736b7099b38ecb46ee7 +Subject: Тачка качења није празна +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Директоријум @WHERE@ је наведен као тачка качења (друго поље у +/etc/fstab датотеци или у „Where=“ пољу систем-де јединичне датотеке) +и он није празан. Ово не утиче на качење али ће већ постојеће датотеке у +овом директоријуму постати недоступне. Да бисте видели ове недоступне +датотеке, ручно прикачите основни систем датотека у другу +путању. + +-- 24d8d4452573402496068381a6312df2 +Subject: Виртуелна машина или контејнер је покренут(а) +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Виртуелна машина @NAME@ са водећим ПИБ-ом @LEADER@ је +покренута и сада је спремна за коришћење. + +-- 58432bd3bace477cb514b56381b8a758 +Subject: Виртуелна машина или контејнер је окончан(а) +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Виртуелна машина @NAME@ са водећим ПИБ-ом @LEADER@ је +угашена. diff --git a/src/journal/catalog/systemd.zh_CN.catalog b/src/journal/catalog/systemd.zh_CN.catalog new file mode 100644 index 0000000000..38639109e4 --- /dev/null +++ b/src/journal/catalog/systemd.zh_CN.catalog @@ -0,0 +1,253 @@ +# This file is part of systemd. +# +# Copyright 2012 Lennart Poettering +# Copyright 2015 Boyuan Yang +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. + +# Message catalog for systemd's own messages +# Simplified Chinese translation + +# 本 catalog 文档格式被记载在 +# http://www.freedesktop.org/wiki/Software/systemd/catalog + +# 如需了解我们为什么做这些工作,请见 https://xkcd.com/1024/ + +-- f77379a8490b408bbe5f6940505a777b +Subject: 日志已开始 +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +系统日志进程已启动,已打开供写入的日志文件并准备好处理请求。 + +-- d93fb3c9c24d451a97cea615ce59c00b +Subject: 日志已停止 +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +系统日志进程已终止,并已关闭所有当前活动的日志文件。 + +-- a596d6fe7bfa4994828e72309e95d61e +Subject: 由某个服务而来的消息已被抑制 +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: man:journald.conf(5) + +某个服务在一个时间周期内记录了太多消息。 +从该服务而来的消息已被丢弃。 + +请注意只有由有问题的服务传来的消息被丢弃, +其它服务的消息不受影响。 + +可以在 /etc/systemd/journald.conf 中设定 RateLimitInterval= +以及 RateLimitBurst = 的值以控制丢弃信息的限制。 +请参见 journald.conf(5) 以了解详情。 + +-- e9bf28e6e834481bb6f48f548ad13606 +Subject: 日志消息已遗失 +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +因日志系统对内核消息的处理速度不够快, +部分信息已经遗失。 + +-- fc2e22bc6ee647b6b90729ab34a250b1 +Subject: 进程 @COREDUMP_PID@ (@COREDUMP_COMM@) 核心已转储 +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: man:core(5) + +进程 @COREDUMP_PID@ (@COREDUMP_COMM@) 已崩溃并进行核心转储。 + +这通常意味着崩溃程序中存在编程错误,并应当将此错误向其开发者报告。 + +-- 8d45620c1a4348dbb17410da57c60c66 +Subject: 一个新会话 @SESSION_ID@ 已为用户 @USER_ID@ 建立 +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat + +一个 ID 为 @SESSION_ID@ 的新会话已为用户 @USER_ID@ 建立。 + +该会话的首进程为 @LEADER@。 + +-- 3354939424b4456d9802ca8333ed424a +Subject: 会话 @SESSION_ID@ 已终止 +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat + +一个 ID 为 @SESSION_ID@ 的会话已终止。 + +-- fcbefc5da23d428093f97c82a9290f7b +Subject: 一个新的座位 @SEAT_ID@ 可用 +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat + +一个新的座位 @SEAT_ID@ 已被配置并已可用。 + +-- e7852bfe46784ed0accde04bc864c2d5 +Subject: 座位 @SEAT_ID@ 已被移除 +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat + +座位 @SEAT_ID@ 已被移除并不再可用。 + +-- c7a787079b354eaaa9e77b371893cd27 +Subject: 时间已变更 +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +系统时钟已变更为1970年1月1日后 @REALTIME@ 微秒。 + +-- 45f82f4aef7a4bbf942ce861d1f20990 +Subject: 时区变更为 @TIMEZONE@ +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +系统时区已变更为 @TIMEZONE@。 + +-- b07a249cd024414a82dd00cd181378ff +Subject: 系统启动已完成 +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +所有系统启动时需要的系统服务均已成功启动。 +请注意这并不代表现在机器已经空闲,因为某些服务可能仍处于完成启动的过程中。 + +内核启动使用了 @KERNEL_USEC@ 毫秒。 + +初始内存盘启动使用了 @INITRD_USEC@ 毫秒。 + +用户空间启动使用了 @USERSPACE_USEC@ 毫秒。 + +-- 6bbd95ee977941e497c48be27c254128 +Subject: 系统已进入 @SLEEP@ 睡眠状态 +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-deve + +系统现已进入 @SLEEP@ 睡眠状态。 + +-- 8811e6df2a8e40f58a94cea26f8ebf14 +Subject: 系统已离开 @SLEEP@ 睡眠状态 +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +系统现已离开 @SLEEP@ 睡眠状态。 + +-- 98268866d1d54a499c4e98921d93bc40 +Subject: 系统关机已开始 +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +系统关机操作已初始化。 +关机已开始,所有系统服务均已结束,所有文件系统已卸载。 + +-- 7d4958e842da4a758f6c1cdc7b36dcc5 +Subject: @UNIT@ 单元已开始启动 +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +@UNIT@ 单元已开始启动。 + +-- 39f53479d3a045ac8e11786248231fbf +Subject: @UNIT@ 单元已结束启动 +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +@UNIT@ 单元已结束启动。 + +启动结果为“@RESULT@”。 + +-- de5b426a63be47a7b6ac3eaac82e2f6f +Subject: @UNIT@ 单元已开始停止操作 +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +@UNIT@ 单元已开始停止操作。 + +-- 9d1aaa27d60140bd96365438aad20286 +Subject: @UNIT@ 单元已结束停止操作 +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +@UNIT@ 单元已结束停止操作。 + +-- be02cf6855d2428ba40df7e9d022f03d +Subject: @UNIT@ 单元已失败 +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +@UNIT@ 单元已失败。 + +结果为“@RESULT@”。 + +-- d34d037fff1847e6ae669a370e694725 +Subject: @UNIT@ 单元已开始重新载入其配置 +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +@UNIT@ 单元已开始重新载入其配置。 + +-- 7b05ebc668384222baa8881179cfda54 +Subject: @UNIT@ 单元已结束配置重载入 +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +@UNIT@ 单元已结束配置重载入操作。 + +结果为“@RESULT@”。 + +-- 641257651c1b4ec9a8624d7a40a9e1e7 +Subject: 进程 @EXECUTABLE@ 无法执行 +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +进程 @EXECUTABLE@ 无法被执行并已失败。 + +该进程返回的错误代码为 @ERRNO@。 + +-- 0027229ca0644181a76c4e92458afa2e +Subject: 一个或更多消息无法被转发至 syslog +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +有一条或更多的消息无法被转发至与 journald 同时运行的 syslog 服务。 +这通常意味着 syslog 实现无法跟上队列中消息进入的速度。 + +-- 1dee0369c7fc4736b7099b38ecb46ee7 +Subject: 挂载点不为空 +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +目录 @WHERE@ 被指定为挂载点(即 /etc/fstab 文件的第二栏,或 systemd 单元 +文件的 Where= 字段),且该目录非空。 +这并不会影响挂载行为,但该目录中先前已存在的文件将无法被访问。 +如需查看这些文件,请手动将其下的文件系统挂载到另一个位置。 + +-- 24d8d4452573402496068381a6312df2 +Subject: 一个虚拟机或容器已启动 +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +虚拟机 @NAME@,以及其首进程 PID @LEADER@,已被启动并可被使用。 + +-- 58432bd3bace477cb514b56381b8a758 +Subject: 一个虚拟机或容器已被终止 +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +虚拟机 @NAME@,以及其首进程 PID @LEADER@,已被关闭并停止。 diff --git a/src/journal/catalog/systemd.zh_TW.catalog b/src/journal/catalog/systemd.zh_TW.catalog new file mode 100644 index 0000000000..027ffe44e5 --- /dev/null +++ b/src/journal/catalog/systemd.zh_TW.catalog @@ -0,0 +1,263 @@ +# This file is part of systemd. +# +# Copyright 2012 Lennart Poettering +# Copyright 2015 Jeff Huang +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. + +# Message catalog for systemd's own messages +# Traditional Chinese translation + +# Catalog 的格式記錄於 +# http://www.freedesktop.org/wiki/Software/systemd/catalog + +# For an explanation why we do all this, see https://xkcd.com/1024/ + +-- f77379a8490b408bbe5f6940505a777b +Subject: 日誌已開始 +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +系統日誌行程已啟動,已開啟日誌 +檔案供寫入並準備好對行程的要求做出回應。 + +-- d93fb3c9c24d451a97cea615ce59c00b +Subject: 日誌已停止 +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +系統日誌行程已關閉,且關閉所有目前 +活躍的日誌檔案。 + +-- a596d6fe7bfa4994828e72309e95d61e +Subject: 從服務而來的訊息已被抑制 +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: man:journald.conf(5) + +有一個服務在一個時間週期內記錄了太多訊息。 +從該服務而來的訊息已被丟棄。 + +注意,只有有問題的服務之訊息被丟棄, +其他服務的訊息則不受影響。 + +可以在 /etc/systemd/journald.conf 中設定 +RateLimitInterval= 以及 RateLimitBurst= +來控制當訊息要開始被丟棄時的限制。參見 journald.conf(5) 以獲得更多資訊。 + +-- e9bf28e6e834481bb6f48f548ad13606 +Subject: 日誌訊息已遺失 +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +因日誌系統對核心訊息的處理不夠快速, +部份訊息已遺失。 + +-- fc2e22bc6ee647b6b90729ab34a250b1 +Subject: 行程 @COREDUMP_PID@ (@COREDUMP_COMM@) 核心傾印 +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: man:core(5) + +行程 @COREDUMP_PID@ (@COREDUMP_COMM@) 當掉並核心傾印。 + +這通常代表了在當掉的程式中的一個程式錯誤 +並需要回報錯誤給其開發者。 + +-- 8d45620c1a4348dbb17410da57c60c66 +Subject: 新的工作階段 @SESSION_ID@ 已為使用者 @USER_ID@ 建立 +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat + +一個新的工作階段,ID @SESSION_ID@ 已為使用者 @USER_ID@ 建立。 + +這個工作階段的領導行程為 @LEADER@。 + +-- 3354939424b4456d9802ca8333ed424a +Subject: 工作階段 @SESSION_ID@ 已結束 +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat + +一個工作階段,ID @SESSION_ID@ 已結束。 + +-- fcbefc5da23d428093f97c82a9290f7b +Subject: 新的座位 @SEAT_ID@ 可用 +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat + +一個新的座位 @SEAT_ID@ 已被設定且現在可用。 + +-- e7852bfe46784ed0accde04bc864c2d5 +Subject: 座位 @SEAT_ID@ 已被移除 +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat + +座位 @SEAT_ID@ 已被移除且不再可用。 + +-- c7a787079b354eaaa9e77b371893cd27 +Subject: 時間變更 +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +系統時間已變更為1970年1月1日後 @REALTIME@ 微秒。 + +-- 45f82f4aef7a4bbf942ce861d1f20990 +Subject: 時區變更為 @TIMEZONE@ +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +系統時區已變更為 @TIMEZONE@。 + +-- b07a249cd024414a82dd00cd181378ff +Subject: 系統啟動已完成 +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +所有開機所必要的系統服務都已成功啟動。 +注意這並不代表這臺機器有空閒的時間 +可以服務,可能仍忙於完成啟動。 + +核心啟動需要 @KERNEL_USEC@ 微秒。 + +初始 RAM 磁碟啟動需要 @INITRD_USEC@ 微秒。 + +使用者空間啟動需要 @USERSPACE_USEC@ 微秒。 + +-- 6bbd95ee977941e497c48be27c254128 +Subject: 系統進入 @SLEEP@ 睡眠狀態 +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +系統現在已進入 @SLEEP@ 睡眠狀態。 + +-- 8811e6df2a8e40f58a94cea26f8ebf14 +Subject: 系統離開 @SLEEP@ 睡眠狀態 +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +系統現在已離開 @SLEEP@ 睡眠狀態。 + +-- 98268866d1d54a499c4e98921d93bc40 +Subject: 系統關機開始 +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Systemd 關閉已經開始。關閉已開始且所有系統服務 +都已結束,所有的檔案系統也都已被卸載。 + +-- 7d4958e842da4a758f6c1cdc7b36dcc5 +Subject: 單位 @UNIT@ 已開始啟動 +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +單位 @UNIT@ 已開始啟動。 + +-- 39f53479d3a045ac8e11786248231fbf +Subject: 單位 @UNIT@ 啟動已結束 +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +單位 @UNIT@ 啟動已結束。 + +啟動結果為 @RESULT@。 + +-- de5b426a63be47a7b6ac3eaac82e2f6f +Subject: 單位 @UNIT@ 已開始關閉 +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +單位 @UNIT@ 已開始關閉。 + +-- 9d1aaa27d60140bd96365438aad20286 +Subject: 單位 @UNIT@ 已關閉結束 +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +單位 @UNIT@ 已關閉結束。 + +-- be02cf6855d2428ba40df7e9d022f03d +Subject: 單位 @UNIT@ 已失敗 +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +單位 @UNIT@ 已失敗。 + +結果為 @RESULT@。 + +-- d34d037fff1847e6ae669a370e694725 +Subject: 單位 @UNIT@ 已開始重新載入其設定 +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +單位 @UNIT@ 已開始重新載入其設定 + +-- 7b05ebc668384222baa8881179cfda54 +Subject: 單位 @UNIT@ 已結束重新載入其設定 +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +單位 @UNIT@ 已結束重新載入其設定 + +結果為 @RESULT@。 + +-- 641257651c1b4ec9a8624d7a40a9e1e7 +Subject: 行程 @EXECUTABLE@ 無法執行 +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +行程 @EXECUTABLE@ 無法執行且失敗。 + +由該行程所回傳的錯誤碼為 @ERRNO@。 + +-- 0027229ca0644181a76c4e92458afa2e +Subject: 一個或更多訊息無法被轉發到 syslog +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +一個或更多訊息無法被轉發到 syslog 服務 +以及並行執行的 journald。這通常代表著 +syslog 實作並無未跟上佇列中訊息 +的速度。 + +-- 1dee0369c7fc4736b7099b38ecb46ee7 +Subject: 掛載點不為空 +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +目錄 @WHERE@ 被指定為掛載點(在 /etc/fstab 中的 +第二欄或是在 systemd 單位檔案中的 Where= 欄位)且其不為空。 +這並不會干擾掛載,但在此目錄中已存在的檔案 +會變成無法存取的狀態。要檢視這些 over-mounted 的檔案, +請手動掛載下面的檔案系統到次要 +位置。 + +-- 24d8d4452573402496068381a6312df2 +Subject: 虛擬機器或容器已啟動 +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +虛擬機器 @NAME@ 包含它的領導 PID @LEADER@ 現在 +已經開始並已經可以使用。 + +-- 58432bd3bace477cb514b56381b8a758 +Subject: 虛擬機器或容器已結束 +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +虛擬機器 @NAME@ 包含它的領導 PID @LEADER@ 已經 +關閉。 diff --git a/src/journal/journal-qrcode.h b/src/journal/journal-qrcode.h index ef39085561..34a779d5be 100644 --- a/src/journal/journal-qrcode.h +++ b/src/journal/journal-qrcode.h @@ -22,6 +22,6 @@ #include <inttypes.h> #include <stdio.h> -#include "sd-id128.h" +#include <systemd/sd-id128.h> int print_qr_code(FILE *f, const void *seed, size_t seed_size, uint64_t start, uint64_t interval, const char *hn, sd_id128_t machine); diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c index 273242bea6..1670978466 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -33,8 +33,8 @@ #include <sys/stat.h> #include <unistd.h> -#include "sd-bus.h" -#include "sd-journal.h" +#include <systemd/sd-bus.h> +#include <systemd/sd-journal.h> #include "acl-util.h" #include "alloc-util.h" diff --git a/src/journal/journald-kmsg.c b/src/journal/journald-kmsg.c index eb1ac90e98..1ac57bb361 100644 --- a/src/journal/journald-kmsg.c +++ b/src/journal/journald-kmsg.c @@ -24,7 +24,7 @@ #include <unistd.h> #include "libudev.h" -#include "sd-messages.h" +#include <systemd/sd-messages.h> #include "escape.h" #include "fd-util.h" diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c index ee2db8d29f..4f53bf01c3 100644 --- a/src/journal/journald-server.c +++ b/src/journal/journald-server.c @@ -27,9 +27,9 @@ #include <linux/sockios.h> #include "libudev.h" -#include "sd-daemon.h" -#include "sd-journal.h" -#include "sd-messages.h" +#include <systemd/sd-daemon.h> +#include <systemd/sd-journal.h> +#include <systemd/sd-messages.h> #include "acl-util.h" #include "alloc-util.h" diff --git a/src/journal/journald-server.h b/src/journal/journald-server.h index b9551dda1b..cb8a5bbe9b 100644 --- a/src/journal/journald-server.h +++ b/src/journal/journald-server.h @@ -22,7 +22,7 @@ #include <stdbool.h> #include <sys/types.h> -#include "sd-event.h" +#include <systemd/sd-event.h> typedef struct Server Server; diff --git a/src/journal/journald-stream.c b/src/journal/journald-stream.c index 6e8b405b53..583b1305ae 100644 --- a/src/journal/journald-stream.c +++ b/src/journal/journald-stream.c @@ -24,8 +24,8 @@ #include <selinux/selinux.h> #endif -#include "sd-daemon.h" -#include "sd-event.h" +#include <systemd/sd-daemon.h> +#include <systemd/sd-event.h> #include "alloc-util.h" #include "dirent-util.h" diff --git a/src/journal/journald-syslog.c b/src/journal/journald-syslog.c index 5153fd0cce..480a1cc405 100644 --- a/src/journal/journald-syslog.c +++ b/src/journal/journald-syslog.c @@ -21,7 +21,7 @@ #include <sys/epoll.h> #include <unistd.h> -#include "sd-messages.h" +#include <systemd/sd-messages.h> #include "alloc-util.h" #include "fd-util.h" diff --git a/src/journal/journald.c b/src/journal/journald.c index 272acb71c4..1afe44fa8e 100644 --- a/src/journal/journald.c +++ b/src/journal/journald.c @@ -19,8 +19,8 @@ #include <unistd.h> -#include "sd-daemon.h" -#include "sd-messages.h" +#include <systemd/sd-daemon.h> +#include <systemd/sd-messages.h> #include "formats-util.h" #include "journal-authenticate.h" diff --git a/src/journal/test-catalog.c b/src/journal/test-catalog.c index da6fcbca4d..6f2f9f5561 100644 --- a/src/journal/test-catalog.c +++ b/src/journal/test-catalog.c @@ -23,7 +23,7 @@ #include <locale.h> #include <unistd.h> -#include "sd-messages.h" +#include <systemd/sd-messages.h> #include "alloc-util.h" #include "catalog.h" diff --git a/src/journal/test-journal-enum.c b/src/journal/test-journal-enum.c index e5e9d9dcb3..ffdc317e1d 100644 --- a/src/journal/test-journal-enum.c +++ b/src/journal/test-journal-enum.c @@ -19,7 +19,7 @@ #include <stdio.h> -#include "sd-journal.h" +#include <systemd/sd-journal.h> #include "journal-internal.h" #include "log.h" diff --git a/src/journal/test-journal-flush.c b/src/journal/test-journal-flush.c index 7bd9c40366..3dee462e74 100644 --- a/src/journal/test-journal-flush.c +++ b/src/journal/test-journal-flush.c @@ -19,7 +19,7 @@ #include <fcntl.h> -#include "sd-journal.h" +#include <systemd/sd-journal.h> #include "alloc-util.h" #include "journal-file.h" diff --git a/src/journal/test-journal-init.c b/src/journal/test-journal-init.c index ef21e2d05f..e6713034dd 100644 --- a/src/journal/test-journal-init.c +++ b/src/journal/test-journal-init.c @@ -17,7 +17,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-journal.h" +#include <systemd/sd-journal.h> #include "log.h" #include "parse-util.h" diff --git a/src/journal/test-journal-interleaving.c b/src/journal/test-journal-interleaving.c index 7f94990888..b47182dbfd 100644 --- a/src/journal/test-journal-interleaving.c +++ b/src/journal/test-journal-interleaving.c @@ -21,7 +21,7 @@ #include <fcntl.h> #include <unistd.h> -#include "sd-journal.h" +#include <systemd/sd-journal.h> #include "alloc-util.h" #include "journal-file.h" diff --git a/src/journal/test-journal-match.c b/src/journal/test-journal-match.c index 3ab554b9b0..5ee2adb827 100644 --- a/src/journal/test-journal-match.c +++ b/src/journal/test-journal-match.c @@ -19,7 +19,7 @@ #include <stdio.h> -#include "sd-journal.h" +#include <systemd/sd-journal.h> #include "alloc-util.h" #include "journal-internal.h" diff --git a/src/journal/test-journal-send.c b/src/journal/test-journal-send.c index d70f0b0bc8..169082f9a4 100644 --- a/src/journal/test-journal-send.c +++ b/src/journal/test-journal-send.c @@ -21,7 +21,7 @@ #include <stdlib.h> #include <unistd.h> -#include "sd-journal.h" +#include <systemd/sd-journal.h> #include "macro.h" diff --git a/src/journal/test-journal-stream.c b/src/journal/test-journal-stream.c index 4e6f8c0f7b..57c6c0872d 100644 --- a/src/journal/test-journal-stream.c +++ b/src/journal/test-journal-stream.c @@ -20,7 +20,7 @@ #include <fcntl.h> #include <unistd.h> -#include "sd-journal.h" +#include <systemd/sd-journal.h> #include "alloc-util.h" #include "journal-file.h" diff --git a/src/kernel-install/Makefile b/src/kernel-install/Makefile index d0b0e8e008..f0d39fd1e5 120000..100644 --- a/src/kernel-install/Makefile +++ b/src/kernel-install/Makefile @@ -1 +1,34 @@ -../Makefile
\ No newline at end of file +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +dist_bin_SCRIPTS = \ + src/kernel-install/kernel-install + +dist_kernelinstall_SCRIPTS = \ + src/kernel-install/50-depmod.install \ + src/kernel-install/90-loaderentry.install + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/kernel-install/bash-completion_kernel-install b/src/kernel-install/bash-completion_kernel-install new file mode 100644 index 0000000000..7cd2494cf7 --- /dev/null +++ b/src/kernel-install/bash-completion_kernel-install @@ -0,0 +1,50 @@ +# kernel-install(8) completion -*- shell-script -*- +# +# This file is part of systemd. +# +# Copyright 2013 Kay Sievers +# Copyright 2013 Harald Hoyer +# +# 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 +# (at your option) any later version. +# +# systemd 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 +# General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with systemd; If not, see <http://www.gnu.org/licenses/>. + +_kernel_install() { + local comps + local MACHINE_ID + local cur=${COMP_WORDS[COMP_CWORD]} + + case $COMP_CWORD in + 1) + comps="add remove" + ;; + 2) + comps=$(cd /lib/modules; echo [0-9]*) + if [[ ${COMP_WORDS[1]} == "remove" ]] && [[ -f /etc/machine-id ]]; then + read MACHINE_ID < /etc/machine-id + if [[ $MACHINE_ID ]] && ( [[ -d /boot/$MACHINE_ID ]] || [[ -L /boot/$MACHINE_ID ]] ); then + comps=$(cd "/boot/$MACHINE_ID"; echo [0-9]*) + fi + fi + ;; + 3) + [[ "$cur" ]] || cur=/boot/vmlinuz-${COMP_WORDS[2]} + comps=$(compgen -f -- "$cur") + compopt -o filenames + ;; + esac + + COMPREPLY=( $(compgen -W '$comps' -- "$cur") ) + return 0 +} + +complete -F _kernel_install kernel-install diff --git a/src/kernel-install/kernel-install.xml b/src/kernel-install/kernel-install.xml new file mode 100644 index 0000000000..eb519188a6 --- /dev/null +++ b/src/kernel-install/kernel-install.xml @@ -0,0 +1,192 @@ +<?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*--> +<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" +"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> + +<!-- + This file is part of systemd. + + Copyright 2013 Harald Hoyer + + 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 + (at your option) any later version. + + systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +--> + +<refentry id="kernel-install"> + + <refentryinfo> + <title>kernel-install</title> + <productname>systemd</productname> + + <authorgroup> + <author> + <contrib>Developer</contrib> + <firstname>Harald</firstname> + <surname>Hoyer</surname> + <email>harald@redhat.com</email> + </author> + </authorgroup> + </refentryinfo> + + <refmeta> + <refentrytitle>kernel-install</refentrytitle> + <manvolnum>8</manvolnum> + </refmeta> + + <refnamediv> + <refname>kernel-install</refname> + <refpurpose>Add and remove kernel and initramfs images to and from /boot</refpurpose> + </refnamediv> + + <refsynopsisdiv> + <cmdsynopsis> + <command>kernel-install</command> + <arg choice="plain">COMMAND</arg> + <arg choice="plain"><replaceable>KERNEL-VERSION</replaceable></arg> + <arg choice="opt"><replaceable>KERNEL-IMAGE</replaceable></arg> + </cmdsynopsis> + </refsynopsisdiv> + + <refsect1> + <title>Description</title> + <para> + <command>kernel-install</command> is used to install and remove kernel and + initramfs images to and from <filename>/boot</filename>. + </para> + + <para><command>kernel-install</command> will execute the files + located in the directory <filename>/usr/lib/kernel/install.d/</filename> + and the local administration directory <filename>/etc/kernel/install.d/</filename>. + All files are collectively sorted and executed in lexical order, regardless of the directory in + which they live. However, files with identical filenames replace each other. + Files in <filename>/etc/kernel/install.d/</filename> take precedence over files with the same name + in <filename>/usr/lib/kernel/install.d/</filename>. This can be used to override a system-supplied + executables with a local file if needed; a symbolic link in <filename>/etc/kernel/install.d/</filename> + with the same name as an executable in <filename>/usr/lib/kernel/install.d/</filename>, + pointing to /dev/null, disables the executable entirely. Executables must have the + extension <literal>.install</literal>; other extensions are ignored.</para> + + </refsect1> + + <refsect1> + <title>Commands</title> + <para>The following commands are understood:</para> + <variablelist> + <varlistentry> + <term><command>add <replaceable>KERNEL-VERSION</replaceable> <replaceable>KERNEL-IMAGE</replaceable></command></term> + <listitem> + <para><command>kernel-install</command> creates the directory + <filename>/boot/<replaceable>MACHINE-ID</replaceable>/<replaceable>KERNEL-VERSION</replaceable>/</filename> + and calls every executable + <filename>/usr/lib/kernel/install.d/*.install</filename> and + <filename>/etc/kernel/install.d/*.install</filename> with + the arguments + <programlisting>add <replaceable>KERNEL-VERSION</replaceable> <filename>/boot/<replaceable>MACHINE-ID</replaceable>/<replaceable>KERNEL-VERSION</replaceable>/</filename></programlisting> + </para> + + <para>The kernel-install plugin <filename>50-depmod.install</filename> runs depmod for the <replaceable>KERNEL-VERSION</replaceable>.</para> + + <para>The kernel-install plugin + <filename>90-loaderentry.install</filename> copies + <replaceable>KERNEL-IMAGE</replaceable> to + <filename>/boot/<replaceable>MACHINE-ID</replaceable>/<replaceable>KERNEL-VERSION</replaceable>/linux</filename>. + It also creates a boot loader entry according to the boot + loader specification in + <filename>/boot/loader/entries/<replaceable>MACHINE-ID</replaceable>-<replaceable>KERNEL-VERSION</replaceable>.conf</filename>. + The title of the entry is the + <replaceable>PRETTY_NAME</replaceable> parameter specified + in <filename>/etc/os-release</filename> or + <filename>/usr/lib/os-release</filename> (if the former is + missing), or "GNU/Linux + <replaceable>KERNEL-VERSION</replaceable>", if unset. If + the file <filename>initrd</filename> is found next to the + <filename>linux</filename> file, the initrd will be added to + the configuration.</para> + </listitem> + </varlistentry> + <varlistentry> + <term><command>remove <replaceable>KERNEL-VERSION</replaceable></command></term> + <listitem> + <para>Calls every executable <filename>/usr/lib/kernel/install.d/*.install</filename> + and <filename>/etc/kernel/install.d/*.install</filename> with the arguments + <programlisting>remove <replaceable>KERNEL-VERSION</replaceable> <filename>/boot/<replaceable>MACHINE-ID</replaceable>/<replaceable>KERNEL-VERSION</replaceable>/</filename></programlisting> + </para> + + <para><command>kernel-install</command> removes the entire directory + <filename>/boot/<replaceable>MACHINE-ID</replaceable>/<replaceable>KERNEL-VERSION</replaceable>/</filename> afterwards.</para> + + <para>The kernel-install plugin <filename>90-loaderentry.install</filename> removes the file + <filename>/boot/loader/entries/<replaceable>MACHINE-ID</replaceable>-<replaceable>KERNEL-VERSION</replaceable>.conf</filename>.</para> + </listitem> + </varlistentry> + + </variablelist> + + </refsect1> + + <refsect1> + <title>Exit status</title> + <para>If every executable returns with 0, 0 is returned, a non-zero failure code otherwise.</para> + </refsect1> + + <refsect1> + <title>Files</title> + <variablelist> + <varlistentry> + <term> + <filename>/usr/lib/kernel/install.d/*.install</filename> + <filename>/etc/kernel/install.d/*.install</filename> + </term> + <listitem> + <para>Drop-in files which are executed by kernel-install.</para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <filename>/etc/kernel/cmdline</filename> + <filename>/proc/cmdline</filename> + </term> + <listitem> + <para>The content of the file <filename>/etc/kernel/cmdline</filename> specifies the kernel command line to use. + If that file does not exist, <filename>/proc/cmdline</filename> is used.</para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <filename>/etc/machine-id</filename> + </term> + <listitem> + <para>The content of the file specifies the machine identification <replaceable>MACHINE-ID</replaceable>.</para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <filename>/etc/os-release</filename> + <filename>/usr/lib/os-release</filename> + </term> + <listitem> + <para>The content of the file specifies the operating system title <replaceable>PRETTY_NAME</replaceable>.</para> + </listitem> + </varlistentry> + </variablelist> + </refsect1> + + <refsect1> + <title>See Also</title> + <para> + <citerefentry><refentrytitle>machine-id</refentrytitle><manvolnum>5</manvolnum></citerefentry>, + <citerefentry><refentrytitle>os-release</refentrytitle><manvolnum>5</manvolnum></citerefentry>, + <ulink url="http://www.freedesktop.org/wiki/Specifications/BootLoaderSpec">Boot loader specification</ulink> + </para> + </refsect1> + +</refentry> diff --git a/src/kernel-install/zsh-completion_kernel-install b/src/kernel-install/zsh-completion_kernel-install new file mode 100644 index 0000000000..4fdd3a4ae7 --- /dev/null +++ b/src/kernel-install/zsh-completion_kernel-install @@ -0,0 +1,26 @@ +#compdef kernel-install + +_images(){ + if [[ "$words[2]" == "remove" ]]; then + _message 'No more options' + else + _path_files -W /boot/ -P /boot/ -g "vmlinuz-*" + fi +} + +_kernels(){ + read _MACHINE_ID < /etc/machine-id + _kernel=( /lib/modules/[0-9]* ) + if [[ "$cmd" == "remove" && -n "$_MACHINE_ID" ]]; then + _kernel=( "/boot/$_MACHINE_ID"/[0-9]* ) + fi + _kernel=( ${_kernel##*/} ) + _describe "installed kernels" _kernel +} + +_arguments \ + '1::add or remove:(add remove)' \ + '2::kernel versions:_kernels' \ + '3::kernel images:_images' + +#vim: set ft=zsh sw=4 ts=4 et diff --git a/src/basic/.gitignore b/src/libbasic/.gitignore index e22411e484..e22411e484 100644 --- a/src/basic/.gitignore +++ b/src/libbasic/.gitignore diff --git a/src/libbasic/Makefile b/src/libbasic/Makefile new file mode 100644 index 0000000000..744ccd6801 --- /dev/null +++ b/src/libbasic/Makefile @@ -0,0 +1,281 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +noinst_LTLIBRARIES += \ + libbasic.la + +libbasic_la_SOURCES = \ + src/basic/missing.h \ + src/basic/capability-util.c \ + src/basic/capability-util.h \ + src/basic/c-rbtree.c \ + src/basic/c-rbtree.h \ + src/basic/conf-files.c \ + src/basic/conf-files.h \ + src/basic/stdio-util.h \ + src/basic/hostname-util.h \ + src/basic/hostname-util.c \ + src/basic/unit-name.c \ + src/basic/unit-name.h \ + src/basic/ioprio.h \ + src/basic/securebits.h \ + src/basic/special.h \ + src/basic/list.h \ + src/basic/unaligned.h \ + src/basic/macro.h \ + src/basic/def.h \ + src/basic/sparse-endian.h \ + src/basic/refcnt.h \ + src/basic/util.c \ + src/basic/util.h \ + src/basic/io-util.c \ + src/basic/io-util.h \ + src/basic/string-util.c \ + src/basic/string-util.h \ + src/basic/fd-util.c \ + src/basic/fd-util.h \ + src/basic/parse-util.c \ + src/basic/parse-util.h \ + src/basic/user-util.c \ + src/basic/user-util.h \ + src/basic/rlimit-util.c \ + src/basic/rlimit-util.h \ + src/basic/dirent-util.c \ + src/basic/dirent-util.h \ + src/basic/xattr-util.c \ + src/basic/xattr-util.h \ + src/basic/chattr-util.c \ + src/basic/chattr-util.h \ + src/basic/proc-cmdline.c \ + src/basic/proc-cmdline.h \ + src/basic/fs-util.c \ + src/basic/fs-util.h \ + src/basic/syslog-util.c \ + src/basic/syslog-util.h \ + src/basic/stat-util.c \ + src/basic/stat-util.h \ + src/basic/mount-util.c \ + src/basic/mount-util.h \ + src/basic/hexdecoct.c \ + src/basic/hexdecoct.h \ + src/basic/glob-util.h \ + src/basic/glob-util.c \ + src/basic/extract-word.c \ + src/basic/extract-word.h \ + src/basic/escape.c \ + src/basic/escape.h \ + src/basic/cpu-set-util.c \ + src/basic/cpu-set-util.h \ + src/basic/lockfile-util.c \ + src/basic/lockfile-util.h \ + src/basic/path-util.c \ + src/basic/path-util.h \ + src/basic/time-util.c \ + src/basic/time-util.h \ + src/basic/locale-util.c \ + src/basic/locale-util.h \ + src/basic/umask-util.h \ + src/basic/signal-util.c \ + src/basic/signal-util.h \ + src/basic/string-table.c \ + src/basic/string-table.h \ + src/basic/mempool.c \ + src/basic/mempool.h \ + src/basic/hashmap.c \ + src/basic/hashmap.h \ + src/basic/hash-funcs.c \ + src/basic/hash-funcs.h \ + src/basic/siphash24.c \ + src/basic/siphash24.h \ + src/basic/set.h \ + src/basic/ordered-set.h \ + src/basic/ordered-set.c \ + src/basic/bitmap.c \ + src/basic/bitmap.h \ + src/basic/fdset.c \ + src/basic/fdset.h \ + src/basic/prioq.c \ + src/basic/prioq.h \ + src/basic/web-util.c \ + src/basic/web-util.h \ + src/basic/strv.c \ + src/basic/strv.h \ + src/basic/env-util.c \ + src/basic/env-util.h \ + src/basic/strbuf.c \ + src/basic/strbuf.h \ + src/basic/strxcpyx.c \ + src/basic/strxcpyx.h \ + src/basic/log.c \ + src/basic/log.h \ + src/basic/bus-label.c \ + src/basic/bus-label.h \ + src/basic/ratelimit.h \ + src/basic/ratelimit.c \ + src/basic/exit-status.c \ + src/basic/exit-status.h \ + src/basic/virt.c \ + src/basic/virt.h \ + src/basic/smack-util.c \ + src/basic/smack-util.h \ + src/basic/device-nodes.c \ + src/basic/device-nodes.h \ + src/basic/utf8.c \ + src/basic/utf8.h \ + src/basic/gunicode.c \ + src/basic/gunicode.h \ + src/basic/socket-util.c \ + src/basic/socket-util.h \ + src/basic/in-addr-util.c \ + src/basic/in-addr-util.h \ + src/basic/ether-addr-util.h \ + src/basic/ether-addr-util.c \ + src/basic/replace-var.c \ + src/basic/replace-var.h \ + src/basic/clock-util.c \ + src/basic/clock-util.h \ + src/basic/calendarspec.c \ + src/basic/calendarspec.h \ + src/basic/fileio.c \ + src/basic/fileio.h \ + src/basic/MurmurHash2.c \ + src/basic/MurmurHash2.h \ + src/basic/mkdir.c \ + src/basic/mkdir.h \ + src/basic/cgroup-util.c \ + src/basic/cgroup-util.h \ + src/basic/errno-list.c \ + src/basic/errno-list.h \ + src/basic/af-list.c \ + src/basic/af-list.h \ + src/basic/arphrd-list.c \ + src/basic/arphrd-list.h \ + src/basic/terminal-util.c \ + src/basic/terminal-util.h \ + src/basic/login-util.h \ + src/basic/login-util.c \ + src/basic/cap-list.c \ + src/basic/cap-list.h \ + src/basic/audit-util.c \ + src/basic/audit-util.h \ + src/basic/xml.c \ + src/basic/xml.h \ + src/basic/json.c \ + src/basic/json.h \ + src/basic/barrier.c \ + src/basic/barrier.h \ + src/basic/async.c \ + src/basic/async.h \ + src/basic/memfd-util.c \ + src/basic/memfd-util.h \ + src/basic/process-util.c \ + src/basic/process-util.h \ + src/basic/random-util.c \ + src/basic/random-util.h \ + src/basic/verbs.c \ + src/basic/verbs.h \ + src/basic/sigbus.c \ + src/basic/sigbus.h \ + src/basic/build.h \ + src/basic/socket-label.c \ + src/basic/label.c \ + src/basic/label.h \ + src/basic/btrfs-util.c \ + src/basic/btrfs-util.h \ + src/basic/btrfs-ctree.h \ + src/basic/selinux-util.c \ + src/basic/selinux-util.h \ + src/basic/mkdir-label.c \ + src/basic/fileio-label.c \ + src/basic/fileio-label.h \ + src/basic/rm-rf.c \ + src/basic/rm-rf.h \ + src/basic/copy.c \ + src/basic/copy.h \ + src/basic/alloc-util.h \ + src/basic/alloc-util.c \ + src/basic/formats-util.h \ + src/basic/nss-util.h + +nodist_libbasic_la_SOURCES = \ + src/basic/errno-from-name.h \ + src/basic/errno-to-name.h \ + src/basic/af-from-name.h \ + src/basic/af-to-name.h \ + src/basic/arphrd-from-name.h \ + src/basic/arphrd-to-name.h \ + src/basic/cap-from-name.h \ + src/basic/cap-to-name.h + +libbasic_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(SELINUX_CFLAGS) \ + $(CAP_CFLAGS) \ + -pthread + +libbasic_la_LIBADD = \ + $(SELINUX_LIBS) \ + $(CAP_LIBS) \ + -lrt \ + -lm + +$(outdir)/errno-list.txt: + $(AM_V_GEN)$(CPP) $(ALL_CPPFLAGS) -dM -include errno.h - </dev/null | $(AWK) '/^#define[ \t]+E[^ _]+[ \t]+/ { print $$2; }' >$@ + +$(outdir)/errno-to-name.h: $(outdir)/errno-list.txt + $(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const errno_names[] = { "} !/EDEADLOCK/ && !/EWOULDBLOCK/ && !/ENOTSUP/ { printf "[%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' <$< >$@ + + +$(outdir)/af-list.txt: + $(AM_V_GEN)$(CPP) $(ALL_CPPFLAGS) -dM -include sys/socket.h - </dev/null | grep -v AF_UNSPEC | grep -v AF_MAX | $(AWK) '/^#define[ \t]+AF_[^ \t]+[ \t]+PF_[^ \t]/ { print $$2; }' >$@ + +$(outdir)/af-to-name.h: $(outdir)/af-list.txt + $(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const af_names[] = { "} !/AF_FILE/ && !/AF_ROUTE/ && !/AF_LOCAL/ { printf "[%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' <$< >$@ + + +$(outdir)/arphrd-list.txt: + $(AM_V_GEN)$(CPP) $(ALL_CPPFLAGS) -dM -include net/if_arp.h - </dev/null | $(AWK) '/^#define[ \t]+ARPHRD_[^ \t]+[ \t]+[^ \t]/ { print $$2; }' | sed -e 's/ARPHRD_//' >$@ + +$(outdir)/arphrd-to-name.h: $(outdir)/arphrd-list.txt + $(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const arphrd_names[] = { "} !/CISCO/ { printf "[ARPHRD_%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' <$< >$@ + +$(outdir)/arphrd-from-name.gperf: $(outdir)/arphrd-list.txt + $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct arphrd_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { printf "%s, ARPHRD_%s\n", $$1, $$1 }' <$< >$@ + + +$(outdir)/cap-list.txt: + $(AM_V_GEN)$(CPP) $(ALL_CPPFLAGS) -dM -include linux/capability.h -include missing.h - </dev/null | $(AWK) '/^#define[ \t]+CAP_[A-Z_]+[ \t]+/ { print $$2; }' | grep -v CAP_LAST_CAP >$@ + +$(outdir)/cap-to-name.h: $(outdir)/cap-list.txt + $(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const capability_names[] = { "} { printf "[%s] = \"%s\",\n", $$1, tolower($$1) } END{print "};"}' <$< >$@ + +$(outdir)/cap-from-name.gperf: $(outdir)/cap-list.txt + $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct capability_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { printf "%s, %s\n", $$1, $$1 }' <$< >$@ + +$(outdir)/cap-from-name.h: $(outdir)/cap-from-name.gperf + $(AM_V_GPERF)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_capability -H hash_capability_name -p -C <$< >$@ + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/basic/MurmurHash2.c b/src/libbasic/MurmurHash2.c index 2f4149dbe9..2f4149dbe9 100644 --- a/src/basic/MurmurHash2.c +++ b/src/libbasic/MurmurHash2.c diff --git a/src/basic/MurmurHash2.h b/src/libbasic/MurmurHash2.h index 93362dd485..93362dd485 100644 --- a/src/basic/MurmurHash2.h +++ b/src/libbasic/MurmurHash2.h diff --git a/src/basic/af-list.c b/src/libbasic/af-list.c index 3fac9c508b..3fac9c508b 100644 --- a/src/basic/af-list.c +++ b/src/libbasic/af-list.c diff --git a/src/basic/af-list.h b/src/libbasic/af-list.h index 135248dc64..135248dc64 100644 --- a/src/basic/af-list.h +++ b/src/libbasic/af-list.h diff --git a/src/basic/alloc-util.c b/src/libbasic/alloc-util.c index b540dcddf5..b540dcddf5 100644 --- a/src/basic/alloc-util.c +++ b/src/libbasic/alloc-util.c diff --git a/src/basic/alloc-util.h b/src/libbasic/alloc-util.h index 679ba7f398..679ba7f398 100644 --- a/src/basic/alloc-util.h +++ b/src/libbasic/alloc-util.h diff --git a/src/basic/arphrd-list.c b/src/libbasic/arphrd-list.c index 6792d1ee3f..6792d1ee3f 100644 --- a/src/basic/arphrd-list.c +++ b/src/libbasic/arphrd-list.c diff --git a/src/basic/arphrd-list.h b/src/libbasic/arphrd-list.h index c0f8758dbe..c0f8758dbe 100644 --- a/src/basic/arphrd-list.h +++ b/src/libbasic/arphrd-list.h diff --git a/src/basic/async.c b/src/libbasic/async.c index a1f163f27b..a1f163f27b 100644 --- a/src/basic/async.c +++ b/src/libbasic/async.c diff --git a/src/basic/async.h b/src/libbasic/async.h index 9bd13ff6e0..9bd13ff6e0 100644 --- a/src/basic/async.h +++ b/src/libbasic/async.h diff --git a/src/basic/audit-util.c b/src/libbasic/audit-util.c index 5741fecdd6..5741fecdd6 100644 --- a/src/basic/audit-util.c +++ b/src/libbasic/audit-util.c diff --git a/src/basic/audit-util.h b/src/libbasic/audit-util.h index e048503991..e048503991 100644 --- a/src/basic/audit-util.h +++ b/src/libbasic/audit-util.h diff --git a/src/basic/barrier.c b/src/libbasic/barrier.c index 2da633b311..2da633b311 100644 --- a/src/basic/barrier.c +++ b/src/libbasic/barrier.c diff --git a/src/basic/barrier.h b/src/libbasic/barrier.h index 6347fddc4d..6347fddc4d 100644 --- a/src/basic/barrier.h +++ b/src/libbasic/barrier.h diff --git a/src/basic/bitmap.c b/src/libbasic/bitmap.c index ad1fda0198..ad1fda0198 100644 --- a/src/basic/bitmap.c +++ b/src/libbasic/bitmap.c diff --git a/src/basic/bitmap.h b/src/libbasic/bitmap.h index f5f8f2f018..f5f8f2f018 100644 --- a/src/basic/bitmap.h +++ b/src/libbasic/bitmap.h diff --git a/src/basic/blkid-util.h b/src/libbasic/blkid-util.h index 7aa75eb091..7aa75eb091 100644 --- a/src/basic/blkid-util.h +++ b/src/libbasic/blkid-util.h diff --git a/src/basic/btrfs-ctree.h b/src/libbasic/btrfs-ctree.h index 66bdf9736e..66bdf9736e 100644 --- a/src/basic/btrfs-ctree.h +++ b/src/libbasic/btrfs-ctree.h diff --git a/src/basic/btrfs-util.c b/src/libbasic/btrfs-util.c index 359d85f2e8..359d85f2e8 100644 --- a/src/basic/btrfs-util.c +++ b/src/libbasic/btrfs-util.c diff --git a/src/basic/btrfs-util.h b/src/libbasic/btrfs-util.h index 37802c2565..29f8ba63d3 100644 --- a/src/basic/btrfs-util.h +++ b/src/libbasic/btrfs-util.h @@ -23,7 +23,7 @@ #include <stdint.h> #include <sys/types.h> -#include "sd-id128.h" +#include <systemd/sd-id128.h> #include "time-util.h" diff --git a/src/basic/build.h b/src/libbasic/build.h index 633c2aaccb..633c2aaccb 100644 --- a/src/basic/build.h +++ b/src/libbasic/build.h diff --git a/src/basic/bus-label.c b/src/libbasic/bus-label.c index d4531c7947..d4531c7947 100644 --- a/src/basic/bus-label.c +++ b/src/libbasic/bus-label.c diff --git a/src/basic/bus-label.h b/src/libbasic/bus-label.h index 62fb2c450c..62fb2c450c 100644 --- a/src/basic/bus-label.h +++ b/src/libbasic/bus-label.h diff --git a/src/basic/c-rbtree.c b/src/libbasic/c-rbtree.c index 914d7e5229..914d7e5229 100644 --- a/src/basic/c-rbtree.c +++ b/src/libbasic/c-rbtree.c diff --git a/src/basic/c-rbtree.h b/src/libbasic/c-rbtree.h index 20c5515ca1..20c5515ca1 100644 --- a/src/basic/c-rbtree.h +++ b/src/libbasic/c-rbtree.h diff --git a/src/basic/calendarspec.c b/src/libbasic/calendarspec.c index 775879076d..775879076d 100644 --- a/src/basic/calendarspec.c +++ b/src/libbasic/calendarspec.c diff --git a/src/basic/calendarspec.h b/src/libbasic/calendarspec.h index f6472c1244..f6472c1244 100644 --- a/src/basic/calendarspec.h +++ b/src/libbasic/calendarspec.h diff --git a/src/basic/cap-list.c b/src/libbasic/cap-list.c index 3e773a06f5..3e773a06f5 100644 --- a/src/basic/cap-list.c +++ b/src/libbasic/cap-list.c diff --git a/src/basic/cap-list.h b/src/libbasic/cap-list.h index c1f6b94ad3..c1f6b94ad3 100644 --- a/src/basic/cap-list.h +++ b/src/libbasic/cap-list.h diff --git a/src/basic/capability-util.c b/src/libbasic/capability-util.c index d4c5bd6937..d4c5bd6937 100644 --- a/src/basic/capability-util.c +++ b/src/libbasic/capability-util.c diff --git a/src/basic/capability-util.h b/src/libbasic/capability-util.h index 35a896e229..35a896e229 100644 --- a/src/basic/capability-util.h +++ b/src/libbasic/capability-util.h diff --git a/src/basic/cgroup-util.c b/src/libbasic/cgroup-util.c index 6ef00d51df..6ef00d51df 100644 --- a/src/basic/cgroup-util.c +++ b/src/libbasic/cgroup-util.c diff --git a/src/basic/cgroup-util.h b/src/libbasic/cgroup-util.h index ad1edd9cdb..ad1edd9cdb 100644 --- a/src/basic/cgroup-util.h +++ b/src/libbasic/cgroup-util.h diff --git a/src/basic/chattr-util.c b/src/libbasic/chattr-util.c index 2896a729af..2896a729af 100644 --- a/src/basic/chattr-util.c +++ b/src/libbasic/chattr-util.c diff --git a/src/basic/chattr-util.h b/src/libbasic/chattr-util.h index 960cf6d5b3..960cf6d5b3 100644 --- a/src/basic/chattr-util.h +++ b/src/libbasic/chattr-util.h diff --git a/src/basic/clock-util.c b/src/libbasic/clock-util.c index 507e757ff0..507e757ff0 100644 --- a/src/basic/clock-util.c +++ b/src/libbasic/clock-util.c diff --git a/src/basic/clock-util.h b/src/libbasic/clock-util.h index f471f2abcf..f471f2abcf 100644 --- a/src/basic/clock-util.h +++ b/src/libbasic/clock-util.h diff --git a/src/basic/conf-files.c b/src/libbasic/conf-files.c index c781610e14..c781610e14 100644 --- a/src/basic/conf-files.c +++ b/src/libbasic/conf-files.c diff --git a/src/basic/conf-files.h b/src/libbasic/conf-files.h index e00e0e81fb..e00e0e81fb 100644 --- a/src/basic/conf-files.h +++ b/src/libbasic/conf-files.h diff --git a/src/basic/copy.c b/src/libbasic/copy.c index 519b412941..519b412941 100644 --- a/src/basic/copy.c +++ b/src/libbasic/copy.c diff --git a/src/basic/copy.h b/src/libbasic/copy.h index 3e5eb52506..3e5eb52506 100644 --- a/src/basic/copy.h +++ b/src/libbasic/copy.h diff --git a/src/basic/cpu-set-util.c b/src/libbasic/cpu-set-util.c index 95ed6928ff..95ed6928ff 100644 --- a/src/basic/cpu-set-util.c +++ b/src/libbasic/cpu-set-util.c diff --git a/src/basic/cpu-set-util.h b/src/libbasic/cpu-set-util.h index 6f49d9afb0..6f49d9afb0 100644 --- a/src/basic/cpu-set-util.h +++ b/src/libbasic/cpu-set-util.h diff --git a/src/basic/def.h b/src/libbasic/def.h index 963343eb7d..963343eb7d 100644 --- a/src/basic/def.h +++ b/src/libbasic/def.h diff --git a/src/basic/device-nodes.c b/src/libbasic/device-nodes.c index 38c0628a90..38c0628a90 100644 --- a/src/basic/device-nodes.c +++ b/src/libbasic/device-nodes.c diff --git a/src/basic/device-nodes.h b/src/libbasic/device-nodes.h index 94f385abcb..94f385abcb 100644 --- a/src/basic/device-nodes.h +++ b/src/libbasic/device-nodes.h diff --git a/src/basic/dirent-util.c b/src/libbasic/dirent-util.c index 5fb535cb13..5fb535cb13 100644 --- a/src/basic/dirent-util.c +++ b/src/libbasic/dirent-util.c diff --git a/src/basic/dirent-util.h b/src/libbasic/dirent-util.h index 6bf099b46c..6bf099b46c 100644 --- a/src/basic/dirent-util.h +++ b/src/libbasic/dirent-util.h diff --git a/src/basic/env-util.c b/src/libbasic/env-util.c index 7f5fddb700..7f5fddb700 100644 --- a/src/basic/env-util.c +++ b/src/libbasic/env-util.c diff --git a/src/basic/env-util.h b/src/libbasic/env-util.h index b1fef704c2..b1fef704c2 100644 --- a/src/basic/env-util.h +++ b/src/libbasic/env-util.h diff --git a/src/basic/errno-list.c b/src/libbasic/errno-list.c index 31b66bad5e..31b66bad5e 100644 --- a/src/basic/errno-list.c +++ b/src/libbasic/errno-list.c diff --git a/src/basic/errno-list.h b/src/libbasic/errno-list.h index 4eec0cc786..4eec0cc786 100644 --- a/src/basic/errno-list.h +++ b/src/libbasic/errno-list.h diff --git a/src/basic/escape.c b/src/libbasic/escape.c index 2e483880c8..2e483880c8 100644 --- a/src/basic/escape.c +++ b/src/libbasic/escape.c diff --git a/src/basic/escape.h b/src/libbasic/escape.h index 1b28bd10af..1b28bd10af 100644 --- a/src/basic/escape.h +++ b/src/libbasic/escape.h diff --git a/src/basic/ether-addr-util.c b/src/libbasic/ether-addr-util.c index ded6d31f4b..ded6d31f4b 100644 --- a/src/basic/ether-addr-util.c +++ b/src/libbasic/ether-addr-util.c diff --git a/src/basic/ether-addr-util.h b/src/libbasic/ether-addr-util.h index 4487149efd..4487149efd 100644 --- a/src/basic/ether-addr-util.h +++ b/src/libbasic/ether-addr-util.h diff --git a/src/basic/exit-status.c b/src/libbasic/exit-status.c index 5e0bc415c8..5e0bc415c8 100644 --- a/src/basic/exit-status.c +++ b/src/libbasic/exit-status.c diff --git a/src/basic/exit-status.h b/src/libbasic/exit-status.h index 79525d30ee..79525d30ee 100644 --- a/src/basic/exit-status.h +++ b/src/libbasic/exit-status.h diff --git a/src/basic/extract-word.c b/src/libbasic/extract-word.c index ee35d2a0ec..ee35d2a0ec 100644 --- a/src/basic/extract-word.c +++ b/src/libbasic/extract-word.c diff --git a/src/basic/extract-word.h b/src/libbasic/extract-word.h index 21db5ef33f..21db5ef33f 100644 --- a/src/basic/extract-word.h +++ b/src/libbasic/extract-word.h diff --git a/src/basic/fd-util.c b/src/libbasic/fd-util.c index ec9560cd07..ec9560cd07 100644 --- a/src/basic/fd-util.c +++ b/src/libbasic/fd-util.c diff --git a/src/basic/fd-util.h b/src/libbasic/fd-util.h index 44528c6e35..44528c6e35 100644 --- a/src/basic/fd-util.h +++ b/src/libbasic/fd-util.h diff --git a/src/basic/fdset.c b/src/libbasic/fdset.c index 3674d3ed9d..da1162991f 100644 --- a/src/basic/fdset.c +++ b/src/libbasic/fdset.c @@ -23,7 +23,7 @@ #include <fcntl.h> #include <stddef.h> -#include "sd-daemon.h" +#include <systemd/sd-daemon.h> #include "fd-util.h" #include "fdset.h" diff --git a/src/basic/fdset.h b/src/libbasic/fdset.h index 12d0cef761..12d0cef761 100644 --- a/src/basic/fdset.h +++ b/src/libbasic/fdset.h diff --git a/src/basic/fileio-label.c b/src/libbasic/fileio-label.c index 66dbc0fe1e..66dbc0fe1e 100644 --- a/src/basic/fileio-label.c +++ b/src/libbasic/fileio-label.c diff --git a/src/basic/fileio-label.h b/src/libbasic/fileio-label.h index fe7543013d..fe7543013d 100644 --- a/src/basic/fileio-label.h +++ b/src/libbasic/fileio-label.h diff --git a/src/basic/fileio.c b/src/libbasic/fileio.c index e43ca6d29e..e43ca6d29e 100644 --- a/src/basic/fileio.c +++ b/src/libbasic/fileio.c diff --git a/src/basic/fileio.h b/src/libbasic/fileio.h index 8084895ff3..8084895ff3 100644 --- a/src/basic/fileio.h +++ b/src/libbasic/fileio.h diff --git a/src/basic/formats-util.h b/src/libbasic/formats-util.h index ce516b117d..ce516b117d 100644 --- a/src/basic/formats-util.h +++ b/src/libbasic/formats-util.h diff --git a/src/basic/fs-util.c b/src/libbasic/fs-util.c index 3ef1b90edd..3ef1b90edd 100644 --- a/src/basic/fs-util.c +++ b/src/libbasic/fs-util.c diff --git a/src/basic/fs-util.h b/src/libbasic/fs-util.h index 0e2fcb21b9..0e2fcb21b9 100644 --- a/src/basic/fs-util.h +++ b/src/libbasic/fs-util.h diff --git a/src/basic/glob-util.c b/src/libbasic/glob-util.c index 007198c269..007198c269 100644 --- a/src/basic/glob-util.c +++ b/src/libbasic/glob-util.c diff --git a/src/basic/glob-util.h b/src/libbasic/glob-util.h index 5d8fb47a26..5d8fb47a26 100644 --- a/src/basic/glob-util.h +++ b/src/libbasic/glob-util.h diff --git a/src/basic/gunicode.c b/src/libbasic/gunicode.c index 542110503f..542110503f 100644 --- a/src/basic/gunicode.c +++ b/src/libbasic/gunicode.c diff --git a/src/basic/gunicode.h b/src/libbasic/gunicode.h index b03aa43160..b03aa43160 100644 --- a/src/basic/gunicode.h +++ b/src/libbasic/gunicode.h diff --git a/src/basic/hash-funcs.c b/src/libbasic/hash-funcs.c index c3a4a011b5..c3a4a011b5 100644 --- a/src/basic/hash-funcs.c +++ b/src/libbasic/hash-funcs.c diff --git a/src/basic/hash-funcs.h b/src/libbasic/hash-funcs.h index 299189d143..299189d143 100644 --- a/src/basic/hash-funcs.h +++ b/src/libbasic/hash-funcs.h diff --git a/src/basic/hashmap.c b/src/libbasic/hashmap.c index 6f1a049d47..6f1a049d47 100644 --- a/src/basic/hashmap.c +++ b/src/libbasic/hashmap.c diff --git a/src/basic/hashmap.h b/src/libbasic/hashmap.h index 6d1ae48b21..6d1ae48b21 100644 --- a/src/basic/hashmap.h +++ b/src/libbasic/hashmap.h diff --git a/src/basic/hexdecoct.c b/src/libbasic/hexdecoct.c index 592df53cb5..592df53cb5 100644 --- a/src/basic/hexdecoct.c +++ b/src/libbasic/hexdecoct.c diff --git a/src/basic/hexdecoct.h b/src/libbasic/hexdecoct.h index 1ba2f69ebd..1ba2f69ebd 100644 --- a/src/basic/hexdecoct.h +++ b/src/libbasic/hexdecoct.h diff --git a/src/basic/hostname-util.c b/src/libbasic/hostname-util.c index 7bb23448ed..7bb23448ed 100644 --- a/src/basic/hostname-util.c +++ b/src/libbasic/hostname-util.c diff --git a/src/basic/hostname-util.h b/src/libbasic/hostname-util.h index d062eddea1..d062eddea1 100644 --- a/src/basic/hostname-util.h +++ b/src/libbasic/hostname-util.h diff --git a/src/basic/in-addr-util.c b/src/libbasic/in-addr-util.c index 245107ebb8..245107ebb8 100644 --- a/src/basic/in-addr-util.c +++ b/src/libbasic/in-addr-util.c diff --git a/src/basic/in-addr-util.h b/src/libbasic/in-addr-util.h index 17798ce816..17798ce816 100644 --- a/src/basic/in-addr-util.h +++ b/src/libbasic/in-addr-util.h diff --git a/src/basic/io-util.c b/src/libbasic/io-util.c index 3ec8d61236..3ec8d61236 100644 --- a/src/basic/io-util.c +++ b/src/libbasic/io-util.c diff --git a/src/basic/io-util.h b/src/libbasic/io-util.h index 142c940d92..142c940d92 100644 --- a/src/basic/io-util.h +++ b/src/libbasic/io-util.h diff --git a/src/basic/ioprio.h b/src/libbasic/ioprio.h index d8bb6eb497..d8bb6eb497 100644 --- a/src/basic/ioprio.h +++ b/src/libbasic/ioprio.h diff --git a/src/basic/json.c b/src/libbasic/json.c index daa98fc815..daa98fc815 100644 --- a/src/basic/json.c +++ b/src/libbasic/json.c diff --git a/src/basic/json.h b/src/libbasic/json.h index a4509f680f..a4509f680f 100644 --- a/src/basic/json.h +++ b/src/libbasic/json.h diff --git a/src/basic/label.c b/src/libbasic/label.c index f5ab855d32..f5ab855d32 100644 --- a/src/basic/label.c +++ b/src/libbasic/label.c diff --git a/src/basic/label.h b/src/libbasic/label.h index 3e9251aa71..3e9251aa71 100644 --- a/src/basic/label.h +++ b/src/libbasic/label.h diff --git a/src/basic/list.h b/src/libbasic/list.h index c68185f587..c68185f587 100644 --- a/src/basic/list.h +++ b/src/libbasic/list.h diff --git a/src/basic/locale-util.c b/src/libbasic/locale-util.c index cda6b2895d..cda6b2895d 100644 --- a/src/basic/locale-util.c +++ b/src/libbasic/locale-util.c diff --git a/src/basic/locale-util.h b/src/libbasic/locale-util.h index b0f9679286..b0f9679286 100644 --- a/src/basic/locale-util.h +++ b/src/libbasic/locale-util.h diff --git a/src/basic/lockfile-util.c b/src/libbasic/lockfile-util.c index 3ee4191e4d..3ee4191e4d 100644 --- a/src/basic/lockfile-util.c +++ b/src/libbasic/lockfile-util.c diff --git a/src/basic/lockfile-util.h b/src/libbasic/lockfile-util.h index 22491ee8e1..22491ee8e1 100644 --- a/src/basic/lockfile-util.h +++ b/src/libbasic/lockfile-util.h diff --git a/src/basic/log.c b/src/libbasic/log.c index d89e6f7274..f625e3bd95 100644 --- a/src/basic/log.c +++ b/src/libbasic/log.c @@ -33,7 +33,7 @@ #include <time.h> #include <unistd.h> -#include "sd-messages.h" +#include <systemd/sd-messages.h> #include "alloc-util.h" #include "fd-util.h" diff --git a/src/basic/log.h b/src/libbasic/log.h index 60ddead74c..8ccbf8ed70 100644 --- a/src/basic/log.h +++ b/src/libbasic/log.h @@ -27,7 +27,7 @@ #include <sys/socket.h> #include <syslog.h> -#include "sd-id128.h" +#include <systemd/sd-id128.h> #include "macro.h" diff --git a/src/basic/login-util.c b/src/libbasic/login-util.c index 339e94f12d..339e94f12d 100644 --- a/src/basic/login-util.c +++ b/src/libbasic/login-util.c diff --git a/src/basic/login-util.h b/src/libbasic/login-util.h index 89a337d7c1..89a337d7c1 100644 --- a/src/basic/login-util.h +++ b/src/libbasic/login-util.h diff --git a/src/basic/macro.h b/src/libbasic/macro.h index 2695d0edb7..2695d0edb7 100644 --- a/src/basic/macro.h +++ b/src/libbasic/macro.h diff --git a/src/basic/memfd-util.c b/src/libbasic/memfd-util.c index 8c8cc78ebf..8c8cc78ebf 100644 --- a/src/basic/memfd-util.c +++ b/src/libbasic/memfd-util.c diff --git a/src/basic/memfd-util.h b/src/libbasic/memfd-util.h index 46d4989e4c..46d4989e4c 100644 --- a/src/basic/memfd-util.h +++ b/src/libbasic/memfd-util.h diff --git a/src/basic/mempool.c b/src/libbasic/mempool.c index f95e2beb0f..f95e2beb0f 100644 --- a/src/basic/mempool.c +++ b/src/libbasic/mempool.c diff --git a/src/basic/mempool.h b/src/libbasic/mempool.h index fea7841bcf..fea7841bcf 100644 --- a/src/basic/mempool.h +++ b/src/libbasic/mempool.h diff --git a/src/basic/missing.h b/src/libbasic/missing.h index 36b060496a..36b060496a 100644 --- a/src/basic/missing.h +++ b/src/libbasic/missing.h diff --git a/src/basic/mkdir-label.c b/src/libbasic/mkdir-label.c index aa6878cdf0..aa6878cdf0 100644 --- a/src/basic/mkdir-label.c +++ b/src/libbasic/mkdir-label.c diff --git a/src/basic/mkdir.c b/src/libbasic/mkdir.c index 6b1a98402c..6b1a98402c 100644 --- a/src/basic/mkdir.c +++ b/src/libbasic/mkdir.c diff --git a/src/basic/mkdir.h b/src/libbasic/mkdir.h index d564a3547f..d564a3547f 100644 --- a/src/basic/mkdir.h +++ b/src/libbasic/mkdir.h diff --git a/src/basic/mount-util.c b/src/libbasic/mount-util.c index 33f2ee96d8..33f2ee96d8 100644 --- a/src/basic/mount-util.c +++ b/src/libbasic/mount-util.c diff --git a/src/basic/mount-util.h b/src/libbasic/mount-util.h index bdb525d6b0..bdb525d6b0 100644 --- a/src/basic/mount-util.h +++ b/src/libbasic/mount-util.h diff --git a/src/basic/nss-util.h b/src/libbasic/nss-util.h index df565a3593..df565a3593 100644 --- a/src/basic/nss-util.h +++ b/src/libbasic/nss-util.h diff --git a/src/basic/ordered-set.c b/src/libbasic/ordered-set.c index 2e0bdf6488..2e0bdf6488 100644 --- a/src/basic/ordered-set.c +++ b/src/libbasic/ordered-set.c diff --git a/src/basic/ordered-set.h b/src/libbasic/ordered-set.h index e1dfc86380..e1dfc86380 100644 --- a/src/basic/ordered-set.h +++ b/src/libbasic/ordered-set.h diff --git a/src/basic/parse-util.c b/src/libbasic/parse-util.c index a3cb81b040..a3cb81b040 100644 --- a/src/basic/parse-util.c +++ b/src/libbasic/parse-util.c diff --git a/src/basic/parse-util.h b/src/libbasic/parse-util.h index d8dc26a36e..d8dc26a36e 100644 --- a/src/basic/parse-util.h +++ b/src/libbasic/parse-util.h diff --git a/src/basic/path-util.c b/src/libbasic/path-util.c index 822c09bfba..822c09bfba 100644 --- a/src/basic/path-util.c +++ b/src/libbasic/path-util.c diff --git a/src/basic/path-util.h b/src/libbasic/path-util.h index 2c2f87a9f2..2c2f87a9f2 100644 --- a/src/basic/path-util.h +++ b/src/libbasic/path-util.h diff --git a/src/basic/prioq.c b/src/libbasic/prioq.c index d2ec516d29..d2ec516d29 100644 --- a/src/basic/prioq.c +++ b/src/libbasic/prioq.c diff --git a/src/basic/prioq.h b/src/libbasic/prioq.h index 113c73d040..113c73d040 100644 --- a/src/basic/prioq.h +++ b/src/libbasic/prioq.h diff --git a/src/basic/proc-cmdline.c b/src/libbasic/proc-cmdline.c index 3505fa9c9a..3505fa9c9a 100644 --- a/src/basic/proc-cmdline.c +++ b/src/libbasic/proc-cmdline.c diff --git a/src/basic/proc-cmdline.h b/src/libbasic/proc-cmdline.h index 452642a2f5..452642a2f5 100644 --- a/src/basic/proc-cmdline.h +++ b/src/libbasic/proc-cmdline.h diff --git a/src/basic/process-util.c b/src/libbasic/process-util.c index 189ef9ab60..189ef9ab60 100644 --- a/src/basic/process-util.c +++ b/src/libbasic/process-util.c diff --git a/src/basic/process-util.h b/src/libbasic/process-util.h index f5d193e762..f5d193e762 100644 --- a/src/basic/process-util.h +++ b/src/libbasic/process-util.h diff --git a/src/basic/random-util.c b/src/libbasic/random-util.c index 2f468db770..2f468db770 100644 --- a/src/basic/random-util.c +++ b/src/libbasic/random-util.c diff --git a/src/basic/random-util.h b/src/libbasic/random-util.h index 3cee4c5014..3cee4c5014 100644 --- a/src/basic/random-util.h +++ b/src/libbasic/random-util.h diff --git a/src/basic/ratelimit.c b/src/libbasic/ratelimit.c index 3ca5625e4d..3ca5625e4d 100644 --- a/src/basic/ratelimit.c +++ b/src/libbasic/ratelimit.c diff --git a/src/basic/ratelimit.h b/src/libbasic/ratelimit.h index 9c8dddf5ad..9c8dddf5ad 100644 --- a/src/basic/ratelimit.h +++ b/src/libbasic/ratelimit.h diff --git a/src/basic/refcnt.h b/src/libbasic/refcnt.h index 1d77a6445a..1d77a6445a 100644 --- a/src/basic/refcnt.h +++ b/src/libbasic/refcnt.h diff --git a/src/basic/replace-var.c b/src/libbasic/replace-var.c index 6a204b9ec3..6a204b9ec3 100644 --- a/src/basic/replace-var.c +++ b/src/libbasic/replace-var.c diff --git a/src/basic/replace-var.h b/src/libbasic/replace-var.h index 78412910b2..78412910b2 100644 --- a/src/basic/replace-var.h +++ b/src/libbasic/replace-var.h diff --git a/src/basic/rlimit-util.c b/src/libbasic/rlimit-util.c index 7540b43215..7540b43215 100644 --- a/src/basic/rlimit-util.c +++ b/src/libbasic/rlimit-util.c diff --git a/src/basic/rlimit-util.h b/src/libbasic/rlimit-util.h index d4594eccd6..d4594eccd6 100644 --- a/src/basic/rlimit-util.h +++ b/src/libbasic/rlimit-util.h diff --git a/src/basic/rm-rf.c b/src/libbasic/rm-rf.c index 43816fd1bb..43816fd1bb 100644 --- a/src/basic/rm-rf.c +++ b/src/libbasic/rm-rf.c diff --git a/src/basic/rm-rf.h b/src/libbasic/rm-rf.h index 6d03268919..6d03268919 100644 --- a/src/basic/rm-rf.h +++ b/src/libbasic/rm-rf.h diff --git a/src/basic/securebits.h b/src/libbasic/securebits.h index 98fbe0d433..98fbe0d433 100644 --- a/src/basic/securebits.h +++ b/src/libbasic/securebits.h diff --git a/src/basic/selinux-util.c b/src/libbasic/selinux-util.c index 6c63b9d652..6c63b9d652 100644 --- a/src/basic/selinux-util.c +++ b/src/libbasic/selinux-util.c diff --git a/src/basic/selinux-util.h b/src/libbasic/selinux-util.h index 27e8edb41b..27e8edb41b 100644 --- a/src/basic/selinux-util.h +++ b/src/libbasic/selinux-util.h diff --git a/src/basic/set.h b/src/libbasic/set.h index 2bff5062da..2bff5062da 100644 --- a/src/basic/set.h +++ b/src/libbasic/set.h diff --git a/src/basic/sigbus.c b/src/libbasic/sigbus.c index 0ce4f75684..0ce4f75684 100644 --- a/src/basic/sigbus.c +++ b/src/libbasic/sigbus.c diff --git a/src/basic/sigbus.h b/src/libbasic/sigbus.h index cce9eb201b..cce9eb201b 100644 --- a/src/basic/sigbus.h +++ b/src/libbasic/sigbus.h diff --git a/src/basic/signal-util.c b/src/libbasic/signal-util.c index e3047b209b..e3047b209b 100644 --- a/src/basic/signal-util.c +++ b/src/libbasic/signal-util.c diff --git a/src/basic/signal-util.h b/src/libbasic/signal-util.h index 72b10e8712..72b10e8712 100644 --- a/src/basic/signal-util.h +++ b/src/libbasic/signal-util.h diff --git a/src/basic/siphash24.c b/src/libbasic/siphash24.c index 060e8ba387..060e8ba387 100644 --- a/src/basic/siphash24.c +++ b/src/libbasic/siphash24.c diff --git a/src/basic/siphash24.h b/src/libbasic/siphash24.h index 54e2420cc6..54e2420cc6 100644 --- a/src/basic/siphash24.h +++ b/src/libbasic/siphash24.h diff --git a/src/basic/smack-util.c b/src/libbasic/smack-util.c index 3a3df987df..3a3df987df 100644 --- a/src/basic/smack-util.c +++ b/src/libbasic/smack-util.c diff --git a/src/basic/smack-util.h b/src/libbasic/smack-util.h index f90ba0a027..f90ba0a027 100644 --- a/src/basic/smack-util.h +++ b/src/libbasic/smack-util.h diff --git a/src/basic/socket-label.c b/src/libbasic/socket-label.c index 35e9573aa4..35e9573aa4 100644 --- a/src/basic/socket-label.c +++ b/src/libbasic/socket-label.c diff --git a/src/basic/socket-util.c b/src/libbasic/socket-util.c index 58512686e3..58512686e3 100644 --- a/src/basic/socket-util.c +++ b/src/libbasic/socket-util.c diff --git a/src/basic/socket-util.h b/src/libbasic/socket-util.h index d17a2f35f8..d17a2f35f8 100644 --- a/src/basic/socket-util.h +++ b/src/libbasic/socket-util.h diff --git a/src/basic/sparse-endian.h b/src/libbasic/sparse-endian.h index c913fda8c5..c913fda8c5 100644 --- a/src/basic/sparse-endian.h +++ b/src/libbasic/sparse-endian.h diff --git a/src/basic/special.h b/src/libbasic/special.h index 2fd03d9f75..2fd03d9f75 100644 --- a/src/basic/special.h +++ b/src/libbasic/special.h diff --git a/src/basic/stat-util.c b/src/libbasic/stat-util.c index 309e84b93d..309e84b93d 100644 --- a/src/basic/stat-util.c +++ b/src/libbasic/stat-util.c diff --git a/src/basic/stat-util.h b/src/libbasic/stat-util.h index 56d28f791e..56d28f791e 100644 --- a/src/basic/stat-util.h +++ b/src/libbasic/stat-util.h diff --git a/src/basic/stdio-util.h b/src/libbasic/stdio-util.h index 0a675571ff..0a675571ff 100644 --- a/src/basic/stdio-util.h +++ b/src/libbasic/stdio-util.h diff --git a/src/basic/strbuf.c b/src/libbasic/strbuf.c index 77220c0251..77220c0251 100644 --- a/src/basic/strbuf.c +++ b/src/libbasic/strbuf.c diff --git a/src/basic/strbuf.h b/src/libbasic/strbuf.h index a1632da0e8..a1632da0e8 100644 --- a/src/basic/strbuf.h +++ b/src/libbasic/strbuf.h diff --git a/src/basic/string-table.c b/src/libbasic/string-table.c index a1499ab126..a1499ab126 100644 --- a/src/basic/string-table.c +++ b/src/libbasic/string-table.c diff --git a/src/basic/string-table.h b/src/libbasic/string-table.h index b180488fe8..b180488fe8 100644 --- a/src/basic/string-table.h +++ b/src/libbasic/string-table.h diff --git a/src/basic/string-util.c b/src/libbasic/string-util.c index 0bde55f9d5..0bde55f9d5 100644 --- a/src/basic/string-util.c +++ b/src/libbasic/string-util.c diff --git a/src/basic/string-util.h b/src/libbasic/string-util.h index ad0c813761..ad0c813761 100644 --- a/src/basic/string-util.h +++ b/src/libbasic/string-util.h diff --git a/src/basic/strv.c b/src/libbasic/strv.c index b5d4d8191b..b5d4d8191b 100644 --- a/src/basic/strv.c +++ b/src/libbasic/strv.c diff --git a/src/basic/strv.h b/src/libbasic/strv.h index 7bfa54408d..7bfa54408d 100644 --- a/src/basic/strv.h +++ b/src/libbasic/strv.h diff --git a/src/basic/strxcpyx.c b/src/libbasic/strxcpyx.c index aaf11d21f6..aaf11d21f6 100644 --- a/src/basic/strxcpyx.c +++ b/src/libbasic/strxcpyx.c diff --git a/src/basic/strxcpyx.h b/src/libbasic/strxcpyx.h index 80ff58726b..80ff58726b 100644 --- a/src/basic/strxcpyx.h +++ b/src/libbasic/strxcpyx.h diff --git a/src/basic/syslog-util.c b/src/libbasic/syslog-util.c index db3405154e..db3405154e 100644 --- a/src/basic/syslog-util.c +++ b/src/libbasic/syslog-util.c diff --git a/src/basic/syslog-util.h b/src/libbasic/syslog-util.h index 5cb606a1bf..5cb606a1bf 100644 --- a/src/basic/syslog-util.h +++ b/src/libbasic/syslog-util.h diff --git a/src/basic/terminal-util.c b/src/libbasic/terminal-util.c index 0a9d2bbdef..0a9d2bbdef 100644 --- a/src/basic/terminal-util.c +++ b/src/libbasic/terminal-util.c diff --git a/src/basic/terminal-util.h b/src/libbasic/terminal-util.h index a7c96a77cb..a7c96a77cb 100644 --- a/src/basic/terminal-util.h +++ b/src/libbasic/terminal-util.h diff --git a/src/basic/time-util.c b/src/libbasic/time-util.c index 3973850b44..3973850b44 100644 --- a/src/basic/time-util.c +++ b/src/libbasic/time-util.c diff --git a/src/basic/time-util.h b/src/libbasic/time-util.h index 9894e626c5..9894e626c5 100644 --- a/src/basic/time-util.h +++ b/src/libbasic/time-util.h diff --git a/src/basic/umask-util.h b/src/libbasic/umask-util.h index 359d87d27c..359d87d27c 100644 --- a/src/basic/umask-util.h +++ b/src/libbasic/umask-util.h diff --git a/src/basic/unaligned.h b/src/libbasic/unaligned.h index 79be645bed..79be645bed 100644 --- a/src/basic/unaligned.h +++ b/src/libbasic/unaligned.h diff --git a/src/basic/unit-name.c b/src/libbasic/unit-name.c index fe883b95c7..fe883b95c7 100644 --- a/src/basic/unit-name.c +++ b/src/libbasic/unit-name.c diff --git a/src/basic/unit-name.h b/src/libbasic/unit-name.h index f209a84634..f209a84634 100644 --- a/src/basic/unit-name.h +++ b/src/libbasic/unit-name.h diff --git a/src/basic/user-util.c b/src/libbasic/user-util.c index 19155bce53..19155bce53 100644 --- a/src/basic/user-util.c +++ b/src/libbasic/user-util.c diff --git a/src/basic/user-util.h b/src/libbasic/user-util.h index c23f1d485d..c23f1d485d 100644 --- a/src/basic/user-util.h +++ b/src/libbasic/user-util.h diff --git a/src/basic/utf8.c b/src/libbasic/utf8.c index 629db123cd..629db123cd 100644 --- a/src/basic/utf8.c +++ b/src/libbasic/utf8.c diff --git a/src/basic/utf8.h b/src/libbasic/utf8.h index 12c272d66e..12c272d66e 100644 --- a/src/basic/utf8.h +++ b/src/libbasic/utf8.h diff --git a/src/basic/util.c b/src/libbasic/util.c index ea1bed7ceb..ea1bed7ceb 100644 --- a/src/basic/util.c +++ b/src/libbasic/util.c diff --git a/src/basic/util.h b/src/libbasic/util.h index 6f42c85a33..6f42c85a33 100644 --- a/src/basic/util.h +++ b/src/libbasic/util.h diff --git a/src/basic/verbs.c b/src/libbasic/verbs.c index d9cdb38d65..d9cdb38d65 100644 --- a/src/basic/verbs.c +++ b/src/libbasic/verbs.c diff --git a/src/basic/verbs.h b/src/libbasic/verbs.h index 7b5e18510f..7b5e18510f 100644 --- a/src/basic/verbs.h +++ b/src/libbasic/verbs.h diff --git a/src/basic/virt.c b/src/libbasic/virt.c index 19b6318e3d..19b6318e3d 100644 --- a/src/basic/virt.c +++ b/src/libbasic/virt.c diff --git a/src/basic/virt.h b/src/libbasic/virt.h index a538f07f6b..a538f07f6b 100644 --- a/src/basic/virt.h +++ b/src/libbasic/virt.h diff --git a/src/basic/web-util.c b/src/libbasic/web-util.c index 595688ed93..595688ed93 100644 --- a/src/basic/web-util.c +++ b/src/libbasic/web-util.c diff --git a/src/basic/web-util.h b/src/libbasic/web-util.h index e6bb6b53f5..e6bb6b53f5 100644 --- a/src/basic/web-util.h +++ b/src/libbasic/web-util.h diff --git a/src/basic/xattr-util.c b/src/libbasic/xattr-util.c index 8d7f14f382..8d7f14f382 100644 --- a/src/basic/xattr-util.c +++ b/src/libbasic/xattr-util.c diff --git a/src/basic/xattr-util.h b/src/libbasic/xattr-util.h index 6fa097bf7e..6fa097bf7e 100644 --- a/src/basic/xattr-util.h +++ b/src/libbasic/xattr-util.h diff --git a/src/basic/xml.c b/src/libbasic/xml.c index 1dbeac7324..1dbeac7324 100644 --- a/src/basic/xml.c +++ b/src/libbasic/xml.c diff --git a/src/basic/xml.h b/src/libbasic/xml.h index 41cb69f0dc..41cb69f0dc 100644 --- a/src/basic/xml.h +++ b/src/libbasic/xml.h diff --git a/src/libbus-proxy-core/Makefile b/src/libbus-proxy-core/Makefile new file mode 100644 index 0000000000..3ac995f31c --- /dev/null +++ b/src/libbus-proxy-core/Makefile @@ -0,0 +1,43 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +noinst_LTLIBRARIES += \ + libbus-proxy-core.la + +libbus_proxy_core_la_SOURCES = \ + src/bus-proxyd/bus-xml-policy.c \ + src/bus-proxyd/bus-xml-policy.h \ + src/bus-proxyd/driver.c \ + src/bus-proxyd/driver.h \ + src/bus-proxyd/proxy.c \ + src/bus-proxyd/proxy.h \ + src/bus-proxyd/synthesize.c \ + src/bus-proxyd/synthesize.h + +libbus_proxy_core_la_LIBADD = \ + libshared.la + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/bus-proxyd/bus-xml-policy.c b/src/libbus-proxy-core/bus-xml-policy.c index 8943e0dc12..86a8362142 100644 --- a/src/bus-proxyd/bus-xml-policy.c +++ b/src/libbus-proxy-core/bus-xml-policy.c @@ -17,7 +17,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-login.h" +#include <systemd/sd-login.h> #include "alloc-util.h" #include "bus-internal.h" diff --git a/src/bus-proxyd/bus-xml-policy.h b/src/libbus-proxy-core/bus-xml-policy.h index 3dcddaa048..3dcddaa048 100644 --- a/src/bus-proxyd/bus-xml-policy.h +++ b/src/libbus-proxy-core/bus-xml-policy.h diff --git a/src/bus-proxyd/driver.c b/src/libbus-proxy-core/driver.c index 1af5c310ea..133b2e0f39 100644 --- a/src/bus-proxyd/driver.c +++ b/src/libbus-proxy-core/driver.c @@ -23,7 +23,7 @@ #include <stddef.h> #include <string.h> -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "alloc-util.h" #include "bus-internal.h" diff --git a/src/bus-proxyd/driver.h b/src/libbus-proxy-core/driver.h index 1630cdc7b9..cad7aa7851 100644 --- a/src/bus-proxyd/driver.h +++ b/src/libbus-proxy-core/driver.h @@ -19,7 +19,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "bus-xml-policy.h" #include "proxy.h" diff --git a/src/bus-proxyd/proxy.c b/src/libbus-proxy-core/proxy.c index 907d93d4c7..bcfbab0dad 100644 --- a/src/bus-proxyd/proxy.c +++ b/src/libbus-proxy-core/proxy.c @@ -26,8 +26,8 @@ #include <sys/socket.h> #include <sys/types.h> -#include "sd-bus.h" -#include "sd-daemon.h" +#include <systemd/sd-bus.h> +#include <systemd/sd-daemon.h> #include "alloc-util.h" #include "bus-control.h" diff --git a/src/bus-proxyd/proxy.h b/src/libbus-proxy-core/proxy.h index d9e75cf73b..0e3ed8a87a 100644 --- a/src/bus-proxyd/proxy.h +++ b/src/libbus-proxy-core/proxy.h @@ -19,7 +19,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "bus-xml-policy.h" diff --git a/src/bus-proxyd/synthesize.c b/src/libbus-proxy-core/synthesize.c index 8eea7dc5b9..7562f29ecb 100644 --- a/src/bus-proxyd/synthesize.c +++ b/src/libbus-proxy-core/synthesize.c @@ -21,7 +21,7 @@ #include <stddef.h> -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "bus-internal.h" #include "bus-match.h" diff --git a/src/bus-proxyd/synthesize.h b/src/libbus-proxy-core/synthesize.h index 1b7197f8ec..cb8c21cdb7 100644 --- a/src/bus-proxyd/synthesize.h +++ b/src/libbus-proxy-core/synthesize.h @@ -19,7 +19,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "proxy.h" diff --git a/src/bus-proxyd/test-bus-xml-policy.c b/src/libbus-proxy-core/test-bus-xml-policy.c index af7c9128a2..6f32c09789 100644 --- a/src/bus-proxyd/test-bus-xml-policy.c +++ b/src/libbus-proxy-core/test-bus-xml-policy.c @@ -21,7 +21,7 @@ #include <stddef.h> #include <unistd.h> -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "alloc-util.h" #include "bus-xml-policy.h" diff --git a/src/core/.gitignore b/src/libcore/.gitignore index 465b4fcc20..465b4fcc20 100644 --- a/src/core/.gitignore +++ b/src/libcore/.gitignore diff --git a/src/libcore/Makefile b/src/libcore/Makefile new file mode 100644 index 0000000000..e7e5ab6904 --- /dev/null +++ b/src/libcore/Makefile @@ -0,0 +1,173 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +noinst_LTLIBRARIES += \ + libcore.la + +libcore_la_SOURCES = \ + src/core/unit.c \ + src/core/unit.h \ + src/core/unit-printf.c \ + src/core/unit-printf.h \ + src/core/job.c \ + src/core/job.h \ + src/core/manager.c \ + src/core/manager.h \ + src/core/transaction.c \ + src/core/transaction.h \ + src/core/load-fragment.c \ + src/core/load-fragment.h \ + src/core/service.c \ + src/core/service.h \ + src/core/socket.c \ + src/core/socket.h \ + src/core/busname.c \ + src/core/busname.h \ + src/core/bus-endpoint.c \ + src/core/bus-endpoint.h \ + src/core/bus-policy.c \ + src/core/bus-policy.h \ + src/core/target.c \ + src/core/target.h \ + src/core/device.c \ + src/core/device.h \ + src/core/mount.c \ + src/core/mount.h \ + src/core/automount.c \ + src/core/automount.h \ + src/core/swap.c \ + src/core/swap.h \ + src/core/timer.c \ + src/core/timer.h \ + src/core/path.c \ + src/core/path.h \ + src/core/slice.c \ + src/core/slice.h \ + src/core/scope.c \ + src/core/scope.h \ + src/core/load-dropin.c \ + src/core/load-dropin.h \ + src/core/execute.c \ + src/core/execute.h \ + src/core/kill.c \ + src/core/kill.h \ + src/core/dbus.c \ + src/core/dbus.h \ + src/core/dbus-manager.c \ + src/core/dbus-manager.h \ + src/core/dbus-unit.c \ + src/core/dbus-unit.h \ + src/core/dbus-job.c \ + src/core/dbus-job.h \ + src/core/dbus-service.c \ + src/core/dbus-service.h \ + src/core/dbus-socket.c \ + src/core/dbus-socket.h \ + src/core/dbus-busname.c \ + src/core/dbus-busname.h \ + src/core/dbus-target.c \ + src/core/dbus-target.h \ + src/core/dbus-device.c \ + src/core/dbus-device.h \ + src/core/dbus-mount.c \ + src/core/dbus-mount.h \ + src/core/dbus-automount.c \ + src/core/dbus-automount.h \ + src/core/dbus-swap.c \ + src/core/dbus-swap.h \ + src/core/dbus-timer.c \ + src/core/dbus-timer.h \ + src/core/dbus-path.c \ + src/core/dbus-path.h \ + src/core/dbus-slice.c \ + src/core/dbus-slice.h \ + src/core/dbus-scope.c \ + src/core/dbus-scope.h \ + src/core/dbus-execute.c \ + src/core/dbus-execute.h \ + src/core/dbus-kill.c \ + src/core/dbus-kill.h \ + src/core/dbus-cgroup.c \ + src/core/dbus-cgroup.h \ + src/core/cgroup.c \ + src/core/cgroup.h \ + src/core/selinux-access.c \ + src/core/selinux-access.h \ + src/core/selinux-setup.c \ + src/core/selinux-setup.h \ + src/core/smack-setup.c \ + src/core/smack-setup.h \ + src/core/ima-setup.c \ + src/core/ima-setup.h \ + src/core/locale-setup.h \ + src/core/locale-setup.c \ + src/core/hostname-setup.c \ + src/core/hostname-setup.h \ + src/core/machine-id-setup.c \ + src/core/machine-id-setup.h \ + src/core/mount-setup.c \ + src/core/mount-setup.h \ + src/core/kmod-setup.c \ + src/core/kmod-setup.h \ + src/core/loopback-setup.h \ + src/core/loopback-setup.c \ + src/core/namespace.c \ + src/core/namespace.h \ + src/core/killall.h \ + src/core/killall.c \ + src/core/audit-fd.c \ + src/core/audit-fd.h \ + src/core/show-status.c \ + src/core/show-status.h \ + src/core/failure-action.c \ + src/core/failure-action.h + +nodist_libcore_la_SOURCES = \ + src/core/load-fragment-gperf.c \ + src/core/load-fragment-gperf-nulstr.c + +libcore_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(PAM_CFLAGS) \ + $(AUDIT_CFLAGS) \ + $(KMOD_CFLAGS) \ + $(APPARMOR_CFLAGS) \ + $(MOUNT_CFLAGS) \ + $(SECCOMP_CFLAGS) + +libcore_la_LIBADD = \ + libshared.la \ + $(PAM_LIBS) \ + $(AUDIT_LIBS) \ + $(KMOD_LIBS) \ + $(APPARMOR_LIBS) \ + $(MOUNT_LIBS) + +$(outdir)/load-fragment-gperf-nulstr.c: src/core/load-fragment-gperf.gperf + $(AM_V_at)$(MKDIR_P) $(dir $@) + $(AM_V_GEN)$(AWK) 'BEGIN{ keywords=0 ; FS="," ; print "extern const char load_fragment_gperf_nulstr[];" ; print "const char load_fragment_gperf_nulstr[] ="} ; keyword==1 { print "\"" $$1 "\\0\"" } ; /%%/ { keyword=1} ; END { print ";" }' < $< > $@ + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/core/audit-fd.c b/src/libcore/audit-fd.c index 76afe3fe15..76afe3fe15 100644 --- a/src/core/audit-fd.c +++ b/src/libcore/audit-fd.c diff --git a/src/core/audit-fd.h b/src/libcore/audit-fd.h index 0eccb59210..0eccb59210 100644 --- a/src/core/audit-fd.h +++ b/src/libcore/audit-fd.h diff --git a/src/core/automount.c b/src/libcore/automount.c index 5dc6fd98e7..5dc6fd98e7 100644 --- a/src/core/automount.c +++ b/src/libcore/automount.c diff --git a/src/core/automount.h b/src/libcore/automount.h index cf5b1cf994..cf5b1cf994 100644 --- a/src/core/automount.h +++ b/src/libcore/automount.h diff --git a/src/core/bus-endpoint.c b/src/libcore/bus-endpoint.c index d22a80c91f..d22a80c91f 100644 --- a/src/core/bus-endpoint.c +++ b/src/libcore/bus-endpoint.c diff --git a/src/core/bus-endpoint.h b/src/libcore/bus-endpoint.h index f2fbc4701c..f2fbc4701c 100644 --- a/src/core/bus-endpoint.h +++ b/src/libcore/bus-endpoint.h diff --git a/src/core/bus-policy.c b/src/libcore/bus-policy.c index 4907c268e8..4907c268e8 100644 --- a/src/core/bus-policy.c +++ b/src/libcore/bus-policy.c diff --git a/src/core/bus-policy.h b/src/libcore/bus-policy.h index 5b2c4d5953..5b2c4d5953 100644 --- a/src/core/bus-policy.h +++ b/src/libcore/bus-policy.h diff --git a/src/core/busname.c b/src/libcore/busname.c index de2a21ccde..de2a21ccde 100644 --- a/src/core/busname.c +++ b/src/libcore/busname.c diff --git a/src/core/busname.h b/src/libcore/busname.h index 6b6f6c62d4..6b6f6c62d4 100644 --- a/src/core/busname.h +++ b/src/libcore/busname.h diff --git a/src/core/cgroup.c b/src/libcore/cgroup.c index 39235a95f6..39235a95f6 100644 --- a/src/core/cgroup.c +++ b/src/libcore/cgroup.c diff --git a/src/core/cgroup.h b/src/libcore/cgroup.h index 360bbca30f..360bbca30f 100644 --- a/src/core/cgroup.h +++ b/src/libcore/cgroup.h diff --git a/src/core/dbus-automount.c b/src/libcore/dbus-automount.c index b2806ad86f..b2806ad86f 100644 --- a/src/core/dbus-automount.c +++ b/src/libcore/dbus-automount.c diff --git a/src/core/dbus-automount.h b/src/libcore/dbus-automount.h index 7b51eb973a..7b51eb973a 100644 --- a/src/core/dbus-automount.h +++ b/src/libcore/dbus-automount.h diff --git a/src/core/dbus-busname.c b/src/libcore/dbus-busname.c index cf816ba15b..cf816ba15b 100644 --- a/src/core/dbus-busname.c +++ b/src/libcore/dbus-busname.c diff --git a/src/core/dbus-busname.h b/src/libcore/dbus-busname.h index 8643d1a404..8643d1a404 100644 --- a/src/core/dbus-busname.h +++ b/src/libcore/dbus-busname.h diff --git a/src/core/dbus-cgroup.c b/src/libcore/dbus-cgroup.c index 859d155ec1..859d155ec1 100644 --- a/src/core/dbus-cgroup.c +++ b/src/libcore/dbus-cgroup.c diff --git a/src/core/dbus-cgroup.h b/src/libcore/dbus-cgroup.h index b2212fe44e..84d0f1ba04 100644 --- a/src/core/dbus-cgroup.h +++ b/src/libcore/dbus-cgroup.h @@ -19,7 +19,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "cgroup.h" diff --git a/src/core/dbus-device.c b/src/libcore/dbus-device.c index e1a12224d3..e1a12224d3 100644 --- a/src/core/dbus-device.c +++ b/src/libcore/dbus-device.c diff --git a/src/core/dbus-device.h b/src/libcore/dbus-device.h index eb1d8c3278..eb1d8c3278 100644 --- a/src/core/dbus-device.h +++ b/src/libcore/dbus-device.h diff --git a/src/core/dbus-execute.c b/src/libcore/dbus-execute.c index f2fc301f8e..f2fc301f8e 100644 --- a/src/core/dbus-execute.c +++ b/src/libcore/dbus-execute.c diff --git a/src/core/dbus-execute.h b/src/libcore/dbus-execute.h index d0aa8e1dd5..bdfef41db4 100644 --- a/src/core/dbus-execute.h +++ b/src/libcore/dbus-execute.h @@ -19,7 +19,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "execute.h" diff --git a/src/core/dbus-job.c b/src/libcore/dbus-job.c index 97a93fb2f1..337cef8a4f 100644 --- a/src/core/dbus-job.c +++ b/src/libcore/dbus-job.c @@ -17,7 +17,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "alloc-util.h" #include "dbus-job.h" diff --git a/src/core/dbus-job.h b/src/libcore/dbus-job.h index 024d06719e..95664cb90c 100644 --- a/src/core/dbus-job.h +++ b/src/libcore/dbus-job.h @@ -19,7 +19,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "job.h" diff --git a/src/core/dbus-kill.c b/src/libcore/dbus-kill.c index fc50fafaad..fc50fafaad 100644 --- a/src/core/dbus-kill.c +++ b/src/libcore/dbus-kill.c diff --git a/src/core/dbus-kill.h b/src/libcore/dbus-kill.h index b9b18811e3..b32ce9d223 100644 --- a/src/core/dbus-kill.h +++ b/src/libcore/dbus-kill.h @@ -19,7 +19,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "kill.h" #include "unit.h" diff --git a/src/core/dbus-manager.c b/src/libcore/dbus-manager.c index f939196397..f939196397 100644 --- a/src/core/dbus-manager.c +++ b/src/libcore/dbus-manager.c diff --git a/src/core/dbus-manager.h b/src/libcore/dbus-manager.h index 36a2e9481b..36a2e9481b 100644 --- a/src/core/dbus-manager.h +++ b/src/libcore/dbus-manager.h diff --git a/src/core/dbus-mount.c b/src/libcore/dbus-mount.c index 935db7c48b..935db7c48b 100644 --- a/src/core/dbus-mount.c +++ b/src/libcore/dbus-mount.c diff --git a/src/core/dbus-mount.h b/src/libcore/dbus-mount.h index ec16166d36..f9844e449d 100644 --- a/src/core/dbus-mount.h +++ b/src/libcore/dbus-mount.h @@ -19,7 +19,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "unit.h" diff --git a/src/core/dbus-path.c b/src/libcore/dbus-path.c index 1e153e503f..1e153e503f 100644 --- a/src/core/dbus-path.c +++ b/src/libcore/dbus-path.c diff --git a/src/core/dbus-path.h b/src/libcore/dbus-path.h index d3c19e0c2b..d3c19e0c2b 100644 --- a/src/core/dbus-path.h +++ b/src/libcore/dbus-path.h diff --git a/src/core/dbus-scope.c b/src/libcore/dbus-scope.c index 34ee9a8fa9..34ee9a8fa9 100644 --- a/src/core/dbus-scope.c +++ b/src/libcore/dbus-scope.c diff --git a/src/core/dbus-scope.h b/src/libcore/dbus-scope.h index 270306f508..f96ddef0cf 100644 --- a/src/core/dbus-scope.h +++ b/src/libcore/dbus-scope.h @@ -19,7 +19,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "unit.h" diff --git a/src/core/dbus-service.c b/src/libcore/dbus-service.c index 03eecca911..03eecca911 100644 --- a/src/core/dbus-service.c +++ b/src/libcore/dbus-service.c diff --git a/src/core/dbus-service.h b/src/libcore/dbus-service.h index 769a53769e..291959325c 100644 --- a/src/core/dbus-service.h +++ b/src/libcore/dbus-service.h @@ -19,7 +19,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "unit.h" diff --git a/src/core/dbus-slice.c b/src/libcore/dbus-slice.c index e37f50b283..e37f50b283 100644 --- a/src/core/dbus-slice.c +++ b/src/libcore/dbus-slice.c diff --git a/src/core/dbus-slice.h b/src/libcore/dbus-slice.h index 52ceebb135..8e4cabbf8a 100644 --- a/src/core/dbus-slice.h +++ b/src/libcore/dbus-slice.h @@ -19,7 +19,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "unit.h" diff --git a/src/core/dbus-socket.c b/src/libcore/dbus-socket.c index d33e494f6b..d33e494f6b 100644 --- a/src/core/dbus-socket.c +++ b/src/libcore/dbus-socket.c diff --git a/src/core/dbus-socket.h b/src/libcore/dbus-socket.h index 7a792c7a89..a31906feea 100644 --- a/src/core/dbus-socket.h +++ b/src/libcore/dbus-socket.h @@ -19,7 +19,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "unit.h" diff --git a/src/core/dbus-swap.c b/src/libcore/dbus-swap.c index 292f8738c6..292f8738c6 100644 --- a/src/core/dbus-swap.c +++ b/src/libcore/dbus-swap.c diff --git a/src/core/dbus-swap.h b/src/libcore/dbus-swap.h index 5238471f98..19151fb771 100644 --- a/src/core/dbus-swap.h +++ b/src/libcore/dbus-swap.h @@ -20,7 +20,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "unit.h" diff --git a/src/core/dbus-target.c b/src/libcore/dbus-target.c index 6858b1ce72..6858b1ce72 100644 --- a/src/core/dbus-target.c +++ b/src/libcore/dbus-target.c diff --git a/src/core/dbus-target.h b/src/libcore/dbus-target.h index 9be5ce06b7..c97a9d626e 100644 --- a/src/core/dbus-target.h +++ b/src/libcore/dbus-target.h @@ -19,6 +19,6 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-bus.h" +#include <systemd/sd-bus.h> extern const sd_bus_vtable bus_target_vtable[]; diff --git a/src/core/dbus-timer.c b/src/libcore/dbus-timer.c index bc121b83a2..bc121b83a2 100644 --- a/src/core/dbus-timer.c +++ b/src/libcore/dbus-timer.c diff --git a/src/core/dbus-timer.h b/src/libcore/dbus-timer.h index 39053dc4a2..505fb5df72 100644 --- a/src/core/dbus-timer.h +++ b/src/libcore/dbus-timer.h @@ -19,7 +19,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "unit.h" diff --git a/src/core/dbus-unit.c b/src/libcore/dbus-unit.c index b351f6a2c2..9a09f59fc2 100644 --- a/src/core/dbus-unit.c +++ b/src/libcore/dbus-unit.c @@ -17,7 +17,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "alloc-util.h" #include "bus-common-errors.h" diff --git a/src/core/dbus-unit.h b/src/libcore/dbus-unit.h index 07948b9cd0..1a0070fce6 100644 --- a/src/core/dbus-unit.h +++ b/src/libcore/dbus-unit.h @@ -19,7 +19,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "unit.h" diff --git a/src/core/dbus.c b/src/libcore/dbus.c index 413489373f..dc939b023a 100644 --- a/src/core/dbus.c +++ b/src/libcore/dbus.c @@ -21,7 +21,7 @@ #include <sys/epoll.h> #include <unistd.h> -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "alloc-util.h" #include "bus-common-errors.h" diff --git a/src/core/dbus.h b/src/libcore/dbus.h index e16a84fbb8..e16a84fbb8 100644 --- a/src/core/dbus.h +++ b/src/libcore/dbus.h diff --git a/src/core/device.c b/src/libcore/device.c index d201dc5e4b..d201dc5e4b 100644 --- a/src/core/device.c +++ b/src/libcore/device.c diff --git a/src/core/device.h b/src/libcore/device.h index 184a1a349b..184a1a349b 100644 --- a/src/core/device.h +++ b/src/libcore/device.h diff --git a/src/core/execute.c b/src/libcore/execute.c index 1e4630182d..6fd35c8350 100644 --- a/src/core/execute.c +++ b/src/libcore/execute.c @@ -48,7 +48,7 @@ #include <sys/apparmor.h> #endif -#include "sd-messages.h" +#include <systemd/sd-messages.h> #include "af-list.h" #include "alloc-util.h" diff --git a/src/core/execute.h b/src/libcore/execute.h index 578f85b6bc..578f85b6bc 100644 --- a/src/core/execute.h +++ b/src/libcore/execute.h diff --git a/src/core/failure-action.c b/src/libcore/failure-action.c index 39f5519ca1..39f5519ca1 100644 --- a/src/core/failure-action.c +++ b/src/libcore/failure-action.c diff --git a/src/core/failure-action.h b/src/libcore/failure-action.h index 1adac4ad5c..1adac4ad5c 100644 --- a/src/core/failure-action.h +++ b/src/libcore/failure-action.h diff --git a/src/core/hostname-setup.c b/src/libcore/hostname-setup.c index 68be52856b..68be52856b 100644 --- a/src/core/hostname-setup.c +++ b/src/libcore/hostname-setup.c diff --git a/src/core/hostname-setup.h b/src/libcore/hostname-setup.h index 73e8c75c71..73e8c75c71 100644 --- a/src/core/hostname-setup.h +++ b/src/libcore/hostname-setup.h diff --git a/src/core/ima-setup.c b/src/libcore/ima-setup.c index ff7558d500..ff7558d500 100644 --- a/src/core/ima-setup.c +++ b/src/libcore/ima-setup.c diff --git a/src/core/ima-setup.h b/src/libcore/ima-setup.h index 3bad74b246..3bad74b246 100644 --- a/src/core/ima-setup.h +++ b/src/libcore/ima-setup.h diff --git a/src/core/job.c b/src/libcore/job.c index 97304c4d05..1e2f12bba0 100644 --- a/src/core/job.c +++ b/src/libcore/job.c @@ -19,8 +19,8 @@ #include <errno.h> -#include "sd-id128.h" -#include "sd-messages.h" +#include <systemd/sd-id128.h> +#include <systemd/sd-messages.h> #include "alloc-util.h" #include "async.h" diff --git a/src/core/job.h b/src/libcore/job.h index 856b0ce829..de130303d2 100644 --- a/src/core/job.h +++ b/src/libcore/job.h @@ -21,7 +21,7 @@ #include <stdbool.h> -#include "sd-event.h" +#include <systemd/sd-event.h> #include "list.h" #include "unit-name.h" diff --git a/src/core/kill.c b/src/libcore/kill.c index 6854587d54..6854587d54 100644 --- a/src/core/kill.c +++ b/src/libcore/kill.c diff --git a/src/core/kill.h b/src/libcore/kill.h index b3d2056cb0..b3d2056cb0 100644 --- a/src/core/kill.h +++ b/src/libcore/kill.h diff --git a/src/core/killall.c b/src/libcore/killall.c index 09378f7085..09378f7085 100644 --- a/src/core/killall.c +++ b/src/libcore/killall.c diff --git a/src/core/killall.h b/src/libcore/killall.h index acc2439f00..acc2439f00 100644 --- a/src/core/killall.h +++ b/src/libcore/killall.h diff --git a/src/core/kmod-setup.c b/src/libcore/kmod-setup.c index 3503db52ed..3503db52ed 100644 --- a/src/core/kmod-setup.c +++ b/src/libcore/kmod-setup.c diff --git a/src/core/kmod-setup.h b/src/libcore/kmod-setup.h index 685f4df301..685f4df301 100644 --- a/src/core/kmod-setup.h +++ b/src/libcore/kmod-setup.h diff --git a/src/shared/linux/auto_dev-ioctl.h b/src/libcore/linux/auto_dev-ioctl.h index aeaeb3ea7a..aeaeb3ea7a 100644 --- a/src/shared/linux/auto_dev-ioctl.h +++ b/src/libcore/linux/auto_dev-ioctl.h diff --git a/src/core/load-dropin.c b/src/libcore/load-dropin.c index 22b71b6f5e..22b71b6f5e 100644 --- a/src/core/load-dropin.c +++ b/src/libcore/load-dropin.c diff --git a/src/core/load-dropin.h b/src/libcore/load-dropin.h index d8a4aefbb3..d8a4aefbb3 100644 --- a/src/core/load-dropin.h +++ b/src/libcore/load-dropin.h diff --git a/src/core/load-fragment-gperf.gperf.m4 b/src/libcore/load-fragment-gperf.gperf.m4 index 5024fd19a5..5024fd19a5 100644 --- a/src/core/load-fragment-gperf.gperf.m4 +++ b/src/libcore/load-fragment-gperf.gperf.m4 diff --git a/src/core/load-fragment.c b/src/libcore/load-fragment.c index 8804b3ac41..8804b3ac41 100644 --- a/src/core/load-fragment.c +++ b/src/libcore/load-fragment.c diff --git a/src/core/load-fragment.h b/src/libcore/load-fragment.h index 5fb5910919..5fb5910919 100644 --- a/src/core/load-fragment.h +++ b/src/libcore/load-fragment.h diff --git a/src/core/locale-setup.c b/src/libcore/locale-setup.c index ccf61d29fb..ccf61d29fb 100644 --- a/src/core/locale-setup.c +++ b/src/libcore/locale-setup.c diff --git a/src/core/locale-setup.h b/src/libcore/locale-setup.h index 3b97497afe..3b97497afe 100644 --- a/src/core/locale-setup.h +++ b/src/libcore/locale-setup.h diff --git a/src/core/loopback-setup.c b/src/libcore/loopback-setup.c index 04062a7910..d56bbfa6fc 100644 --- a/src/core/loopback-setup.c +++ b/src/libcore/loopback-setup.c @@ -20,7 +20,7 @@ #include <net/if.h> #include <stdlib.h> -#include "sd-netlink.h" +#include <systemd/sd-netlink.h> #include "loopback-setup.h" #include "missing.h" diff --git a/src/core/loopback-setup.h b/src/libcore/loopback-setup.h index e7547b8a26..e7547b8a26 100644 --- a/src/core/loopback-setup.h +++ b/src/libcore/loopback-setup.h diff --git a/src/core/machine-id-setup.c b/src/libcore/machine-id-setup.c index 9e6b3d3292..30f27ffc67 100644 --- a/src/core/machine-id-setup.c +++ b/src/libcore/machine-id-setup.c @@ -25,7 +25,7 @@ #include <sys/mount.h> #include <unistd.h> -#include "sd-id128.h" +#include <systemd/sd-id128.h> #include "alloc-util.h" #include "fd-util.h" diff --git a/src/core/machine-id-setup.h b/src/libcore/machine-id-setup.h index a7e7678ed9..a7e7678ed9 100644 --- a/src/core/machine-id-setup.h +++ b/src/libcore/machine-id-setup.h diff --git a/src/core/manager.c b/src/libcore/manager.c index f36cf5e320..9a34742cf6 100644 --- a/src/core/manager.c +++ b/src/libcore/manager.c @@ -35,8 +35,8 @@ #include <libaudit.h> #endif -#include "sd-daemon.h" -#include "sd-messages.h" +#include <systemd/sd-daemon.h> +#include <systemd/sd-messages.h> #include "alloc-util.h" #include "audit-fd.h" diff --git a/src/core/manager.h b/src/libcore/manager.h index 9803f73129..d6c97d8f3b 100644 --- a/src/core/manager.h +++ b/src/libcore/manager.h @@ -23,8 +23,8 @@ #include <stdbool.h> #include <stdio.h> -#include "sd-bus.h" -#include "sd-event.h" +#include <systemd/sd-bus.h> +#include <systemd/sd-event.h> #include "cgroup-util.h" #include "fdset.h" diff --git a/src/core/mount-setup.c b/src/libcore/mount-setup.c index de1a361cc4..de1a361cc4 100644 --- a/src/core/mount-setup.c +++ b/src/libcore/mount-setup.c diff --git a/src/core/mount-setup.h b/src/libcore/mount-setup.h index 647bd770ae..647bd770ae 100644 --- a/src/core/mount-setup.h +++ b/src/libcore/mount-setup.h diff --git a/src/core/mount.c b/src/libcore/mount.c index de1075d3a0..d573e92759 100644 --- a/src/core/mount.c +++ b/src/libcore/mount.c @@ -22,7 +22,7 @@ #include <stdio.h> #include <sys/epoll.h> -#include "sd-messages.h" +#include <systemd/sd-messages.h> #include "alloc-util.h" #include "dbus-mount.h" diff --git a/src/core/mount.h b/src/libcore/mount.h index 3b343c6b1f..3b343c6b1f 100644 --- a/src/core/mount.h +++ b/src/libcore/mount.h diff --git a/src/core/namespace.c b/src/libcore/namespace.c index 4fa381db5b..4fa381db5b 100644 --- a/src/core/namespace.c +++ b/src/libcore/namespace.c diff --git a/src/core/namespace.h b/src/libcore/namespace.h index 40bee74e2c..40bee74e2c 100644 --- a/src/core/namespace.h +++ b/src/libcore/namespace.h diff --git a/src/core/path.c b/src/libcore/path.c index 460c1d3bf2..460c1d3bf2 100644 --- a/src/core/path.c +++ b/src/libcore/path.c diff --git a/src/core/path.h b/src/libcore/path.h index bbbcebd78e..bbbcebd78e 100644 --- a/src/core/path.h +++ b/src/libcore/path.h diff --git a/src/core/scope.c b/src/libcore/scope.c index c5d0ecef04..c5d0ecef04 100644 --- a/src/core/scope.c +++ b/src/libcore/scope.c diff --git a/src/core/scope.h b/src/libcore/scope.h index 2dc86325c5..2dc86325c5 100644 --- a/src/core/scope.h +++ b/src/libcore/scope.h diff --git a/src/core/selinux-access.c b/src/libcore/selinux-access.c index 2cdfcf7b5d..76fcc9a6be 100644 --- a/src/core/selinux-access.c +++ b/src/libcore/selinux-access.c @@ -29,7 +29,7 @@ #include <libaudit.h> #endif -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "alloc-util.h" #include "audit-fd.h" diff --git a/src/core/selinux-access.h b/src/libcore/selinux-access.h index 8f1f058a32..cbf33ef6c4 100644 --- a/src/core/selinux-access.h +++ b/src/libcore/selinux-access.h @@ -19,7 +19,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "bus-util.h" #include "manager.h" diff --git a/src/core/selinux-setup.c b/src/libcore/selinux-setup.c index 9a115a4387..9a115a4387 100644 --- a/src/core/selinux-setup.c +++ b/src/libcore/selinux-setup.c diff --git a/src/core/selinux-setup.h b/src/libcore/selinux-setup.h index 7b613249b0..7b613249b0 100644 --- a/src/core/selinux-setup.h +++ b/src/libcore/selinux-setup.h diff --git a/src/core/service.c b/src/libcore/service.c index ac7e41d777..ac7e41d777 100644 --- a/src/core/service.c +++ b/src/libcore/service.c diff --git a/src/core/service.h b/src/libcore/service.h index d342e000bb..d342e000bb 100644 --- a/src/core/service.h +++ b/src/libcore/service.h diff --git a/src/core/show-status.c b/src/libcore/show-status.c index 59ebdc7219..59ebdc7219 100644 --- a/src/core/show-status.c +++ b/src/libcore/show-status.c diff --git a/src/core/show-status.h b/src/libcore/show-status.h index 9a29e72645..9a29e72645 100644 --- a/src/core/show-status.h +++ b/src/libcore/show-status.h diff --git a/src/core/shutdown.c b/src/libcore/shutdown.c index 6296b4c94a..6296b4c94a 100644 --- a/src/core/shutdown.c +++ b/src/libcore/shutdown.c diff --git a/src/core/slice.c b/src/libcore/slice.c index d65364c6f4..d65364c6f4 100644 --- a/src/core/slice.c +++ b/src/libcore/slice.c diff --git a/src/core/slice.h b/src/libcore/slice.h index c9f3f61067..c9f3f61067 100644 --- a/src/core/slice.h +++ b/src/libcore/slice.h diff --git a/src/core/smack-setup.c b/src/libcore/smack-setup.c index 0c26e85460..0c26e85460 100644 --- a/src/core/smack-setup.c +++ b/src/libcore/smack-setup.c diff --git a/src/core/smack-setup.h b/src/libcore/smack-setup.h index 78164c85e6..78164c85e6 100644 --- a/src/core/smack-setup.h +++ b/src/libcore/smack-setup.h diff --git a/src/core/socket.c b/src/libcore/socket.c index 976687af41..f36e312f7b 100644 --- a/src/core/socket.c +++ b/src/libcore/socket.c @@ -28,7 +28,7 @@ #include <unistd.h> #include <linux/sctp.h> -#include "sd-event.h" +#include <systemd/sd-event.h> #include "alloc-util.h" #include "bus-error.h" #include "bus-util.h" diff --git a/src/core/socket.h b/src/libcore/socket.h index b537b026a7..b537b026a7 100644 --- a/src/core/socket.h +++ b/src/libcore/socket.h diff --git a/src/core/swap.c b/src/libcore/swap.c index 1bf0c0a808..1bf0c0a808 100644 --- a/src/core/swap.c +++ b/src/libcore/swap.c diff --git a/src/core/swap.h b/src/libcore/swap.h index ac7a63d81b..ac7a63d81b 100644 --- a/src/core/swap.h +++ b/src/libcore/swap.h diff --git a/src/core/target.c b/src/libcore/target.c index 61a91aad07..61a91aad07 100644 --- a/src/core/target.c +++ b/src/libcore/target.c diff --git a/src/core/target.h b/src/libcore/target.h index 339aea154e..339aea154e 100644 --- a/src/core/target.h +++ b/src/libcore/target.h diff --git a/src/core/timer.c b/src/libcore/timer.c index 3d0bae16e5..3d0bae16e5 100644 --- a/src/core/timer.c +++ b/src/libcore/timer.c diff --git a/src/core/timer.h b/src/libcore/timer.h index 698e6da2f5..698e6da2f5 100644 --- a/src/core/timer.h +++ b/src/libcore/timer.h diff --git a/src/core/transaction.c b/src/libcore/transaction.c index b28fc76785..b28fc76785 100644 --- a/src/core/transaction.c +++ b/src/libcore/transaction.c diff --git a/src/core/transaction.h b/src/libcore/transaction.h index 6a3f927b0f..6a3f927b0f 100644 --- a/src/core/transaction.h +++ b/src/libcore/transaction.h diff --git a/src/core/umount.c b/src/libcore/umount.c index a458768e7d..a458768e7d 100644 --- a/src/core/umount.c +++ b/src/libcore/umount.c diff --git a/src/core/umount.h b/src/libcore/umount.h index 4e2215a47d..4e2215a47d 100644 --- a/src/core/umount.h +++ b/src/libcore/umount.h diff --git a/src/core/unit-printf.c b/src/libcore/unit-printf.c index fc057d965c..fc057d965c 100644 --- a/src/core/unit-printf.c +++ b/src/libcore/unit-printf.c diff --git a/src/core/unit-printf.h b/src/libcore/unit-printf.h index 4fc8531228..4fc8531228 100644 --- a/src/core/unit-printf.h +++ b/src/libcore/unit-printf.h diff --git a/src/core/unit.c b/src/libcore/unit.c index d39e3dcaeb..4f7c0e2449 100644 --- a/src/core/unit.c +++ b/src/libcore/unit.c @@ -23,8 +23,8 @@ #include <sys/stat.h> #include <unistd.h> -#include "sd-id128.h" -#include "sd-messages.h" +#include <systemd/sd-id128.h> +#include <systemd/sd-messages.h> #include "alloc-util.h" #include "bus-common-errors.h" diff --git a/src/core/unit.h b/src/libcore/unit.h index 601e763ce2..601e763ce2 100644 --- a/src/core/unit.h +++ b/src/libcore/unit.h diff --git a/src/libfirewall/Makefile b/src/libfirewall/Makefile new file mode 100644 index 0000000000..99a428fcd9 --- /dev/null +++ b/src/libfirewall/Makefile @@ -0,0 +1,43 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +ifneq ($(HAVE_LIBIPTC),) +noinst_LTLIBRARIES += \ + libfirewall.la + +libfirewall_la_SOURCES = \ + src/shared/firewall-util.h \ + src/shared/firewall-util.c + +libfirewall_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(LIBIPTC_CFLAGS) + +libfirewall_la_LIBADD = \ + $(LIBIPTC_LIBS) +endif # HAVE_LIBIPTC + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/shared/firewall-util.c b/src/libfirewall/firewall-util.c index 0d3da2e6d2..0d3da2e6d2 100644 --- a/src/shared/firewall-util.c +++ b/src/libfirewall/firewall-util.c diff --git a/src/shared/firewall-util.h b/src/libfirewall/firewall-util.h index c39b34cf8f..c39b34cf8f 100644 --- a/src/shared/firewall-util.h +++ b/src/libfirewall/firewall-util.h diff --git a/src/libshared/Makefile b/src/libshared/Makefile new file mode 100644 index 0000000000..3c229062e8 --- /dev/null +++ b/src/libshared/Makefile @@ -0,0 +1,141 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +noinst_LTLIBRARIES += \ + libshared.la + +libshared_la_SOURCES = \ + src/shared/output-mode.h \ + src/shared/gpt.h \ + src/shared/udev-util.h \ + src/shared/linux/auto_dev-ioctl.h \ + src/shared/initreq.h \ + src/shared/dns-domain.c \ + src/shared/dns-domain.h \ + src/shared/architecture.c \ + src/shared/architecture.h \ + src/shared/efivars.c \ + src/shared/efivars.h \ + src/shared/fstab-util.c \ + src/shared/fstab-util.h \ + src/shared/sleep-config.c \ + src/shared/sleep-config.h \ + src/shared/conf-parser.c \ + src/shared/conf-parser.h \ + src/shared/pager.c \ + src/shared/pager.h \ + src/shared/spawn-polkit-agent.c \ + src/shared/spawn-polkit-agent.h \ + src/shared/apparmor-util.c \ + src/shared/apparmor-util.h \ + src/shared/ima-util.c \ + src/shared/ima-util.h \ + src/shared/ptyfwd.c \ + src/shared/ptyfwd.h \ + src/shared/base-filesystem.c \ + src/shared/base-filesystem.h \ + src/shared/uid-range.c \ + src/shared/uid-range.h \ + src/shared/install.c \ + src/shared/install.h \ + src/shared/install-printf.c \ + src/shared/install-printf.h \ + src/shared/path-lookup.c \ + src/shared/path-lookup.h \ + src/shared/specifier.c \ + src/shared/specifier.h \ + src/shared/dev-setup.c \ + src/shared/dev-setup.h \ + src/shared/dropin.c \ + src/shared/dropin.h \ + src/shared/condition.c \ + src/shared/condition.h \ + src/shared/clean-ipc.c \ + src/shared/clean-ipc.h \ + src/shared/generator.h \ + src/shared/generator.c \ + src/shared/acpi-fpdt.h \ + src/shared/acpi-fpdt.c \ + src/shared/boot-timestamps.h \ + src/shared/boot-timestamps.c \ + src/shared/cgroup-show.c \ + src/shared/cgroup-show.h \ + src/shared/utmp-wtmp.h \ + src/shared/watchdog.c \ + src/shared/watchdog.h \ + src/shared/spawn-ask-password-agent.c \ + src/shared/spawn-ask-password-agent.h \ + src/shared/ask-password-api.c \ + src/shared/ask-password-api.h \ + src/shared/switch-root.h \ + src/shared/switch-root.c \ + src/shared/import-util.c \ + src/shared/import-util.h \ + src/shared/sysctl-util.c \ + src/shared/sysctl-util.h \ + src/shared/bus-util.c \ + src/shared/bus-util.h \ + src/shared/logs-show.c \ + src/shared/logs-show.h \ + src/shared/machine-image.c \ + src/shared/machine-image.h \ + src/shared/machine-pool.c \ + src/shared/machine-pool.h \ + src/shared/resolve-util.c \ + src/shared/resolve-util.h + +ifneq ($(HAVE_UTMP),) +libshared_la_SOURCES += \ + src/shared/utmp-wtmp.c +endif # HAVE_UTMP + +ifneq ($(HAVE_SECCOMP),) +libshared_la_SOURCES += \ + src/shared/seccomp-util.h \ + src/shared/seccomp-util.c +endif # HAVE_SECCOMP + +ifneq ($(HAVE_ACL),) +libshared_la_SOURCES += \ + src/shared/acl-util.c \ + src/shared/acl-util.h +endif # HAVE_ACL + +libshared_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(ACL_CFLAGS) \ + $(LIBIDN_CFLAGS) \ + $(SECCOMP_CFLAGS) + +libshared_la_LIBADD = \ + libsystemd-internal.la \ + libsystemd-journal-internal.la \ + libudev-internal.la \ + $(ACL_LIBS) \ + $(LIBIDN_LIBS) \ + $(SECCOMP_LIBS) + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/shared/acl-util.c b/src/libshared/acl-util.c index 2aa951fce9..2aa951fce9 100644 --- a/src/shared/acl-util.c +++ b/src/libshared/acl-util.c diff --git a/src/shared/acl-util.h b/src/libshared/acl-util.h index 396e9e067e..396e9e067e 100644 --- a/src/shared/acl-util.h +++ b/src/libshared/acl-util.h diff --git a/src/shared/acpi-fpdt.c b/src/libshared/acpi-fpdt.c index 3cb9e781fd..3cb9e781fd 100644 --- a/src/shared/acpi-fpdt.c +++ b/src/libshared/acpi-fpdt.c diff --git a/src/shared/acpi-fpdt.h b/src/libshared/acpi-fpdt.h index fc28175d0a..fc28175d0a 100644 --- a/src/shared/acpi-fpdt.h +++ b/src/libshared/acpi-fpdt.h diff --git a/src/shared/apparmor-util.c b/src/libshared/apparmor-util.c index edd695fd23..edd695fd23 100644 --- a/src/shared/apparmor-util.c +++ b/src/libshared/apparmor-util.c diff --git a/src/shared/apparmor-util.h b/src/libshared/apparmor-util.h index 524f740152..524f740152 100644 --- a/src/shared/apparmor-util.h +++ b/src/libshared/apparmor-util.h diff --git a/src/shared/architecture.c b/src/libshared/architecture.c index a9ecfc1cd6..a9ecfc1cd6 100644 --- a/src/shared/architecture.c +++ b/src/libshared/architecture.c diff --git a/src/shared/architecture.h b/src/libshared/architecture.h index 26679e28c6..26679e28c6 100644 --- a/src/shared/architecture.h +++ b/src/libshared/architecture.h diff --git a/src/shared/ask-password-api.c b/src/libshared/ask-password-api.c index 6805873f9e..6805873f9e 100644 --- a/src/shared/ask-password-api.c +++ b/src/libshared/ask-password-api.c diff --git a/src/shared/ask-password-api.h b/src/libshared/ask-password-api.h index 9d7f65130c..9d7f65130c 100644 --- a/src/shared/ask-password-api.h +++ b/src/libshared/ask-password-api.h diff --git a/src/shared/base-filesystem.c b/src/libshared/base-filesystem.c index 59a34a9d11..59a34a9d11 100644 --- a/src/shared/base-filesystem.c +++ b/src/libshared/base-filesystem.c diff --git a/src/shared/base-filesystem.h b/src/libshared/base-filesystem.h index 49599f0a60..49599f0a60 100644 --- a/src/shared/base-filesystem.h +++ b/src/libshared/base-filesystem.h diff --git a/src/shared/boot-timestamps.c b/src/libshared/boot-timestamps.c index 7e0152761c..7e0152761c 100644 --- a/src/shared/boot-timestamps.c +++ b/src/libshared/boot-timestamps.c diff --git a/src/shared/boot-timestamps.h b/src/libshared/boot-timestamps.h index 6f691026be..6f691026be 100644 --- a/src/shared/boot-timestamps.h +++ b/src/libshared/boot-timestamps.h diff --git a/src/shared/bus-util.c b/src/libshared/bus-util.c index 38557f0b8d..a874bb84cc 100644 --- a/src/shared/bus-util.c +++ b/src/libshared/bus-util.c @@ -28,11 +28,11 @@ #include <sys/socket.h> #include <unistd.h> -#include "sd-bus-protocol.h" -#include "sd-bus.h" -#include "sd-daemon.h" -#include "sd-event.h" -#include "sd-id128.h" +#include <systemd/sd-bus-protocol.h> +#include <systemd/sd-bus.h> +#include <systemd/sd-daemon.h> +#include <systemd/sd-event.h> +#include <systemd/sd-id128.h> #include "alloc-util.h" #include "bus-internal.h" diff --git a/src/shared/bus-util.h b/src/libshared/bus-util.h index 204da55682..77474522be 100644 --- a/src/shared/bus-util.h +++ b/src/libshared/bus-util.h @@ -24,9 +24,9 @@ #include <stdint.h> #include <sys/types.h> -#include "sd-bus-vtable.h" -#include "sd-bus.h" -#include "sd-event.h" +#include <systemd/sd-bus-vtable.h> +#include <systemd/sd-bus.h> +#include <systemd/sd-event.h> #include "hashmap.h" #include "install.h" diff --git a/src/shared/cgroup-show.c b/src/libshared/cgroup-show.c index f3039b23f7..f3039b23f7 100644 --- a/src/shared/cgroup-show.c +++ b/src/libshared/cgroup-show.c diff --git a/src/shared/cgroup-show.h b/src/libshared/cgroup-show.h index 3ab7dfb33c..3ab7dfb33c 100644 --- a/src/shared/cgroup-show.h +++ b/src/libshared/cgroup-show.h diff --git a/src/shared/clean-ipc.c b/src/libshared/clean-ipc.c index a3ac7aeb82..a3ac7aeb82 100644 --- a/src/shared/clean-ipc.c +++ b/src/libshared/clean-ipc.c diff --git a/src/shared/clean-ipc.h b/src/libshared/clean-ipc.h index 44a83afcf7..44a83afcf7 100644 --- a/src/shared/clean-ipc.h +++ b/src/libshared/clean-ipc.h diff --git a/src/shared/condition.c b/src/libshared/condition.c index f93785865e..1719a4c7a6 100644 --- a/src/shared/condition.c +++ b/src/libshared/condition.c @@ -27,7 +27,7 @@ #include <time.h> #include <unistd.h> -#include "sd-id128.h" +#include <systemd/sd-id128.h> #include "alloc-util.h" #include "apparmor-util.h" diff --git a/src/shared/condition.h b/src/libshared/condition.h index bdda04b770..bdda04b770 100644 --- a/src/shared/condition.h +++ b/src/libshared/condition.h diff --git a/src/shared/conf-parser.c b/src/libshared/conf-parser.c index e7fe9ac21e..e7fe9ac21e 100644 --- a/src/shared/conf-parser.c +++ b/src/libshared/conf-parser.c diff --git a/src/shared/conf-parser.h b/src/libshared/conf-parser.h index a91c94c322..a91c94c322 100644 --- a/src/shared/conf-parser.h +++ b/src/libshared/conf-parser.h diff --git a/src/shared/dev-setup.c b/src/libshared/dev-setup.c index b2d464c117..b2d464c117 100644 --- a/src/shared/dev-setup.c +++ b/src/libshared/dev-setup.c diff --git a/src/shared/dev-setup.h b/src/libshared/dev-setup.h index 5766a62060..5766a62060 100644 --- a/src/shared/dev-setup.h +++ b/src/libshared/dev-setup.h diff --git a/src/shared/dns-domain.c b/src/libshared/dns-domain.c index 45d24c0079..45d24c0079 100644 --- a/src/shared/dns-domain.c +++ b/src/libshared/dns-domain.c diff --git a/src/shared/dns-domain.h b/src/libshared/dns-domain.h index 2de3642cb3..2de3642cb3 100644 --- a/src/shared/dns-domain.h +++ b/src/libshared/dns-domain.h diff --git a/src/shared/dropin.c b/src/libshared/dropin.c index cc1acd6f23..cc1acd6f23 100644 --- a/src/shared/dropin.c +++ b/src/libshared/dropin.c diff --git a/src/shared/dropin.h b/src/libshared/dropin.h index c1936f397b..c1936f397b 100644 --- a/src/shared/dropin.h +++ b/src/libshared/dropin.h diff --git a/src/shared/efivars.c b/src/libshared/efivars.c index 8631a5a5d9..5073c61740 100644 --- a/src/shared/efivars.c +++ b/src/libshared/efivars.c @@ -27,7 +27,7 @@ #include <sys/stat.h> #include <unistd.h> -#include "sd-id128.h" +#include <systemd/sd-id128.h> #include "alloc-util.h" #include "dirent-util.h" diff --git a/src/shared/efivars.h b/src/libshared/efivars.h index b61d14c4ec..243151f922 100644 --- a/src/shared/efivars.h +++ b/src/libshared/efivars.h @@ -23,7 +23,7 @@ #include <stddef.h> #include <stdint.h> -#include "sd-id128.h" +#include <systemd/sd-id128.h> #include "time-util.h" diff --git a/src/shared/fstab-util.c b/src/libshared/fstab-util.c index a4e0cd3267..a4e0cd3267 100644 --- a/src/shared/fstab-util.c +++ b/src/libshared/fstab-util.c diff --git a/src/shared/fstab-util.h b/src/libshared/fstab-util.h index 679f6902f7..679f6902f7 100644 --- a/src/shared/fstab-util.h +++ b/src/libshared/fstab-util.h diff --git a/src/shared/generator.c b/src/libshared/generator.c index cd3c35cd55..cd3c35cd55 100644 --- a/src/shared/generator.c +++ b/src/libshared/generator.c diff --git a/src/shared/generator.h b/src/libshared/generator.h index a734e13970..a734e13970 100644 --- a/src/shared/generator.h +++ b/src/libshared/generator.h diff --git a/src/shared/gpt.h b/src/libshared/gpt.h index 52ab29ed5f..9b8f59abee 100644 --- a/src/shared/gpt.h +++ b/src/libshared/gpt.h @@ -21,7 +21,7 @@ #include <endian.h> -#include "sd-id128.h" +#include <systemd/sd-id128.h> /* We only support root disk discovery for x86, x86-64, Itanium and ARM for * now, since EFI for anything else doesn't really exist, and we only diff --git a/src/shared/ima-util.c b/src/libshared/ima-util.c index 789064d653..789064d653 100644 --- a/src/shared/ima-util.c +++ b/src/libshared/ima-util.c diff --git a/src/shared/ima-util.h b/src/libshared/ima-util.h index 5be94761fd..5be94761fd 100644 --- a/src/shared/ima-util.h +++ b/src/libshared/ima-util.h diff --git a/src/shared/import-util.c b/src/libshared/import-util.c index ab701ad8b2..ab701ad8b2 100644 --- a/src/shared/import-util.c +++ b/src/libshared/import-util.c diff --git a/src/shared/import-util.h b/src/libshared/import-util.h index 77b17d91f3..77b17d91f3 100644 --- a/src/shared/import-util.h +++ b/src/libshared/import-util.h diff --git a/src/shared/initreq.h b/src/libshared/initreq.h index 710037d84b..710037d84b 100644 --- a/src/shared/initreq.h +++ b/src/libshared/initreq.h diff --git a/src/shared/install-printf.c b/src/libshared/install-printf.c index 88143361da..88143361da 100644 --- a/src/shared/install-printf.c +++ b/src/libshared/install-printf.c diff --git a/src/shared/install-printf.h b/src/libshared/install-printf.h index acf519f4f7..acf519f4f7 100644 --- a/src/shared/install-printf.h +++ b/src/libshared/install-printf.h diff --git a/src/shared/install.c b/src/libshared/install.c index ef8f485cae..ef8f485cae 100644 --- a/src/shared/install.c +++ b/src/libshared/install.c diff --git a/src/shared/install.h b/src/libshared/install.h index c1a43e23e7..c1a43e23e7 100644 --- a/src/shared/install.h +++ b/src/libshared/install.h diff --git a/src/shared/logs-show.c b/src/libshared/logs-show.c index 5eb3bd35c7..7ac6d49549 100644 --- a/src/shared/logs-show.c +++ b/src/libshared/logs-show.c @@ -28,8 +28,8 @@ #include <time.h> #include <unistd.h> -#include "sd-id128.h" -#include "sd-journal.h" +#include <systemd/sd-id128.h> +#include <systemd/sd-journal.h> #include "alloc-util.h" #include "fd-util.h" diff --git a/src/shared/logs-show.h b/src/libshared/logs-show.h index 9765a24ff2..682a4adc7b 100644 --- a/src/shared/logs-show.h +++ b/src/libshared/logs-show.h @@ -24,7 +24,7 @@ #include <stdio.h> #include <sys/types.h> -#include "sd-journal.h" +#include <systemd/sd-journal.h> #include "macro.h" #include "output-mode.h" diff --git a/src/shared/machine-image.c b/src/libshared/machine-image.c index ed8a29c575..ed8a29c575 100644 --- a/src/shared/machine-image.c +++ b/src/libshared/machine-image.c diff --git a/src/shared/machine-image.h b/src/libshared/machine-image.h index 31b720d50c..31b720d50c 100644 --- a/src/shared/machine-image.h +++ b/src/libshared/machine-image.h diff --git a/src/shared/machine-pool.c b/src/libshared/machine-pool.c index e5674e4137..056b5bfae5 100644 --- a/src/shared/machine-pool.c +++ b/src/libshared/machine-pool.c @@ -32,8 +32,8 @@ #include <sys/statvfs.h> #include <unistd.h> -#include "sd-bus-protocol.h" -#include "sd-bus.h" +#include <systemd/sd-bus-protocol.h> +#include <systemd/sd-bus.h> #include "alloc-util.h" #include "btrfs-util.h" diff --git a/src/shared/machine-pool.h b/src/libshared/machine-pool.h index 40fe5ecb3a..fe99b7e0ae 100644 --- a/src/shared/machine-pool.h +++ b/src/libshared/machine-pool.h @@ -21,7 +21,7 @@ #include <stdint.h> -#include "sd-bus.h" +#include <systemd/sd-bus.h> /* Grow the /var/lib/machines directory after each 10MiB written */ #define GROW_INTERVAL_BYTES (UINT64_C(10) * UINT64_C(1024) * UINT64_C(1024)) diff --git a/src/shared/output-mode.h b/src/libshared/output-mode.h index c5470e7c1b..c5470e7c1b 100644 --- a/src/shared/output-mode.h +++ b/src/libshared/output-mode.h diff --git a/src/shared/pager.c b/src/libshared/pager.c index 05b2b15e40..05b2b15e40 100644 --- a/src/shared/pager.c +++ b/src/libshared/pager.c diff --git a/src/shared/pager.h b/src/libshared/pager.h index 9fb05796bb..9fb05796bb 100644 --- a/src/shared/pager.h +++ b/src/libshared/pager.h diff --git a/src/shared/path-lookup.c b/src/libshared/path-lookup.c index 5410620725..5410620725 100644 --- a/src/shared/path-lookup.c +++ b/src/libshared/path-lookup.c diff --git a/src/shared/path-lookup.h b/src/libshared/path-lookup.h index 26c83d6111..26c83d6111 100644 --- a/src/shared/path-lookup.h +++ b/src/libshared/path-lookup.h diff --git a/src/shared/ptyfwd.c b/src/libshared/ptyfwd.c index 061d31f4de..a97e0d5143 100644 --- a/src/shared/ptyfwd.c +++ b/src/libshared/ptyfwd.c @@ -30,7 +30,7 @@ #include <termios.h> #include <unistd.h> -#include "sd-event.h" +#include <systemd/sd-event.h> #include "alloc-util.h" #include "fd-util.h" diff --git a/src/shared/ptyfwd.h b/src/libshared/ptyfwd.h index a046eb4e5e..83c1f60970 100644 --- a/src/shared/ptyfwd.h +++ b/src/libshared/ptyfwd.h @@ -21,7 +21,7 @@ #include <stdbool.h> -#include "sd-event.h" +#include <systemd/sd-event.h> #include "macro.h" diff --git a/src/shared/resolve-util.c b/src/libshared/resolve-util.c index e2da81bab7..e2da81bab7 100644 --- a/src/shared/resolve-util.c +++ b/src/libshared/resolve-util.c diff --git a/src/shared/resolve-util.h b/src/libshared/resolve-util.h index 8636a6c134..8636a6c134 100644 --- a/src/shared/resolve-util.h +++ b/src/libshared/resolve-util.h diff --git a/src/shared/seccomp-util.c b/src/libshared/seccomp-util.c index cebe0fce2a..cebe0fce2a 100644 --- a/src/shared/seccomp-util.c +++ b/src/libshared/seccomp-util.c diff --git a/src/shared/seccomp-util.h b/src/libshared/seccomp-util.h index 4ed2afc1b2..4ed2afc1b2 100644 --- a/src/shared/seccomp-util.h +++ b/src/libshared/seccomp-util.h diff --git a/src/shared/sleep-config.c b/src/libshared/sleep-config.c index a0aef66bc8..a0aef66bc8 100644 --- a/src/shared/sleep-config.c +++ b/src/libshared/sleep-config.c diff --git a/src/shared/sleep-config.h b/src/libshared/sleep-config.h index 51f4621844..51f4621844 100644 --- a/src/shared/sleep-config.h +++ b/src/libshared/sleep-config.h diff --git a/src/shared/spawn-ask-password-agent.c b/src/libshared/spawn-ask-password-agent.c index a46b7525f0..a46b7525f0 100644 --- a/src/shared/spawn-ask-password-agent.c +++ b/src/libshared/spawn-ask-password-agent.c diff --git a/src/shared/spawn-ask-password-agent.h b/src/libshared/spawn-ask-password-agent.h index fb0749b13f..fb0749b13f 100644 --- a/src/shared/spawn-ask-password-agent.h +++ b/src/libshared/spawn-ask-password-agent.h diff --git a/src/shared/spawn-polkit-agent.c b/src/libshared/spawn-polkit-agent.c index cf3c8ad5a3..cf3c8ad5a3 100644 --- a/src/shared/spawn-polkit-agent.c +++ b/src/libshared/spawn-polkit-agent.c diff --git a/src/shared/spawn-polkit-agent.h b/src/libshared/spawn-polkit-agent.h index 42b2989ded..42b2989ded 100644 --- a/src/shared/spawn-polkit-agent.h +++ b/src/libshared/spawn-polkit-agent.h diff --git a/src/shared/specifier.c b/src/libshared/specifier.c index 1c17eb5251..303ddf0401 100644 --- a/src/shared/specifier.c +++ b/src/libshared/specifier.c @@ -24,7 +24,7 @@ #include <string.h> #include <sys/utsname.h> -#include "sd-id128.h" +#include <systemd/sd-id128.h> #include "alloc-util.h" #include "hostname-util.h" diff --git a/src/shared/specifier.h b/src/libshared/specifier.h index 6b1623ee61..6b1623ee61 100644 --- a/src/shared/specifier.h +++ b/src/libshared/specifier.h diff --git a/src/shared/switch-root.c b/src/libshared/switch-root.c index 47d3a5a1fa..47d3a5a1fa 100644 --- a/src/shared/switch-root.c +++ b/src/libshared/switch-root.c diff --git a/src/shared/switch-root.h b/src/libshared/switch-root.h index a7a080b3e8..a7a080b3e8 100644 --- a/src/shared/switch-root.h +++ b/src/libshared/switch-root.h diff --git a/src/shared/sysctl-util.c b/src/libshared/sysctl-util.c index e1ccb3294c..e1ccb3294c 100644 --- a/src/shared/sysctl-util.c +++ b/src/libshared/sysctl-util.c diff --git a/src/shared/sysctl-util.h b/src/libshared/sysctl-util.h index 2decb39f58..2decb39f58 100644 --- a/src/shared/sysctl-util.h +++ b/src/libshared/sysctl-util.h diff --git a/src/shared/test-tables.h b/src/libshared/test-tables.h index 228e510104..228e510104 100644 --- a/src/shared/test-tables.h +++ b/src/libshared/test-tables.h diff --git a/src/shared/udev-util.h b/src/libshared/udev-util.h index ca0889f8a6..ca0889f8a6 100644 --- a/src/shared/udev-util.h +++ b/src/libshared/udev-util.h diff --git a/src/shared/uid-range.c b/src/libshared/uid-range.c index eb251492c3..eb251492c3 100644 --- a/src/shared/uid-range.c +++ b/src/libshared/uid-range.c diff --git a/src/shared/uid-range.h b/src/libshared/uid-range.h index 4044eb4c9c..4044eb4c9c 100644 --- a/src/shared/uid-range.h +++ b/src/libshared/uid-range.h diff --git a/src/shared/utmp-wtmp.c b/src/libshared/utmp-wtmp.c index 9750dcd817..9750dcd817 100644 --- a/src/shared/utmp-wtmp.c +++ b/src/libshared/utmp-wtmp.c diff --git a/src/shared/utmp-wtmp.h b/src/libshared/utmp-wtmp.h index 438e270a26..438e270a26 100644 --- a/src/shared/utmp-wtmp.h +++ b/src/libshared/utmp-wtmp.h diff --git a/src/shared/watchdog.c b/src/libshared/watchdog.c index 4f3e0125f3..4f3e0125f3 100644 --- a/src/shared/watchdog.c +++ b/src/libshared/watchdog.c diff --git a/src/shared/watchdog.h b/src/libshared/watchdog.h index f6ec178ea1..f6ec178ea1 100644 --- a/src/shared/watchdog.h +++ b/src/libshared/watchdog.h diff --git a/src/libsystemd-network/Makefile b/src/libsystemd-network/Makefile index d0b0e8e008..3ca5e10caf 120000..100644 --- a/src/libsystemd-network/Makefile +++ b/src/libsystemd-network/Makefile @@ -1 +1,181 @@ -../Makefile
\ No newline at end of file +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +noinst_LTLIBRARIES += \ + libsystemd-network.la + +libsystemd_network_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(KMOD_CFLAGS) + +libsystemd_network_la_SOURCES = \ + src/systemd/sd-dhcp-client.h \ + src/systemd/sd-dhcp-server.h \ + src/systemd/sd-dhcp-lease.h \ + src/systemd/sd-ipv4ll.h \ + src/systemd/sd-ipv4acd.h \ + src/systemd/sd-ndisc.h \ + src/systemd/sd-dhcp6-client.h \ + src/systemd/sd-dhcp6-lease.h \ + src/systemd/sd-lldp.h \ + src/libsystemd-network/sd-dhcp-client.c \ + src/libsystemd-network/sd-dhcp-server.c \ + src/libsystemd-network/dhcp-network.c \ + src/libsystemd-network/dhcp-option.c \ + src/libsystemd-network/dhcp-packet.c \ + src/libsystemd-network/dhcp-internal.h \ + src/libsystemd-network/dhcp-server-internal.h \ + src/libsystemd-network/dhcp-protocol.h \ + src/libsystemd-network/dhcp-lease-internal.h \ + src/libsystemd-network/sd-dhcp-lease.c \ + src/libsystemd-network/sd-ipv4ll.c \ + src/libsystemd-network/sd-ipv4acd.c \ + src/libsystemd-network/arp-util.h \ + src/libsystemd-network/arp-util.c \ + src/libsystemd-network/network-internal.c \ + src/libsystemd-network/network-internal.h \ + src/libsystemd-network/sd-ndisc.c \ + src/libsystemd-network/icmp6-util.h \ + src/libsystemd-network/icmp6-util.c \ + src/libsystemd-network/sd-dhcp6-client.c \ + src/libsystemd-network/dhcp6-internal.h \ + src/libsystemd-network/dhcp6-protocol.h \ + src/libsystemd-network/dhcp6-network.c \ + src/libsystemd-network/dhcp6-option.c \ + src/libsystemd-network/dhcp6-lease-internal.h \ + src/libsystemd-network/sd-dhcp6-lease.c \ + src/libsystemd-network/dhcp-identifier.h \ + src/libsystemd-network/dhcp-identifier.c \ + src/libsystemd-network/lldp.h \ + src/libsystemd-network/lldp-tlv.h \ + src/libsystemd-network/lldp-tlv.c \ + src/libsystemd-network/lldp-network.h \ + src/libsystemd-network/lldp-network.c \ + src/libsystemd-network/lldp-port.h \ + src/libsystemd-network/lldp-port.c \ + src/libsystemd-network/lldp-internal.h \ + src/libsystemd-network/lldp-internal.c \ + src/libsystemd-network/sd-lldp.c + +libsystemd_network_la_LIBADD = \ + $(KMOD_LIBS) + +test_dhcp_option_SOURCES = \ + src/libsystemd-network/dhcp-protocol.h \ + src/libsystemd-network/dhcp-internal.h \ + src/libsystemd-network/test-dhcp-option.c + +test_dhcp_option_LDADD = \ + libsystemd-network.la \ + libshared.la + +test_dhcp_client_SOURCES = \ + src/systemd/sd-dhcp-client.h \ + src/libsystemd-network/dhcp-protocol.h \ + src/libsystemd-network/dhcp-internal.h \ + src/libsystemd-network/test-dhcp-client.c + +test_dhcp_client_LDADD = \ + libsystemd-network.la \ + libshared.la + +test_dhcp_server_SOURCES = \ + src/libsystemd-network/test-dhcp-server.c + +test_dhcp_server_LDADD = \ + libsystemd-network.la \ + libshared.la + +test_ipv4ll_SOURCES = \ + src/systemd/sd-ipv4ll.h \ + src/libsystemd-network/arp-util.h \ + src/libsystemd-network/test-ipv4ll.c + +test_ipv4ll_LDADD = \ + libsystemd-network.la \ + libshared.la + +test_ipv4ll_manual_SOURCES = \ + src/systemd/sd-ipv4ll.h \ + src/libsystemd-network/test-ipv4ll-manual.c + +test_ipv4ll_manual_LDADD = \ + libsystemd-network.la \ + libshared.la + +test_acd_SOURCES = \ + src/systemd/sd-ipv4acd.h \ + src/libsystemd-network/test-acd.c + +test_acd_LDADD = \ + libsystemd-network.la \ + libshared.la + +test_ndisc_rs_SOURCES = \ + src/systemd/sd-dhcp6-client.h \ + src/systemd/sd-ndisc.h \ + src/libsystemd-network/icmp6-util.h \ + src/libsystemd-network/test-ndisc-rs.c \ + src/libsystemd-network/dhcp-identifier.h \ + src/libsystemd-network/dhcp-identifier.c + +test_ndisc_rs_LDADD = \ + libsystemd-network.la \ + libudev.la \ + libshared.la + +test_dhcp6_client_SOURCES = \ + src/systemd/sd-dhcp6-client.h \ + src/libsystemd-network/dhcp6-internal.h \ + src/libsystemd-network/test-dhcp6-client.c \ + src/libsystemd-network/dhcp-identifier.h \ + src/libsystemd-network/dhcp-identifier.c + +test_dhcp6_client_LDADD = \ + libsystemd-network.la \ + libudev.la \ + libshared.la + +test_lldp_SOURCES = \ + src/libsystemd-network/lldp.h \ + src/libsystemd-network/lldp-tlv.h \ + src/libsystemd-network/lldp-tlv.c \ + src/libsystemd-network/test-lldp.c + +test_lldp_LDADD = \ + libsystemd-network.la \ + libshared.la + +tests += \ + test-dhcp-option \ + test-dhcp-client \ + test-dhcp-server \ + test-ipv4ll \ + test-ndisc-rs \ + test-dhcp6-client \ + test-lldp + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/libsystemd-network/dhcp-identifier.c b/src/libsystemd-network/dhcp-identifier.c index 1d9ec7be82..d58f9029cc 100644 --- a/src/libsystemd-network/dhcp-identifier.c +++ b/src/libsystemd-network/dhcp-identifier.c @@ -18,7 +18,7 @@ ***/ #include "libudev.h" -#include "sd-id128.h" +#include <systemd/sd-id128.h> #include "dhcp-identifier.h" #include "dhcp6-protocol.h" diff --git a/src/libsystemd-network/dhcp-identifier.h b/src/libsystemd-network/dhcp-identifier.h index 93f06f5938..31f461abd1 100644 --- a/src/libsystemd-network/dhcp-identifier.h +++ b/src/libsystemd-network/dhcp-identifier.h @@ -19,7 +19,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-id128.h" +#include <systemd/sd-id128.h> #include "macro.h" #include "sparse-endian.h" diff --git a/src/libsystemd-network/dhcp-internal.h b/src/libsystemd-network/dhcp-internal.h index a3b842cda3..51cb193847 100644 --- a/src/libsystemd-network/dhcp-internal.h +++ b/src/libsystemd-network/dhcp-internal.h @@ -25,7 +25,7 @@ #include <net/if_arp.h> #include <stdint.h> -#include "sd-dhcp-client.h" +#include <systemd/sd-dhcp-client.h> #include "dhcp-protocol.h" #include "socket-util.h" diff --git a/src/libsystemd-network/dhcp-lease-internal.h b/src/libsystemd-network/dhcp-lease-internal.h index 82cae2300a..646e612cee 100644 --- a/src/libsystemd-network/dhcp-lease-internal.h +++ b/src/libsystemd-network/dhcp-lease-internal.h @@ -23,7 +23,7 @@ #include <stdint.h> #include <linux/if_packet.h> -#include "sd-dhcp-client.h" +#include <systemd/sd-dhcp-client.h> #include "dhcp-protocol.h" #include "list.h" diff --git a/src/libsystemd-network/dhcp-server-internal.h b/src/libsystemd-network/dhcp-server-internal.h index bf123f1439..a5306b2907 100644 --- a/src/libsystemd-network/dhcp-server-internal.h +++ b/src/libsystemd-network/dhcp-server-internal.h @@ -20,8 +20,8 @@ #pragma once -#include "sd-dhcp-server.h" -#include "sd-event.h" +#include <systemd/sd-dhcp-server.h> +#include <systemd/sd-event.h> #include "dhcp-internal.h" #include "hashmap.h" diff --git a/src/libsystemd-network/dhcp6-internal.h b/src/libsystemd-network/dhcp6-internal.h index 749086d33a..228feb49d8 100644 --- a/src/libsystemd-network/dhcp6-internal.h +++ b/src/libsystemd-network/dhcp6-internal.h @@ -22,7 +22,7 @@ #include <net/ethernet.h> #include <netinet/in.h> -#include "sd-event.h" +#include <systemd/sd-event.h> #include "list.h" #include "macro.h" diff --git a/src/libsystemd-network/dhcp6-lease-internal.h b/src/libsystemd-network/dhcp6-lease-internal.h index 14e708ef63..8e9a6f8e8c 100644 --- a/src/libsystemd-network/dhcp6-lease-internal.h +++ b/src/libsystemd-network/dhcp6-lease-internal.h @@ -22,7 +22,7 @@ #include <stdint.h> -#include "sd-dhcp6-lease.h" +#include <systemd/sd-dhcp6-lease.h> #include "dhcp6-internal.h" diff --git a/src/libsystemd-network/dhcp6-option.c b/src/libsystemd-network/dhcp6-option.c index b073906660..91d7f8a7da 100644 --- a/src/libsystemd-network/dhcp6-option.c +++ b/src/libsystemd-network/dhcp6-option.c @@ -21,7 +21,7 @@ #include <netinet/in.h> #include <string.h> -#include "sd-dhcp6-client.h" +#include <systemd/sd-dhcp6-client.h> #include "alloc-util.h" #include "dhcp6-internal.h" diff --git a/src/libsystemd-network/lldp-internal.c b/src/libsystemd-network/lldp-internal.c index c8740ce5f0..902a262f39 100644 --- a/src/libsystemd-network/lldp-internal.c +++ b/src/libsystemd-network/lldp-internal.c @@ -18,7 +18,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-lldp.h" +#include <systemd/sd-lldp.h> #include "alloc-util.h" #include "lldp-internal.h" diff --git a/src/libsystemd-network/lldp-internal.h b/src/libsystemd-network/lldp-internal.h index 15b4a11b15..565149fbcf 100644 --- a/src/libsystemd-network/lldp-internal.h +++ b/src/libsystemd-network/lldp-internal.h @@ -20,7 +20,7 @@ #pragma once -#include "sd-event.h" +#include <systemd/sd-event.h> #include "list.h" #include "lldp-tlv.h" diff --git a/src/libsystemd-network/lldp-network.h b/src/libsystemd-network/lldp-network.h index dcf31faa95..3eb03a102d 100644 --- a/src/libsystemd-network/lldp-network.h +++ b/src/libsystemd-network/lldp-network.h @@ -20,6 +20,6 @@ #pragma once -#include "sd-event.h" +#include <systemd/sd-event.h> int lldp_network_bind_raw_socket(int ifindex); diff --git a/src/libsystemd-network/lldp-port.h b/src/libsystemd-network/lldp-port.h index 96092f8df9..36e1edc17c 100644 --- a/src/libsystemd-network/lldp-port.h +++ b/src/libsystemd-network/lldp-port.h @@ -22,8 +22,8 @@ #include <net/ethernet.h> -#include "sd-event.h" -#include "sd-lldp.h" +#include <systemd/sd-event.h> +#include <systemd/sd-lldp.h> #include "util.h" diff --git a/src/libsystemd-network/lldp-tlv.h b/src/libsystemd-network/lldp-tlv.h index 8e7706c612..4362b2ace6 100644 --- a/src/libsystemd-network/lldp-tlv.h +++ b/src/libsystemd-network/lldp-tlv.h @@ -22,7 +22,7 @@ #include <net/ethernet.h> -#include "sd-lldp.h" +#include <systemd/sd-lldp.h> #include "list.h" #include "lldp.h" diff --git a/src/libsystemd-network/network-internal.c b/src/libsystemd-network/network-internal.c index fdafcd84d8..35860cf11a 100644 --- a/src/libsystemd-network/network-internal.c +++ b/src/libsystemd-network/network-internal.c @@ -21,7 +21,7 @@ #include <linux/if.h> #include <netinet/ether.h> -#include "sd-ndisc.h" +#include <systemd/sd-ndisc.h> #include "alloc-util.h" #include "condition.h" diff --git a/src/libsystemd-network/network-internal.h b/src/libsystemd-network/network-internal.h index c8a531ab0f..2549d1420e 100644 --- a/src/libsystemd-network/network-internal.h +++ b/src/libsystemd-network/network-internal.h @@ -21,7 +21,7 @@ #include <stdbool.h> -#include "sd-dhcp-lease.h" +#include <systemd/sd-dhcp-lease.h> #include "condition.h" #include "udev.h" diff --git a/src/libsystemd-network/sd-dhcp-client.c b/src/libsystemd-network/sd-dhcp-client.c index 729ef880ce..bd5ec76fc5 100644 --- a/src/libsystemd-network/sd-dhcp-client.c +++ b/src/libsystemd-network/sd-dhcp-client.c @@ -26,7 +26,7 @@ #include <sys/ioctl.h> #include <linux/if_infiniband.h> -#include "sd-dhcp-client.h" +#include <systemd/sd-dhcp-client.h> #include "alloc-util.h" #include "async.h" diff --git a/src/libsystemd-network/sd-dhcp-lease.c b/src/libsystemd-network/sd-dhcp-lease.c index 7a119fd488..d8d6f446ee 100644 --- a/src/libsystemd-network/sd-dhcp-lease.c +++ b/src/libsystemd-network/sd-dhcp-lease.c @@ -24,7 +24,7 @@ #include <stdlib.h> #include <string.h> -#include "sd-dhcp-lease.h" +#include <systemd/sd-dhcp-lease.h> #include "alloc-util.h" #include "dhcp-lease-internal.h" diff --git a/src/libsystemd-network/sd-dhcp-server.c b/src/libsystemd-network/sd-dhcp-server.c index 54ff1a3f28..e11462e6ac 100644 --- a/src/libsystemd-network/sd-dhcp-server.c +++ b/src/libsystemd-network/sd-dhcp-server.c @@ -20,7 +20,7 @@ #include <sys/ioctl.h> -#include "sd-dhcp-server.h" +#include <systemd/sd-dhcp-server.h> #include "alloc-util.h" #include "dhcp-internal.h" diff --git a/src/libsystemd-network/sd-dhcp6-client.c b/src/libsystemd-network/sd-dhcp6-client.c index 7d56d4cc60..494036cb54 100644 --- a/src/libsystemd-network/sd-dhcp6-client.c +++ b/src/libsystemd-network/sd-dhcp6-client.c @@ -22,7 +22,7 @@ #include <sys/ioctl.h> #include <linux/if_infiniband.h> -#include "sd-dhcp6-client.h" +#include <systemd/sd-dhcp6-client.h> #include "alloc-util.h" #include "dhcp-identifier.h" diff --git a/src/libsystemd-network/sd-ipv4acd.c b/src/libsystemd-network/sd-ipv4acd.c index f7880a891c..f97fc0bf47 100644 --- a/src/libsystemd-network/sd-ipv4acd.c +++ b/src/libsystemd-network/sd-ipv4acd.c @@ -24,7 +24,7 @@ #include <stdlib.h> #include <string.h> -#include "sd-ipv4acd.h" +#include <systemd/sd-ipv4acd.h> #include "alloc-util.h" #include "arp-util.h" diff --git a/src/libsystemd-network/sd-ipv4ll.c b/src/libsystemd-network/sd-ipv4ll.c index db6cf22aaa..7725b67548 100644 --- a/src/libsystemd-network/sd-ipv4ll.c +++ b/src/libsystemd-network/sd-ipv4ll.c @@ -24,8 +24,8 @@ #include <stdlib.h> #include <string.h> -#include "sd-ipv4acd.h" -#include "sd-ipv4ll.h" +#include <systemd/sd-ipv4acd.h> +#include <systemd/sd-ipv4ll.h> #include "alloc-util.h" #include "in-addr-util.h" diff --git a/src/libsystemd-network/sd-lldp.c b/src/libsystemd-network/sd-lldp.c index 885ca62425..6bb2c7797b 100644 --- a/src/libsystemd-network/sd-lldp.c +++ b/src/libsystemd-network/sd-lldp.c @@ -20,7 +20,7 @@ #include <arpa/inet.h> -#include "sd-lldp.h" +#include <systemd/sd-lldp.h> #include "alloc-util.h" #include "fd-util.h" diff --git a/src/libsystemd-network/sd-ndisc.c b/src/libsystemd-network/sd-ndisc.c index bae6a49fe6..cd07fc1b3f 100644 --- a/src/libsystemd-network/sd-ndisc.c +++ b/src/libsystemd-network/sd-ndisc.c @@ -24,7 +24,7 @@ #include <string.h> #include <sys/ioctl.h> -#include "sd-ndisc.h" +#include <systemd/sd-ndisc.h> #include "alloc-util.h" #include "async.h" diff --git a/src/libsystemd-network/test-acd.c b/src/libsystemd-network/test-acd.c index 75564615b9..53ddfc3b62 100644 --- a/src/libsystemd-network/test-acd.c +++ b/src/libsystemd-network/test-acd.c @@ -24,9 +24,9 @@ #include <linux/veth.h> #include <net/if.h> -#include "sd-event.h" -#include "sd-ipv4acd.h" -#include "sd-netlink.h" +#include <systemd/sd-event.h> +#include <systemd/sd-ipv4acd.h> +#include <systemd/sd-netlink.h> #include "in-addr-util.h" #include "netlink-util.h" diff --git a/src/libsystemd-network/test-dhcp-client.c b/src/libsystemd-network/test-dhcp-client.c index c3c08fef5e..478b370c4c 100644 --- a/src/libsystemd-network/test-dhcp-client.c +++ b/src/libsystemd-network/test-dhcp-client.c @@ -22,8 +22,8 @@ #include <sys/socket.h> #include <unistd.h> -#include "sd-dhcp-client.h" -#include "sd-event.h" +#include <systemd/sd-dhcp-client.h> +#include <systemd/sd-event.h> #include "alloc-util.h" #include "dhcp-identifier.h" diff --git a/src/libsystemd-network/test-dhcp-server.c b/src/libsystemd-network/test-dhcp-server.c index e81c508c7f..7dc315c07f 100644 --- a/src/libsystemd-network/test-dhcp-server.c +++ b/src/libsystemd-network/test-dhcp-server.c @@ -20,8 +20,8 @@ #include <errno.h> -#include "sd-dhcp-server.h" -#include "sd-event.h" +#include <systemd/sd-dhcp-server.h> +#include <systemd/sd-event.h> #include "dhcp-server-internal.h" diff --git a/src/libsystemd-network/test-dhcp6-client.c b/src/libsystemd-network/test-dhcp6-client.c index e74c8c72db..0548e8381e 100644 --- a/src/libsystemd-network/test-dhcp6-client.c +++ b/src/libsystemd-network/test-dhcp6-client.c @@ -24,8 +24,8 @@ #include <sys/types.h> #include <unistd.h> -#include "sd-dhcp6-client.h" -#include "sd-event.h" +#include <systemd/sd-dhcp6-client.h> +#include <systemd/sd-event.h> #include "dhcp6-internal.h" #include "dhcp6-lease-internal.h" diff --git a/src/libsystemd-network/test-ipv4ll-manual.c b/src/libsystemd-network/test-ipv4ll-manual.c index 85dd61470d..caa315b210 100644 --- a/src/libsystemd-network/test-ipv4ll-manual.c +++ b/src/libsystemd-network/test-ipv4ll-manual.c @@ -23,9 +23,9 @@ #include <unistd.h> #include <linux/veth.h> -#include "sd-event.h" -#include "sd-ipv4ll.h" -#include "sd-netlink.h" +#include <systemd/sd-event.h> +#include <systemd/sd-ipv4ll.h> +#include <systemd/sd-netlink.h> #include "alloc-util.h" #include "in-addr-util.h" diff --git a/src/libsystemd-network/test-ipv4ll.c b/src/libsystemd-network/test-ipv4ll.c index a233e0378c..b7278834f2 100644 --- a/src/libsystemd-network/test-ipv4ll.c +++ b/src/libsystemd-network/test-ipv4ll.c @@ -25,7 +25,7 @@ #include <sys/types.h> #include <unistd.h> -#include "sd-ipv4ll.h" +#include <systemd/sd-ipv4ll.h> #include "arp-util.h" #include "fd-util.h" diff --git a/src/libsystemd-network/test-lldp.c b/src/libsystemd-network/test-lldp.c index b8490073dd..0243bc132b 100644 --- a/src/libsystemd-network/test-lldp.c +++ b/src/libsystemd-network/test-lldp.c @@ -23,8 +23,8 @@ #include <stdio.h> #include <string.h> -#include "sd-event.h" -#include "sd-lldp.h" +#include <systemd/sd-event.h> +#include <systemd/sd-lldp.h> #include "alloc-util.h" #include "fd-util.h" diff --git a/src/libsystemd-network/test-ndisc-rs.c b/src/libsystemd-network/test-ndisc-rs.c index f7b2eb8050..863a76637c 100644 --- a/src/libsystemd-network/test-ndisc-rs.c +++ b/src/libsystemd-network/test-ndisc-rs.c @@ -19,7 +19,7 @@ #include <netinet/icmp6.h> -#include "sd-ndisc.h" +#include <systemd/sd-ndisc.h> #include "icmp6-util.h" #include "socket-util.h" diff --git a/src/libsystemd/Makefile b/src/libsystemd/Makefile index d0b0e8e008..43d06ad24f 120000..100644 --- a/src/libsystemd/Makefile +++ b/src/libsystemd/Makefile @@ -1 +1,130 @@ -../Makefile
\ No newline at end of file +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +LIBSYSTEMD_CURRENT=14 +LIBSYSTEMD_REVISION=0 +LIBSYSTEMD_AGE=14 + +# The following four libraries only exist for compatibility reasons, +# their version info should not be bumped anymore +LIBSYSTEMD_LOGIN_CURRENT=9 +LIBSYSTEMD_LOGIN_REVISION=3 +LIBSYSTEMD_LOGIN_AGE=9 + +LIBSYSTEMD_DAEMON_CURRENT=0 +LIBSYSTEMD_DAEMON_REVISION=12 +LIBSYSTEMD_DAEMON_AGE=0 + +LIBSYSTEMD_ID128_CURRENT=0 +LIBSYSTEMD_ID128_REVISION=28 +LIBSYSTEMD_ID128_AGE=0 + +LIBSYSTEMD_JOURNAL_CURRENT=11 +LIBSYSTEMD_JOURNAL_REVISION=5 +LIBSYSTEMD_JOURNAL_AGE=11 + +EXTRA_DIST += \ + src/libsystemd/libsystemd.pc.in \ + src/libsystemd/sd-bus/DIFFERENCES \ + src/libsystemd/sd-bus/GVARIANT-SERIALIZATION + +libsystemd_la_SOURCES = \ + $(libsystemd_internal_la_SOURCES) \ + $(libsystemd_journal_internal_la_SOURCES) + +nodist_libsystemd_la_SOURCES = \ + $(nodist_libsystemd_internal_la_SOURCES) + +libsystemd_la_CFLAGS = \ + $(libsystemd_internal_la_CFLAGS) \ + $(libsystemd_journal_internal_la_CFLAGS) + +libsystemd_la_LDFLAGS = \ + $(AM_LDFLAGS) \ + -version-info $(LIBSYSTEMD_CURRENT):$(LIBSYSTEMD_REVISION):$(LIBSYSTEMD_AGE) \ + -Wl,--version-script=$(top_srcdir)/src/libsystemd/libsystemd.sym + +libsystemd_la_LIBADD = \ + $(libsystemd_internal_la_LIBADD) \ + $(libsystemd_journal_internal_la_LIBADD) + +pkgconfiglib_DATA += \ + src/libsystemd/libsystemd.pc + +pkginclude_HEADERS += \ + src/systemd/sd-bus.h \ + src/systemd/sd-bus-protocol.h \ + src/systemd/sd-bus-vtable.h \ + src/systemd/sd-event.h \ + src/systemd/sd-login.h \ + src/systemd/sd-id128.h \ + src/systemd/sd-daemon.h + +lib_LTLIBRARIES += \ + libsystemd.la + +# ------------------------------------------------------------------------------ + +tests += \ + test-bus-marshal \ + test-bus-signature \ + test-bus-benchmark \ + test-bus-chat \ + test-bus-cleanup \ + test-bus-server \ + test-bus-match \ + test-bus-proxy \ + test-bus-kernel \ + test-bus-kernel-bloom \ + test-bus-zero-copy \ + test-bus-introspect \ + test-bus-objects \ + test-bus-error \ + test-bus-creds \ + test-bus-gvariant \ + test-event \ + test-netlink \ + test-local-addresses \ + test-resolve + +test-libsystemd-sym.c: \ + $(top_builddir)/src/libsystemd/libsystemd.sym \ + src/systemd/sd-journal.h \ + src/systemd/sd-daemon.h \ + src/systemd/sd-login.h \ + src/systemd/sd-bus.h \ + src/systemd/sd-utf8.h \ + src/systemd/sd-resolve.h \ + src/systemd/sd-path.h \ + src/systemd/sd-event.h + $(generate-sym-test) + +nodist_test_libsystemd_sym_SOURCES = \ + test-libsystemd-sym.c +test_libsystemd_sym_LDADD = \ + libsystemd.la + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/compat-libs/.gitignore b/src/libsystemd/compat-libs/.gitignore index 662c154cdd..662c154cdd 100644 --- a/src/compat-libs/.gitignore +++ b/src/libsystemd/compat-libs/.gitignore diff --git a/src/libsystemd/compat-libs/Makefile b/src/libsystemd/compat-libs/Makefile new file mode 100644 index 0000000000..eb3787659d --- /dev/null +++ b/src/libsystemd/compat-libs/Makefile @@ -0,0 +1,147 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +ifneq ($(ENABLE_COMPAT_LIBS),) +libsystemd-%.c: src/compat-libs/libsystemd-%.sym + $(AM_V_at)$(MKDIR_P) $(dir $@) + $(AM_V_GEN)sed -r -n 's/^ +(sd_.*);/obsolete_lib(\1,$(notdir $(basename $<)));/p' <$< >$@ + +BUILT_SOURCES += \ + libsystemd-journal.c \ + libsystemd-login.c \ + libsystemd-id128.c \ + libsystemd-daemon.c + +nodist_libsystemd_journal_la_SOURCES = \ + libsystemd-journal.c + +libsystemd_journal_la_SOURCES = \ + src/compat-libs/libsystemd-journal.sym + +libsystemd_journal_la_CPPFLAGS = \ + $(AM_CPPFLAGS) \ + -imacros$(top_srcdir)/src/compat-libs/linkwarning.h + +libsystemd_journal_la_LDFLAGS = \ + $(AM_LDFLAGS) \ + -version-info $(LIBSYSTEMD_JOURNAL_CURRENT):$(LIBSYSTEMD_JOURNAL_REVISION):$(LIBSYSTEMD_JOURNAL_AGE) \ + -Wl,--version-script=$(top_srcdir)/src/compat-libs/libsystemd-journal.sym + +libsystemd_journal_la_LIBADD = \ + libsystemd-journal-internal.la \ + libsystemd-internal.la + +nodist_libsystemd_login_la_SOURCES = \ + libsystemd-login.c + +libsystemd_login_la_SOURCES = \ + src/compat-libs/libsystemd-login.sym + +libsystemd_login_la_CPPFLAGS = \ + $(AM_CPPFLAGS) \ + -imacros$(top_srcdir)/src/compat-libs/linkwarning.h + +libsystemd_login_la_LDFLAGS = \ + $(AM_LDFLAGS) \ + -version-info $(LIBSYSTEMD_LOGIN_CURRENT):$(LIBSYSTEMD_LOGIN_REVISION):$(LIBSYSTEMD_LOGIN_AGE) \ + -Wl,--version-script=$(top_srcdir)/src/compat-libs/libsystemd-login.sym + +libsystemd_login_la_LIBADD = \ + libsystemd-internal.la + +nodist_libsystemd_id128_la_SOURCES = \ + libsystemd-id128.c + +libsystemd_id128_la_SOURCES = \ + src/compat-libs/libsystemd-id128.sym + +libsystemd_id128_la_CPPFLAGS = \ + $(AM_CPPFLAGS) \ + -imacros$(top_srcdir)/src/compat-libs/linkwarning.h + +libsystemd_id128_la_LDFLAGS = \ + $(AM_LDFLAGS) \ + -version-info $(LIBSYSTEMD_ID128_CURRENT):$(LIBSYSTEMD_ID128_REVISION):$(LIBSYSTEMD_ID128_AGE) \ + -Wl,--version-script=$(top_srcdir)/src/compat-libs/libsystemd-id128.sym + +libsystemd_id128_la_LIBADD = \ + libsystemd-internal.la + +nodist_libsystemd_daemon_la_SOURCES = \ + libsystemd-daemon.c + +libsystemd_daemon_la_SOURCES = \ + src/compat-libs/libsystemd-daemon.sym + +libsystemd_daemon_la_CPPFLAGS = \ + $(AM_CPPFLAGS) \ + -imacros$(top_srcdir)/src/compat-libs/linkwarning.h + +libsystemd_daemon_la_LDFLAGS = \ + $(AM_LDFLAGS) \ + -version-info $(LIBSYSTEMD_DAEMON_CURRENT):$(LIBSYSTEMD_DAEMON_REVISION):$(LIBSYSTEMD_DAEMON_AGE) \ + -Wl,--version-script=$(top_srcdir)/src/compat-libs/libsystemd-daemon.sym + +libsystemd_daemon_la_LIBADD = \ + libsystemd-internal.la + +lib_LTLIBRARIES += \ + libsystemd-journal.la \ + libsystemd-login.la \ + libsystemd-id128.la \ + libsystemd-daemon.la + +pkgconfiglib_DATA += \ + src/compat-libs/libsystemd-journal.pc \ + src/compat-libs/libsystemd-login.pc \ + src/compat-libs/libsystemd-id128.pc \ + src/compat-libs/libsystemd-daemon.pc + +# move lib from $(libdir) to $(libdir) and update devel link, if needed +compat-lib-install-hook: + libname=libsystemd-login.so && $(move-to-libdir) + libname=libsystemd-journal.so && $(move-to-libdir) + libname=libsystemd-id128.so && $(move-to-libdir) + libname=libsystemd-daemon.so && $(move-to-libdir) + +compat-lib-uninstall-hook: + rm -f $(DESTDIR)$(libdir)/libsystemd-login.so* + rm -f $(DESTDIR)$(libdir)/libsystemd-journal.so* + rm -f $(DESTDIR)$(libdir)/libsystemd-id128.so* + rm -f $(DESTDIR)$(libdir)/libsystemd-daemon.so* + +INSTALL_EXEC_HOOKS += compat-lib-install-hook +UNINSTALL_EXEC_HOOKS += compat-lib-uninstall-hook +endif # ENABLE_COMPAT_LIBS + +EXTRA_DIST += \ + src/compat-libs/linkwarning.h \ + src/compat-libs/libsystemd-journal.pc.in \ + src/compat-libs/libsystemd-login.pc.in \ + src/compat-libs/libsystemd-id128.pc.in \ + src/compat-libs/libsystemd-daemon.pc.in + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/compat-libs/libsystemd-daemon.pc.in b/src/libsystemd/compat-libs/libsystemd-daemon.pc.in index 847afc9d60..847afc9d60 100644 --- a/src/compat-libs/libsystemd-daemon.pc.in +++ b/src/libsystemd/compat-libs/libsystemd-daemon.pc.in diff --git a/src/compat-libs/libsystemd-daemon.sym b/src/libsystemd/compat-libs/libsystemd-daemon.sym index f440238931..f440238931 100644 --- a/src/compat-libs/libsystemd-daemon.sym +++ b/src/libsystemd/compat-libs/libsystemd-daemon.sym diff --git a/src/compat-libs/libsystemd-id128.pc.in b/src/libsystemd/compat-libs/libsystemd-id128.pc.in index 80f8fee6c3..80f8fee6c3 100644 --- a/src/compat-libs/libsystemd-id128.pc.in +++ b/src/libsystemd/compat-libs/libsystemd-id128.pc.in diff --git a/src/compat-libs/libsystemd-id128.sym b/src/libsystemd/compat-libs/libsystemd-id128.sym index 604c0026c6..604c0026c6 100644 --- a/src/compat-libs/libsystemd-id128.sym +++ b/src/libsystemd/compat-libs/libsystemd-id128.sym diff --git a/src/compat-libs/libsystemd-journal.pc.in b/src/libsystemd/compat-libs/libsystemd-journal.pc.in index 395f71005b..395f71005b 100644 --- a/src/compat-libs/libsystemd-journal.pc.in +++ b/src/libsystemd/compat-libs/libsystemd-journal.pc.in diff --git a/src/compat-libs/libsystemd-journal.sym b/src/libsystemd/compat-libs/libsystemd-journal.sym index 4eb15910d2..4eb15910d2 100644 --- a/src/compat-libs/libsystemd-journal.sym +++ b/src/libsystemd/compat-libs/libsystemd-journal.sym diff --git a/src/compat-libs/libsystemd-login.pc.in b/src/libsystemd/compat-libs/libsystemd-login.pc.in index db3f79c99a..db3f79c99a 100644 --- a/src/compat-libs/libsystemd-login.pc.in +++ b/src/libsystemd/compat-libs/libsystemd-login.pc.in diff --git a/src/compat-libs/libsystemd-login.sym b/src/libsystemd/compat-libs/libsystemd-login.sym index 54aa91c609..54aa91c609 100644 --- a/src/compat-libs/libsystemd-login.sym +++ b/src/libsystemd/compat-libs/libsystemd-login.sym diff --git a/src/compat-libs/linkwarning.h b/src/libsystemd/compat-libs/linkwarning.h index 79ece9e7d1..79ece9e7d1 100644 --- a/src/compat-libs/linkwarning.h +++ b/src/libsystemd/compat-libs/linkwarning.h diff --git a/src/systemd/_sd-common.h b/src/libsystemd/include/systemd/_sd-common.h index 2d4e1f26e1..2d4e1f26e1 100644 --- a/src/systemd/_sd-common.h +++ b/src/libsystemd/include/systemd/_sd-common.h diff --git a/src/systemd/sd-bus-protocol.h b/src/libsystemd/include/systemd/sd-bus-protocol.h index 47b256d5b9..47b256d5b9 100644 --- a/src/systemd/sd-bus-protocol.h +++ b/src/libsystemd/include/systemd/sd-bus-protocol.h diff --git a/src/systemd/sd-bus-vtable.h b/src/libsystemd/include/systemd/sd-bus-vtable.h index 6ad6d51979..9363f5425a 100644 --- a/src/systemd/sd-bus-vtable.h +++ b/src/libsystemd/include/systemd/sd-bus-vtable.h @@ -26,7 +26,7 @@ _SD_BEGIN_DECLARATIONS; typedef struct sd_bus_vtable sd_bus_vtable; -#include "sd-bus.h" +#include <systemd/sd-bus.h> enum { _SD_BUS_VTABLE_START = '<', diff --git a/src/systemd/sd-bus.h b/src/libsystemd/include/systemd/sd-bus.h index 2a2ef0eb98..2ded47c2b6 100644 --- a/src/systemd/sd-bus.h +++ b/src/libsystemd/include/systemd/sd-bus.h @@ -25,8 +25,8 @@ #include <sys/types.h> #include <sys/uio.h> -#include "sd-event.h" -#include "sd-id128.h" +#include <systemd/sd-event.h> +#include <systemd/sd-id128.h> #include "_sd-common.h" @@ -107,8 +107,8 @@ typedef int (*sd_bus_object_find_t) (sd_bus *bus, const char *path, const char * typedef int (*sd_bus_node_enumerator_t) (sd_bus *bus, const char *prefix, void *userdata, char ***ret_nodes, sd_bus_error *ret_error); typedef int (*sd_bus_track_handler_t) (sd_bus_track *track, void *userdata); -#include "sd-bus-protocol.h" -#include "sd-bus-vtable.h" +#include <systemd/sd-bus-protocol.h> +#include <systemd/sd-bus-vtable.h> /* Connections */ diff --git a/src/systemd/sd-daemon.h b/src/libsystemd/include/systemd/sd-daemon.h index e6787b0a64..e6787b0a64 100644 --- a/src/systemd/sd-daemon.h +++ b/src/libsystemd/include/systemd/sd-daemon.h diff --git a/src/systemd/sd-device.h b/src/libsystemd/include/systemd/sd-device.h index 5bfca6ecec..5bfca6ecec 100644 --- a/src/systemd/sd-device.h +++ b/src/libsystemd/include/systemd/sd-device.h diff --git a/src/systemd/sd-dhcp-client.h b/src/libsystemd/include/systemd/sd-dhcp-client.h index 2b865a80e1..897a6b0223 100644 --- a/src/systemd/sd-dhcp-client.h +++ b/src/libsystemd/include/systemd/sd-dhcp-client.h @@ -25,8 +25,8 @@ #include <netinet/in.h> #include <sys/types.h> -#include "sd-dhcp-lease.h" -#include "sd-event.h" +#include <systemd/sd-dhcp-lease.h> +#include <systemd/sd-event.h> #include "_sd-common.h" diff --git a/src/systemd/sd-dhcp-lease.h b/src/libsystemd/include/systemd/sd-dhcp-lease.h index 2f565ca825..2f565ca825 100644 --- a/src/systemd/sd-dhcp-lease.h +++ b/src/libsystemd/include/systemd/sd-dhcp-lease.h diff --git a/src/systemd/sd-dhcp-server.h b/src/libsystemd/include/systemd/sd-dhcp-server.h index 8658197e80..ede8f18533 100644 --- a/src/systemd/sd-dhcp-server.h +++ b/src/libsystemd/include/systemd/sd-dhcp-server.h @@ -24,7 +24,7 @@ #include <inttypes.h> #include <netinet/in.h> -#include "sd-event.h" +#include <systemd/sd-event.h> #include "_sd-common.h" diff --git a/src/systemd/sd-dhcp6-client.h b/src/libsystemd/include/systemd/sd-dhcp6-client.h index 9608060830..9c05336ab9 100644 --- a/src/systemd/sd-dhcp6-client.h +++ b/src/libsystemd/include/systemd/sd-dhcp6-client.h @@ -24,8 +24,8 @@ #include <net/ethernet.h> #include <sys/types.h> -#include "sd-dhcp6-lease.h" -#include "sd-event.h" +#include <systemd/sd-dhcp6-lease.h> +#include <systemd/sd-event.h> #include "_sd-common.h" diff --git a/src/systemd/sd-dhcp6-lease.h b/src/libsystemd/include/systemd/sd-dhcp6-lease.h index 184fbb8e0d..184fbb8e0d 100644 --- a/src/systemd/sd-dhcp6-lease.h +++ b/src/libsystemd/include/systemd/sd-dhcp6-lease.h diff --git a/src/systemd/sd-event.h b/src/libsystemd/include/systemd/sd-event.h index 1ea97e47f8..1ea97e47f8 100644 --- a/src/systemd/sd-event.h +++ b/src/libsystemd/include/systemd/sd-event.h diff --git a/src/systemd/sd-hwdb.h b/src/libsystemd/include/systemd/sd-hwdb.h index 7105920492..7105920492 100644 --- a/src/systemd/sd-hwdb.h +++ b/src/libsystemd/include/systemd/sd-hwdb.h diff --git a/src/systemd/sd-id128.h b/src/libsystemd/include/systemd/sd-id128.h index a3bf5897b8..a3bf5897b8 100644 --- a/src/systemd/sd-id128.h +++ b/src/libsystemd/include/systemd/sd-id128.h diff --git a/src/systemd/sd-ipv4acd.h b/src/libsystemd/include/systemd/sd-ipv4acd.h index 3a2219c82c..0fb52b33f9 100644 --- a/src/systemd/sd-ipv4acd.h +++ b/src/libsystemd/include/systemd/sd-ipv4acd.h @@ -24,7 +24,7 @@ #include <net/ethernet.h> #include <netinet/in.h> -#include "sd-event.h" +#include <systemd/sd-event.h> #include "_sd-common.h" diff --git a/src/systemd/sd-ipv4ll.h b/src/libsystemd/include/systemd/sd-ipv4ll.h index 67c566fe0d..2d1d51a473 100644 --- a/src/systemd/sd-ipv4ll.h +++ b/src/libsystemd/include/systemd/sd-ipv4ll.h @@ -23,7 +23,7 @@ #include <net/ethernet.h> #include <netinet/in.h> -#include "sd-event.h" +#include <systemd/sd-event.h> #include "_sd-common.h" diff --git a/src/systemd/sd-journal.h b/src/libsystemd/include/systemd/sd-journal.h index abb9eca576..559a8fa929 100644 --- a/src/systemd/sd-journal.h +++ b/src/libsystemd/include/systemd/sd-journal.h @@ -26,7 +26,7 @@ #include <sys/uio.h> #include <syslog.h> -#include "sd-id128.h" +#include <systemd/sd-id128.h> #include "_sd-common.h" diff --git a/src/systemd/sd-lldp.h b/src/libsystemd/include/systemd/sd-lldp.h index ea952ef187..45d8a36697 100644 --- a/src/systemd/sd-lldp.h +++ b/src/libsystemd/include/systemd/sd-lldp.h @@ -24,7 +24,7 @@ #include <inttypes.h> #include <net/ethernet.h> -#include "sd-event.h" +#include <systemd/sd-event.h> #include "_sd-common.h" diff --git a/src/systemd/sd-login.h b/src/libsystemd/include/systemd/sd-login.h index 3c10ff032f..3c10ff032f 100644 --- a/src/systemd/sd-login.h +++ b/src/libsystemd/include/systemd/sd-login.h diff --git a/src/systemd/sd-messages.h b/src/libsystemd/include/systemd/sd-messages.h index 8a72576ec8..1aeac17851 100644 --- a/src/systemd/sd-messages.h +++ b/src/libsystemd/include/systemd/sd-messages.h @@ -20,7 +20,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-id128.h" +#include <systemd/sd-id128.h> #include "_sd-common.h" diff --git a/src/systemd/sd-ndisc.h b/src/libsystemd/include/systemd/sd-ndisc.h index 762947531d..734701bca3 100644 --- a/src/systemd/sd-ndisc.h +++ b/src/libsystemd/include/systemd/sd-ndisc.h @@ -23,7 +23,7 @@ #include <inttypes.h> #include <net/ethernet.h> -#include "sd-event.h" +#include <systemd/sd-event.h> #include "_sd-common.h" diff --git a/src/systemd/sd-netlink.h b/src/libsystemd/include/systemd/sd-netlink.h index b4798d2476..333df4676f 100644 --- a/src/systemd/sd-netlink.h +++ b/src/libsystemd/include/systemd/sd-netlink.h @@ -26,7 +26,7 @@ #include <linux/rtnetlink.h> #include <linux/neighbour.h> -#include "sd-event.h" +#include <systemd/sd-event.h> #include "_sd-common.h" diff --git a/src/systemd/sd-network.h b/src/libsystemd/include/systemd/sd-network.h index e20d12c44d..e20d12c44d 100644 --- a/src/systemd/sd-network.h +++ b/src/libsystemd/include/systemd/sd-network.h diff --git a/src/systemd/sd-path.h b/src/libsystemd/include/systemd/sd-path.h index be6abdcd03..be6abdcd03 100644 --- a/src/systemd/sd-path.h +++ b/src/libsystemd/include/systemd/sd-path.h diff --git a/src/systemd/sd-resolve.h b/src/libsystemd/include/systemd/sd-resolve.h index 903b917f70..9c3b0ee70f 100644 --- a/src/systemd/sd-resolve.h +++ b/src/libsystemd/include/systemd/sd-resolve.h @@ -25,7 +25,7 @@ #include <sys/socket.h> #include <sys/types.h> -#include "sd-event.h" +#include <systemd/sd-event.h> #include "_sd-common.h" diff --git a/src/systemd/sd-utf8.h b/src/libsystemd/include/systemd/sd-utf8.h index 6781983878..6781983878 100644 --- a/src/systemd/sd-utf8.h +++ b/src/libsystemd/include/systemd/sd-utf8.h diff --git a/src/libsystemd/libsystemd-internal/Makefile b/src/libsystemd/libsystemd-internal/Makefile new file mode 100644 index 0000000000..086e904d0e --- /dev/null +++ b/src/libsystemd/libsystemd-internal/Makefile @@ -0,0 +1,260 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +libsystemd_internal_la_SOURCES = \ + src/systemd/sd-bus.h \ + src/systemd/sd-bus-protocol.h \ + src/systemd/sd-bus-vtable.h \ + src/systemd/sd-utf8.h \ + src/systemd/sd-event.h \ + src/systemd/sd-netlink.h \ + src/systemd/sd-resolve.h \ + src/systemd/sd-login.h \ + src/systemd/sd-id128.h \ + src/systemd/sd-daemon.h \ + src/systemd/sd-path.h \ + src/systemd/sd-network.h \ + src/systemd/sd-hwdb.h \ + src/systemd/sd-device.h \ + src/libsystemd/libsystemd.sym \ + src/libsystemd/sd-bus/sd-bus.c \ + src/libsystemd/sd-bus/bus-control.c \ + src/libsystemd/sd-bus/bus-control.h \ + src/libsystemd/sd-bus/bus-error.c \ + src/libsystemd/sd-bus/bus-error.h \ + src/libsystemd/sd-bus/bus-common-errors.h \ + src/libsystemd/sd-bus/bus-common-errors.c \ + src/libsystemd/sd-bus/bus-internal.c \ + src/libsystemd/sd-bus/bus-internal.h \ + src/libsystemd/sd-bus/bus-socket.c \ + src/libsystemd/sd-bus/bus-socket.h \ + src/libsystemd/sd-bus/bus-kernel.c \ + src/libsystemd/sd-bus/bus-kernel.h \ + src/libsystemd/sd-bus/bus-container.c \ + src/libsystemd/sd-bus/bus-container.h \ + src/libsystemd/sd-bus/bus-message.c \ + src/libsystemd/sd-bus/bus-message.h \ + src/libsystemd/sd-bus/bus-creds.c \ + src/libsystemd/sd-bus/bus-creds.h \ + src/libsystemd/sd-bus/bus-signature.c \ + src/libsystemd/sd-bus/bus-signature.h \ + src/libsystemd/sd-bus/bus-type.c \ + src/libsystemd/sd-bus/bus-type.h \ + src/libsystemd/sd-bus/bus-match.c \ + src/libsystemd/sd-bus/bus-match.h \ + src/libsystemd/sd-bus/bus-bloom.c \ + src/libsystemd/sd-bus/bus-bloom.h \ + src/libsystemd/sd-bus/bus-introspect.c \ + src/libsystemd/sd-bus/bus-introspect.h \ + src/libsystemd/sd-bus/bus-objects.c \ + src/libsystemd/sd-bus/bus-objects.h \ + src/libsystemd/sd-bus/bus-gvariant.c \ + src/libsystemd/sd-bus/bus-gvariant.h \ + src/libsystemd/sd-bus/bus-convenience.c \ + src/libsystemd/sd-bus/bus-track.c \ + src/libsystemd/sd-bus/bus-track.h \ + src/libsystemd/sd-bus/bus-slot.c \ + src/libsystemd/sd-bus/bus-slot.h \ + src/libsystemd/sd-bus/bus-protocol.h \ + src/libsystemd/sd-bus/kdbus.h \ + src/libsystemd/sd-bus/bus-dump.c \ + src/libsystemd/sd-bus/bus-dump.h \ + src/libsystemd/sd-utf8/sd-utf8.c \ + src/libsystemd/sd-event/sd-event.c \ + src/libsystemd/sd-netlink/sd-netlink.c \ + src/libsystemd/sd-netlink/netlink-internal.h \ + src/libsystemd/sd-netlink/netlink-message.c \ + src/libsystemd/sd-netlink/netlink-socket.c \ + src/libsystemd/sd-netlink/rtnl-message.c \ + src/libsystemd/sd-netlink/netlink-types.h \ + src/libsystemd/sd-netlink/netlink-types.c \ + src/libsystemd/sd-netlink/netlink-util.h \ + src/libsystemd/sd-netlink/netlink-util.c \ + src/libsystemd/sd-netlink/local-addresses.h \ + src/libsystemd/sd-netlink/local-addresses.c \ + src/libsystemd/sd-id128/sd-id128.c \ + src/libsystemd/sd-daemon/sd-daemon.c \ + src/libsystemd/sd-login/sd-login.c \ + src/libsystemd/sd-path/sd-path.c \ + src/libsystemd/sd-network/sd-network.c \ + src/libsystemd/sd-network/network-util.h \ + src/libsystemd/sd-network/network-util.c \ + src/libsystemd/sd-hwdb/sd-hwdb.c \ + src/libsystemd/sd-hwdb/hwdb-util.h \ + src/libsystemd/sd-hwdb/hwdb-internal.h \ + src/libsystemd/sd-device/device-internal.h \ + src/libsystemd/sd-device/device-util.h \ + src/libsystemd/sd-device/device-enumerator.c \ + src/libsystemd/sd-device/device-enumerator-private.h \ + src/libsystemd/sd-device/sd-device.c \ + src/libsystemd/sd-device/device-private.c \ + src/libsystemd/sd-device/device-private.h \ + src/libsystemd/sd-resolve/sd-resolve.c + +libsystemd_internal_la_LIBADD = \ + libbasic.la \ + -lresolv + +noinst_LTLIBRARIES += \ + libsystemd-internal.la + +test_bus_marshal_SOURCES = \ + src/libsystemd/sd-bus/test-bus-marshal.c + +test_bus_marshal_LDADD = \ + libshared.la \ + $(GLIB_LIBS) \ + $(DBUS_LIBS) + +test_bus_marshal_CFLAGS = \ + $(AM_CFLAGS) \ + $(GLIB_CFLAGS) \ + $(DBUS_CFLAGS) + +test_bus_signature_SOURCES = \ + src/libsystemd/sd-bus/test-bus-signature.c + +test_bus_signature_LDADD = \ + libshared.la + +test_bus_chat_SOURCES = \ + src/libsystemd/sd-bus/test-bus-chat.c + +test_bus_chat_LDADD = \ + libshared.la + +test_bus_cleanup_SOURCES = \ + src/libsystemd/sd-bus/test-bus-cleanup.c + +test_bus_cleanup_CFLAGS = \ + $(AM_CFLAGS) \ + $(SECCOMP_CFLAGS) + +test_bus_cleanup_LDADD = \ + libshared.la + +test_bus_server_SOURCES = \ + src/libsystemd/sd-bus/test-bus-server.c + +test_bus_server_LDADD = \ + libshared.la + +test_bus_objects_SOURCES = \ + src/libsystemd/sd-bus/test-bus-objects.c + +test_bus_objects_LDADD = \ + libshared.la + +test_bus_error_SOURCES = \ + src/libsystemd/sd-bus/test-bus-error.c + +test_bus_error_LDADD = \ + libshared.la + +test_bus_gvariant_SOURCES = \ + src/libsystemd/sd-bus/test-bus-gvariant.c + +test_bus_gvariant_LDADD = \ + libshared.la \ + $(GLIB_LIBS) + +test_bus_gvariant_CFLAGS = \ + $(AM_CFLAGS) \ + $(GLIB_CFLAGS) + +test_bus_creds_SOURCES = \ + src/libsystemd/sd-bus/test-bus-creds.c + +test_bus_creds_LDADD = \ + libshared.la + +test_bus_match_SOURCES = \ + src/libsystemd/sd-bus/test-bus-match.c + +test_bus_match_LDADD = \ + libshared.la + +test_bus_proxy_SOURCES = \ + src/libsystemd/sd-bus/test-bus-proxy.c + +test_bus_proxy_LDADD = \ + libshared.la + +test_bus_kernel_SOURCES = \ + src/libsystemd/sd-bus/test-bus-kernel.c + +test_bus_kernel_LDADD = \ + libshared.la + +test_bus_kernel_bloom_SOURCES = \ + src/libsystemd/sd-bus/test-bus-kernel-bloom.c + +test_bus_kernel_bloom_LDADD = \ + libshared.la + +test_bus_benchmark_SOURCES = \ + src/libsystemd/sd-bus/test-bus-benchmark.c + +test_bus_benchmark_LDADD = \ + libshared.la + +test_bus_zero_copy_SOURCES = \ + src/libsystemd/sd-bus/test-bus-zero-copy.c + +test_bus_zero_copy_LDADD = \ + libshared.la + +test_bus_introspect_SOURCES = \ + src/libsystemd/sd-bus/test-bus-introspect.c + +test_bus_introspect_LDADD = \ + libshared.la + +test_event_SOURCES = \ + src/libsystemd/sd-event/test-event.c + +test_event_LDADD = \ + libshared.la + +test_netlink_SOURCES = \ + src/libsystemd/sd-netlink/test-netlink.c + +test_netlink_LDADD = \ + libshared.la + +test_local_addresses_SOURCES = \ + src/libsystemd/sd-netlink/test-local-addresses.c + +test_local_addresses_LDADD = \ + libshared.la + +test_resolve_SOURCES = \ + src/libsystemd/sd-resolve/test-resolve.c + +test_resolve_LDADD = \ + libshared.la + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/libsystemd/sd-bus/DIFFERENCES b/src/libsystemd/libsystemd-internal/sd-bus/DIFFERENCES index db269675a7..db269675a7 100644 --- a/src/libsystemd/sd-bus/DIFFERENCES +++ b/src/libsystemd/libsystemd-internal/sd-bus/DIFFERENCES diff --git a/src/libsystemd/sd-bus/GVARIANT-SERIALIZATION b/src/libsystemd/libsystemd-internal/sd-bus/GVARIANT-SERIALIZATION index 6aeb11364a..6aeb11364a 100644 --- a/src/libsystemd/sd-bus/GVARIANT-SERIALIZATION +++ b/src/libsystemd/libsystemd-internal/sd-bus/GVARIANT-SERIALIZATION diff --git a/src/libsystemd/sd-bus/PORTING-DBUS1 b/src/libsystemd/libsystemd-internal/sd-bus/PORTING-DBUS1 index 2dedb28bcf..2dedb28bcf 100644 --- a/src/libsystemd/sd-bus/PORTING-DBUS1 +++ b/src/libsystemd/libsystemd-internal/sd-bus/PORTING-DBUS1 diff --git a/src/libsystemd/sd-bus/bus-bloom.c b/src/libsystemd/libsystemd-internal/sd-bus/bus-bloom.c index 112769fcb6..112769fcb6 100644 --- a/src/libsystemd/sd-bus/bus-bloom.c +++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-bloom.c diff --git a/src/libsystemd/sd-bus/bus-bloom.h b/src/libsystemd/libsystemd-internal/sd-bus/bus-bloom.h index c824622b95..c824622b95 100644 --- a/src/libsystemd/sd-bus/bus-bloom.h +++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-bloom.h diff --git a/src/libsystemd/sd-bus/bus-common-errors.c b/src/libsystemd/libsystemd-internal/sd-bus/bus-common-errors.c index 3c19f2b108..2d8ca47987 100644 --- a/src/libsystemd/sd-bus/bus-common-errors.c +++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-common-errors.c @@ -19,7 +19,7 @@ #include <errno.h> -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "bus-common-errors.h" #include "bus-error.h" diff --git a/src/libsystemd/sd-bus/bus-common-errors.h b/src/libsystemd/libsystemd-internal/sd-bus/bus-common-errors.h index fab8748f46..fab8748f46 100644 --- a/src/libsystemd/sd-bus/bus-common-errors.h +++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-common-errors.h diff --git a/src/libsystemd/sd-bus/bus-container.c b/src/libsystemd/libsystemd-internal/sd-bus/bus-container.c index 3191d27ded..3191d27ded 100644 --- a/src/libsystemd/sd-bus/bus-container.c +++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-container.c diff --git a/src/libsystemd/sd-bus/bus-container.h b/src/libsystemd/libsystemd-internal/sd-bus/bus-container.h index 509ef45624..5cd6d15ede 100644 --- a/src/libsystemd/sd-bus/bus-container.h +++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-container.h @@ -19,7 +19,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-bus.h" +#include <systemd/sd-bus.h> int bus_container_connect_socket(sd_bus *b); int bus_container_connect_kernel(sd_bus *b); diff --git a/src/libsystemd/sd-bus/bus-control.c b/src/libsystemd/libsystemd-internal/sd-bus/bus-control.c index 05222b8d30..9a975baa24 100644 --- a/src/libsystemd/sd-bus/bus-control.c +++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-control.c @@ -24,7 +24,7 @@ #include <errno.h> #include <stddef.h> -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "alloc-util.h" #include "bus-bloom.h" diff --git a/src/libsystemd/sd-bus/bus-control.h b/src/libsystemd/libsystemd-internal/sd-bus/bus-control.h index c181aa7959..229c95efb0 100644 --- a/src/libsystemd/sd-bus/bus-control.h +++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-control.h @@ -19,7 +19,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "bus-match.h" diff --git a/src/libsystemd/sd-bus/bus-convenience.c b/src/libsystemd/libsystemd-internal/sd-bus/bus-convenience.c index 2d06bf541f..2d06bf541f 100644 --- a/src/libsystemd/sd-bus/bus-convenience.c +++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-convenience.c diff --git a/src/libsystemd/sd-bus/bus-creds.c b/src/libsystemd/libsystemd-internal/sd-bus/bus-creds.c index c4f693dee9..c4f693dee9 100644 --- a/src/libsystemd/sd-bus/bus-creds.c +++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-creds.c diff --git a/src/libsystemd/sd-bus/bus-creds.h b/src/libsystemd/libsystemd-internal/sd-bus/bus-creds.h index df8a1f1005..3e2311f91d 100644 --- a/src/libsystemd/sd-bus/bus-creds.h +++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-creds.h @@ -21,7 +21,7 @@ #include <stdbool.h> -#include "sd-bus.h" +#include <systemd/sd-bus.h> struct sd_bus_creds { bool allocated; diff --git a/src/libsystemd/sd-bus/bus-dump.c b/src/libsystemd/libsystemd-internal/sd-bus/bus-dump.c index 7c81e7a25d..7c81e7a25d 100644 --- a/src/libsystemd/sd-bus/bus-dump.c +++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-dump.c diff --git a/src/libsystemd/sd-bus/bus-dump.h b/src/libsystemd/libsystemd-internal/sd-bus/bus-dump.h index 874e86d09c..68fa043786 100644 --- a/src/libsystemd/sd-bus/bus-dump.h +++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-dump.h @@ -22,7 +22,7 @@ #include <stdbool.h> #include <stdio.h> -#include "sd-bus.h" +#include <systemd/sd-bus.h> enum { BUS_MESSAGE_DUMP_WITH_HEADER = 1, diff --git a/src/libsystemd/sd-bus/bus-error.c b/src/libsystemd/libsystemd-internal/sd-bus/bus-error.c index 26219bdeed..b6bb0c4a83 100644 --- a/src/libsystemd/sd-bus/bus-error.c +++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-error.c @@ -24,7 +24,7 @@ #include <stdlib.h> #include <string.h> -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "alloc-util.h" #include "bus-error.h" diff --git a/src/libsystemd/sd-bus/bus-error.h b/src/libsystemd/libsystemd-internal/sd-bus/bus-error.h index e2c4cf4b3f..b7aedf406d 100644 --- a/src/libsystemd/sd-bus/bus-error.h +++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-error.h @@ -21,7 +21,7 @@ #include <stdbool.h> -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "macro.h" diff --git a/src/libsystemd/sd-bus/bus-gvariant.c b/src/libsystemd/libsystemd-internal/sd-bus/bus-gvariant.c index 58782767fa..58782767fa 100644 --- a/src/libsystemd/sd-bus/bus-gvariant.c +++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-gvariant.c diff --git a/src/libsystemd/sd-bus/bus-gvariant.h b/src/libsystemd/libsystemd-internal/sd-bus/bus-gvariant.h index 6da637fb05..6da637fb05 100644 --- a/src/libsystemd/sd-bus/bus-gvariant.h +++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-gvariant.h diff --git a/src/libsystemd/sd-bus/bus-internal.c b/src/libsystemd/libsystemd-internal/sd-bus/bus-internal.c index caca679086..caca679086 100644 --- a/src/libsystemd/sd-bus/bus-internal.c +++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-internal.c diff --git a/src/libsystemd/sd-bus/bus-internal.h b/src/libsystemd/libsystemd-internal/sd-bus/bus-internal.h index 216d9f62bc..8c4c6fa772 100644 --- a/src/libsystemd/sd-bus/bus-internal.h +++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-internal.h @@ -22,7 +22,7 @@ #include <pthread.h> #include <sys/socket.h> -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "bus-error.h" #include "bus-kernel.h" diff --git a/src/libsystemd/sd-bus/bus-introspect.c b/src/libsystemd/libsystemd-internal/sd-bus/bus-introspect.c index 8f93edb8da..8f93edb8da 100644 --- a/src/libsystemd/sd-bus/bus-introspect.c +++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-introspect.c diff --git a/src/libsystemd/sd-bus/bus-introspect.h b/src/libsystemd/libsystemd-internal/sd-bus/bus-introspect.h index 8e2f3800ca..87ac03b26a 100644 --- a/src/libsystemd/sd-bus/bus-introspect.h +++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-introspect.h @@ -21,7 +21,7 @@ #include <stdio.h> -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "set.h" diff --git a/src/libsystemd/sd-bus/bus-kernel.c b/src/libsystemd/libsystemd-internal/sd-bus/bus-kernel.c index 0896eeb177..0896eeb177 100644 --- a/src/libsystemd/sd-bus/bus-kernel.c +++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-kernel.c diff --git a/src/libsystemd/sd-bus/bus-kernel.h b/src/libsystemd/libsystemd-internal/sd-bus/bus-kernel.h index 53ba3bdcf3..2927ba26a5 100644 --- a/src/libsystemd/sd-bus/bus-kernel.h +++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-kernel.h @@ -21,7 +21,7 @@ #include <stdbool.h> -#include "sd-bus.h" +#include <systemd/sd-bus.h> #define KDBUS_ITEM_NEXT(item) \ (typeof(item))(((uint8_t *)item) + ALIGN8((item)->size)) diff --git a/src/libsystemd/sd-bus/bus-match.c b/src/libsystemd/libsystemd-internal/sd-bus/bus-match.c index 397baf6f33..397baf6f33 100644 --- a/src/libsystemd/sd-bus/bus-match.c +++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-match.c diff --git a/src/libsystemd/sd-bus/bus-match.h b/src/libsystemd/libsystemd-internal/sd-bus/bus-match.h index 8cbbb63b11..3f71720185 100644 --- a/src/libsystemd/sd-bus/bus-match.h +++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-match.h @@ -19,7 +19,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "hashmap.h" diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/libsystemd-internal/sd-bus/bus-message.c index 7be28c509b..6a9e87c2d8 100644 --- a/src/libsystemd/sd-bus/bus-message.c +++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-message.c @@ -21,7 +21,7 @@ #include <fcntl.h> #include <sys/mman.h> -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "alloc-util.h" #include "bus-gvariant.h" diff --git a/src/libsystemd/sd-bus/bus-message.h b/src/libsystemd/libsystemd-internal/sd-bus/bus-message.h index 4710c106b9..6a2c2d533c 100644 --- a/src/libsystemd/sd-bus/bus-message.h +++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-message.h @@ -23,7 +23,7 @@ #include <stdbool.h> #include <sys/socket.h> -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "bus-creds.h" #include "bus-protocol.h" diff --git a/src/libsystemd/sd-bus/bus-objects.c b/src/libsystemd/libsystemd-internal/sd-bus/bus-objects.c index 1f285ae8a6..1f285ae8a6 100644 --- a/src/libsystemd/sd-bus/bus-objects.c +++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-objects.c diff --git a/src/libsystemd/sd-bus/bus-objects.h b/src/libsystemd/libsystemd-internal/sd-bus/bus-objects.h index e0b8c534ed..e0b8c534ed 100644 --- a/src/libsystemd/sd-bus/bus-objects.h +++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-objects.h diff --git a/src/libsystemd/sd-bus/bus-protocol.h b/src/libsystemd/libsystemd-internal/sd-bus/bus-protocol.h index 9d180cb284..9d180cb284 100644 --- a/src/libsystemd/sd-bus/bus-protocol.h +++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-protocol.h diff --git a/src/libsystemd/sd-bus/bus-signature.c b/src/libsystemd/libsystemd-internal/sd-bus/bus-signature.c index 7bc243494a..7bc243494a 100644 --- a/src/libsystemd/sd-bus/bus-signature.c +++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-signature.c diff --git a/src/libsystemd/sd-bus/bus-signature.h b/src/libsystemd/libsystemd-internal/sd-bus/bus-signature.h index 1e0cd7f587..1e0cd7f587 100644 --- a/src/libsystemd/sd-bus/bus-signature.h +++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-signature.h diff --git a/src/libsystemd/sd-bus/bus-slot.c b/src/libsystemd/libsystemd-internal/sd-bus/bus-slot.c index a8c74011bf..b1783cd4a9 100644 --- a/src/libsystemd/sd-bus/bus-slot.c +++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-slot.c @@ -17,7 +17,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "alloc-util.h" #include "bus-control.h" diff --git a/src/libsystemd/sd-bus/bus-slot.h b/src/libsystemd/libsystemd-internal/sd-bus/bus-slot.h index 3b8b94dc6b..b862799d1c 100644 --- a/src/libsystemd/sd-bus/bus-slot.h +++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-slot.h @@ -19,7 +19,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "bus-internal.h" diff --git a/src/libsystemd/sd-bus/bus-socket.c b/src/libsystemd/libsystemd-internal/sd-bus/bus-socket.c index a2fb391239..a0008190c5 100644 --- a/src/libsystemd/sd-bus/bus-socket.c +++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-socket.c @@ -22,8 +22,8 @@ #include <stdlib.h> #include <unistd.h> -#include "sd-bus.h" -#include "sd-daemon.h" +#include <systemd/sd-bus.h> +#include <systemd/sd-daemon.h> #include "alloc-util.h" #include "bus-internal.h" diff --git a/src/libsystemd/sd-bus/bus-socket.h b/src/libsystemd/libsystemd-internal/sd-bus/bus-socket.h index 684feead74..6e1d32e6a7 100644 --- a/src/libsystemd/sd-bus/bus-socket.h +++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-socket.h @@ -19,7 +19,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-bus.h" +#include <systemd/sd-bus.h> void bus_socket_setup(sd_bus *b); diff --git a/src/libsystemd/sd-bus/bus-track.c b/src/libsystemd/libsystemd-internal/sd-bus/bus-track.c index bdbf7d4a85..5d08b0a37b 100644 --- a/src/libsystemd/sd-bus/bus-track.c +++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-track.c @@ -17,7 +17,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "alloc-util.h" #include "bus-internal.h" diff --git a/src/libsystemd/sd-bus/bus-track.h b/src/libsystemd/libsystemd-internal/sd-bus/bus-track.h index 7d93a727d6..7d93a727d6 100644 --- a/src/libsystemd/sd-bus/bus-track.h +++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-track.h diff --git a/src/libsystemd/sd-bus/bus-type.c b/src/libsystemd/libsystemd-internal/sd-bus/bus-type.c index c692afc580..c692afc580 100644 --- a/src/libsystemd/sd-bus/bus-type.c +++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-type.c diff --git a/src/libsystemd/sd-bus/bus-type.h b/src/libsystemd/libsystemd-internal/sd-bus/bus-type.h index 5c87eb5f08..7169b0f765 100644 --- a/src/libsystemd/sd-bus/bus-type.h +++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-type.h @@ -21,7 +21,7 @@ #include <stdbool.h> -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "macro.h" diff --git a/src/libsystemd/sd-bus/kdbus.h b/src/libsystemd/libsystemd-internal/sd-bus/kdbus.h index ecffc6b13c..ecffc6b13c 100644 --- a/src/libsystemd/sd-bus/kdbus.h +++ b/src/libsystemd/libsystemd-internal/sd-bus/kdbus.h diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/libsystemd-internal/sd-bus/sd-bus.c index c6f626d8aa..850949fa25 100644 --- a/src/libsystemd/sd-bus/sd-bus.c +++ b/src/libsystemd/libsystemd-internal/sd-bus/sd-bus.c @@ -25,7 +25,7 @@ #include <sys/mman.h> #include <unistd.h> -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "alloc-util.h" #include "bus-container.h" diff --git a/src/libsystemd/sd-bus/test-bus-benchmark.c b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-benchmark.c index 56ac2ab3dd..a222d36bb4 100644 --- a/src/libsystemd/sd-bus/test-bus-benchmark.c +++ b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-benchmark.c @@ -19,7 +19,7 @@ #include <sys/wait.h> -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "alloc-util.h" #include "bus-internal.h" diff --git a/src/libsystemd/sd-bus/test-bus-chat.c b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-chat.c index 048c0d19e2..1f028d2b23 100644 --- a/src/libsystemd/sd-bus/test-bus-chat.c +++ b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-chat.c @@ -22,7 +22,7 @@ #include <stdlib.h> #include <unistd.h> -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "alloc-util.h" #include "bus-error.h" diff --git a/src/libsystemd/sd-bus/test-bus-cleanup.c b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-cleanup.c index 250a5b2908..bd4a3fbf34 100644 --- a/src/libsystemd/sd-bus/test-bus-cleanup.c +++ b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-cleanup.c @@ -19,7 +19,7 @@ #include <stdio.h> -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "bus-internal.h" #include "bus-message.h" diff --git a/src/libsystemd/sd-bus/test-bus-creds.c b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-creds.c index e9ef483bdd..c58b76c258 100644 --- a/src/libsystemd/sd-bus/test-bus-creds.c +++ b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-creds.c @@ -17,7 +17,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "bus-dump.h" #include "bus-util.h" diff --git a/src/libsystemd/sd-bus/test-bus-error.c b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-error.c index 46d18abd29..b9ceda7a8b 100644 --- a/src/libsystemd/sd-bus/test-bus-error.c +++ b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-error.c @@ -17,7 +17,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "bus-common-errors.h" #include "bus-error.h" diff --git a/src/libsystemd/sd-bus/test-bus-gvariant.c b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-gvariant.c index 83f114a0fe..3c9ec9fef0 100644 --- a/src/libsystemd/sd-bus/test-bus-gvariant.c +++ b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-gvariant.c @@ -21,7 +21,7 @@ #include <glib.h> #endif -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "alloc-util.h" #include "bus-dump.h" diff --git a/src/libsystemd/sd-bus/test-bus-introspect.c b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-introspect.c index 4425cfae26..4425cfae26 100644 --- a/src/libsystemd/sd-bus/test-bus-introspect.c +++ b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-introspect.c diff --git a/src/libsystemd/sd-bus/test-bus-kernel-bloom.c b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-kernel-bloom.c index eb6179d7d2..f16e14a310 100644 --- a/src/libsystemd/sd-bus/test-bus-kernel-bloom.c +++ b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-kernel-bloom.c @@ -17,7 +17,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "alloc-util.h" #include "bus-kernel.h" diff --git a/src/libsystemd/sd-bus/test-bus-kernel.c b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-kernel.c index 2214817312..2a5ba60cc9 100644 --- a/src/libsystemd/sd-bus/test-bus-kernel.c +++ b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-kernel.c @@ -19,7 +19,7 @@ #include <fcntl.h> -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "alloc-util.h" #include "bus-dump.h" diff --git a/src/libsystemd/sd-bus/test-bus-marshal.c b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-marshal.c index a28cc5b79e..45db4764a0 100644 --- a/src/libsystemd/sd-bus/test-bus-marshal.c +++ b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-marshal.c @@ -28,7 +28,7 @@ #include <dbus/dbus.h> #endif -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "alloc-util.h" #include "bus-dump.h" diff --git a/src/libsystemd/sd-bus/test-bus-match.c b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-match.c index 29c4529f95..29c4529f95 100644 --- a/src/libsystemd/sd-bus/test-bus-match.c +++ b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-match.c diff --git a/src/libsystemd/sd-bus/test-bus-objects.c b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-objects.c index f11cafd888..e9bb655665 100644 --- a/src/libsystemd/sd-bus/test-bus-objects.c +++ b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-objects.c @@ -20,7 +20,7 @@ #include <pthread.h> #include <stdlib.h> -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "alloc-util.h" #include "bus-dump.h" diff --git a/src/libsystemd/sd-bus/test-bus-proxy.c b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-proxy.c index 45d0a5ffce..a9fe44e66c 100644 --- a/src/libsystemd/sd-bus/test-bus-proxy.c +++ b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-proxy.c @@ -21,7 +21,7 @@ #include <fcntl.h> #include <stdlib.h> -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "alloc-util.h" #include "bus-dump.h" diff --git a/src/libsystemd/sd-bus/test-bus-server.c b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-server.c index b6272efc30..190410674b 100644 --- a/src/libsystemd/sd-bus/test-bus-server.c +++ b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-server.c @@ -20,7 +20,7 @@ #include <pthread.h> #include <stdlib.h> -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "bus-internal.h" #include "bus-util.h" diff --git a/src/libsystemd/sd-bus/test-bus-signature.c b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-signature.c index 4f4fd093bf..4f4fd093bf 100644 --- a/src/libsystemd/sd-bus/test-bus-signature.c +++ b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-signature.c diff --git a/src/libsystemd/sd-bus/test-bus-zero-copy.c b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-zero-copy.c index 3380e8500a..9e20d67670 100644 --- a/src/libsystemd/sd-bus/test-bus-zero-copy.c +++ b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-zero-copy.c @@ -19,7 +19,7 @@ #include <sys/mman.h> -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "alloc-util.h" #include "bus-dump.h" diff --git a/src/libsystemd/sd-daemon/sd-daemon.c b/src/libsystemd/libsystemd-internal/sd-daemon/sd-daemon.c index 4e50b61979..7c79a938b9 100644 --- a/src/libsystemd/sd-daemon/sd-daemon.c +++ b/src/libsystemd/libsystemd-internal/sd-daemon/sd-daemon.c @@ -31,7 +31,7 @@ #include <sys/un.h> #include <unistd.h> -#include "sd-daemon.h" +#include <systemd/sd-daemon.h> #include "alloc-util.h" #include "fd-util.h" diff --git a/src/libsystemd/sd-device/device-enumerator-private.h b/src/libsystemd/libsystemd-internal/sd-device/device-enumerator-private.h index eb06f9542d..d46e26b56e 100644 --- a/src/libsystemd/sd-device/device-enumerator-private.h +++ b/src/libsystemd/libsystemd-internal/sd-device/device-enumerator-private.h @@ -19,7 +19,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-device.h" +#include <systemd/sd-device.h> int device_enumerator_scan_devices(sd_device_enumerator *enumeartor); int device_enumerator_scan_subsystems(sd_device_enumerator *enumeartor); diff --git a/src/libsystemd/sd-device/device-enumerator.c b/src/libsystemd/libsystemd-internal/sd-device/device-enumerator.c index 4a7a8b1f9e..796728ee0e 100644 --- a/src/libsystemd/sd-device/device-enumerator.c +++ b/src/libsystemd/libsystemd-internal/sd-device/device-enumerator.c @@ -18,7 +18,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-device.h" +#include <systemd/sd-device.h> #include "alloc-util.h" #include "device-enumerator-private.h" diff --git a/src/libsystemd/sd-device/device-internal.h b/src/libsystemd/libsystemd-internal/sd-device/device-internal.h index b96441de56..b96441de56 100644 --- a/src/libsystemd/sd-device/device-internal.h +++ b/src/libsystemd/libsystemd-internal/sd-device/device-internal.h diff --git a/src/libsystemd/sd-device/device-private.c b/src/libsystemd/libsystemd-internal/sd-device/device-private.c index f2af3ab3ae..bf7d3c6f9f 100644 --- a/src/libsystemd/sd-device/device-private.c +++ b/src/libsystemd/libsystemd-internal/sd-device/device-private.c @@ -22,7 +22,7 @@ #include <net/if.h> #include <sys/types.h> -#include "sd-device.h" +#include <systemd/sd-device.h> #include "alloc-util.h" #include "device-internal.h" diff --git a/src/libsystemd/sd-device/device-private.h b/src/libsystemd/libsystemd-internal/sd-device/device-private.h index 29b3e155fb..d6add2f7b2 100644 --- a/src/libsystemd/sd-device/device-private.h +++ b/src/libsystemd/libsystemd-internal/sd-device/device-private.h @@ -23,7 +23,7 @@ #include <stdbool.h> #include <sys/types.h> -#include "sd-device.h" +#include <systemd/sd-device.h> int device_new_from_nulstr(sd_device **ret, uint8_t *nulstr, size_t len); int device_new_from_strv(sd_device **ret, char **strv); diff --git a/src/libsystemd/sd-device/device-util.h b/src/libsystemd/libsystemd-internal/sd-device/device-util.h index 5b42e11de6..5b42e11de6 100644 --- a/src/libsystemd/sd-device/device-util.h +++ b/src/libsystemd/libsystemd-internal/sd-device/device-util.h diff --git a/src/libsystemd/sd-device/sd-device.c b/src/libsystemd/libsystemd-internal/sd-device/sd-device.c index 9633e46ce0..895002499c 100644 --- a/src/libsystemd/sd-device/sd-device.c +++ b/src/libsystemd/libsystemd-internal/sd-device/sd-device.c @@ -22,7 +22,7 @@ #include <net/if.h> #include <sys/types.h> -#include "sd-device.h" +#include <systemd/sd-device.h> #include "alloc-util.h" #include "device-internal.h" diff --git a/src/libsystemd/sd-event/sd-event.c b/src/libsystemd/libsystemd-internal/sd-event/sd-event.c index deef6ba9d3..0fec8d71b2 100644 --- a/src/libsystemd/sd-event/sd-event.c +++ b/src/libsystemd/libsystemd-internal/sd-event/sd-event.c @@ -21,9 +21,9 @@ #include <sys/timerfd.h> #include <sys/wait.h> -#include "sd-daemon.h" -#include "sd-event.h" -#include "sd-id128.h" +#include <systemd/sd-daemon.h> +#include <systemd/sd-event.h> +#include <systemd/sd-id128.h> #include "alloc-util.h" #include "fd-util.h" diff --git a/src/libsystemd/sd-event/test-event.c b/src/libsystemd/libsystemd-internal/sd-event/test-event.c index daea4126f8..6beb1b08cd 100644 --- a/src/libsystemd/sd-event/test-event.c +++ b/src/libsystemd/libsystemd-internal/sd-event/test-event.c @@ -17,7 +17,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-event.h" +#include <systemd/sd-event.h> #include "fd-util.h" #include "log.h" diff --git a/src/libsystemd/sd-hwdb/hwdb-internal.h b/src/libsystemd/libsystemd-internal/sd-hwdb/hwdb-internal.h index 13fddfc8ad..13fddfc8ad 100644 --- a/src/libsystemd/sd-hwdb/hwdb-internal.h +++ b/src/libsystemd/libsystemd-internal/sd-hwdb/hwdb-internal.h diff --git a/src/libsystemd/sd-hwdb/hwdb-util.h b/src/libsystemd/libsystemd-internal/sd-hwdb/hwdb-util.h index 5e21e5008b..05dc47962b 100644 --- a/src/libsystemd/sd-hwdb/hwdb-util.h +++ b/src/libsystemd/libsystemd-internal/sd-hwdb/hwdb-util.h @@ -19,7 +19,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-hwdb.h" +#include <systemd/sd-hwdb.h> #include "util.h" diff --git a/src/libsystemd/sd-hwdb/sd-hwdb.c b/src/libsystemd/libsystemd-internal/sd-hwdb/sd-hwdb.c index 062fa97b17..7dcfe95b87 100644 --- a/src/libsystemd/sd-hwdb/sd-hwdb.c +++ b/src/libsystemd/libsystemd-internal/sd-hwdb/sd-hwdb.c @@ -27,7 +27,7 @@ #include <string.h> #include <sys/mman.h> -#include "sd-hwdb.h" +#include <systemd/sd-hwdb.h> #include "alloc-util.h" #include "fd-util.h" diff --git a/src/libsystemd/sd-id128/sd-id128.c b/src/libsystemd/libsystemd-internal/sd-id128/sd-id128.c index d9c0116f60..cda3e9f0df 100644 --- a/src/libsystemd/sd-id128/sd-id128.c +++ b/src/libsystemd/libsystemd-internal/sd-id128/sd-id128.c @@ -21,7 +21,7 @@ #include <fcntl.h> #include <unistd.h> -#include "sd-id128.h" +#include <systemd/sd-id128.h> #include "fd-util.h" #include "hexdecoct.h" diff --git a/src/libsystemd/sd-login/sd-login.c b/src/libsystemd/libsystemd-internal/sd-login/sd-login.c index 9d4f187502..84831d5e95 100644 --- a/src/libsystemd/sd-login/sd-login.c +++ b/src/libsystemd/libsystemd-internal/sd-login/sd-login.c @@ -23,7 +23,7 @@ #include <sys/inotify.h> #include <unistd.h> -#include "sd-login.h" +#include <systemd/sd-login.h> #include "alloc-util.h" #include "cgroup-util.h" diff --git a/src/libsystemd/sd-login/test-login.c b/src/libsystemd/libsystemd-internal/sd-login/test-login.c index c1fd7dd33e..994c76df4a 100644 --- a/src/libsystemd/sd-login/test-login.c +++ b/src/libsystemd/libsystemd-internal/sd-login/test-login.c @@ -20,7 +20,7 @@ #include <poll.h> #include <string.h> -#include "sd-login.h" +#include <systemd/sd-login.h> #include "alloc-util.h" #include "fd-util.h" diff --git a/src/libsystemd/sd-netlink/local-addresses.c b/src/libsystemd/libsystemd-internal/sd-netlink/local-addresses.c index 6abd8fd0cc..e6feb859cd 100644 --- a/src/libsystemd/sd-netlink/local-addresses.c +++ b/src/libsystemd/libsystemd-internal/sd-netlink/local-addresses.c @@ -18,7 +18,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-netlink.h" +#include <systemd/sd-netlink.h> #include "alloc-util.h" #include "local-addresses.h" diff --git a/src/libsystemd/sd-netlink/local-addresses.h b/src/libsystemd/libsystemd-internal/sd-netlink/local-addresses.h index 18d71e797e..1ddc50ace5 100644 --- a/src/libsystemd/sd-netlink/local-addresses.h +++ b/src/libsystemd/libsystemd-internal/sd-netlink/local-addresses.h @@ -20,7 +20,7 @@ ***/ -#include "sd-netlink.h" +#include <systemd/sd-netlink.h> #include "in-addr-util.h" diff --git a/src/libsystemd/sd-netlink/netlink-internal.h b/src/libsystemd/libsystemd-internal/sd-netlink/netlink-internal.h index dcfb080ad3..1d29c3a369 100644 --- a/src/libsystemd/sd-netlink/netlink-internal.h +++ b/src/libsystemd/libsystemd-internal/sd-netlink/netlink-internal.h @@ -21,7 +21,7 @@ #include <linux/netlink.h> -#include "sd-netlink.h" +#include <systemd/sd-netlink.h> #include "list.h" #include "netlink-types.h" diff --git a/src/libsystemd/sd-netlink/netlink-message.c b/src/libsystemd/libsystemd-internal/sd-netlink/netlink-message.c index 3a866fdafe..0c307661f1 100644 --- a/src/libsystemd/sd-netlink/netlink-message.c +++ b/src/libsystemd/libsystemd-internal/sd-netlink/netlink-message.c @@ -21,7 +21,7 @@ #include <stdbool.h> #include <unistd.h> -#include "sd-netlink.h" +#include <systemd/sd-netlink.h> #include "alloc-util.h" #include "formats-util.h" diff --git a/src/libsystemd/sd-netlink/netlink-socket.c b/src/libsystemd/libsystemd-internal/sd-netlink/netlink-socket.c index 590fc53fc7..25b7509217 100644 --- a/src/libsystemd/sd-netlink/netlink-socket.c +++ b/src/libsystemd/libsystemd-internal/sd-netlink/netlink-socket.c @@ -21,7 +21,7 @@ #include <stdbool.h> #include <unistd.h> -#include "sd-netlink.h" +#include <systemd/sd-netlink.h> #include "alloc-util.h" #include "formats-util.h" diff --git a/src/libsystemd/sd-netlink/netlink-types.c b/src/libsystemd/libsystemd-internal/sd-netlink/netlink-types.c index a5758bb516..a5758bb516 100644 --- a/src/libsystemd/sd-netlink/netlink-types.c +++ b/src/libsystemd/libsystemd-internal/sd-netlink/netlink-types.c diff --git a/src/libsystemd/sd-netlink/netlink-types.h b/src/libsystemd/libsystemd-internal/sd-netlink/netlink-types.h index ecb20bfcdc..ecb20bfcdc 100644 --- a/src/libsystemd/sd-netlink/netlink-types.h +++ b/src/libsystemd/libsystemd-internal/sd-netlink/netlink-types.h diff --git a/src/libsystemd/sd-netlink/netlink-util.c b/src/libsystemd/libsystemd-internal/sd-netlink/netlink-util.c index 73b9ac0258..828ae7db7f 100644 --- a/src/libsystemd/sd-netlink/netlink-util.c +++ b/src/libsystemd/libsystemd-internal/sd-netlink/netlink-util.c @@ -17,7 +17,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-netlink.h" +#include <systemd/sd-netlink.h> #include "netlink-internal.h" #include "netlink-util.h" diff --git a/src/libsystemd/sd-netlink/netlink-util.h b/src/libsystemd/libsystemd-internal/sd-netlink/netlink-util.h index f49bf4eaa6..e8f932549f 100644 --- a/src/libsystemd/sd-netlink/netlink-util.h +++ b/src/libsystemd/libsystemd-internal/sd-netlink/netlink-util.h @@ -19,7 +19,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-netlink.h" +#include <systemd/sd-netlink.h> #include "util.h" diff --git a/src/libsystemd/sd-netlink/rtnl-message.c b/src/libsystemd/libsystemd-internal/sd-netlink/rtnl-message.c index 090552f576..2f1254295a 100644 --- a/src/libsystemd/sd-netlink/rtnl-message.c +++ b/src/libsystemd/libsystemd-internal/sd-netlink/rtnl-message.c @@ -21,7 +21,7 @@ #include <stdbool.h> #include <unistd.h> -#include "sd-netlink.h" +#include <systemd/sd-netlink.h> #include "formats-util.h" #include "missing.h" diff --git a/src/libsystemd/sd-netlink/sd-netlink.c b/src/libsystemd/libsystemd-internal/sd-netlink/sd-netlink.c index 4833815b43..c536364a24 100644 --- a/src/libsystemd/sd-netlink/sd-netlink.c +++ b/src/libsystemd/libsystemd-internal/sd-netlink/sd-netlink.c @@ -20,7 +20,7 @@ #include <poll.h> #include <sys/socket.h> -#include "sd-netlink.h" +#include <systemd/sd-netlink.h> #include "alloc-util.h" #include "fd-util.h" diff --git a/src/libsystemd/sd-netlink/test-local-addresses.c b/src/libsystemd/libsystemd-internal/sd-netlink/test-local-addresses.c index e0e28cc0cc..e0e28cc0cc 100644 --- a/src/libsystemd/sd-netlink/test-local-addresses.c +++ b/src/libsystemd/libsystemd-internal/sd-netlink/test-local-addresses.c diff --git a/src/libsystemd/sd-netlink/test-netlink.c b/src/libsystemd/libsystemd-internal/sd-netlink/test-netlink.c index de5e0ffc8f..e16c35144d 100644 --- a/src/libsystemd/sd-netlink/test-netlink.c +++ b/src/libsystemd/libsystemd-internal/sd-netlink/test-netlink.c @@ -20,7 +20,7 @@ #include <net/if.h> #include <netinet/ether.h> -#include "sd-netlink.h" +#include <systemd/sd-netlink.h> #include "ether-addr-util.h" #include "macro.h" diff --git a/src/libsystemd/sd-network/network-util.c b/src/libsystemd/libsystemd-internal/sd-network/network-util.c index a0d9b5f1a4..a0d9b5f1a4 100644 --- a/src/libsystemd/sd-network/network-util.c +++ b/src/libsystemd/libsystemd-internal/sd-network/network-util.c diff --git a/src/libsystemd/sd-network/network-util.h b/src/libsystemd/libsystemd-internal/sd-network/network-util.h index 26780dce28..8c4dbc68b1 100644 --- a/src/libsystemd/sd-network/network-util.h +++ b/src/libsystemd/libsystemd-internal/sd-network/network-util.h @@ -19,6 +19,6 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-network.h" +#include <systemd/sd-network.h> bool network_is_online(void); diff --git a/src/libsystemd/sd-network/sd-network.c b/src/libsystemd/libsystemd-internal/sd-network/sd-network.c index 62051992ef..5ebe7de7af 100644 --- a/src/libsystemd/sd-network/sd-network.c +++ b/src/libsystemd/libsystemd-internal/sd-network/sd-network.c @@ -23,7 +23,7 @@ #include <string.h> #include <sys/inotify.h> -#include "sd-network.h" +#include <systemd/sd-network.h> #include "alloc-util.h" #include "fd-util.h" diff --git a/src/libsystemd/sd-path/sd-path.c b/src/libsystemd/libsystemd-internal/sd-path/sd-path.c index 480f1ad065..61a8b092da 100644 --- a/src/libsystemd/sd-path/sd-path.c +++ b/src/libsystemd/libsystemd-internal/sd-path/sd-path.c @@ -17,7 +17,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-path.h" +#include <systemd/sd-path.h> #include "alloc-util.h" #include "architecture.h" diff --git a/src/libsystemd/sd-resolve/sd-resolve.c b/src/libsystemd/libsystemd-internal/sd-resolve/sd-resolve.c index 653dbfbe57..30176d7283 100644 --- a/src/libsystemd/sd-resolve/sd-resolve.c +++ b/src/libsystemd/libsystemd-internal/sd-resolve/sd-resolve.c @@ -29,7 +29,7 @@ #include <sys/prctl.h> #include <unistd.h> -#include "sd-resolve.h" +#include <systemd/sd-resolve.h> #include "alloc-util.h" #include "fd-util.h" diff --git a/src/libsystemd/sd-resolve/test-resolve.c b/src/libsystemd/libsystemd-internal/sd-resolve/test-resolve.c index 33ef6fc0f7..9e3ac16597 100644 --- a/src/libsystemd/sd-resolve/test-resolve.c +++ b/src/libsystemd/libsystemd-internal/sd-resolve/test-resolve.c @@ -26,7 +26,7 @@ #include <string.h> #include <sys/socket.h> -#include "sd-resolve.h" +#include <systemd/sd-resolve.h> #include "alloc-util.h" #include "macro.h" diff --git a/src/libsystemd/sd-utf8/sd-utf8.c b/src/libsystemd/libsystemd-internal/sd-utf8/sd-utf8.c index 33a5a04ea1..77be8e1996 100644 --- a/src/libsystemd/sd-utf8/sd-utf8.c +++ b/src/libsystemd/libsystemd-internal/sd-utf8/sd-utf8.c @@ -17,7 +17,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-utf8.h" +#include <systemd/sd-utf8.h> #include "utf8.h" #include "util.h" diff --git a/src/libsystemd/libsystemd-journal-internal/Makefile b/src/libsystemd/libsystemd-journal-internal/Makefile new file mode 100644 index 0000000000..dffb4176ee --- /dev/null +++ b/src/libsystemd/libsystemd-journal-internal/Makefile @@ -0,0 +1,112 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +audit_list_includes = -include linux/audit.h -include missing.h +ifneq ($(HAVE_AUDIT),) +audit_list_includes += -include libaudit.h +endif # HAVE_AUDIT + +$(outdir)/audit_type-list.txt: + $(AM_V_GEN)$(CPP) $(ALL_CPPFLAGS) -dM $(audit_list_includes) - </dev/null | grep -vE 'AUDIT_.*(FIRST|LAST)_' | $(SED) -r -n 's/^#define\s+AUDIT_(\w+)\s+([0-9]{4})\s*$$/\1\t\2/p' | sort -k2 >$@ + +$(outdir)/audit_type-to-name.h: $(outdir)/audit_type-list.txt + $(AM_V_GEN)$(AWK) 'BEGIN{ print "const char *audit_type_to_string(int type) {\n\tswitch(type) {" } {printf " case AUDIT_%s: return \"%s\";\n", $$1, $$1 } END{ print " default: return NULL;\n\t}\n}\n" }' <$< >$@ + +pkginclude_HEADERS += \ + src/systemd/sd-journal.h \ + src/systemd/sd-messages.h \ + src/systemd/_sd-common.h + +libsystemd_journal_internal_la_SOURCES = \ + src/journal/sd-journal.c \ + src/systemd/sd-journal.h \ + src/systemd/_sd-common.h \ + src/journal/journal-file.c \ + src/journal/journal-file.h \ + src/journal/journal-vacuum.c \ + src/journal/journal-vacuum.h \ + src/journal/journal-verify.c \ + src/journal/journal-verify.h \ + src/journal/lookup3.c \ + src/journal/lookup3.h \ + src/journal/journal-send.c \ + src/journal/journal-def.h \ + src/journal/compress.h \ + src/journal/catalog.c \ + src/journal/catalog.h \ + src/journal/mmap-cache.c \ + src/journal/mmap-cache.h \ + src/journal/compress.c \ + src/journal/audit-type.h \ + src/journal/audit-type.c + +nodist_libsystemd_journal_internal_la_SOURCES = \ + src/journal/audit_type-to-name.h + +gperf_txt_sources += \ + src/journal/audit_type-list.txt + +# using _CFLAGS = in the conditional below would suppress AM_CFLAGS +libsystemd_journal_internal_la_CFLAGS = \ + $(AM_CFLAGS) + +libsystemd_journal_internal_la_LIBADD = + +ifneq ($(HAVE_XZ),) +libsystemd_journal_internal_la_CFLAGS += \ + $(XZ_CFLAGS) + +libsystemd_journal_internal_la_LIBADD += \ + $(XZ_LIBS) +endif # HAVE_XZ + +ifneq ($(HAVE_LZ4),) +libsystemd_journal_internal_la_CFLAGS += \ + $(LZ4_CFLAGS) + +libsystemd_journal_internal_la_LIBADD += \ + $(LZ4_LIBS) +endif # HAVE_LZ4 + +ifneq ($(HAVE_GCRYPT),) +libsystemd_journal_internal_la_SOURCES += \ + src/journal/journal-authenticate.c \ + src/journal/journal-authenticate.h \ + src/journal/fsprg.c \ + src/journal/fsprg.h + +libsystemd_journal_internal_la_LIBADD += \ + $(GCRYPT_LIBS) + +# fsprg.c is a drop-in file using void pointer arithmetic +libsystemd_journal_internal_la_CFLAGS += \ + $(GCRYPT_CFLAGS) \ + -Wno-pointer-arith +endif # HAVE_GCRYPT + +noinst_LTLIBRARIES += \ + libsystemd-journal-internal.la +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/journal/audit-type.c b/src/libsystemd/libsystemd-journal-internal/audit-type.c index 71e8790ca8..71e8790ca8 100644 --- a/src/journal/audit-type.c +++ b/src/libsystemd/libsystemd-journal-internal/audit-type.c diff --git a/src/journal/audit-type.h b/src/libsystemd/libsystemd-journal-internal/audit-type.h index 1dd2163707..1dd2163707 100644 --- a/src/journal/audit-type.h +++ b/src/libsystemd/libsystemd-journal-internal/audit-type.h diff --git a/src/journal/catalog.c b/src/libsystemd/libsystemd-journal-internal/catalog.c index 164a3a15f2..962ca238b9 100644 --- a/src/journal/catalog.c +++ b/src/libsystemd/libsystemd-journal-internal/catalog.c @@ -25,7 +25,7 @@ #include <sys/mman.h> #include <unistd.h> -#include "sd-id128.h" +#include <systemd/sd-id128.h> #include "alloc-util.h" #include "catalog.h" diff --git a/src/journal/catalog.h b/src/libsystemd/libsystemd-journal-internal/catalog.h index 1b1014b335..b621de3068 100644 --- a/src/journal/catalog.h +++ b/src/libsystemd/libsystemd-journal-internal/catalog.h @@ -21,7 +21,7 @@ #include <stdbool.h> -#include "sd-id128.h" +#include <systemd/sd-id128.h> #include "hashmap.h" #include "strbuf.h" diff --git a/src/journal/compress.c b/src/libsystemd/libsystemd-journal-internal/compress.c index 1933b87b00..1933b87b00 100644 --- a/src/journal/compress.c +++ b/src/libsystemd/libsystemd-journal-internal/compress.c diff --git a/src/journal/compress.h b/src/libsystemd/libsystemd-journal-internal/compress.h index c138099d9a..c138099d9a 100644 --- a/src/journal/compress.h +++ b/src/libsystemd/libsystemd-journal-internal/compress.h diff --git a/src/journal/fsprg.c b/src/libsystemd/libsystemd-journal-internal/fsprg.c index 8f7e137e74..8f7e137e74 100644 --- a/src/journal/fsprg.c +++ b/src/libsystemd/libsystemd-journal-internal/fsprg.c diff --git a/src/journal/fsprg.h b/src/libsystemd/libsystemd-journal-internal/fsprg.h index 829b56e240..829b56e240 100644 --- a/src/journal/fsprg.h +++ b/src/libsystemd/libsystemd-journal-internal/fsprg.h diff --git a/src/journal/journal-authenticate.c b/src/libsystemd/libsystemd-journal-internal/journal-authenticate.c index 49f3c8f0f4..49f3c8f0f4 100644 --- a/src/journal/journal-authenticate.c +++ b/src/libsystemd/libsystemd-journal-internal/journal-authenticate.c diff --git a/src/journal/journal-authenticate.h b/src/libsystemd/libsystemd-journal-internal/journal-authenticate.h index 6c87319ede..6c87319ede 100644 --- a/src/journal/journal-authenticate.h +++ b/src/libsystemd/libsystemd-journal-internal/journal-authenticate.h diff --git a/src/journal/journal-def.h b/src/libsystemd/libsystemd-journal-internal/journal-def.h index 67edb43960..a0a052ce4f 100644 --- a/src/journal/journal-def.h +++ b/src/libsystemd/libsystemd-journal-internal/journal-def.h @@ -19,7 +19,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-id128.h" +#include <systemd/sd-id128.h> #include "macro.h" #include "sparse-endian.h" diff --git a/src/journal/journal-file.c b/src/libsystemd/libsystemd-journal-internal/journal-file.c index 912eb94d0a..4ea7013a53 100644 --- a/src/journal/journal-file.c +++ b/src/libsystemd/libsystemd-journal-internal/journal-file.c @@ -37,7 +37,7 @@ #include "lookup3.h" #include "parse-util.h" #include "random-util.h" -#include "sd-event.h" +#include <systemd/sd-event.h> #include "string-util.h" #include "xattr-util.h" diff --git a/src/journal/journal-file.h b/src/libsystemd/libsystemd-journal-internal/journal-file.h index 07b9561b8a..0414117d98 100644 --- a/src/journal/journal-file.h +++ b/src/libsystemd/libsystemd-journal-internal/journal-file.h @@ -25,13 +25,13 @@ #include <gcrypt.h> #endif -#include "sd-id128.h" +#include <systemd/sd-id128.h> #include "hashmap.h" #include "journal-def.h" #include "macro.h" #include "mmap-cache.h" -#include "sd-event.h" +#include <systemd/sd-event.h> #include "sparse-endian.h" typedef struct JournalMetrics { diff --git a/src/journal/journal-internal.h b/src/libsystemd/libsystemd-journal-internal/journal-internal.h index 7639325acf..8f21544ae1 100644 --- a/src/journal/journal-internal.h +++ b/src/libsystemd/libsystemd-journal-internal/journal-internal.h @@ -23,8 +23,8 @@ #include <stdbool.h> #include <sys/types.h> -#include "sd-id128.h" -#include "sd-journal.h" +#include <systemd/sd-id128.h> +#include <systemd/sd-journal.h> #include "hashmap.h" #include "journal-def.h" diff --git a/src/journal/journal-send.c b/src/libsystemd/libsystemd-journal-internal/journal-send.c index c7d670f4ff..b85d9d3c61 100644 --- a/src/journal/journal-send.c +++ b/src/libsystemd/libsystemd-journal-internal/journal-send.c @@ -27,7 +27,7 @@ #define SD_JOURNAL_SUPPRESS_LOCATION -#include "sd-journal.h" +#include <systemd/sd-journal.h> #include "alloc-util.h" #include "fd-util.h" diff --git a/src/journal/journal-vacuum.c b/src/libsystemd/libsystemd-journal-internal/journal-vacuum.c index 05e97620ae..3650ab3865 100644 --- a/src/journal/journal-vacuum.c +++ b/src/libsystemd/libsystemd-journal-internal/journal-vacuum.c @@ -21,7 +21,7 @@ #include <sys/stat.h> #include <unistd.h> -#include "sd-id128.h" +#include <systemd/sd-id128.h> #include "alloc-util.h" #include "dirent-util.h" diff --git a/src/journal/journal-vacuum.h b/src/libsystemd/libsystemd-journal-internal/journal-vacuum.h index 1e750a2170..1e750a2170 100644 --- a/src/journal/journal-vacuum.h +++ b/src/libsystemd/libsystemd-journal-internal/journal-vacuum.h diff --git a/src/journal/journal-verify.c b/src/libsystemd/libsystemd-journal-internal/journal-verify.c index b968e89bb8..b968e89bb8 100644 --- a/src/journal/journal-verify.c +++ b/src/libsystemd/libsystemd-journal-internal/journal-verify.c diff --git a/src/journal/journal-verify.h b/src/libsystemd/libsystemd-journal-internal/journal-verify.h index 8f0eaf6daa..8f0eaf6daa 100644 --- a/src/journal/journal-verify.h +++ b/src/libsystemd/libsystemd-journal-internal/journal-verify.h diff --git a/src/journal/lookup3.c b/src/libsystemd/libsystemd-journal-internal/lookup3.c index 3d791234f4..3d791234f4 100644 --- a/src/journal/lookup3.c +++ b/src/libsystemd/libsystemd-journal-internal/lookup3.c diff --git a/src/journal/lookup3.h b/src/libsystemd/libsystemd-journal-internal/lookup3.h index 787921ffbf..787921ffbf 100644 --- a/src/journal/lookup3.h +++ b/src/libsystemd/libsystemd-journal-internal/lookup3.h diff --git a/src/journal/mmap-cache.c b/src/libsystemd/libsystemd-journal-internal/mmap-cache.c index 9c0ce8ccbf..9c0ce8ccbf 100644 --- a/src/journal/mmap-cache.c +++ b/src/libsystemd/libsystemd-journal-internal/mmap-cache.c diff --git a/src/journal/mmap-cache.h b/src/libsystemd/libsystemd-journal-internal/mmap-cache.h index 199d944647..199d944647 100644 --- a/src/journal/mmap-cache.h +++ b/src/libsystemd/libsystemd-journal-internal/mmap-cache.h diff --git a/src/journal/sd-journal.c b/src/libsystemd/libsystemd-journal-internal/sd-journal.c index 5a2a28a8d4..1493f0348d 100644 --- a/src/journal/sd-journal.c +++ b/src/libsystemd/libsystemd-journal-internal/sd-journal.c @@ -26,7 +26,7 @@ #include <sys/vfs.h> #include <unistd.h> -#include "sd-journal.h" +#include <systemd/sd-journal.h> #include "alloc-util.h" #include "catalog.h" diff --git a/src/libsystemd/sd-bus/Makefile b/src/libsystemd/sd-bus/Makefile deleted file mode 120000 index 94aaae2c4d..0000000000 --- a/src/libsystemd/sd-bus/Makefile +++ /dev/null @@ -1 +0,0 @@ -../../Makefile
\ No newline at end of file diff --git a/src/libsystemd/sd-daemon/Makefile b/src/libsystemd/sd-daemon/Makefile deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/libsystemd/sd-daemon/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile
\ No newline at end of file diff --git a/src/libsystemd/sd-device/Makefile b/src/libsystemd/sd-device/Makefile deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/libsystemd/sd-device/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile
\ No newline at end of file diff --git a/src/libsystemd/sd-event/Makefile b/src/libsystemd/sd-event/Makefile deleted file mode 120000 index 94aaae2c4d..0000000000 --- a/src/libsystemd/sd-event/Makefile +++ /dev/null @@ -1 +0,0 @@ -../../Makefile
\ No newline at end of file diff --git a/src/libsystemd/sd-hwdb/Makefile b/src/libsystemd/sd-hwdb/Makefile deleted file mode 120000 index 94aaae2c4d..0000000000 --- a/src/libsystemd/sd-hwdb/Makefile +++ /dev/null @@ -1 +0,0 @@ -../../Makefile
\ No newline at end of file diff --git a/src/libsystemd/sd-id128/Makefile b/src/libsystemd/sd-id128/Makefile deleted file mode 120000 index 94aaae2c4d..0000000000 --- a/src/libsystemd/sd-id128/Makefile +++ /dev/null @@ -1 +0,0 @@ -../../Makefile
\ No newline at end of file diff --git a/src/libsystemd/sd-login/Makefile b/src/libsystemd/sd-login/Makefile deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/libsystemd/sd-login/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile
\ No newline at end of file diff --git a/src/libsystemd/sd-netlink/Makefile b/src/libsystemd/sd-netlink/Makefile deleted file mode 120000 index 94aaae2c4d..0000000000 --- a/src/libsystemd/sd-netlink/Makefile +++ /dev/null @@ -1 +0,0 @@ -../../Makefile
\ No newline at end of file diff --git a/src/libsystemd/sd-network/Makefile b/src/libsystemd/sd-network/Makefile deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/libsystemd/sd-network/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile
\ No newline at end of file diff --git a/src/libsystemd/sd-path/Makefile b/src/libsystemd/sd-path/Makefile deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/libsystemd/sd-path/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile
\ No newline at end of file diff --git a/src/libsystemd/sd-resolve/Makefile b/src/libsystemd/sd-resolve/Makefile deleted file mode 120000 index 94aaae2c4d..0000000000 --- a/src/libsystemd/sd-resolve/Makefile +++ /dev/null @@ -1 +0,0 @@ -../../Makefile
\ No newline at end of file diff --git a/src/libsystemd/sd-utf8/Makefile b/src/libsystemd/sd-utf8/Makefile deleted file mode 120000 index 94aaae2c4d..0000000000 --- a/src/libsystemd/sd-utf8/Makefile +++ /dev/null @@ -1 +0,0 @@ -../../Makefile
\ No newline at end of file diff --git a/src/libudev/Makefile b/src/libudev/Makefile deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/libudev/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile
\ No newline at end of file diff --git a/src/libudev/libudev.h b/src/libudev/include/libudev.h index eb58740d26..eb58740d26 100644 --- a/src/libudev/libudev.h +++ b/src/libudev/include/libudev.h diff --git a/src/libudev/.gitignore b/src/libudev/src/.gitignore index 0c8a5d5231..0c8a5d5231 100644 --- a/src/libudev/.gitignore +++ b/src/libudev/src/.gitignore diff --git a/src/libudev/src/Makefile b/src/libudev/src/Makefile new file mode 100644 index 0000000000..1dd575021c --- /dev/null +++ b/src/libudev/src/Makefile @@ -0,0 +1,78 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +LIBUDEV_CURRENT=7 +LIBUDEV_REVISION=4 +LIBUDEV_AGE=6 + +include_HEADERS += \ + src/libudev/libudev.h + +lib_LTLIBRARIES += \ + libudev.la + +libudev_la_SOURCES =\ + src/libudev/libudev.sym \ + src/libudev/libudev-private.h \ + src/libudev/libudev-device-internal.h \ + src/libudev/libudev.c \ + src/libudev/libudev-list.c \ + src/libudev/libudev-util.c \ + src/libudev/libudev-device.c \ + src/libudev/libudev-device-private.c \ + src/libudev/libudev-enumerate.c \ + src/libudev/libudev-monitor.c \ + src/libudev/libudev-queue.c \ + src/libudev/libudev-hwdb.c + +libudev_la_LDFLAGS = \ + $(AM_LDFLAGS) \ + -version-info $(LIBUDEV_CURRENT):$(LIBUDEV_REVISION):$(LIBUDEV_AGE) \ + -Wl,--version-script=$(top_srcdir)/src/libudev/libudev.sym + +libudev_la_LIBADD = \ + libsystemd-internal.la + +pkgconfiglib_DATA += \ + src/libudev/libudev.pc + +EXTRA_DIST += \ + src/libudev/libudev.pc.in + +test-libudev-sym.c: \ + src/libudev/libudev.sym \ + src/udev/udev.h + $(generate-sym-test) + +nodist_test_libudev_sym_SOURCES = \ + test-libudev-sym.c +test_libudev_sym_CFLAGS = \ + $(AM_CFLAGS) \ + -Wno-deprecated-declarations +test_libudev_sym_LDADD = \ + libudev.la + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/libudev/libudev-device-internal.h b/src/libudev/src/libudev-device-internal.h index 40d59201cf..de6f680819 100644 --- a/src/libudev/libudev-device-internal.h +++ b/src/libudev/src/libudev-device-internal.h @@ -21,7 +21,7 @@ #pragma once #include "libudev.h" -#include "sd-device.h" +#include <systemd/sd-device.h> #include "libudev-private.h" diff --git a/src/libudev/libudev-device-private.c b/src/libudev/src/libudev-device-private.c index 2aae0726c1..2aae0726c1 100644 --- a/src/libudev/libudev-device-private.c +++ b/src/libudev/src/libudev-device-private.c diff --git a/src/libudev/libudev-device.c b/src/libudev/src/libudev-device.c index 814e016800..6536f4cfbb 100644 --- a/src/libudev/libudev-device.c +++ b/src/libudev/src/libudev-device.c @@ -35,7 +35,7 @@ #include <unistd.h> #include "libudev.h" -#include "sd-device.h" +#include <systemd/sd-device.h> #include "alloc-util.h" #include "device-private.h" diff --git a/src/libudev/libudev-enumerate.c b/src/libudev/src/libudev-enumerate.c index e416e178b4..c784da5715 100644 --- a/src/libudev/libudev-enumerate.c +++ b/src/libudev/src/libudev-enumerate.c @@ -29,7 +29,7 @@ #include <sys/stat.h> #include "libudev.h" -#include "sd-device.h" +#include <systemd/sd-device.h> #include "alloc-util.h" #include "device-enumerator-private.h" diff --git a/src/libudev/libudev-hwdb.c b/src/libudev/src/libudev-hwdb.c index a53f000015..8c4b488086 100644 --- a/src/libudev/libudev-hwdb.c +++ b/src/libudev/src/libudev-hwdb.c @@ -17,7 +17,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-hwdb.h" +#include <systemd/sd-hwdb.h> #include "alloc-util.h" #include "hwdb-util.h" diff --git a/src/libudev/libudev-list.c b/src/libudev/src/libudev-list.c index da496ed456..da496ed456 100644 --- a/src/libudev/libudev-list.c +++ b/src/libudev/src/libudev-list.c diff --git a/src/libudev/libudev-monitor.c b/src/libudev/src/libudev-monitor.c index f870eba9eb..f870eba9eb 100644 --- a/src/libudev/libudev-monitor.c +++ b/src/libudev/src/libudev-monitor.c diff --git a/src/libudev/libudev-private.h b/src/libudev/src/libudev-private.h index 52c5075110..52c5075110 100644 --- a/src/libudev/libudev-private.h +++ b/src/libudev/src/libudev-private.h diff --git a/src/libudev/libudev-queue.c b/src/libudev/src/libudev-queue.c index e3dffa6925..e3dffa6925 100644 --- a/src/libudev/libudev-queue.c +++ b/src/libudev/src/libudev-queue.c diff --git a/src/libudev/libudev-util.c b/src/libudev/src/libudev-util.c index 574cfeac85..574cfeac85 100644 --- a/src/libudev/libudev-util.c +++ b/src/libudev/src/libudev-util.c diff --git a/src/libudev/libudev.c b/src/libudev/src/libudev.c index 63fb05547d..63fb05547d 100644 --- a/src/libudev/libudev.c +++ b/src/libudev/src/libudev.c diff --git a/src/libudev/libudev.pc.in b/src/libudev/src/libudev.pc.in index a0f3f524e0..a0f3f524e0 100644 --- a/src/libudev/libudev.pc.in +++ b/src/libudev/src/libudev.pc.in diff --git a/src/libudev/libudev.sym b/src/libudev/src/libudev.sym index 76726fca77..76726fca77 100644 --- a/src/libudev/libudev.sym +++ b/src/libudev/src/libudev.sym diff --git a/src/udev/udev.h b/src/libudev/src/udev.h index 1f9c8120c0..91dfc950b4 100644 --- a/src/udev/udev.h +++ b/src/libudev/src/udev.h @@ -22,7 +22,7 @@ #include <sys/types.h> #include "libudev.h" -#include "sd-netlink.h" +#include <systemd/sd-netlink.h> #include "label.h" #include "libudev-private.h" diff --git a/src/locale/Makefile b/src/locale/Makefile index d0b0e8e008..7ff69e87a9 120000..100644 --- a/src/locale/Makefile +++ b/src/locale/Makefile @@ -1 +1,91 @@ -../Makefile
\ No newline at end of file +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +ifneq ($(ENABLE_LOCALED),) +systemd_localed_SOURCES = \ + src/locale/localed.c + +systemd_localed_LDADD = \ + libshared.la \ + $(XKBCOMMON_LIBS) + +systemd_localed_CFLAGS = \ + $(AM_CFLAGS) \ + $(XKBCOMMON_CFLAGS) + +nodist_systemunit_DATA += \ + units/systemd-localed.service + +dist_systemunit_DATA_busnames += \ + units/org.freedesktop.locale1.busname + +libexec_PROGRAMS += \ + systemd-localed + +dist_dbuspolicy_DATA += \ + src/locale/org.freedesktop.locale1.conf + +dist_dbussystemservice_DATA += \ + src/locale/org.freedesktop.locale1.service + +polkitpolicy_files += \ + src/locale/org.freedesktop.locale1.policy + +SYSTEM_UNIT_ALIASES += \ + systemd-localed.service dbus-org.freedesktop.locale1.service + +BUSNAMES_TARGET_WANTS += \ + org.freedesktop.locale1.busname + +dist_pkgdata_DATA = \ + src/locale/kbd-model-map \ + src/locale/language-fallback-map + +localectl_SOURCES = \ + src/locale/localectl.c + +localectl_LDADD = \ + libshared.la + +bin_PROGRAMS += \ + localectl + +dist_bashcompletion_data += \ + shell-completion/bash/localectl + +dist_zshcompletion_data += \ + shell-completion/zsh/_localectl +endif # ENABLE_LOCALED + +.PHONY: update-kbd-model-map + +polkitpolicy_in_files += \ + src/locale/org.freedesktop.locale1.policy.in + +EXTRA_DIST += \ + units/systemd-localed.service.in + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/locale/localectl.c b/src/locale/localectl.c index 365c79aa51..c684ff7d90 100644 --- a/src/locale/localectl.c +++ b/src/locale/localectl.c @@ -25,7 +25,7 @@ #include <stdlib.h> #include <string.h> -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "bus-error.h" #include "bus-util.h" diff --git a/src/locale/localed.c b/src/locale/localed.c index f0fe59cc67..eb6c0565f0 100644 --- a/src/locale/localed.c +++ b/src/locale/localed.c @@ -26,7 +26,7 @@ #include <xkbcommon/xkbcommon.h> #endif -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "alloc-util.h" #include "bus-error.h" diff --git a/src/login/Makefile b/src/login/Makefile index d0b0e8e008..4f75bc1cdd 120000..100644 --- a/src/login/Makefile +++ b/src/login/Makefile @@ -1 +1,244 @@ -../Makefile
\ No newline at end of file +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +ifneq ($(ENABLE_LOGIND),) +systemd_logind_SOURCES = \ + src/login/logind.c \ + src/login/logind.h + +nodist_systemd_logind_SOURCES = \ + src/login/logind-gperf.c + +systemd_logind_LDADD = \ + liblogind-core.la + +liblogind_core_la_SOURCES = \ + src/login/logind-core.c \ + src/login/logind-device.c \ + src/login/logind-device.h \ + src/login/logind-button.c \ + src/login/logind-button.h \ + src/login/logind-action.c \ + src/login/logind-action.h \ + src/login/logind-seat.c \ + src/login/logind-seat.h \ + src/login/logind-session.c \ + src/login/logind-session.h \ + src/login/logind-session-device.c \ + src/login/logind-session-device.h \ + src/login/logind-user.c \ + src/login/logind-user.h \ + src/login/logind-inhibit.c \ + src/login/logind-inhibit.h \ + src/login/logind-dbus.c \ + src/login/logind-session-dbus.c \ + src/login/logind-seat-dbus.c \ + src/login/logind-user-dbus.c \ + src/login/logind-utmp.c \ + src/login/logind-acl.h + +liblogind_core_la_LIBADD = \ + libshared.la + +ifneq ($(HAVE_ACL),) +liblogind_core_la_SOURCES += \ + src/login/logind-acl.c +endif # HAVE_ACL + +noinst_LTLIBRARIES += \ + liblogind-core.la + +libexec_PROGRAMS += \ + systemd-logind + +loginctl_SOURCES = \ + src/login/loginctl.c \ + src/login/sysfs-show.h \ + src/login/sysfs-show.c + +loginctl_LDADD = \ + libshared.la + +bin_PROGRAMS += \ + loginctl + +dist_bashcompletion_data += \ + shell-completion/bash/loginctl + +dist_zshcompletion_data += \ + shell-completion/zsh/_loginctl \ + shell-completion/zsh/_systemd-inhibit + +systemd_inhibit_SOURCES = \ + src/login/inhibit.c + +systemd_inhibit_LDADD = \ + libshared.la + +bin_PROGRAMS += \ + systemd-inhibit + +test_login_SOURCES = \ + src/libsystemd/sd-login/test-login.c + +test_login_LDADD = \ + libshared.la + +test_login_shared_SOURCES = \ + src/login/test-login-shared.c + +test_login_shared_LDADD = \ + libshared.la + +test_inhibit_SOURCES = \ + src/login/test-inhibit.c + +test_inhibit_LDADD = \ + libshared.la + +test_login_tables_SOURCES = \ + src/login/test-login-tables.c + +test_login_tables_LDADD = \ + liblogind-core.la + +manual_tests += \ + test-login \ + test-inhibit + +tests += \ + test-login-tables \ + test-login-shared + +ifneq ($(HAVE_PAM),) +pam_systemd_la_SOURCES = \ + src/login/pam_systemd.sym \ + src/login/pam_systemd.c + +pam_systemd_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(PAM_CFLAGS) + +pam_systemd_la_LDFLAGS = \ + $(AM_LDFLAGS) \ + -module \ + -export-dynamic \ + -avoid-version \ + -shared \ + -Wl,--version-script=$(top_srcdir)/src/login/pam_systemd.sym + +pam_systemd_la_LIBADD = \ + libshared.la \ + $(PAM_LIBS) + +pamlib_LTLIBRARIES = \ + pam_systemd.la + +dist_pamconf_DATA = \ + src/login/systemd-user + +EXTRA_DIST += \ + src/login/systemd-user.m4 +endif # HAVE_PAM + +nodist_systemunit_DATA += \ + units/systemd-logind.service + +dist_systemunit_DATA += \ + units/user.slice + +dist_systemunit_DATA_busnames += \ + units/org.freedesktop.login1.busname + +dist_dbussystemservice_DATA += \ + src/login/org.freedesktop.login1.service + +dist_dbuspolicy_DATA += \ + src/login/org.freedesktop.login1.conf + +dist_pkgsysconf_DATA += \ + src/login/logind.conf + +polkitpolicy_files += \ + src/login/org.freedesktop.login1.policy + +INSTALL_DIRS += \ + $(systemdstatedir) + +MULTI_USER_TARGET_WANTS += \ + systemd-logind.service + +SYSTEM_UNIT_ALIASES += \ + systemd-logind.service dbus-org.freedesktop.login1.service + +BUSNAMES_TARGET_WANTS += \ + org.freedesktop.login1.busname + +dist_udevrules_DATA += \ + src/login/70-uaccess.rules \ + src/login/70-power-switch.rules + +nodist_udevrules_DATA += \ + src/login/71-seat.rules \ + src/login/73-seat-late.rules + +endif # ENABLE_LOGIND + +polkitpolicy_in_files += \ + src/login/org.freedesktop.login1.policy.in + +gperf_gperf_sources += \ + src/login/logind-gperf.gperf + +EXTRA_DIST += \ + src/login/71-seat.rules.in \ + src/login/73-seat-late.rules.in \ + units/systemd-logind.service.in + +# ------------------------------------------------------------------------------ +ifneq ($(HAVE_PAM),) + +systemd_user_sessions_SOURCES = \ + src/user-sessions/user-sessions.c + +systemd_user_sessions_LDADD = \ + libshared.la + +libexec_PROGRAMS += \ + systemd-user-sessions + +nodist_systemunit_DATA += \ + units/systemd-user-sessions.service + +MULTI_USER_TARGET_WANTS += \ + systemd-user-sessions.service + +endif # HAVE_PAM + +EXTRA_DIST += \ + units/systemd-user-sessions.service.in + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/login/inhibit.c b/src/login/inhibit.c index f2c37a8623..905e757a32 100644 --- a/src/login/inhibit.c +++ b/src/login/inhibit.c @@ -23,7 +23,7 @@ #include <stdlib.h> #include <unistd.h> -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "alloc-util.h" #include "bus-error.h" diff --git a/src/login/loginctl.c b/src/login/loginctl.c index 6ad3d089bd..fd8dcdc22c 100644 --- a/src/login/loginctl.c +++ b/src/login/loginctl.c @@ -23,7 +23,7 @@ #include <string.h> #include <unistd.h> -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "alloc-util.h" #include "bus-error.h" diff --git a/src/login/logind-button.c b/src/login/logind-button.c index baa6b7113c..acf7504a2e 100644 --- a/src/login/logind-button.c +++ b/src/login/logind-button.c @@ -24,7 +24,7 @@ #include <unistd.h> #include <linux/input.h> -#include "sd-messages.h" +#include <systemd/sd-messages.h> #include "alloc-util.h" #include "fd-util.h" diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c index 1d3133ee25..efcc386dce 100644 --- a/src/login/logind-dbus.c +++ b/src/login/logind-dbus.c @@ -22,7 +22,7 @@ #include <string.h> #include <unistd.h> -#include "sd-messages.h" +#include <systemd/sd-messages.h> #include "alloc-util.h" #include "audit-util.h" diff --git a/src/login/logind-seat.c b/src/login/logind-seat.c index b5192320e4..aec67718a1 100644 --- a/src/login/logind-seat.c +++ b/src/login/logind-seat.c @@ -22,7 +22,7 @@ #include <string.h> #include <unistd.h> -#include "sd-messages.h" +#include <systemd/sd-messages.h> #include "alloc-util.h" #include "fd-util.h" diff --git a/src/login/logind-session.c b/src/login/logind-session.c index 417b7f5d98..b22420deea 100644 --- a/src/login/logind-session.c +++ b/src/login/logind-session.c @@ -26,7 +26,7 @@ #include <sys/ioctl.h> #include <unistd.h> -#include "sd-messages.h" +#include <systemd/sd-messages.h> #include "alloc-util.h" #include "audit-util.h" diff --git a/src/login/logind-utmp.c b/src/login/logind-utmp.c index 11a91c3947..5106821645 100644 --- a/src/login/logind-utmp.c +++ b/src/login/logind-utmp.c @@ -22,7 +22,7 @@ #include <string.h> #include <unistd.h> -#include "sd-messages.h" +#include <systemd/sd-messages.h> #include "alloc-util.h" #include "audit-util.h" diff --git a/src/login/logind.c b/src/login/logind.c index 933602eb08..34d0c04a2a 100644 --- a/src/login/logind.c +++ b/src/login/logind.c @@ -23,7 +23,7 @@ #include <unistd.h> #include "libudev.h" -#include "sd-daemon.h" +#include <systemd/sd-daemon.h> #include "alloc-util.h" #include "bus-error.h" diff --git a/src/login/logind.h b/src/login/logind.h index 6748af3c07..c642d56413 100644 --- a/src/login/logind.h +++ b/src/login/logind.h @@ -22,8 +22,8 @@ #include <stdbool.h> #include "libudev.h" -#include "sd-bus.h" -#include "sd-event.h" +#include <systemd/sd-bus.h> +#include <systemd/sd-event.h> #include "hashmap.h" #include "list.h" diff --git a/src/login/test-inhibit.c b/src/login/test-inhibit.c index a3cf9d293b..be7145b4bc 100644 --- a/src/login/test-inhibit.c +++ b/src/login/test-inhibit.c @@ -19,7 +19,7 @@ #include <unistd.h> -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "bus-util.h" #include "fd-util.h" diff --git a/src/machine-id-setup/Makefile b/src/machine-id-setup/Makefile index d0b0e8e008..b3f1e6f8a8 120000..100644 --- a/src/machine-id-setup/Makefile +++ b/src/machine-id-setup/Makefile @@ -1 +1,38 @@ -../Makefile
\ No newline at end of file +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +systemd_machine_id_setup_SOURCES = \ + src/machine-id-setup/machine-id-setup-main.c \ + src/core/machine-id-setup.c \ + src/core/machine-id-setup.h + +systemd_machine_id_setup_LDADD = \ + libshared.la + +SYSINIT_TARGET_WANTS += \ + systemd-machine-id-commit.service + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/machine/Makefile b/src/machine/Makefile deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/machine/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile
\ No newline at end of file diff --git a/src/modules-load/Makefile b/src/modules-load/Makefile index d0b0e8e008..390a2dc4e9 120000..100644 --- a/src/modules-load/Makefile +++ b/src/modules-load/Makefile @@ -1 +1,61 @@ -../Makefile
\ No newline at end of file +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +ifneq ($(HAVE_KMOD),) +systemd_modules_load_SOURCES = \ + src/modules-load/modules-load.c + +systemd_modules_load_CFLAGS = \ + $(AM_CFLAGS) \ + $(KMOD_CFLAGS) + +systemd_modules_load_LDADD = \ + libshared.la \ + $(KMOD_LIBS) + +libexec_PROGRAMS += \ + systemd-modules-load + +nodist_systemunit_DATA += \ + units/systemd-modules-load.service + +SYSINIT_TARGET_WANTS += \ + systemd-modules-load.service + +ifneq ($(ENABLE_TMPFILES),) +nodist_systemunit_DATA += \ + units/kmod-static-nodes.service + +SYSINIT_TARGET_WANTS += \ + kmod-static-nodes.service +endif # ENABLE_TMPFILES +endif # HAVE_KMOD + +EXTRA_DIST += \ + units/systemd-modules-load.service.in \ + units/kmod-static-nodes.service.in + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/network/Makefile b/src/network/Makefile index d0b0e8e008..d390da1fc4 120000..100644 --- a/src/network/Makefile +++ b/src/network/Makefile @@ -1 +1,201 @@ -../Makefile
\ No newline at end of file +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +ifneq ($(ENABLE_NETWORKD),) +libexec_PROGRAMS += \ + systemd-networkd + +systemd_networkd_SOURCES = \ + src/network/networkd.c + +systemd_networkd_LDADD = \ + libnetworkd-core.la + +ifneq ($(HAVE_LIBIPTC),) +systemd_networkd_LDADD += \ + libfirewall.la +endif # HAVE_LIBIPTC + +noinst_LTLIBRARIES += \ + libnetworkd-core.la + +libnetworkd_core_la_CFLAGS = \ + $(AM_CFLAGS) + +libnetworkd_core_la_SOURCES = \ + src/libsystemd-network/network-internal.h \ + src/network/networkd.h \ + src/network/networkd-link.h \ + src/network/networkd-link.c \ + src/network/networkd-netdev.h \ + src/network/networkd-netdev.c \ + src/network/networkd-netdev-tunnel.h \ + src/network/networkd-netdev-tunnel.c \ + src/network/networkd-netdev-veth.h \ + src/network/networkd-netdev-veth.c \ + src/network/networkd-netdev-vxlan.h \ + src/network/networkd-netdev-vxlan.c \ + src/network/networkd-netdev-vlan.h \ + src/network/networkd-netdev-vlan.c \ + src/network/networkd-netdev-macvlan.h \ + src/network/networkd-netdev-macvlan.c \ + src/network/networkd-netdev-ipvlan.h \ + src/network/networkd-netdev-ipvlan.c \ + src/network/networkd-netdev-dummy.h \ + src/network/networkd-netdev-dummy.c \ + src/network/networkd-netdev-tuntap.h \ + src/network/networkd-netdev-tuntap.c \ + src/network/networkd-netdev-bond.h \ + src/network/networkd-netdev-bond.c \ + src/network/networkd-netdev-bridge.h \ + src/network/networkd-netdev-bridge.c \ + src/network/networkd-link-bus.c \ + src/network/networkd-ipv4ll.c \ + src/network/networkd-dhcp4.c \ + src/network/networkd-dhcp6.c \ + src/network/networkd-ndisc.c \ + src/network/networkd-network.h \ + src/network/networkd-network.c \ + src/network/networkd-network-bus.c \ + src/network/networkd-address.h \ + src/network/networkd-address.c \ + src/network/networkd-route.h \ + src/network/networkd-route.c \ + src/network/networkd-manager.c \ + src/network/networkd-manager-bus.c \ + src/network/networkd-fdb.h \ + src/network/networkd-fdb.c \ + src/network/networkd-address-pool.h \ + src/network/networkd-address-pool.c \ + src/network/networkd-util.h \ + src/network/networkd-util.c + +nodist_libnetworkd_core_la_SOURCES = \ + src/network/networkd-network-gperf.c \ + src/network/networkd-netdev-gperf.c + +libnetworkd_core_la_LIBADD = \ + libsystemd-network.la \ + libshared.la + +libexec_PROGRAMS += \ + systemd-networkd-wait-online + +systemd_networkd_wait_online_CFLAGS = \ + $(AM_CFLAGS) + +systemd_networkd_wait_online_SOURCES = \ + src/libsystemd-network/network-internal.h \ + src/network/networkd-wait-online.h \ + src/network/networkd-wait-online-link.h \ + src/network/networkd-wait-online.c \ + src/network/networkd-wait-online-manager.c \ + src/network/networkd-wait-online-link.c + +systemd_networkd_wait_online_LDADD = \ + libsystemd-network.la \ + libshared.la + +bin_PROGRAMS += \ + networkctl + +networkctl_SOURCES = \ + src/network/networkctl.c + +networkctl_LDADD = \ + libshared.la \ + libsystemd-network.la + +dist_bashcompletion_data += \ + shell-completion/bash/networkctl + +test_network_SOURCES = \ + src/network/test-network.c + +test_network_LDADD = \ + libnetworkd-core.la + +ifneq ($(HAVE_LIBIPTC),) +test_network_LDADD += \ + libfirewall.la +endif # HAVE_LIBIPTC + +test_network_tables_SOURCES = \ + src/network/test-network-tables.c \ + src/shared/test-tables.h + +test_network_tables_LDADD = \ + libnetworkd-core.la \ + libudev-core.la + +ifneq ($(HAVE_LIBIPTC),) +test_network_tables_LDADD += \ + libfirewall.la +endif # HAVE_LIBIPTC + +tests += \ + test-network \ + test-network-tables + +dist_systemunit_DATA += \ + units/systemd-networkd.socket + +nodist_systemunit_DATA += \ + units/systemd-networkd.service \ + units/systemd-networkd-wait-online.service + +dist_systemunit_DATA_busnames += \ + units/org.freedesktop.network1.busname + +dist_dbussystemservice_DATA += \ + src/network/org.freedesktop.network1.service + +dist_dbuspolicy_DATA += \ + src/network/org.freedesktop.network1.conf + +GENERAL_ALIASES += \ + $(systemunitdir)/systemd-networkd.socket $(pkgsysconfdir)/system/sockets.target.wants/systemd-networkd.socket \ + $(systemunitdir)/systemd-networkd.service $(pkgsysconfdir)/system/multi-user.target.wants/systemd-networkd.service \ + $(systemunitdir)/systemd-networkd-wait-online.service $(pkgsysconfdir)/system/network-online.target.wants/systemd-networkd-wait-online.service + +SYSTEM_UNIT_ALIASES += \ + systemd-networkd.service dbus-org.freedesktop.network1.service + +BUSNAMES_TARGET_WANTS += \ + org.freedesktop.network1.busname + +endif # ENABLE_NETWORKD + +gperf_gperf_sources += \ + src/network/networkd-network-gperf.gperf \ + src/network/networkd-netdev-gperf.gperf + +EXTRA_DIST += \ + units/systemd-networkd.service.m4.in \ + units/systemd-networkd-wait-online.service.in \ + test/networkd-test.py + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/network/networkctl.c b/src/network/networkctl.c index 60724fce80..6e436d2043 100644 --- a/src/network/networkctl.c +++ b/src/network/networkctl.c @@ -21,10 +21,10 @@ #include <net/if.h> #include <stdbool.h> -#include "sd-device.h" -#include "sd-hwdb.h" -#include "sd-netlink.h" -#include "sd-network.h" +#include <systemd/sd-device.h> +#include <systemd/sd-hwdb.h> +#include <systemd/sd-netlink.h> +#include <systemd/sd-network.h> #include "alloc-util.h" #include "arphrd-list.h" diff --git a/src/network/networkd-dhcp6.c b/src/network/networkd-dhcp6.c index 5f7a005c36..bf8e826368 100644 --- a/src/network/networkd-dhcp6.c +++ b/src/network/networkd-dhcp6.c @@ -20,7 +20,7 @@ #include <netinet/ether.h> #include <linux/if.h> -#include "sd-dhcp6-client.h" +#include <systemd/sd-dhcp6-client.h> #include "network-internal.h" #include "networkd-link.h" diff --git a/src/network/networkd-link.h b/src/network/networkd-link.h index 0e6a7b6f21..30f01faf2a 100644 --- a/src/network/networkd-link.h +++ b/src/network/networkd-link.h @@ -21,12 +21,12 @@ #include <endian.h> -#include "sd-dhcp-client.h" -#include "sd-dhcp-server.h" -#include "sd-dhcp6-client.h" -#include "sd-ipv4ll.h" -#include "sd-lldp.h" -#include "sd-ndisc.h" +#include <systemd/sd-dhcp-client.h> +#include <systemd/sd-dhcp-server.h> +#include <systemd/sd-dhcp6-client.h> +#include <systemd/sd-ipv4ll.h> +#include <systemd/sd-lldp.h> +#include <systemd/sd-ndisc.h> typedef struct Link Link; diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c index b527191a5a..c73d313c85 100644 --- a/src/network/networkd-manager.c +++ b/src/network/networkd-manager.c @@ -20,8 +20,8 @@ #include <sys/socket.h> #include <linux/if.h> -#include "sd-daemon.h" -#include "sd-netlink.h" +#include <systemd/sd-daemon.h> +#include <systemd/sd-netlink.h> #include "alloc-util.h" #include "bus-util.h" diff --git a/src/network/networkd-ndisc.c b/src/network/networkd-ndisc.c index f2287be20a..ae647b0293 100644 --- a/src/network/networkd-ndisc.c +++ b/src/network/networkd-ndisc.c @@ -21,7 +21,7 @@ #include <netinet/icmp6.h> #include <linux/if.h> -#include "sd-ndisc.h" +#include <systemd/sd-ndisc.h> #include "networkd-link.h" diff --git a/src/network/networkd-netdev-bond.c b/src/network/networkd-netdev-bond.c index 106f15fabc..e04e78f870 100644 --- a/src/network/networkd-netdev-bond.c +++ b/src/network/networkd-netdev-bond.c @@ -21,7 +21,7 @@ #include <netinet/ether.h> #include <linux/if_bonding.h> -#include "sd-netlink.h" +#include <systemd/sd-netlink.h> #include "alloc-util.h" #include "conf-parser.h" diff --git a/src/network/networkd-netdev-tunnel.c b/src/network/networkd-netdev-tunnel.c index 46ff2974f4..408ceaf55e 100644 --- a/src/network/networkd-netdev-tunnel.c +++ b/src/network/networkd-netdev-tunnel.c @@ -23,7 +23,7 @@ #include <linux/if_tunnel.h> #include <linux/ip6_tunnel.h> -#include "sd-netlink.h" +#include <systemd/sd-netlink.h> #include "conf-parser.h" #include "missing.h" diff --git a/src/network/networkd-netdev-veth.c b/src/network/networkd-netdev-veth.c index b122a06c25..185b441c5a 100644 --- a/src/network/networkd-netdev-veth.c +++ b/src/network/networkd-netdev-veth.c @@ -20,7 +20,7 @@ #include <net/if.h> #include <linux/veth.h> -#include "sd-netlink.h" +#include <systemd/sd-netlink.h> #include "networkd-netdev-veth.h" diff --git a/src/network/networkd-netdev-vxlan.c b/src/network/networkd-netdev-vxlan.c index eb9a2c06b3..223d60f4db 100644 --- a/src/network/networkd-netdev-vxlan.c +++ b/src/network/networkd-netdev-vxlan.c @@ -19,7 +19,7 @@ #include <net/if.h> -#include "sd-netlink.h" +#include <systemd/sd-netlink.h> #include "conf-parser.h" #include "alloc-util.h" diff --git a/src/network/networkd-wait-online-link.c b/src/network/networkd-wait-online-link.c index 5727422e3d..971545296f 100644 --- a/src/network/networkd-wait-online-link.c +++ b/src/network/networkd-wait-online-link.c @@ -18,7 +18,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-network.h" +#include <systemd/sd-network.h> #include "alloc-util.h" #include "networkd-wait-online-link.h" diff --git a/src/network/networkd-wait-online.c b/src/network/networkd-wait-online.c index 3220c4b7ef..a08272463e 100644 --- a/src/network/networkd-wait-online.c +++ b/src/network/networkd-wait-online.c @@ -20,7 +20,7 @@ #include <getopt.h> -#include "sd-daemon.h" +#include <systemd/sd-daemon.h> #include "networkd-wait-online.h" #include "signal-util.h" diff --git a/src/network/networkd-wait-online.h b/src/network/networkd-wait-online.h index 421c2bdf44..f1ea4a6494 100644 --- a/src/network/networkd-wait-online.h +++ b/src/network/networkd-wait-online.h @@ -19,9 +19,9 @@ #pragma once -#include "sd-event.h" -#include "sd-netlink.h" -#include "sd-network.h" +#include <systemd/sd-event.h> +#include <systemd/sd-netlink.h> +#include <systemd/sd-network.h> #include "hashmap.h" diff --git a/src/network/networkd.c b/src/network/networkd.c index 3a2615e6fd..6cf396e478 100644 --- a/src/network/networkd.c +++ b/src/network/networkd.c @@ -17,7 +17,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-daemon.h" +#include <systemd/sd-daemon.h> #include "capability-util.h" #include "networkd.h" diff --git a/src/network/networkd.h b/src/network/networkd.h index 7ee922621a..efe70970c3 100644 --- a/src/network/networkd.h +++ b/src/network/networkd.h @@ -21,9 +21,9 @@ #include <arpa/inet.h> -#include "sd-bus.h" -#include "sd-event.h" -#include "sd-netlink.h" +#include <systemd/sd-bus.h> +#include <systemd/sd-event.h> +#include <systemd/sd-netlink.h> #include "hashmap.h" #include "list.h" diff --git a/src/notify/Makefile b/src/notify/Makefile deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/notify/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile
\ No newline at end of file diff --git a/src/nspawn/Makefile b/src/nspawn/Makefile deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/nspawn/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile
\ No newline at end of file diff --git a/src/nss-myhostname/Makefile b/src/nss-myhostname/Makefile index d0b0e8e008..1477a13a2c 120000..100644 --- a/src/nss-myhostname/Makefile +++ b/src/nss-myhostname/Makefile @@ -1 +1,48 @@ -../Makefile
\ No newline at end of file +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +ifneq ($(HAVE_MYHOSTNAME),) +libnss_myhostname_la_SOURCES = \ + src/nss-myhostname/nss-myhostname.sym \ + src/nss-myhostname/nss-myhostname.c + +libnss_myhostname_la_LDFLAGS = \ + $(AM_LDFLAGS) \ + -module \ + -export-dynamic \ + -avoid-version \ + -shared \ + -shrext .so.2 \ + -Wl,--version-script=$(top_srcdir)/src/nss-myhostname/nss-myhostname.sym + +libnss_myhostname_la_LIBADD = \ + libsystemd-internal.la + +lib_LTLIBRARIES += \ + libnss_myhostname.la +endif # HAVE_MYHOSTNAME + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/nss-mymachines/Makefile b/src/nss-mymachines/Makefile deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/nss-mymachines/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile
\ No newline at end of file diff --git a/src/nss-resolve/Makefile b/src/nss-resolve/Makefile deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/nss-resolve/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile
\ No newline at end of file diff --git a/src/path/Makefile b/src/path/Makefile deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/path/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile
\ No newline at end of file diff --git a/src/quotacheck/Makefile b/src/quotacheck/Makefile deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/quotacheck/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile
\ No newline at end of file diff --git a/src/random-seed/Makefile b/src/random-seed/Makefile deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/random-seed/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile
\ No newline at end of file diff --git a/src/rc-local-generator/Makefile b/src/rc-local-generator/Makefile deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/rc-local-generator/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile
\ No newline at end of file diff --git a/src/remount-fs/Makefile b/src/remount-fs/Makefile deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/remount-fs/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile
\ No newline at end of file diff --git a/src/reply-password/Makefile b/src/reply-password/Makefile deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/reply-password/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile
\ No newline at end of file diff --git a/src/resolve/Makefile b/src/resolve/Makefile deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/resolve/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile
\ No newline at end of file diff --git a/src/rfkill/Makefile b/src/rfkill/Makefile deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/rfkill/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile
\ No newline at end of file diff --git a/src/run/Makefile b/src/run/Makefile deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/run/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile
\ No newline at end of file diff --git a/src/shared/Makefile b/src/shared/Makefile deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/shared/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile
\ No newline at end of file diff --git a/src/sleep/Makefile b/src/sleep/Makefile index d0b0e8e008..b88418c3fb 120000..100644 --- a/src/sleep/Makefile +++ b/src/sleep/Makefile @@ -1 +1,33 @@ -../Makefile
\ No newline at end of file +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +systemd_sleep_SOURCES = \ + src/sleep/sleep.c + +systemd_sleep_LDADD = \ + libshared.la + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c index c8f0742183..7f8a95728d 100644 --- a/src/sleep/sleep.c +++ b/src/sleep/sleep.c @@ -22,7 +22,7 @@ #include <getopt.h> #include <stdio.h> -#include "sd-messages.h" +#include <systemd/sd-messages.h> #include "def.h" #include "fd-util.h" diff --git a/src/socket-proxy/Makefile b/src/socket-proxy/Makefile index d0b0e8e008..b2e6ba4f7a 120000..100644 --- a/src/socket-proxy/Makefile +++ b/src/socket-proxy/Makefile @@ -1 +1,34 @@ -../Makefile
\ No newline at end of file +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + + +systemd_socket_proxyd_SOURCES = \ + src/socket-proxy/socket-proxyd.c + +systemd_socket_proxyd_LDADD = \ + libshared.la + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/socket-proxy/socket-proxyd.c b/src/socket-proxy/socket-proxyd.c index 99d4b62139..4be8d0507f 100644 --- a/src/socket-proxy/socket-proxyd.c +++ b/src/socket-proxy/socket-proxyd.c @@ -28,9 +28,9 @@ #include <sys/un.h> #include <unistd.h> -#include "sd-daemon.h" -#include "sd-event.h" -#include "sd-resolve.h" +#include <systemd/sd-daemon.h> +#include <systemd/sd-event.h> +#include <systemd/sd-resolve.h> #include "alloc-util.h" #include "fd-util.h" diff --git a/src/sysctl/Makefile b/src/sysctl/Makefile index d0b0e8e008..b35c3d997a 120000..100644 --- a/src/sysctl/Makefile +++ b/src/sysctl/Makefile @@ -1 +1,33 @@ -../Makefile
\ No newline at end of file +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +systemd_sysctl_SOURCES = \ + src/sysctl/sysctl.c + +systemd_sysctl_LDADD = \ + libshared.la + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/system-update-generator/Makefile b/src/system-update-generator/Makefile deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/system-update-generator/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile
\ No newline at end of file diff --git a/src/systemctl/Makefile b/src/systemctl/Makefile deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/systemctl/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile
\ No newline at end of file diff --git a/src/systemd-ac-power/Makefile b/src/systemd-ac-power/Makefile new file mode 100644 index 0000000000..9fd451c65c --- /dev/null +++ b/src/systemd-ac-power/Makefile @@ -0,0 +1,33 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +systemd_ac_power_SOURCES = \ + src/ac-power/ac-power.c + +systemd_ac_power_LDADD = \ + libshared.la + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/ac-power/ac-power.c b/src/systemd-ac-power/ac-power.c index c5277884a8..c5277884a8 100644 --- a/src/ac-power/ac-power.c +++ b/src/systemd-ac-power/ac-power.c diff --git a/src/systemd-activate/Makefile b/src/systemd-activate/Makefile new file mode 100644 index 0000000000..8659cb1beb --- /dev/null +++ b/src/systemd-activate/Makefile @@ -0,0 +1,37 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + + +libexec_PROGRAMS += \ + systemd-activate + +systemd_activate_SOURCES = \ + src/activate/activate.c + +systemd_activate_LDADD = \ + libshared.la + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/activate/activate.c b/src/systemd-activate/activate.c index 0db4967edb..94f99028e5 100644 --- a/src/activate/activate.c +++ b/src/systemd-activate/activate.c @@ -24,7 +24,7 @@ #include <sys/wait.h> #include <unistd.h> -#include "sd-daemon.h" +#include <systemd/sd-daemon.h> #include "alloc-util.h" #include "fd-util.h" diff --git a/src/systemd-activate/systemd-activate.xml b/src/systemd-activate/systemd-activate.xml new file mode 100644 index 0000000000..995e6eecce --- /dev/null +++ b/src/systemd-activate/systemd-activate.xml @@ -0,0 +1,204 @@ +<?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*--> +<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" +"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> + +<!-- + This file is part of systemd. + + Copyright 2013 Zbigniew Jędrzejewski-Szmek + + 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 + (at your option) any later version. + + systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +--> + +<refentry id="systemd-activate" + xmlns:xi="http://www.w3.org/2001/XInclude"> + + <refentryinfo> + <title>systemd-activate</title> + <productname>systemd</productname> + + <authorgroup> + <author> + <contrib>Developer</contrib> + <firstname>Zbigniew</firstname> + <surname>Jędrzejewski-Szmek</surname> + <email>zbyszek@in.waw.pl</email> + </author> + </authorgroup> + </refentryinfo> + + <refmeta> + <refentrytitle>systemd-activate</refentrytitle> + <manvolnum>8</manvolnum> + </refmeta> + + <refnamediv> + <refname>systemd-activate</refname> + <refpurpose>Test socket activation of daemons</refpurpose> + </refnamediv> + + <refsynopsisdiv> + <cmdsynopsis> + <command>/usr/lib/systemd/systemd-activate</command> + <arg choice="opt" rep="repeat">OPTIONS</arg> + <arg choice="plain"><replaceable>daemon</replaceable></arg> + <arg choice="opt" rep="repeat">OPTIONS</arg> + </cmdsynopsis> + </refsynopsisdiv> + + <refsect1> + <title>Description</title> + + <para><command>systemd-activate</command> may be used to launch a socket-activated service binary from the command + line for testing purposes. It may also be used to launch individual instances of the service binary per connection. + </para> + + <para>The daemon to launch and its options should be specified + after options intended for <command>systemd-activate</command>. + </para> + + <para>If the <option>--inetd</option> option is given, the socket file descriptor will be used as the standard + input and output of the launched process. Otherwise, standard input and output will be inherited, and sockets will + be passed through file descriptors 3 and higher. Sockets passed through <varname>$LISTEN_FDS</varname> to + <command>systemd-activate</command> will be passed through to the daemon, in the original positions. Other sockets + specified with <option>--listen=</option> will use consecutive descriptors. By default, + <command>systemd-activate</command> listens on a stream socket, use <option>--datagram</option> and + <option>--seqpacket</option> to listen on datagram or sequential packet sockets instead (see below). + </para> + </refsect1> + + <refsect1> + <title>Options</title> + <variablelist> + <varlistentry> + <term><option>-l <replaceable>address</replaceable></option></term> + <term><option>--listen=<replaceable>address</replaceable></option></term> + + <listitem><para>Listen on this <replaceable>address</replaceable>. + Takes a string like <literal>2000</literal> or + <literal>127.0.0.1:2001</literal>.</para> + </listitem> + </varlistentry> + + <varlistentry> + <term><option>-a</option></term> + <term><option>--accept</option></term> + + <listitem><para>Launch an instance of the service binary for each connection and pass the connection + socket.</para></listitem> + </varlistentry> + + <varlistentry> + <term><option>-d</option></term> + <term><option>--datagram</option></term> + + <listitem><para>Listen on a datagram socket (<constant>SOCK_DGRAM</constant>), instead of a stream socket + (<constant>SOCK_STREAM</constant>). May not be combined with <option>--seqpacket</option>.</para></listitem> + </varlistentry> + + <varlistentry> + <term><option>--seqpacket</option></term> + + <listitem><para>Listen on a sequential packet socket (<constant>SOCK_SEQPACKET</constant>), instead of a stream + socket (<constant>SOCK_STREAM</constant>). May not be combined with + <option>--datagram</option>.</para></listitem> + </varlistentry> + + <varlistentry> + <term><option>--inetd</option></term> + + <listitem><para>Use the inetd protocol for passing file descriptors, i.e. as standard input and standard + output, instead of the new-style protocol for passing file descriptors using <varname>$LISTEN_FDS</varname> + (see above).</para></listitem> + </varlistentry> + + <varlistentry> + <term><option>-E <replaceable>VAR</replaceable><optional>=<replaceable>VALUE</replaceable></optional></option></term> + <term><option>--setenv=<replaceable>VAR</replaceable><optional>=<replaceable>VALUE</replaceable></optional></option></term> + + <listitem><para>Add this variable to the environment of the + launched process. If <replaceable>VAR</replaceable> is + followed by <literal>=</literal>, assume that it is a + variable–value pair. Otherwise, obtain the value from the + environment of <command>systemd-activate</command> itself. + </para></listitem> + </varlistentry> + + <varlistentry> + <term><option>--fdname=</option><replaceable>NAME</replaceable></term> + + <listitem><para>Specify a name for the activation file + descriptors. This is equivalent to setting + <varname>FileDescriptorName=</varname> in socket unit files, and + enables use of + <citerefentry><refentrytitle>sd_listen_fds_with_names</refentrytitle><manvolnum>3</manvolnum></citerefentry>.</para></listitem> + </varlistentry> + + <xi:include href="standard-options.xml" xpointer="help" /> + <xi:include href="standard-options.xml" xpointer="version" /> + </variablelist> + </refsect1> + + <refsect1> + <title>Environment variables</title> + <variablelist class='environment-variables'> + <varlistentry> + <term><varname>$LISTEN_FDS</varname></term> + <term><varname>$LISTEN_PID</varname></term> + <term><varname>$LISTEN_FDNAMES</varname></term> + + <listitem><para>See + <citerefentry><refentrytitle>sd_listen_fds</refentrytitle><manvolnum>3</manvolnum></citerefentry>.</para></listitem> + </varlistentry> + + <varlistentry> + <term><varname>$SYSTEMD_LOG_TARGET</varname></term> + <term><varname>$SYSTEMD_LOG_LEVEL</varname></term> + <term><varname>$SYSTEMD_LOG_COLOR</varname></term> + <term><varname>$SYSTEMD_LOG_LOCATION</varname></term> + + <listitem><para>Same as in + <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>.</para></listitem> + </varlistentry> + </variablelist> + </refsect1> + + <refsect1> + <title>Examples</title> + + <example> + <title>Run an echo server on port 2000</title> + + <programlisting>$ /usr/lib/systemd/systemd-activate -l 2000 --inetd -a cat</programlisting> + </example> + + <example> + <title>Run a socket-activated instance of <citerefentry><refentrytitle>systemd-journal-gatewayd</refentrytitle><manvolnum>8</manvolnum></citerefentry></title> + + <programlisting>$ /usr/lib/systemd/systemd-activate -l 19531 /usr/lib/systemd/systemd-journal-gatewayd</programlisting> + </example> + </refsect1> + + <refsect1> + <title>See Also</title> + <para> + <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>, + <citerefentry><refentrytitle>systemd.socket</refentrytitle><manvolnum>5</manvolnum></citerefentry>, + <citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>, + <citerefentry><refentrytitle>sd_listen_fds</refentrytitle><manvolnum>3</manvolnum></citerefentry>, + <citerefentry><refentrytitle>sd_listen_fds_with_names</refentrytitle><manvolnum>3</manvolnum></citerefentry>, + <citerefentry project='man-pages'><refentrytitle>cat</refentrytitle><manvolnum>1</manvolnum></citerefentry> + </para> + </refsect1> +</refentry> diff --git a/src/analyze/.gitignore b/src/systemd-analyze/.gitignore index 752ea236c8..752ea236c8 100644 --- a/src/analyze/.gitignore +++ b/src/systemd-analyze/.gitignore diff --git a/src/systemd-analyze/Makefile b/src/systemd-analyze/Makefile new file mode 100644 index 0000000000..b39ba721f6 --- /dev/null +++ b/src/systemd-analyze/Makefile @@ -0,0 +1,40 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +systemd_analyze_SOURCES = \ + src/analyze/analyze.c \ + src/analyze/analyze-verify.c \ + src/analyze/analyze-verify.h + +systemd_analyze_CFLAGS = \ + $(AM_CFLAGS) \ + $(SECCOMP_CFLAGS) \ + $(MOUNT_CFLAGS) + +systemd_analyze_LDADD = \ + libcore.la + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/analyze/analyze-verify.c b/src/systemd-analyze/analyze-verify.c index d36c8db3d4..d36c8db3d4 100644 --- a/src/analyze/analyze-verify.c +++ b/src/systemd-analyze/analyze-verify.c diff --git a/src/analyze/analyze-verify.h b/src/systemd-analyze/analyze-verify.h index 54adad93e1..54adad93e1 100644 --- a/src/analyze/analyze-verify.h +++ b/src/systemd-analyze/analyze-verify.h diff --git a/src/analyze/analyze.c b/src/systemd-analyze/analyze.c index 1a28093b07..13bcc8ebdd 100644 --- a/src/analyze/analyze.c +++ b/src/systemd-analyze/analyze.c @@ -23,7 +23,7 @@ #include <stdio.h> #include <stdlib.h> -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "alloc-util.h" #include "analyze-verify.h" diff --git a/src/systemd-ask-password/Makefile b/src/systemd-ask-password/Makefile new file mode 100644 index 0000000000..51d88d4c09 --- /dev/null +++ b/src/systemd-ask-password/Makefile @@ -0,0 +1,33 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +systemd_ask_password_SOURCES = \ + src/ask-password/ask-password.c + +systemd_ask_password_LDADD = \ + libshared.la + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/ask-password/ask-password.c b/src/systemd-ask-password/ask-password.c index adc9286612..adc9286612 100644 --- a/src/ask-password/ask-password.c +++ b/src/systemd-ask-password/ask-password.c diff --git a/src/systemd-backlight/Makefile b/src/systemd-backlight/Makefile new file mode 100644 index 0000000000..557a236aa9 --- /dev/null +++ b/src/systemd-backlight/Makefile @@ -0,0 +1,44 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +ifneq ($(ENABLE_BACKLIGHT),) +libexec_PROGRAMS += \ + systemd-backlight + +nodist_systemunit_DATA += \ + units/systemd-backlight@.service + +systemd_backlight_SOURCES = \ + src/backlight/backlight.c + +systemd_backlight_LDADD = \ + libshared.la +endif # ENABLE_BACKLIGHT + +EXTRA_DIST += \ + units/systemd-backlight@.service.in + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/backlight/backlight.c b/src/systemd-backlight/backlight.c index 45be135a23..45be135a23 100644 --- a/src/backlight/backlight.c +++ b/src/systemd-backlight/backlight.c diff --git a/src/systemd-binfmt/Makefile b/src/systemd-binfmt/Makefile new file mode 100644 index 0000000000..54f73bacd1 --- /dev/null +++ b/src/systemd-binfmt/Makefile @@ -0,0 +1,57 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +ifneq ($(ENABLE_BINFMT),) +systemd_binfmt_SOURCES = \ + src/binfmt/binfmt.c + +systemd_binfmt_LDADD = \ + libshared.la + +libexec_PROGRAMS += \ + systemd-binfmt + +dist_systemunit_DATA += \ + units/proc-sys-fs-binfmt_misc.automount \ + units/proc-sys-fs-binfmt_misc.mount + +nodist_systemunit_DATA += \ + units/systemd-binfmt.service + +INSTALL_DIRS += \ + $(prefix)/lib/binfmt.d \ + $(sysconfdir)/binfmt.d + +SYSINIT_TARGET_WANTS += \ + systemd-binfmt.service \ + proc-sys-fs-binfmt_misc.automount + +endif # ENABLE_BINFMT + +EXTRA_DIST += \ + units/systemd-binfmt.service.in + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/binfmt/binfmt.c b/src/systemd-binfmt/binfmt.c index eeef04fb1c..eeef04fb1c 100644 --- a/src/binfmt/binfmt.c +++ b/src/systemd-binfmt/binfmt.c diff --git a/src/systemd-bootchart/Makefile b/src/systemd-bootchart/Makefile new file mode 100644 index 0000000000..e752c988e0 --- /dev/null +++ b/src/systemd-bootchart/Makefile @@ -0,0 +1,52 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +ifneq ($(ENABLE_BOOTCHART),) +systemd_bootchart_SOURCES = \ + src/bootchart/bootchart.c \ + src/bootchart/bootchart.h \ + src/bootchart/store.c \ + src/bootchart/store.h \ + src/bootchart/svg.c \ + src/bootchart/svg.h + +systemd_bootchart_LDADD = \ + libshared.la + +libexec_PROGRAMS += \ + systemd-bootchart + +dist_pkgsysconf_DATA += \ + src/bootchart/bootchart.conf + +nodist_systemunit_DATA += \ + units/systemd-bootchart.service +endif # ENABLE_BOOTCHART + +EXTRA_DIST += \ + units/systemd-bootchart.service.in + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/bootchart/bootchart.c b/src/systemd-bootchart/bootchart.c index 77d158f5f9..8755b2d884 100644 --- a/src/bootchart/bootchart.c +++ b/src/systemd-bootchart/bootchart.c @@ -44,7 +44,7 @@ #include <time.h> #include <unistd.h> -#include "sd-journal.h" +#include <systemd/sd-journal.h> #include "alloc-util.h" #include "bootchart.h" diff --git a/src/bootchart/bootchart.conf b/src/systemd-bootchart/bootchart.conf index 4f5e50936e..4f5e50936e 100644 --- a/src/bootchart/bootchart.conf +++ b/src/systemd-bootchart/bootchart.conf diff --git a/src/bootchart/bootchart.h b/src/systemd-bootchart/bootchart.h index 1b445b954b..1b445b954b 100644 --- a/src/bootchart/bootchart.h +++ b/src/systemd-bootchart/bootchart.h diff --git a/src/bootchart/store.c b/src/systemd-bootchart/store.c index 42cb8043ce..42cb8043ce 100644 --- a/src/bootchart/store.c +++ b/src/systemd-bootchart/store.c diff --git a/src/bootchart/store.h b/src/systemd-bootchart/store.h index 6e9acf2a6f..6e9acf2a6f 100644 --- a/src/bootchart/store.h +++ b/src/systemd-bootchart/store.h diff --git a/src/bootchart/svg.c b/src/systemd-bootchart/svg.c index f2af535061..f2af535061 100644 --- a/src/bootchart/svg.c +++ b/src/systemd-bootchart/svg.c diff --git a/src/bootchart/svg.h b/src/systemd-bootchart/svg.h index 6e06b5ad97..6e06b5ad97 100644 --- a/src/bootchart/svg.h +++ b/src/systemd-bootchart/svg.h diff --git a/src/systemd-bus-proxyd/Makefile b/src/systemd-bus-proxyd/Makefile new file mode 100644 index 0000000000..411106d38e --- /dev/null +++ b/src/systemd-bus-proxyd/Makefile @@ -0,0 +1,57 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +systemd_bus_proxyd_SOURCES = \ + src/bus-proxyd/bus-proxyd.c + +systemd_bus_proxyd_LDADD = \ + libbus-proxy-core.la \ + libshared.la + +nodist_systemunit_DATA += \ + units/systemd-bus-proxyd.service + +dist_systemunit_DATA += \ + units/systemd-bus-proxyd.socket + +nodist_userunit_DATA += \ + units/user/systemd-bus-proxyd.service + +dist_userunit_DATA += \ + units/user/systemd-bus-proxyd.socket + +EXTRA_DIST += \ + units/systemd-bus-proxyd.service.m4.in \ + units/user/systemd-bus-proxyd.service.in + +ifneq ($(HAVE_SMACK),) +bus-proxyd-set-cap-hook: + -$(SETCAP) cap_mac_admin+ei $(DESTDIR)$(libexecdir)/systemd-bus-proxyd + +INSTALL_EXEC_HOOKS += bus-proxyd-set-cap-hook +endif # HAVE_SMACK + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/bus-proxyd/bus-proxyd.c b/src/systemd-bus-proxyd/bus-proxyd.c index b6bd6eb390..17b80c3e9a 100644 --- a/src/bus-proxyd/bus-proxyd.c +++ b/src/systemd-bus-proxyd/bus-proxyd.c @@ -29,7 +29,7 @@ #include <sys/socket.h> #include <unistd.h> -#include "sd-daemon.h" +#include <systemd/sd-daemon.h> #include "alloc-util.h" #include "bus-internal.h" diff --git a/src/systemd-cgls/Makefile b/src/systemd-cgls/Makefile new file mode 100644 index 0000000000..6d8bafb838 --- /dev/null +++ b/src/systemd-cgls/Makefile @@ -0,0 +1,33 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +systemd_cgls_SOURCES = \ + src/cgls/cgls.c + +systemd_cgls_LDADD = \ + libshared.la + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/cgls/cgls.c b/src/systemd-cgls/cgls.c index b839fadd04..5862cdb282 100644 --- a/src/cgls/cgls.c +++ b/src/systemd-cgls/cgls.c @@ -23,7 +23,7 @@ #include <string.h> #include <unistd.h> -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "alloc-util.h" #include "bus-error.h" diff --git a/src/systemd-cgroups-agent/Makefile b/src/systemd-cgroups-agent/Makefile new file mode 100644 index 0000000000..3462dcb74c --- /dev/null +++ b/src/systemd-cgroups-agent/Makefile @@ -0,0 +1,33 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +systemd_cgroups_agent_SOURCES = \ + src/cgroups-agent/cgroups-agent.c + +systemd_cgroups_agent_LDADD = \ + libshared.la + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/cgroups-agent/cgroups-agent.c b/src/systemd-cgroups-agent/cgroups-agent.c index aadfba0707..79098b5f2c 100644 --- a/src/cgroups-agent/cgroups-agent.c +++ b/src/systemd-cgroups-agent/cgroups-agent.c @@ -19,7 +19,7 @@ #include <stdlib.h> -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "bus-util.h" #include "log.h" diff --git a/src/systemd-cgtop/Makefile b/src/systemd-cgtop/Makefile new file mode 100644 index 0000000000..92e7bd2dc3 --- /dev/null +++ b/src/systemd-cgtop/Makefile @@ -0,0 +1,33 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +systemd_cgtop_SOURCES = \ + src/cgtop/cgtop.c + +systemd_cgtop_LDADD = \ + libshared.la + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/cgtop/cgtop.c b/src/systemd-cgtop/cgtop.c index 60d6da3246..5d021e5ef4 100644 --- a/src/cgtop/cgtop.c +++ b/src/systemd-cgtop/cgtop.c @@ -26,7 +26,7 @@ #include <string.h> #include <unistd.h> -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "alloc-util.h" #include "bus-error.h" diff --git a/src/systemd-cryptsetup/Makefile b/src/systemd-cryptsetup/Makefile new file mode 100644 index 0000000000..ea731cad5a --- /dev/null +++ b/src/systemd-cryptsetup/Makefile @@ -0,0 +1,60 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +ifneq ($(HAVE_LIBCRYPTSETUP),) +libexec_PROGRAMS += \ + systemd-cryptsetup + +systemgenerator_PROGRAMS += \ + systemd-cryptsetup-generator + +dist_systemunit_DATA += \ + units/cryptsetup.target \ + units/cryptsetup-pre.target + +systemd_cryptsetup_SOURCES = \ + src/cryptsetup/cryptsetup.c + +systemd_cryptsetup_CFLAGS = \ + $(AM_CFLAGS) \ + $(LIBCRYPTSETUP_CFLAGS) + +systemd_cryptsetup_LDADD = \ + libshared.la \ + $(LIBCRYPTSETUP_LIBS) + +systemd_cryptsetup_generator_SOURCES = \ + src/cryptsetup/cryptsetup-generator.c + +systemd_cryptsetup_generator_LDADD = \ + libshared.la + +SYSINIT_TARGET_WANTS += \ + cryptsetup.target + +endif # HAVE_LIBCRYPTSETUP + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/systemd-cryptsetup/cryptsetup-generator.c index 8ac5ab730a..8ac5ab730a 100644 --- a/src/cryptsetup/cryptsetup-generator.c +++ b/src/systemd-cryptsetup/cryptsetup-generator.c diff --git a/src/cryptsetup/cryptsetup.c b/src/systemd-cryptsetup/cryptsetup.c index 2ef966257a..9d8156697d 100644 --- a/src/cryptsetup/cryptsetup.c +++ b/src/systemd-cryptsetup/cryptsetup.c @@ -23,7 +23,7 @@ #include <string.h> #include <sys/mman.h> -#include "sd-device.h" +#include <systemd/sd-device.h> #include "alloc-util.h" #include "ask-password-api.h" diff --git a/src/systemd-dbus1-generator/Makefile b/src/systemd-dbus1-generator/Makefile new file mode 100644 index 0000000000..0ca31fd24b --- /dev/null +++ b/src/systemd-dbus1-generator/Makefile @@ -0,0 +1,50 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +systemgenerator_PROGRAMS += \ + systemd-dbus1-generator + +systemd_dbus1_generator_SOURCES = \ + src/dbus1-generator/dbus1-generator.c + +systemd_dbus1_generator_LDADD = \ + libshared.la + +dbus1-generator-install-hook: + $(AM_V_at)$(MKDIR_P) $(DESTDIR)$(usergeneratordir) + $(AM_V_RM)rm -f $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator + $(AM_V_LN)$(LN_S) --relative -f $(DESTDIR)$(systemgeneratordir)/systemd-dbus1-generator $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator + +dbus1-generator-uninstall-hook: + rm -f $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator + +dist_xinitrc_SCRIPTS = \ + xorg/50-systemd-user.sh + +INSTALL_EXEC_HOOKS += dbus1-generator-install-hook +UNINSTALL_EXEC_HOOKS += dbus1-generator-uninstall-hook + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/dbus1-generator/dbus1-generator.c b/src/systemd-dbus1-generator/dbus1-generator.c index 717cb9558e..717cb9558e 100644 --- a/src/dbus1-generator/dbus1-generator.c +++ b/src/systemd-dbus1-generator/dbus1-generator.c diff --git a/src/systemd-debug-generator/Makefile b/src/systemd-debug-generator/Makefile new file mode 100644 index 0000000000..e86085ca7b --- /dev/null +++ b/src/systemd-debug-generator/Makefile @@ -0,0 +1,33 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +systemd_debug_generator_SOURCES = \ + src/debug-generator/debug-generator.c + +systemd_debug_generator_LDADD = \ + libshared.la + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/debug-generator/debug-generator.c b/src/systemd-debug-generator/debug-generator.c index 7e80af78e7..7e80af78e7 100644 --- a/src/debug-generator/debug-generator.c +++ b/src/systemd-debug-generator/debug-generator.c diff --git a/src/systemd-delta/Makefile b/src/systemd-delta/Makefile new file mode 100644 index 0000000000..63ad09d508 --- /dev/null +++ b/src/systemd-delta/Makefile @@ -0,0 +1,33 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +systemd_delta_SOURCES = \ + src/delta/delta.c + +systemd_delta_LDADD = \ + libshared.la + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/delta/delta.c b/src/systemd-delta/delta.c index a54fc89de6..a54fc89de6 100644 --- a/src/delta/delta.c +++ b/src/systemd-delta/delta.c diff --git a/src/systemd-detect-virt/Makefile b/src/systemd-detect-virt/Makefile new file mode 100644 index 0000000000..4b44544c63 --- /dev/null +++ b/src/systemd-detect-virt/Makefile @@ -0,0 +1,36 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +systemd_detect_virt_SOURCES = \ + src/detect-virt/detect-virt.c + +systemd_detect_virt_LDADD = \ + libshared.la + +INSTALL_EXEC_HOOKS += \ + systemd-detect-virt-install-hook + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/detect-virt/detect-virt.c b/src/systemd-detect-virt/detect-virt.c index 5d51589a31..5d51589a31 100644 --- a/src/detect-virt/detect-virt.c +++ b/src/systemd-detect-virt/detect-virt.c diff --git a/src/systemd-escape/Makefile b/src/systemd-escape/Makefile new file mode 100644 index 0000000000..d0614c0713 --- /dev/null +++ b/src/systemd-escape/Makefile @@ -0,0 +1,33 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +systemd_escape_SOURCES = \ + src/escape/escape.c + +systemd_escape_LDADD = \ + libshared.la + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/escape/escape.c b/src/systemd-escape/escape.c index 9f39049577..9f39049577 100644 --- a/src/escape/escape.c +++ b/src/systemd-escape/escape.c diff --git a/src/systemd-firstboot/Makefile b/src/systemd-firstboot/Makefile new file mode 100644 index 0000000000..71dd8b74c3 --- /dev/null +++ b/src/systemd-firstboot/Makefile @@ -0,0 +1,48 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +ifneq ($(ENABLE_FIRSTBOOT),) +systemd_firstboot_SOURCES = \ + src/firstboot/firstboot.c + +systemd_firstboot_LDADD = \ + libshared.la \ + -lcrypt + +bin_PROGRAMS += \ + systemd-firstboot + +nodist_systemunit_DATA += \ + units/systemd-firstboot.service + +SYSINIT_TARGET_WANTS += \ + systemd-firstboot.service +endif # ENABLE_FIRSTBOOT + +EXTRA_DIST += \ + units/systemd-firstboot.service.in + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/firstboot/firstboot.c b/src/systemd-firstboot/firstboot.c index 8e57a24a70..8e57a24a70 100644 --- a/src/firstboot/firstboot.c +++ b/src/systemd-firstboot/firstboot.c diff --git a/src/systemd-fsck/Makefile b/src/systemd-fsck/Makefile new file mode 100644 index 0000000000..2e040bfb0e --- /dev/null +++ b/src/systemd-fsck/Makefile @@ -0,0 +1,33 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +systemd_fsck_SOURCES = \ + src/fsck/fsck.c + +systemd_fsck_LDADD = \ + libshared.la + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/fsck/fsck.c b/src/systemd-fsck/fsck.c index 6f56066da8..f21433c0ad 100644 --- a/src/fsck/fsck.c +++ b/src/systemd-fsck/fsck.c @@ -27,8 +27,8 @@ #include <sys/stat.h> #include <unistd.h> -#include "sd-bus.h" -#include "sd-device.h" +#include <systemd/sd-bus.h> +#include <systemd/sd-device.h> #include "alloc-util.h" #include "bus-common-errors.h" diff --git a/src/systemd-fstab-generator/Makefile b/src/systemd-fstab-generator/Makefile new file mode 100644 index 0000000000..6a65d25154 --- /dev/null +++ b/src/systemd-fstab-generator/Makefile @@ -0,0 +1,34 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +systemd_fstab_generator_SOURCES = \ + src/fstab-generator/fstab-generator.c \ + src/core/mount-setup.c + +systemd_fstab_generator_LDADD = \ + libshared.la + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/fstab-generator/fstab-generator.c b/src/systemd-fstab-generator/fstab-generator.c index 97a48764ae..97a48764ae 100644 --- a/src/fstab-generator/fstab-generator.c +++ b/src/systemd-fstab-generator/fstab-generator.c diff --git a/src/systemd-getty-generator/Makefile b/src/systemd-getty-generator/Makefile new file mode 100644 index 0000000000..84564079bb --- /dev/null +++ b/src/systemd-getty-generator/Makefile @@ -0,0 +1,33 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +systemd_getty_generator_SOURCES = \ + src/getty-generator/getty-generator.c + +systemd_getty_generator_LDADD = \ + libshared.la + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/getty-generator/getty-generator.c b/src/systemd-getty-generator/getty-generator.c index b15c76b5b8..b15c76b5b8 100644 --- a/src/getty-generator/getty-generator.c +++ b/src/systemd-getty-generator/getty-generator.c diff --git a/src/systemd-gpt-auto-generator/Makefile b/src/systemd-gpt-auto-generator/Makefile new file mode 100644 index 0000000000..16b5933638 --- /dev/null +++ b/src/systemd-gpt-auto-generator/Makefile @@ -0,0 +1,44 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +ifneq ($(HAVE_BLKID),) +systemgenerator_PROGRAMS += \ + systemd-gpt-auto-generator + +systemd_gpt_auto_generator_SOURCES = \ + src/gpt-auto-generator/gpt-auto-generator.c \ + src/basic/blkid-util.h + +systemd_gpt_auto_generator_LDADD = \ + libshared.la \ + $(BLKID_LIBS) + +systemd_gpt_auto_generator_CFLAGS = \ + $(AM_CFLAGS) \ + $(BLKID_CFLAGS) +endif # HAVE_BLKID + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/gpt-auto-generator/gpt-auto-generator.c b/src/systemd-gpt-auto-generator/gpt-auto-generator.c index af96adec06..a8149b8756 100644 --- a/src/gpt-auto-generator/gpt-auto-generator.c +++ b/src/systemd-gpt-auto-generator/gpt-auto-generator.c @@ -23,7 +23,7 @@ #include <unistd.h> #include "libudev.h" -#include "sd-id128.h" +#include <systemd/sd-id128.h> #include "alloc-util.h" #include "blkid-util.h" diff --git a/src/systemd-hibernate-resume/Makefile b/src/systemd-hibernate-resume/Makefile new file mode 100644 index 0000000000..8b204da327 --- /dev/null +++ b/src/systemd-hibernate-resume/Makefile @@ -0,0 +1,61 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +ifneq ($(ENABLE_HIBERNATE),) +systemgenerator_PROGRAMS += \ + systemd-hibernate-resume-generator + +libexec_PROGRAMS += \ + systemd-hibernate-resume + +systemd_hibernate_resume_SOURCES = \ + src/hibernate-resume/hibernate-resume.c + +systemd_hibernate_resume_LDADD = \ + libshared.la + +systemd_hibernate_resume_generator_SOURCES = \ + src/hibernate-resume/hibernate-resume-generator.c + +systemd_hibernate_resume_generator_LDADD = \ + libshared.la + +dist_systemunit_DATA += \ + units/hibernate.target \ + units/hybrid-sleep.target + +nodist_systemunit_DATA += \ + units/systemd-hibernate.service \ + units/systemd-hibernate-resume@.service \ + units/systemd-hybrid-sleep.service +endif # ENABLE_HIBERNATE + +EXTRA_DIST += \ + units/systemd-hibernate.service.in \ + units/systemd-hibernate-resume@.service.in \ + units/systemd-hybrid-sleep.service.in + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/hibernate-resume/hibernate-resume-generator.c b/src/systemd-hibernate-resume/hibernate-resume-generator.c index d7ee80d58f..d7ee80d58f 100644 --- a/src/hibernate-resume/hibernate-resume-generator.c +++ b/src/systemd-hibernate-resume/hibernate-resume-generator.c diff --git a/src/hibernate-resume/hibernate-resume.c b/src/systemd-hibernate-resume/hibernate-resume.c index 21df3c4461..21df3c4461 100644 --- a/src/hibernate-resume/hibernate-resume.c +++ b/src/systemd-hibernate-resume/hibernate-resume.c diff --git a/src/systemd-hwdb/Makefile b/src/systemd-hwdb/Makefile new file mode 100644 index 0000000000..2b3aaeed54 --- /dev/null +++ b/src/systemd-hwdb/Makefile @@ -0,0 +1,77 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +ifneq ($(ENABLE_HWDB),) +INSTALL_DIRS += \ + $(sysconfdir)/udev/hwdb.d + +systemd_hwdb_SOURCES = \ + src/libsystemd/sd-hwdb/hwdb-internal.h \ + src/hwdb/hwdb.c + +systemd_hwdb_LDADD = \ + libshared.la + +bin_PROGRAMS += \ + systemd-hwdb + +dist_udevhwdb_DATA = \ + hwdb/20-pci-vendor-model.hwdb \ + hwdb/20-pci-classes.hwdb \ + hwdb/20-usb-vendor-model.hwdb \ + hwdb/20-usb-classes.hwdb \ + hwdb/20-sdio-vendor-model.hwdb \ + hwdb/20-sdio-classes.hwdb \ + hwdb/20-bluetooth-vendor-product.hwdb \ + hwdb/20-acpi-vendor.hwdb \ + hwdb/20-OUI.hwdb \ + hwdb/20-net-ifname.hwdb \ + hwdb/60-evdev.hwdb \ + hwdb/60-keyboard.hwdb \ + hwdb/70-mouse.hwdb \ + hwdb/70-pointingstick.hwdb + +SYSINIT_TARGET_WANTS += \ + systemd-hwdb-update.service + +# Update hwdb on installation. Do not bother if installing +# in DESTDIR, since this is likely for packaging purposes. +hwdb-update-hook: + -test -n "$(DESTDIR)" || $(bindir)/systemd-hwdb update + +INSTALL_DATA_HOOKS += \ + hwdb-update-hook + +hwdb-remove-hook: + -test -n "$(DESTDIR)" || rm -f /etc/udev/hwdb.bin +endif # ENABLE_HWDB + +EXTRA_DIST += \ + units/systemd-hwdb-update.service.in \ + hwdb/ids-update.pl \ + hwdb/sdio.ids + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/hwdb/hwdb.c b/src/systemd-hwdb/hwdb.c index 1160dacdf1..1160dacdf1 100644 --- a/src/hwdb/hwdb.c +++ b/src/systemd-hwdb/hwdb.c diff --git a/src/systemd-notify/Makefile b/src/systemd-notify/Makefile new file mode 100644 index 0000000000..3de5087a14 --- /dev/null +++ b/src/systemd-notify/Makefile @@ -0,0 +1,33 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +systemd_notify_SOURCES = \ + src/notify/notify.c + +systemd_notify_LDADD = \ + libshared.la + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/notify/notify.c b/src/systemd-notify/notify.c index 49f97c61d9..b18fb5938f 100644 --- a/src/notify/notify.c +++ b/src/systemd-notify/notify.c @@ -23,7 +23,7 @@ #include <stdlib.h> #include <unistd.h> -#include "sd-daemon.h" +#include <systemd/sd-daemon.h> #include "alloc-util.h" #include "env-util.h" diff --git a/src/nspawn/.gitignore b/src/systemd-nspawn/.gitignore index 85c81fff24..85c81fff24 100644 --- a/src/nspawn/.gitignore +++ b/src/systemd-nspawn/.gitignore diff --git a/src/systemd-nspawn/Makefile b/src/systemd-nspawn/Makefile new file mode 100644 index 0000000000..5ec68fb205 --- /dev/null +++ b/src/systemd-nspawn/Makefile @@ -0,0 +1,70 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +systemd_nspawn_SOURCES = \ + src/nspawn/nspawn.c \ + src/nspawn/nspawn-settings.c \ + src/nspawn/nspawn-settings.h \ + src/nspawn/nspawn-mount.c \ + src/nspawn/nspawn-mount.h \ + src/nspawn/nspawn-network.c \ + src/nspawn/nspawn-network.h \ + src/nspawn/nspawn-expose-ports.c \ + src/nspawn/nspawn-expose-ports.h \ + src/nspawn/nspawn-cgroup.c \ + src/nspawn/nspawn-cgroup.h \ + src/nspawn/nspawn-register.c \ + src/nspawn/nspawn-register.h \ + src/nspawn/nspawn-setuid.c \ + src/nspawn/nspawn-setuid.h \ + src/nspawn/nspawn-stub-pid1.c \ + src/nspawn/nspawn-stub-pid1.h \ + src/core/mount-setup.c \ + src/core/mount-setup.h \ + src/core/loopback-setup.c \ + src/core/loopback-setup.h + +nodist_systemd_nspawn_SOURCES = \ + src/nspawn/nspawn-gperf.c + +gperf_gperf_sources += \ + src/nspawn/nspawn-gperf.gperf + +systemd_nspawn_CFLAGS = \ + $(AM_CFLAGS) \ + $(BLKID_CFLAGS) \ + $(SECCOMP_CFLAGS) + +systemd_nspawn_LDADD = \ + libshared.la \ + $(BLKID_LIBS) + +ifneq ($(HAVE_LIBIPTC),) +systemd_nspawn_LDADD += \ + libfirewall.la +endif # HAVE_LIBIPTC + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/nspawn/nspawn-cgroup.c b/src/systemd-nspawn/nspawn-cgroup.c index 1db5ba7116..1db5ba7116 100644 --- a/src/nspawn/nspawn-cgroup.c +++ b/src/systemd-nspawn/nspawn-cgroup.c diff --git a/src/nspawn/nspawn-cgroup.h b/src/systemd-nspawn/nspawn-cgroup.h index 1ff35a299a..1ff35a299a 100644 --- a/src/nspawn/nspawn-cgroup.h +++ b/src/systemd-nspawn/nspawn-cgroup.h diff --git a/src/nspawn/nspawn-expose-ports.c b/src/systemd-nspawn/nspawn-expose-ports.c index 86124b8779..8122a14f7b 100644 --- a/src/nspawn/nspawn-expose-ports.c +++ b/src/systemd-nspawn/nspawn-expose-ports.c @@ -17,7 +17,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-netlink.h" +#include <systemd/sd-netlink.h> #include "alloc-util.h" #include "fd-util.h" diff --git a/src/nspawn/nspawn-expose-ports.h b/src/systemd-nspawn/nspawn-expose-ports.h index 741ad9765c..0e9f8f7e88 100644 --- a/src/nspawn/nspawn-expose-ports.h +++ b/src/systemd-nspawn/nspawn-expose-ports.h @@ -21,8 +21,8 @@ #include <inttypes.h> -#include "sd-event.h" -#include "sd-netlink.h" +#include <systemd/sd-event.h> +#include <systemd/sd-netlink.h> #include "in-addr-util.h" #include "list.h" diff --git a/src/nspawn/nspawn-gperf.gperf b/src/systemd-nspawn/nspawn-gperf.gperf index 116655cdd2..116655cdd2 100644 --- a/src/nspawn/nspawn-gperf.gperf +++ b/src/systemd-nspawn/nspawn-gperf.gperf diff --git a/src/nspawn/nspawn-mount.c b/src/systemd-nspawn/nspawn-mount.c index 70cca15278..70cca15278 100644 --- a/src/nspawn/nspawn-mount.c +++ b/src/systemd-nspawn/nspawn-mount.c diff --git a/src/nspawn/nspawn-mount.h b/src/systemd-nspawn/nspawn-mount.h index 0daf145412..0daf145412 100644 --- a/src/nspawn/nspawn-mount.h +++ b/src/systemd-nspawn/nspawn-mount.h diff --git a/src/nspawn/nspawn-network.c b/src/systemd-nspawn/nspawn-network.c index fcb1efaa74..d03fd001a7 100644 --- a/src/nspawn/nspawn-network.c +++ b/src/systemd-nspawn/nspawn-network.c @@ -21,8 +21,8 @@ #include <net/if.h> #include "libudev.h" -#include "sd-id128.h" -#include "sd-netlink.h" +#include <systemd/sd-id128.h> +#include <systemd/sd-netlink.h> #include "alloc-util.h" #include "ether-addr-util.h" diff --git a/src/nspawn/nspawn-network.h b/src/systemd-nspawn/nspawn-network.h index 9ab1606d1c..9ab1606d1c 100644 --- a/src/nspawn/nspawn-network.h +++ b/src/systemd-nspawn/nspawn-network.h diff --git a/src/nspawn/nspawn-register.c b/src/systemd-nspawn/nspawn-register.c index 760861089d..3b0d778f43 100644 --- a/src/nspawn/nspawn-register.c +++ b/src/systemd-nspawn/nspawn-register.c @@ -17,7 +17,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "bus-error.h" #include "bus-util.h" diff --git a/src/nspawn/nspawn-register.h b/src/systemd-nspawn/nspawn-register.h index 304c5a485b..c7a50f7477 100644 --- a/src/nspawn/nspawn-register.h +++ b/src/systemd-nspawn/nspawn-register.h @@ -21,7 +21,7 @@ #include <sys/types.h> -#include "sd-id128.h" +#include <systemd/sd-id128.h> #include "nspawn-mount.h" diff --git a/src/nspawn/nspawn-settings.c b/src/systemd-nspawn/nspawn-settings.c index 4fb0054698..4fb0054698 100644 --- a/src/nspawn/nspawn-settings.c +++ b/src/systemd-nspawn/nspawn-settings.c diff --git a/src/nspawn/nspawn-settings.h b/src/systemd-nspawn/nspawn-settings.h index a017405cd9..a017405cd9 100644 --- a/src/nspawn/nspawn-settings.h +++ b/src/systemd-nspawn/nspawn-settings.h diff --git a/src/nspawn/nspawn-setuid.c b/src/systemd-nspawn/nspawn-setuid.c index ee15a47e93..ee15a47e93 100644 --- a/src/nspawn/nspawn-setuid.c +++ b/src/systemd-nspawn/nspawn-setuid.c diff --git a/src/nspawn/nspawn-setuid.h b/src/systemd-nspawn/nspawn-setuid.h index b4968ba1fc..b4968ba1fc 100644 --- a/src/nspawn/nspawn-setuid.h +++ b/src/systemd-nspawn/nspawn-setuid.h diff --git a/src/nspawn/nspawn-stub-pid1.c b/src/systemd-nspawn/nspawn-stub-pid1.c index 2de87e3c63..2de87e3c63 100644 --- a/src/nspawn/nspawn-stub-pid1.c +++ b/src/systemd-nspawn/nspawn-stub-pid1.c diff --git a/src/nspawn/nspawn-stub-pid1.h b/src/systemd-nspawn/nspawn-stub-pid1.h index 36c1aaf5dd..36c1aaf5dd 100644 --- a/src/nspawn/nspawn-stub-pid1.h +++ b/src/systemd-nspawn/nspawn-stub-pid1.h diff --git a/src/nspawn/nspawn.c b/src/systemd-nspawn/nspawn.c index ef348c335b..add66be183 100644 --- a/src/nspawn/nspawn.c +++ b/src/systemd-nspawn/nspawn.c @@ -41,8 +41,8 @@ #include <sys/types.h> #include <unistd.h> -#include "sd-daemon.h" -#include "sd-id128.h" +#include <systemd/sd-daemon.h> +#include <systemd/sd-id128.h> #include "alloc-util.h" #include "barrier.h" diff --git a/src/systemd-path/Makefile b/src/systemd-path/Makefile new file mode 100644 index 0000000000..9009100008 --- /dev/null +++ b/src/systemd-path/Makefile @@ -0,0 +1,33 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +systemd_path_SOURCES = \ + src/path/path.c + +systemd_path_LDADD = \ + libshared.la + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/path/path.c b/src/systemd-path/path.c index 61d877fcf8..80268ed874 100644 --- a/src/path/path.c +++ b/src/systemd-path/path.c @@ -22,7 +22,7 @@ #include <stdio.h> #include <stdlib.h> -#include "sd-path.h" +#include <systemd/sd-path.h> #include "alloc-util.h" #include "log.h" diff --git a/src/systemd-quotacheck/Makefile b/src/systemd-quotacheck/Makefile new file mode 100644 index 0000000000..435ed0438c --- /dev/null +++ b/src/systemd-quotacheck/Makefile @@ -0,0 +1,47 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +ifneq ($(ENABLE_QUOTACHECK),) +libexec_PROGRAMS += \ + systemd-quotacheck + +nodist_systemunit_DATA += \ + units/systemd-quotacheck.service + +systemd_quotacheck_SOURCES = \ + src/quotacheck/quotacheck.c + +systemd_quotacheck_LDADD = \ + libshared.la +endif # ENABLE_QUOTACHECK + +EXTRA_DIST += \ + units/systemd-quotacheck.service.in + +nodist_systemunit_DATA += \ + units/quotaon.service + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/quotacheck/quotacheck.c b/src/systemd-quotacheck/quotacheck.c index 6d8c05f046..6d8c05f046 100644 --- a/src/quotacheck/quotacheck.c +++ b/src/systemd-quotacheck/quotacheck.c diff --git a/src/systemd-random-seed/Makefile b/src/systemd-random-seed/Makefile new file mode 100644 index 0000000000..80f122dd73 --- /dev/null +++ b/src/systemd-random-seed/Makefile @@ -0,0 +1,48 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +ifneq ($(ENABLE_RANDOMSEED),) +libexec_PROGRAMS += \ + systemd-random-seed + +nodist_systemunit_DATA += \ + units/systemd-random-seed.service + +systemd_random_seed_SOURCES = \ + src/random-seed/random-seed.c + +systemd_random_seed_LDADD = \ + libshared.la + +SYSINIT_TARGET_WANTS += \ + systemd-random-seed.service + +endif # ENABLE_RANDOMSEED + +EXTRA_DIST += \ + units/systemd-random-seed.service.in + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/random-seed/random-seed.c b/src/systemd-random-seed/random-seed.c index 6748bb9dd3..6748bb9dd3 100644 --- a/src/random-seed/random-seed.c +++ b/src/systemd-random-seed/random-seed.c diff --git a/src/systemd-rc-local-generator/Makefile b/src/systemd-rc-local-generator/Makefile new file mode 100644 index 0000000000..f1673644d4 --- /dev/null +++ b/src/systemd-rc-local-generator/Makefile @@ -0,0 +1,33 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +systemd_rc_local_generator_SOURCES = \ + src/rc-local-generator/rc-local-generator.c + +systemd_rc_local_generator_LDADD = \ + libshared.la + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/rc-local-generator/rc-local-generator.c b/src/systemd-rc-local-generator/rc-local-generator.c index 9e9c161993..9e9c161993 100644 --- a/src/rc-local-generator/rc-local-generator.c +++ b/src/systemd-rc-local-generator/rc-local-generator.c diff --git a/src/systemd-remount-fs/Makefile b/src/systemd-remount-fs/Makefile new file mode 100644 index 0000000000..e8374d805b --- /dev/null +++ b/src/systemd-remount-fs/Makefile @@ -0,0 +1,35 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +systemd_remount_fs_SOURCES = \ + src/remount-fs/remount-fs.c \ + src/core/mount-setup.c \ + src/core/mount-setup.h + +systemd_remount_fs_LDADD = \ + libshared.la + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/remount-fs/remount-fs.c b/src/systemd-remount-fs/remount-fs.c index 6468d1eecd..6468d1eecd 100644 --- a/src/remount-fs/remount-fs.c +++ b/src/systemd-remount-fs/remount-fs.c diff --git a/src/systemd-reply-password/Makefile b/src/systemd-reply-password/Makefile new file mode 100644 index 0000000000..cf5923da07 --- /dev/null +++ b/src/systemd-reply-password/Makefile @@ -0,0 +1,33 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +systemd_reply_password_SOURCES = \ + src/reply-password/reply-password.c + +systemd_reply_password_LDADD = \ + libshared.la + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/reply-password/reply-password.c b/src/systemd-reply-password/reply-password.c index e291758969..e291758969 100644 --- a/src/reply-password/reply-password.c +++ b/src/systemd-reply-password/reply-password.c diff --git a/src/systemd-rfkill/Makefile b/src/systemd-rfkill/Makefile new file mode 100644 index 0000000000..c8eaf043c9 --- /dev/null +++ b/src/systemd-rfkill/Makefile @@ -0,0 +1,47 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +ifneq ($(ENABLE_RFKILL),) +libexec_PROGRAMS += \ + systemd-rfkill + +nodist_systemunit_DATA += \ + units/systemd-rfkill.service + +dist_systemunit_DATA += \ + units/systemd-rfkill.socket + +systemd_rfkill_SOURCES = \ + src/rfkill/rfkill.c + +systemd_rfkill_LDADD = \ + libshared.la +endif # ENABLE_RFKILL + +EXTRA_DIST += \ + units/systemd-rfkill.service.in + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/rfkill/rfkill.c b/src/systemd-rfkill/rfkill.c index 0acdf229ed..f0b0ad9275 100644 --- a/src/rfkill/rfkill.c +++ b/src/systemd-rfkill/rfkill.c @@ -21,7 +21,7 @@ #include <poll.h> #include "libudev.h" -#include "sd-daemon.h" +#include <systemd/sd-daemon.h> #include "alloc-util.h" #include "escape.h" diff --git a/src/Makefile b/src/systemd-run/Makefile index 9d07505194..282ef5168c 100644 --- a/src/Makefile +++ b/src/systemd-run/Makefile @@ -1,6 +1,12 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# # This file is part of systemd. # -# Copyright 2010 Lennart Poettering +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker # # 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 @@ -14,15 +20,14 @@ # # You should have received a copy of the GNU Lesser General Public License # along with systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk -# This file is a dirty trick to simplify compilation from within -# emacs. This file is not intended to be distributed. So, don't touch -# it, even better ignore it! - -all: - $(MAKE) -C .. +systemd_run_SOURCES = \ + src/run/run.c -clean: - $(MAKE) -C .. clean +systemd_run_LDADD = \ + libshared.la -.PHONY: all clean +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/run/run.c b/src/systemd-run/run.c index e7f4c21f73..67706f84a0 100644 --- a/src/run/run.c +++ b/src/systemd-run/run.c @@ -20,8 +20,8 @@ #include <getopt.h> #include <stdio.h> -#include "sd-bus.h" -#include "sd-event.h" +#include <systemd/sd-bus.h> +#include <systemd/sd-event.h> #include "alloc-util.h" #include "bus-error.h" diff --git a/src/systemd-shutdown/Makefile b/src/systemd-shutdown/Makefile new file mode 100644 index 0000000000..1cc4c563cc --- /dev/null +++ b/src/systemd-shutdown/Makefile @@ -0,0 +1,39 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +systemd_shutdown_SOURCES = \ + src/core/umount.c \ + src/core/umount.h \ + src/core/shutdown.c \ + src/core/mount-setup.c \ + src/core/mount-setup.h \ + src/core/killall.h \ + src/core/killall.c + +systemd_shutdown_LDADD = \ + libshared.la + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/systemd-stdio-bridge/Makefile b/src/systemd-stdio-bridge/Makefile new file mode 100644 index 0000000000..24852e78ed --- /dev/null +++ b/src/systemd-stdio-bridge/Makefile @@ -0,0 +1,34 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +systemd_stdio_bridge_SOURCES = \ + src/bus-proxyd/stdio-bridge.c + +systemd_stdio_bridge_LDADD = \ + libbus-proxy-core.la \ + libshared.la + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/bus-proxyd/stdio-bridge.c b/src/systemd-stdio-bridge/stdio-bridge.c index 291c1b09e3..60c4a08325 100644 --- a/src/bus-proxyd/stdio-bridge.c +++ b/src/systemd-stdio-bridge/stdio-bridge.c @@ -25,8 +25,8 @@ #include <string.h> #include <unistd.h> -#include "sd-bus.h" -#include "sd-daemon.h" +#include <systemd/sd-bus.h> +#include <systemd/sd-daemon.h> #include "alloc-util.h" #include "bus-internal.h" diff --git a/src/systemd-system-update-generator/Makefile b/src/systemd-system-update-generator/Makefile new file mode 100644 index 0000000000..e2ae889d7e --- /dev/null +++ b/src/systemd-system-update-generator/Makefile @@ -0,0 +1,33 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +systemd_system_update_generator_SOURCES = \ + src/system-update-generator/system-update-generator.c + +systemd_system_update_generator_LDADD = \ + libshared.la + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/system-update-generator/system-update-generator.c b/src/systemd-system-update-generator/system-update-generator.c index a3d677f068..a3d677f068 100644 --- a/src/system-update-generator/system-update-generator.c +++ b/src/systemd-system-update-generator/system-update-generator.c diff --git a/src/systemd-sysv-generator/Makefile b/src/systemd-sysv-generator/Makefile new file mode 100644 index 0000000000..417cb7d849 --- /dev/null +++ b/src/systemd-sysv-generator/Makefile @@ -0,0 +1,33 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +systemd_sysv_generator_SOURCES = \ + src/sysv-generator/sysv-generator.c + +systemd_sysv_generator_LDADD = \ + libcore.la + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/sysv-generator/sysv-generator.c b/src/systemd-sysv-generator/sysv-generator.c index 5a6818a79d..5a6818a79d 100644 --- a/src/sysv-generator/sysv-generator.c +++ b/src/systemd-sysv-generator/sysv-generator.c diff --git a/src/timesync/.gitignore b/src/systemd-timesync/.gitignore index 35f4d76f79..35f4d76f79 100644 --- a/src/timesync/.gitignore +++ b/src/systemd-timesync/.gitignore diff --git a/src/systemd-timesync/Makefile b/src/systemd-timesync/Makefile new file mode 100644 index 0000000000..26d96ca1e0 --- /dev/null +++ b/src/systemd-timesync/Makefile @@ -0,0 +1,65 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +ifneq ($(ENABLE_TIMESYNCD),) +systemd_timesyncd_SOURCES = \ + src/timesync/timesyncd.c \ + src/timesync/timesyncd-manager.c \ + src/timesync/timesyncd-manager.h \ + src/timesync/timesyncd-conf.c \ + src/timesync/timesyncd-conf.h \ + src/timesync/timesyncd-server.c \ + src/timesync/timesyncd-server.h + +nodist_systemd_timesyncd_SOURCES = \ + src/timesync/timesyncd-gperf.c + +systemd_timesyncd_LDADD = \ + libsystemd-network.la \ + libshared.la + +libexec_PROGRAMS += \ + systemd-timesyncd + +nodist_systemunit_DATA += \ + units/systemd-timesyncd.service + +GENERAL_ALIASES += \ + $(systemunitdir)/systemd-timesyncd.service $(pkgsysconfdir)/system/sysinit.target.wants/systemd-timesyncd.service + +nodist_pkgsysconf_DATA += \ + src/timesync/timesyncd.conf + +endif # ENABLE_TIMESYNCD + +gperf_gperf_sources += \ + src/timesync/timesyncd-gperf.gperf + +EXTRA_DIST += \ + units/systemd-timesyncd.service.in \ + src/timesync/timesyncd.conf.in + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/timesync/timesyncd-conf.c b/src/systemd-timesync/timesyncd-conf.c index 20c64a3354..20c64a3354 100644 --- a/src/timesync/timesyncd-conf.c +++ b/src/systemd-timesync/timesyncd-conf.c diff --git a/src/timesync/timesyncd-conf.h b/src/systemd-timesync/timesyncd-conf.h index cba0724b1b..cba0724b1b 100644 --- a/src/timesync/timesyncd-conf.h +++ b/src/systemd-timesync/timesyncd-conf.h diff --git a/src/timesync/timesyncd-gperf.gperf b/src/systemd-timesync/timesyncd-gperf.gperf index 29a2cfeef6..29a2cfeef6 100644 --- a/src/timesync/timesyncd-gperf.gperf +++ b/src/systemd-timesync/timesyncd-gperf.gperf diff --git a/src/timesync/timesyncd-manager.c b/src/systemd-timesync/timesyncd-manager.c index d5e16db3a0..6a4b52af69 100644 --- a/src/timesync/timesyncd-manager.c +++ b/src/systemd-timesync/timesyncd-manager.c @@ -29,7 +29,7 @@ #include <sys/types.h> #include <time.h> -#include "sd-daemon.h" +#include <systemd/sd-daemon.h> #include "alloc-util.h" #include "fd-util.h" diff --git a/src/timesync/timesyncd-manager.h b/src/systemd-timesync/timesyncd-manager.h index efe3e60d3e..fd25647725 100644 --- a/src/timesync/timesyncd-manager.h +++ b/src/systemd-timesync/timesyncd-manager.h @@ -19,9 +19,9 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-event.h" -#include "sd-network.h" -#include "sd-resolve.h" +#include <systemd/sd-event.h> +#include <systemd/sd-network.h> +#include <systemd/sd-resolve.h> #include "list.h" #include "ratelimit.h" diff --git a/src/timesync/timesyncd-server.c b/src/systemd-timesync/timesyncd-server.c index 6bda86fe6e..6bda86fe6e 100644 --- a/src/timesync/timesyncd-server.c +++ b/src/systemd-timesync/timesyncd-server.c diff --git a/src/timesync/timesyncd-server.h b/src/systemd-timesync/timesyncd-server.h index 8a19e41d67..8a19e41d67 100644 --- a/src/timesync/timesyncd-server.h +++ b/src/systemd-timesync/timesyncd-server.h diff --git a/src/timesync/timesyncd.c b/src/systemd-timesync/timesyncd.c index 23e19159e0..388eefac48 100644 --- a/src/timesync/timesyncd.c +++ b/src/systemd-timesync/timesyncd.c @@ -17,8 +17,8 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-daemon.h" -#include "sd-event.h" +#include <systemd/sd-daemon.h> +#include <systemd/sd-event.h> #include "capability-util.h" #include "clock-util.h" diff --git a/src/timesync/timesyncd.conf.in b/src/systemd-timesync/timesyncd.conf.in index b6a2ada273..b6a2ada273 100644 --- a/src/timesync/timesyncd.conf.in +++ b/src/systemd-timesync/timesyncd.conf.in diff --git a/src/systemd-tmpfiles/Makefile b/src/systemd-tmpfiles/Makefile new file mode 100644 index 0000000000..cd4778b4b5 --- /dev/null +++ b/src/systemd-tmpfiles/Makefile @@ -0,0 +1,85 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +ifneq ($(ENABLE_TMPFILES),) +systemd_tmpfiles_SOURCES = \ + src/tmpfiles/tmpfiles.c + +systemd_tmpfiles_LDADD = \ + libshared.la + +bin_PROGRAMS += \ + systemd-tmpfiles + +dist_systemunit_DATA += \ + units/systemd-tmpfiles-clean.timer + +nodist_systemunit_DATA += \ + units/systemd-tmpfiles-setup-dev.service \ + units/systemd-tmpfiles-setup.service \ + units/systemd-tmpfiles-clean.service + +nodist_tmpfiles_DATA = \ + tmpfiles.d/systemd.conf \ + tmpfiles.d/etc.conf + +dist_tmpfiles_DATA = \ + tmpfiles.d/systemd-nologin.conf \ + tmpfiles.d/tmp.conf \ + tmpfiles.d/x11.conf \ + tmpfiles.d/var.conf \ + tmpfiles.d/home.conf \ + tmpfiles.d/systemd-nspawn.conf \ + tmpfiles.d/journal-nocow.conf + +ifneq ($(HAVE_SYSV_COMPAT),) +dist_tmpfiles_DATA += \ + tmpfiles.d/legacy.conf +endif # HAVE_SYSV_COMPAT + +SYSINIT_TARGET_WANTS += \ + systemd-tmpfiles-setup-dev.service \ + systemd-tmpfiles-setup.service + +dist_zshcompletion_data += \ + shell-completion/zsh/_systemd-tmpfiles + +TIMERS_TARGET_WANTS += \ + systemd-tmpfiles-clean.timer + +INSTALL_DIRS += \ + $(tmpfilesdir) \ + $(sysconfdir)/tmpfiles.d +endif # ENABLE_TMPFILES + +EXTRA_DIST += \ + tmpfiles.d/systemd.conf.m4 \ + tmpfiles.d/etc.conf.m4 \ + units/systemd-tmpfiles-setup-dev.service.in \ + units/systemd-tmpfiles-setup.service.in \ + units/systemd-tmpfiles-clean.service.in + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/tmpfiles/tmpfiles.c b/src/systemd-tmpfiles/tmpfiles.c index 7b105a6bd4..7b105a6bd4 100644 --- a/src/tmpfiles/tmpfiles.c +++ b/src/systemd-tmpfiles/tmpfiles.c diff --git a/src/systemd-tty-ask-password-agent/Makefile b/src/systemd-tty-ask-password-agent/Makefile new file mode 100644 index 0000000000..81d2ac4fee --- /dev/null +++ b/src/systemd-tty-ask-password-agent/Makefile @@ -0,0 +1,33 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +systemd_tty_ask_password_agent_SOURCES = \ + src/tty-ask-password-agent/tty-ask-password-agent.c + +systemd_tty_ask_password_agent_LDADD = \ + libshared.la + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/tty-ask-password-agent/tty-ask-password-agent.c b/src/systemd-tty-ask-password-agent/tty-ask-password-agent.c index 7b67831e54..7b67831e54 100644 --- a/src/tty-ask-password-agent/tty-ask-password-agent.c +++ b/src/systemd-tty-ask-password-agent/tty-ask-password-agent.c diff --git a/src/systemd-update-done/Makefile b/src/systemd-update-done/Makefile new file mode 100644 index 0000000000..654d6af7c1 --- /dev/null +++ b/src/systemd-update-done/Makefile @@ -0,0 +1,33 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +systemd_update_done_SOURCES = \ + src/update-done/update-done.c + +systemd_update_done_LDADD = \ + libshared.la + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/update-done/update-done.c b/src/systemd-update-done/update-done.c index 931e583785..931e583785 100644 --- a/src/update-done/update-done.c +++ b/src/systemd-update-done/update-done.c diff --git a/src/systemd-update-utmp/Makefile b/src/systemd-update-utmp/Makefile new file mode 100644 index 0000000000..5b9933ec95 --- /dev/null +++ b/src/systemd-update-utmp/Makefile @@ -0,0 +1,38 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +systemd_update_utmp_SOURCES = \ + src/update-utmp/update-utmp.c + +systemd_update_utmp_CFLAGS = \ + $(AM_CFLAGS) \ + $(AUDIT_CFLAGS) + +systemd_update_utmp_LDADD = \ + libshared.la \ + $(AUDIT_LIBS) + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/update-utmp/update-utmp.c b/src/systemd-update-utmp/update-utmp.c index 8ae4a8a833..fedcaef91c 100644 --- a/src/update-utmp/update-utmp.c +++ b/src/systemd-update-utmp/update-utmp.c @@ -25,7 +25,7 @@ #include <libaudit.h> #endif -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "alloc-util.h" #include "bus-error.h" diff --git a/src/user-sessions/user-sessions.c b/src/systemd-user-sessions/user-sessions.c index 8bf44e2100..8bf44e2100 100644 --- a/src/user-sessions/user-sessions.c +++ b/src/systemd-user-sessions/user-sessions.c diff --git a/src/vconsole/.gitignore b/src/systemd-vconsole/.gitignore index 82741b2fb3..82741b2fb3 100644 --- a/src/vconsole/.gitignore +++ b/src/systemd-vconsole/.gitignore diff --git a/src/vconsole/90-vconsole.rules.in b/src/systemd-vconsole/90-vconsole.rules.in index 35b9ad5151..35b9ad5151 100644 --- a/src/vconsole/90-vconsole.rules.in +++ b/src/systemd-vconsole/90-vconsole.rules.in diff --git a/src/systemd-vconsole/Makefile b/src/systemd-vconsole/Makefile new file mode 100644 index 0000000000..9cfaaa5fba --- /dev/null +++ b/src/systemd-vconsole/Makefile @@ -0,0 +1,51 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +ifneq ($(ENABLE_VCONSOLE),) +systemd_vconsole_setup_SOURCES = \ + src/vconsole/vconsole-setup.c + +systemd_vconsole_setup_LDADD = \ + libshared.la + +libexec_PROGRAMS += \ + systemd-vconsole-setup + +nodist_udevrules_DATA += \ + src/vconsole/90-vconsole.rules + +nodist_systemunit_DATA += \ + units/systemd-vconsole-setup.service + +SYSINIT_TARGET_WANTS += \ + systemd-vconsole-setup.service +endif # ENABLE_VCONSOLE + +EXTRA_DIST += \ + src/vconsole/90-vconsole.rules.in \ + units/systemd-vconsole-setup.service.in + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/vconsole/vconsole-setup.c b/src/systemd-vconsole/vconsole-setup.c index 8a1b824e65..8a1b824e65 100644 --- a/src/vconsole/vconsole-setup.c +++ b/src/systemd-vconsole/vconsole-setup.c diff --git a/src/systemd/Makefile b/src/systemd/Makefile deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/systemd/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile
\ No newline at end of file diff --git a/src/sysusers/Makefile b/src/sysusers/Makefile index d0b0e8e008..83f497dfac 120000..100644 --- a/src/sysusers/Makefile +++ b/src/sysusers/Makefile @@ -1 +1,62 @@ -../Makefile
\ No newline at end of file +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +ifneq ($(ENABLE_SYSUSERS),) +systemd_sysusers_SOURCES = \ + src/sysusers/sysusers.c + +systemd_sysusers_LDADD = \ + libshared.la + +bin_PROGRAMS += \ + systemd-sysusers + +nodist_systemunit_DATA += \ + units/systemd-sysusers.service + +SYSINIT_TARGET_WANTS += \ + systemd-sysusers.service + +nodist_sysusers_DATA = \ + sysusers.d/systemd.conf \ + sysusers.d/basic.conf + +ifneq ($(HAVE_REMOTE),) +nodist_sysusers_DATA += \ + sysusers.d/systemd-remote.conf +endif # HAVE_REMOTE + +INSTALL_DIRS += \ + $(sysusersdir) +endif # ENABLE_SYSUSERS + +EXTRA_DIST += \ + units/systemd-sysusers.service.in \ + sysusers.d/systemd.conf.m4 \ + sysusers.d/systemd-remote.conf.m4 \ + sysusers.d/basic.conf.in + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/sysv-generator/Makefile b/src/sysv-generator/Makefile deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/sysv-generator/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile
\ No newline at end of file diff --git a/src/test/Makefile b/src/test/Makefile index d0b0e8e008..eb65bdce1e 120000..100644 --- a/src/test/Makefile +++ b/src/test/Makefile @@ -1 +1,36 @@ -../Makefile
\ No newline at end of file +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +test_id128_SOURCES = \ + src/test/test-id128.c + +test_id128_LDADD = \ + libshared.la + +tests += \ + test-id128 + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/test/test-condition.c b/src/test/test-condition.c index 8903d10db7..c4ff41dd0e 100644 --- a/src/test/test-condition.c +++ b/src/test/test-condition.c @@ -17,7 +17,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-id128.h" +#include <systemd/sd-id128.h> #include "alloc-util.h" #include "apparmor-util.h" diff --git a/src/test/test-daemon.c b/src/test/test-daemon.c index 4ce00f4b1f..d181bee214 100644 --- a/src/test/test-daemon.c +++ b/src/test/test-daemon.c @@ -19,7 +19,7 @@ #include <unistd.h> -#include "sd-daemon.h" +#include <systemd/sd-daemon.h> #include "strv.h" diff --git a/src/test/test-helper.h b/src/test/test-helper.h index ddb10f88fd..01068da347 100644 --- a/src/test/test-helper.h +++ b/src/test/test-helper.h @@ -19,7 +19,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-daemon.h" +#include <systemd/sd-daemon.h> #include "macro.h" diff --git a/src/test/test-id128.c b/src/test/test-id128.c index 96aa008c06..90c4860e2a 100644 --- a/src/test/test-id128.c +++ b/src/test/test-id128.c @@ -19,8 +19,8 @@ #include <string.h> -#include "sd-daemon.h" -#include "sd-id128.h" +#include <systemd/sd-daemon.h> +#include <systemd/sd-id128.h> #include "alloc-util.h" #include "macro.h" diff --git a/src/test/test-netlink-manual.c b/src/test/test-netlink-manual.c index 79ff6ae74d..fe15a56aba 100644 --- a/src/test/test-netlink-manual.c +++ b/src/test/test-netlink-manual.c @@ -23,7 +23,7 @@ #include <net/if.h> #include <linux/if_tunnel.h> -#include "sd-netlink.h" +#include <systemd/sd-netlink.h> #include "macro.h" #include "util.h" diff --git a/src/timedate/Makefile b/src/timedate/Makefile deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/timedate/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile
\ No newline at end of file diff --git a/src/timesync/Makefile b/src/timesync/Makefile deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/timesync/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile
\ No newline at end of file diff --git a/src/tmpfiles/Makefile b/src/tmpfiles/Makefile deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/tmpfiles/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile
\ No newline at end of file diff --git a/src/tty-ask-password-agent/Makefile b/src/tty-ask-password-agent/Makefile deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/tty-ask-password-agent/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile
\ No newline at end of file diff --git a/src/udev/Makefile b/src/udev/Makefile index d0b0e8e008..187712f651 120000..100644 --- a/src/udev/Makefile +++ b/src/udev/Makefile @@ -1 +1,182 @@ -../Makefile
\ No newline at end of file +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +INSTALL_DIRS += \ + $(sysconfdir)/udev/rules.d + +dist_network_DATA = \ + network/99-default.link \ + network/80-container-host0.network \ + network/80-container-ve.network + +dist_udevrules_DATA += \ + rules/50-udev-default.rules \ + rules/60-block.rules \ + rules/60-drm.rules \ + rules/60-evdev.rules \ + rules/60-persistent-storage-tape.rules \ + rules/60-persistent-input.rules \ + rules/60-persistent-alsa.rules \ + rules/60-persistent-storage.rules \ + rules/60-serial.rules \ + rules/64-btrfs.rules \ + rules/70-mouse.rules \ + rules/75-net-description.rules \ + rules/78-sound-card.rules \ + rules/80-net-setup-link.rules + +nodist_udevrules_DATA += \ + rules/99-systemd.rules + +udevconfdir = $(sysconfdir)/udev +dist_udevconf_DATA = \ + src/udev/udev.conf + +pkgconfigdata_DATA += \ + src/udev/udev.pc + +EXTRA_DIST += \ + rules/99-systemd.rules.in \ + src/udev/udev.pc.in + +EXTRA_DIST += \ + units/systemd-udevd.service.in \ + units/systemd-udev-trigger.service.in \ + units/systemd-udev-settle.service.in + +SOCKETS_TARGET_WANTS += \ + systemd-udevd-control.socket \ + systemd-udevd-kernel.socket + +SYSINIT_TARGET_WANTS += \ + systemd-udevd.service \ + systemd-udev-trigger.service + +bin_PROGRAMS += \ + udevadm + +libexec_PROGRAMS += \ + systemd-udevd + +noinst_LTLIBRARIES += \ + libudev-core.la + +$(outdir)/keyboard-keys-list.txt: + $(AM_V_at)$(MKDIR_P) $(dir $@) + $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include linux/input.h - < /dev/null | $(AWK) '/^#define[ \t]+KEY_[^ ]+[ \t]+[0-9K]/ { if ($$2 != "KEY_MAX") { print $$2 } }' > $@ + +$(outdir)/keyboard-keys-from-name.gperf: src/udev/keyboard-keys-list.txt + $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct key { const char* name; unsigned short id; };"; print "%null-strings"; print "%%";} { print tolower(substr($$1 ,5)) ", " $$1 }' < $< > $@ + +$(outdir)/keyboard-keys-from-name.h: src/udev/keyboard-keys-from-name.gperf + $(AM_V_GPERF)$(GPERF) -L ANSI-C -t -N keyboard_lookup_key -H hash_key_name -p -C < $< > $@ + +gperf_txt_sources += \ + src/udev/keyboard-keys-list.txt + +libudev_core_la_SOURCES = \ + src/udev/udev.h \ + src/udev/udev-event.c \ + src/udev/udev-watch.c \ + src/udev/udev-node.c \ + src/udev/udev-rules.c \ + src/udev/udev-ctrl.c \ + src/udev/udev-builtin.c \ + src/udev/udev-builtin-btrfs.c \ + src/udev/udev-builtin-hwdb.c \ + src/udev/udev-builtin-input_id.c \ + src/udev/udev-builtin-keyboard.c \ + src/udev/udev-builtin-net_id.c \ + src/udev/udev-builtin-net_setup_link.c \ + src/udev/udev-builtin-path_id.c \ + src/udev/udev-builtin-usb_id.c \ + src/udev/net/link-config.h \ + src/udev/net/link-config.c \ + src/udev/net/ethtool-util.h \ + src/udev/net/ethtool-util.c + +nodist_libudev_core_la_SOURCES = \ + src/udev/keyboard-keys-from-name.h \ + src/udev/net/link-config-gperf.c + +gperf_gperf_sources += \ + src/udev/net/link-config-gperf.gperf + +libudev_core_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(BLKID_CFLAGS) \ + $(KMOD_CFLAGS) + +libudev_core_la_LIBADD = \ + libsystemd-network.la \ + libshared.la \ + $(BLKID_LIBS) \ + $(KMOD_LIBS) + +ifneq ($(HAVE_KMOD),) +libudev_core_la_SOURCES += \ + src/udev/udev-builtin-kmod.c + +dist_udevrules_DATA += \ + rules/80-drivers.rules +endif # HAVE_KMOD + +ifneq ($(HAVE_BLKID),) +libudev_core_la_SOURCES += \ + src/udev/udev-builtin-blkid.c +endif # HAVE_BLKID + +ifneq ($(HAVE_ACL),) +libudev_core_la_SOURCES += \ + src/udev/udev-builtin-uaccess.c \ + src/login/logind-acl.c \ + src/libsystemd/sd-login/sd-login.c \ + src/systemd/sd-login.h +endif # HAVE_ACL + +systemd_udevd_SOURCES = \ + src/udev/udevd.c + +systemd_udevd_LDADD = \ + libudev-core.la + +udevadm_SOURCES = \ + src/udev/udevadm.c \ + src/udev/udevadm-info.c \ + src/udev/udevadm-control.c \ + src/udev/udevadm-monitor.c \ + src/udev/udevadm-hwdb.c \ + src/udev/udevadm-settle.c \ + src/udev/udevadm-trigger.c \ + src/udev/udevadm-test.c \ + src/udev/udevadm-test-builtin.c \ + src/udev/udevadm-util.c \ + src/udev/udevadm-util.h + +udevadm_LDADD = \ + libudev-core.la + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/udev/ata_id/Makefile b/src/udev/ata_id/Makefile index d0b0e8e008..639e3da118 120000..100644 --- a/src/udev/ata_id/Makefile +++ b/src/udev/ata_id/Makefile @@ -1 +1,36 @@ -../Makefile
\ No newline at end of file +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +ata_id_SOURCES = \ + src/udev/ata_id/ata_id.c + +ata_id_LDADD = \ + libshared.la + +udevlibexec_PROGRAMS += \ + ata_id + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/udev/cdrom_id/Makefile b/src/udev/cdrom_id/Makefile index d0b0e8e008..5e9049ad61 120000..100644 --- a/src/udev/cdrom_id/Makefile +++ b/src/udev/cdrom_id/Makefile @@ -1 +1,39 @@ -../Makefile
\ No newline at end of file +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +cdrom_id_SOURCES = \ + src/udev/cdrom_id/cdrom_id.c + +cdrom_id_LDADD = \ + libshared.la + +udevlibexec_PROGRAMS += \ + cdrom_id + +dist_udevrules_DATA += \ + rules/60-cdrom_id.rules + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/udev/collect/Makefile b/src/udev/collect/Makefile index d0b0e8e008..4dacf044f0 120000..100644 --- a/src/udev/collect/Makefile +++ b/src/udev/collect/Makefile @@ -1 +1,36 @@ -../Makefile
\ No newline at end of file +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +collect_SOURCES = \ + src/udev/collect/collect.c + +collect_LDADD = \ + libshared.la + +udevlibexec_PROGRAMS += \ + collect + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/udev/mtd_probe/Makefile b/src/udev/mtd_probe/Makefile index d0b0e8e008..1c57404e70 120000..100644 --- a/src/udev/mtd_probe/Makefile +++ b/src/udev/mtd_probe/Makefile @@ -1 +1,38 @@ -../Makefile
\ No newline at end of file +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +mtd_probe_SOURCES = \ + src/udev/mtd_probe/mtd_probe.c \ + src/udev/mtd_probe/mtd_probe.h \ + src/udev/mtd_probe/probe_smartmedia.c + +dist_udevrules_DATA += \ + rules/75-probe_mtd.rules + +udevlibexec_PROGRAMS += \ + mtd_probe + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/udev/net/Makefile b/src/udev/net/Makefile deleted file mode 120000 index 94aaae2c4d..0000000000 --- a/src/udev/net/Makefile +++ /dev/null @@ -1 +0,0 @@ -../../Makefile
\ No newline at end of file diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c index 15145fc5eb..e712d2ce73 100644 --- a/src/udev/net/link-config.c +++ b/src/udev/net/link-config.c @@ -20,7 +20,7 @@ #include <netinet/ether.h> #include <linux/netdevice.h> -#include "sd-netlink.h" +#include <systemd/sd-netlink.h> #include "alloc-util.h" #include "conf-files.h" diff --git a/src/udev/scsi_id/Makefile b/src/udev/scsi_id/Makefile index d0b0e8e008..9cc633363a 120000..100644 --- a/src/udev/scsi_id/Makefile +++ b/src/udev/scsi_id/Makefile @@ -1 +1,42 @@ -../Makefile
\ No newline at end of file +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +scsi_id_SOURCES =\ + src/udev/scsi_id/scsi_id.c \ + src/udev/scsi_id/scsi_serial.c \ + src/udev/scsi_id/scsi.h \ + src/udev/scsi_id/scsi_id.h + +scsi_id_LDADD = \ + libshared.la + +udevlibexec_PROGRAMS += \ + scsi_id + +EXTRA_DIST += \ + src/udev/scsi_id/README + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/udev/udev-builtin-blkid.c b/src/udev/udev-builtin-blkid.c index ed0ea5ce5f..62cd93264b 100644 --- a/src/udev/udev-builtin-blkid.c +++ b/src/udev/udev-builtin-blkid.c @@ -27,7 +27,7 @@ #include <string.h> #include <sys/stat.h> -#include "sd-id128.h" +#include <systemd/sd-id128.h> #include "alloc-util.h" #include "efivars.h" diff --git a/src/udev/udev-builtin-hwdb.c b/src/udev/udev-builtin-hwdb.c index f4a065a97d..b96f39ba20 100644 --- a/src/udev/udev-builtin-hwdb.c +++ b/src/udev/udev-builtin-hwdb.c @@ -22,7 +22,7 @@ #include <stdio.h> #include <stdlib.h> -#include "sd-hwdb.h" +#include <systemd/sd-hwdb.h> #include "alloc-util.h" #include "hwdb-util.h" diff --git a/src/udev/udev-builtin-uaccess.c b/src/udev/udev-builtin-uaccess.c index 3ebe36f043..2c27116ae9 100644 --- a/src/udev/udev-builtin-uaccess.c +++ b/src/udev/udev-builtin-uaccess.c @@ -22,7 +22,7 @@ #include <stdio.h> #include <stdlib.h> -#include "sd-login.h" +#include <systemd/sd-login.h> #include "login-util.h" #include "logind-acl.h" diff --git a/src/udev/udevd.c b/src/udev/udevd.c index bb92f16352..37489c6ce7 100644 --- a/src/udev/udevd.c +++ b/src/udev/udevd.c @@ -40,8 +40,8 @@ #include <sys/wait.h> #include <unistd.h> -#include "sd-daemon.h" -#include "sd-event.h" +#include <systemd/sd-daemon.h> +#include <systemd/sd-event.h> #include "alloc-util.h" #include "cgroup-util.h" diff --git a/src/udev/v4l_id/Makefile b/src/udev/v4l_id/Makefile index d0b0e8e008..6c9b24a5e1 120000..100644 --- a/src/udev/v4l_id/Makefile +++ b/src/udev/v4l_id/Makefile @@ -1 +1,39 @@ -../Makefile
\ No newline at end of file +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 +# (at your option) any later version. +# +# systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +v4l_id_SOURCES = \ + src/udev/v4l_id/v4l_id.c + +v4l_id_LDADD = \ + libshared.la + +udevlibexec_PROGRAMS += \ + v4l_id + +dist_udevrules_DATA += \ + rules/60-persistent-v4l.rules + +$(eval $(value automake2autothing)) +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/update-done/Makefile b/src/update-done/Makefile deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/update-done/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile
\ No newline at end of file diff --git a/src/update-utmp/Makefile b/src/update-utmp/Makefile deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/update-utmp/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile
\ No newline at end of file diff --git a/src/user-sessions/Makefile b/src/user-sessions/Makefile deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/user-sessions/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile
\ No newline at end of file diff --git a/src/vconsole/Makefile b/src/vconsole/Makefile deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/vconsole/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile
\ No newline at end of file |