diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/Makefile | 21 | ||||
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/binfmt/Makefile | 1 | ||||
l--------- | src/boot/Makefile | 1 | ||||
-rw-r--r-- | src/busctl/Makefile | 37 | ||||
-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/Makefile | 28 | ||||
-rw-r--r-- | src/grp-boot/bootctl/Makefile | 54 | ||||
-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 | 194 | ||||
-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/measure.c (renamed from src/boot/efi/measure.c) | 0 | ||||
-rw-r--r-- | src/grp-boot/systemd-boot/measure.h (renamed from src/boot/efi/measure.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 | ||||
-rwxr-xr-x | src/grp-boot/systemd-boot/test-efi-create-disk.sh | 42 | ||||
-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/Makefile | 28 | ||||
-rw-r--r-- | src/grp-coredump/coredumpctl/Makefile | 41 | ||||
-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 | 81 | ||||
-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-helperunits/systemd-backlight/Makefile | 43 | ||||
-rw-r--r-- | src/grp-helperunits/systemd-backlight/backlight.c (renamed from src/backlight/backlight.c) | 0 | ||||
-rw-r--r-- | src/grp-helperunits/systemd-binfmt/Makefile | 56 | ||||
-rw-r--r-- | src/grp-helperunits/systemd-binfmt/binfmt.c (renamed from src/binfmt/binfmt.c) | 0 | ||||
-rw-r--r-- | src/grp-helperunits/systemd-detect-virt/Makefile | 36 | ||||
-rw-r--r-- | src/grp-helperunits/systemd-detect-virt/detect-virt.c (renamed from src/detect-virt/detect-virt.c) | 0 | ||||
-rw-r--r-- | src/grp-helperunits/systemd-quotacheck/Makefile | 46 | ||||
-rw-r--r-- | src/grp-helperunits/systemd-quotacheck/quotacheck.c (renamed from src/quotacheck/quotacheck.c) | 0 | ||||
-rw-r--r-- | src/grp-helperunits/systemd-random-seed/Makefile | 47 | ||||
-rw-r--r-- | src/grp-helperunits/systemd-random-seed/random-seed.c (renamed from src/random-seed/random-seed.c) | 0 | ||||
-rw-r--r-- | src/grp-helperunits/systemd-rfkill/Makefile | 46 | ||||
-rw-r--r-- | src/grp-helperunits/systemd-rfkill/rfkill.c (renamed from src/rfkill/rfkill.c) | 2 | ||||
-rw-r--r-- | src/grp-helperunits/systemd-sleep/Makefile | 33 | ||||
-rw-r--r-- | src/grp-helperunits/systemd-sleep/sleep.c (renamed from src/sleep/sleep.c) | 2 | ||||
-rw-r--r-- | src/grp-helperunits/systemd-user-sessions/Makefile | 48 | ||||
-rw-r--r-- | src/grp-helperunits/systemd-user-sessions/user-sessions.c (renamed from src/user-sessions/user-sessions.c) | 0 | ||||
-rw-r--r-- | src/grp-helperunits/systemd-vconsole-setup/.gitignore (renamed from src/vconsole/.gitignore) | 0 | ||||
-rw-r--r-- | src/grp-helperunits/systemd-vconsole-setup/90-vconsole.rules.in (renamed from src/vconsole/90-vconsole.rules.in) | 0 | ||||
-rw-r--r-- | src/grp-helperunits/systemd-vconsole-setup/Makefile | 50 | ||||
-rw-r--r-- | src/grp-helperunits/systemd-vconsole-setup/vconsole-setup.c (renamed from src/vconsole/vconsole-setup.c) | 0 | ||||
-rw-r--r-- | src/grp-hostname/.gitignore (renamed from src/hostname/.gitignore) | 0 | ||||
-rw-r--r-- | src/grp-hostname/Makefile | 79 | ||||
-rw-r--r-- | src/grp-hostname/hostnamectl.c (renamed from src/hostname/hostnamectl.c) | 4 | ||||
-rw-r--r-- | src/grp-hostname/hostnamed.c (renamed from src/hostname/hostnamed.c) | 0 | ||||
-rw-r--r-- | src/grp-hostname/org.freedesktop.hostname1.conf (renamed from src/hostname/org.freedesktop.hostname1.conf) | 0 | ||||
-rw-r--r-- | src/grp-hostname/org.freedesktop.hostname1.policy.in (renamed from src/hostname/org.freedesktop.hostname1.policy.in) | 0 | ||||
-rw-r--r-- | src/grp-hostname/org.freedesktop.hostname1.service (renamed from src/hostname/org.freedesktop.hostname1.service) | 0 | ||||
-rw-r--r-- | src/grp-import/.gitignore (renamed from src/import/.gitignore) | 0 | ||||
-rw-r--r-- | src/grp-import/Makefile | 89 | ||||
-rw-r--r-- | src/grp-import/curl-util.c (renamed from src/import/curl-util.c) | 0 | ||||
-rw-r--r-- | src/grp-import/curl-util.h (renamed from src/import/curl-util.h) | 2 | ||||
-rw-r--r-- | src/grp-import/org.freedesktop.import1.conf (renamed from src/import/org.freedesktop.import1.conf) | 0 | ||||
-rw-r--r-- | src/grp-import/org.freedesktop.import1.policy.in (renamed from src/import/org.freedesktop.import1.policy.in) | 0 | ||||
-rw-r--r-- | src/grp-import/org.freedesktop.import1.service (renamed from src/import/org.freedesktop.import1.service) | 0 | ||||
-rw-r--r-- | src/grp-import/qcow2-util.c (renamed from src/import/qcow2-util.c) | 0 | ||||
-rw-r--r-- | src/grp-import/qcow2-util.h (renamed from src/import/qcow2-util.h) | 0 | ||||
-rw-r--r-- | src/grp-import/systemd-export/Makefile | 51 | ||||
-rw-r--r-- | src/grp-import/systemd-export/export-raw.c (renamed from src/import/export-raw.c) | 2 | ||||
-rw-r--r-- | src/grp-import/systemd-export/export-raw.h (renamed from src/import/export-raw.h) | 2 | ||||
-rw-r--r-- | src/grp-import/systemd-export/export-tar.c (renamed from src/import/export-tar.c) | 2 | ||||
-rw-r--r-- | src/grp-import/systemd-export/export-tar.h (renamed from src/import/export-tar.h) | 2 | ||||
-rw-r--r-- | src/grp-import/systemd-export/export.c (renamed from src/import/export.c) | 2 | ||||
-rw-r--r-- | src/grp-import/systemd-import/Makefile | 52 | ||||
-rw-r--r-- | src/grp-import/systemd-import/import-common.c (renamed from src/import/import-common.c) | 0 | ||||
-rw-r--r-- | src/grp-import/systemd-import/import-common.h (renamed from src/import/import-common.h) | 0 | ||||
-rw-r--r-- | src/grp-import/systemd-import/import-compress.c (renamed from src/import/import-compress.c) | 0 | ||||
-rw-r--r-- | src/grp-import/systemd-import/import-compress.h (renamed from src/import/import-compress.h) | 0 | ||||
-rw-r--r-- | src/grp-import/systemd-import/import-pubring.gpg (renamed from src/import/import-pubring.gpg) | bin | 9551 -> 9551 bytes | |||
-rw-r--r-- | src/grp-import/systemd-import/import-raw.c (renamed from src/import/import-raw.c) | 4 | ||||
-rw-r--r-- | src/grp-import/systemd-import/import-raw.h (renamed from src/import/import-raw.h) | 2 | ||||
-rw-r--r-- | src/grp-import/systemd-import/import-tar.c (renamed from src/import/import-tar.c) | 4 | ||||
-rw-r--r-- | src/grp-import/systemd-import/import-tar.h (renamed from src/import/import-tar.h) | 2 | ||||
-rw-r--r-- | src/grp-import/systemd-import/import.c (renamed from src/import/import.c) | 2 | ||||
-rw-r--r-- | src/grp-import/systemd-importd/Makefile | 39 | ||||
-rw-r--r-- | src/grp-import/systemd-importd/importd.c (renamed from src/import/importd.c) | 2 | ||||
-rw-r--r-- | src/grp-import/systemd-pull/Makefile | 64 | ||||
-rw-r--r-- | src/grp-import/systemd-pull/pull-common.c (renamed from src/import/pull-common.c) | 0 | ||||
-rw-r--r-- | src/grp-import/systemd-pull/pull-common.h (renamed from src/import/pull-common.h) | 0 | ||||
-rw-r--r-- | src/grp-import/systemd-pull/pull-job.c (renamed from src/import/pull-job.c) | 0 | ||||
-rw-r--r-- | src/grp-import/systemd-pull/pull-job.h (renamed from src/import/pull-job.h) | 0 | ||||
-rw-r--r-- | src/grp-import/systemd-pull/pull-raw.c (renamed from src/import/pull-raw.c) | 2 | ||||
-rw-r--r-- | src/grp-import/systemd-pull/pull-raw.h (renamed from src/import/pull-raw.h) | 2 | ||||
-rw-r--r-- | src/grp-import/systemd-pull/pull-tar.c (renamed from src/import/pull-tar.c) | 2 | ||||
-rw-r--r-- | src/grp-import/systemd-pull/pull-tar.h (renamed from src/import/pull-tar.h) | 2 | ||||
-rw-r--r-- | src/grp-import/systemd-pull/pull.c (renamed from src/import/pull.c) | 2 | ||||
-rw-r--r-- | src/grp-import/test-qcow2.c (renamed from src/import/test-qcow2.c) | 0 | ||||
-rw-r--r-- | src/grp-journal-remote/.gitignore (renamed from src/journal-remote/.gitignore) | 0 | ||||
-rw-r--r-- | src/grp-journal-remote/Makefile | 30 | ||||
-rw-r--r-- | src/grp-journal-remote/browse.html (renamed from src/journal-remote/browse.html) | 0 | ||||
-rwxr-xr-x | src/grp-journal-remote/log-generator.py (renamed from src/journal-remote/log-generator.py) | 0 | ||||
-rw-r--r-- | src/grp-journal-remote/microhttpd-util.c (renamed from src/journal-remote/microhttpd-util.c) | 0 | ||||
-rw-r--r-- | src/grp-journal-remote/microhttpd-util.h (renamed from src/journal-remote/microhttpd-util.h) | 0 | ||||
-rw-r--r-- | src/grp-journal-remote/systemd-journal-gatewayd/Makefile | 68 | ||||
-rw-r--r-- | src/grp-journal-remote/systemd-journal-gatewayd/journal-gatewayd.c (renamed from src/journal-remote/journal-gatewayd.c) | 6 | ||||
-rw-r--r-- | src/grp-journal-remote/systemd-journal-remote/Makefile | 85 | ||||
-rw-r--r-- | src/grp-journal-remote/systemd-journal-remote/journal-remote-parse.c (renamed from src/journal-remote/journal-remote-parse.c) | 0 | ||||
-rw-r--r-- | src/grp-journal-remote/systemd-journal-remote/journal-remote-parse.h (renamed from src/journal-remote/journal-remote-parse.h) | 2 | ||||
-rw-r--r-- | src/grp-journal-remote/systemd-journal-remote/journal-remote-write.c (renamed from src/journal-remote/journal-remote-write.c) | 0 | ||||
-rw-r--r-- | src/grp-journal-remote/systemd-journal-remote/journal-remote-write.h (renamed from src/journal-remote/journal-remote-write.h) | 0 | ||||
-rw-r--r-- | src/grp-journal-remote/systemd-journal-remote/journal-remote.c (renamed from src/journal-remote/journal-remote.c) | 2 | ||||
-rw-r--r-- | src/grp-journal-remote/systemd-journal-remote/journal-remote.conf.in (renamed from src/journal-remote/journal-remote.conf.in) | 0 | ||||
-rw-r--r-- | src/grp-journal-remote/systemd-journal-remote/journal-remote.h (renamed from src/journal-remote/journal-remote.h) | 2 | ||||
-rw-r--r-- | src/grp-journal-remote/systemd-journal-upload/Makefile | 54 | ||||
-rw-r--r-- | src/grp-journal-remote/systemd-journal-upload/journal-upload-journal.c (renamed from src/journal-remote/journal-upload-journal.c) | 2 | ||||
-rw-r--r-- | src/grp-journal-remote/systemd-journal-upload/journal-upload.c (renamed from src/journal-remote/journal-upload.c) | 2 | ||||
-rw-r--r-- | src/grp-journal-remote/systemd-journal-upload/journal-upload.conf.in (renamed from src/journal-remote/journal-upload.conf.in) | 0 | ||||
-rw-r--r-- | src/grp-journal-remote/systemd-journal-upload/journal-upload.h (renamed from src/journal-remote/journal-upload.h) | 4 | ||||
-rw-r--r-- | src/grp-journal/.gitignore (renamed from src/journal/.gitignore) | 0 | ||||
-rw-r--r-- | src/grp-journal/Makefile | 170 | ||||
-rw-r--r-- | src/grp-journal/catalog/systemd.be.catalog | 260 | ||||
-rw-r--r-- | src/grp-journal/catalog/systemd.be@latin.catalog | 260 | ||||
-rw-r--r-- | src/grp-journal/catalog/systemd.bg.catalog | 324 | ||||
-rw-r--r-- | src/grp-journal/catalog/systemd.catalog | 334 | ||||
-rw-r--r-- | src/grp-journal/catalog/systemd.da.catalog | 261 | ||||
-rw-r--r-- | src/grp-journal/catalog/systemd.fr.catalog | 320 | ||||
-rw-r--r-- | src/grp-journal/catalog/systemd.hr.catalog | 314 | ||||
-rw-r--r-- | src/grp-journal/catalog/systemd.hu.catalog | 262 | ||||
-rw-r--r-- | src/grp-journal/catalog/systemd.it.catalog | 254 | ||||
-rw-r--r-- | src/grp-journal/catalog/systemd.ko.catalog | 264 | ||||
-rw-r--r-- | src/grp-journal/catalog/systemd.pl.catalog | 315 | ||||
-rw-r--r-- | src/grp-journal/catalog/systemd.pt_BR.catalog | 264 | ||||
-rw-r--r-- | src/grp-journal/catalog/systemd.ru.catalog | 354 | ||||
-rw-r--r-- | src/grp-journal/catalog/systemd.sr.catalog | 262 | ||||
-rw-r--r-- | src/grp-journal/catalog/systemd.zh_CN.catalog | 253 | ||||
-rw-r--r-- | src/grp-journal/catalog/systemd.zh_TW.catalog | 263 | ||||
-rw-r--r-- | src/grp-journal/journalctl/Makefile | 49 | ||||
-rw-r--r-- | src/grp-journal/journalctl/journalctl.c (renamed from src/journal/journalctl.c) | 4 | ||||
-rw-r--r-- | src/grp-journal/libjournal-core/Makefile | 56 | ||||
-rw-r--r-- | src/grp-journal/libjournal-core/cat.c (renamed from src/journal/cat.c) | 2 | ||||
-rw-r--r-- | src/grp-journal/libjournal-core/journal-qrcode.c (renamed from src/journal/journal-qrcode.c) | 0 | ||||
-rw-r--r-- | src/grp-journal/libjournal-core/journal-qrcode.h (renamed from src/journal/journal-qrcode.h) | 2 | ||||
-rw-r--r-- | src/grp-journal/libjournal-core/journald-audit.c (renamed from src/journal/journald-audit.c) | 0 | ||||
-rw-r--r-- | src/grp-journal/libjournal-core/journald-audit.h (renamed from src/journal/journald-audit.h) | 0 | ||||
-rw-r--r-- | src/grp-journal/libjournal-core/journald-console.c (renamed from src/journal/journald-console.c) | 0 | ||||
-rw-r--r-- | src/grp-journal/libjournal-core/journald-console.h (renamed from src/journal/journald-console.h) | 0 | ||||
-rw-r--r-- | src/grp-journal/libjournal-core/journald-gperf.gperf (renamed from src/journal/journald-gperf.gperf) | 0 | ||||
-rw-r--r-- | src/grp-journal/libjournal-core/journald-kmsg.c (renamed from src/journal/journald-kmsg.c) | 2 | ||||
-rw-r--r-- | src/grp-journal/libjournal-core/journald-kmsg.h (renamed from src/journal/journald-kmsg.h) | 0 | ||||
-rw-r--r-- | src/grp-journal/libjournal-core/journald-native.c (renamed from src/journal/journald-native.c) | 0 | ||||
-rw-r--r-- | src/grp-journal/libjournal-core/journald-native.h (renamed from src/journal/journald-native.h) | 0 | ||||
-rw-r--r-- | src/grp-journal/libjournal-core/journald-rate-limit.c (renamed from src/journal/journald-rate-limit.c) | 0 | ||||
-rw-r--r-- | src/grp-journal/libjournal-core/journald-rate-limit.h (renamed from src/journal/journald-rate-limit.h) | 0 | ||||
-rw-r--r-- | src/grp-journal/libjournal-core/journald-server.c (renamed from src/journal/journald-server.c) | 6 | ||||
-rw-r--r-- | src/grp-journal/libjournal-core/journald-server.h (renamed from src/journal/journald-server.h) | 2 | ||||
-rw-r--r-- | src/grp-journal/libjournal-core/journald-stream.c (renamed from src/journal/journald-stream.c) | 4 | ||||
-rw-r--r-- | src/grp-journal/libjournal-core/journald-stream.h (renamed from src/journal/journald-stream.h) | 0 | ||||
-rw-r--r-- | src/grp-journal/libjournal-core/journald-syslog.c (renamed from src/journal/journald-syslog.c) | 2 | ||||
-rw-r--r-- | src/grp-journal/libjournal-core/journald-syslog.h (renamed from src/journal/journald-syslog.h) | 0 | ||||
-rw-r--r-- | src/grp-journal/libjournal-core/journald-wall.c (renamed from src/journal/journald-wall.c) | 0 | ||||
-rw-r--r-- | src/grp-journal/libjournal-core/journald-wall.h (renamed from src/journal/journald-wall.h) | 0 | ||||
-rw-r--r-- | src/grp-journal/libjournal-core/journald.conf (renamed from src/journal/journald.conf) | 0 | ||||
-rw-r--r-- | src/grp-journal/libjournal-core/test-audit-type.c (renamed from src/journal/test-audit-type.c) | 0 | ||||
-rw-r--r-- | src/grp-journal/libjournal-core/test-catalog.c (renamed from src/journal/test-catalog.c) | 2 | ||||
-rw-r--r-- | src/grp-journal/libjournal-core/test-compress-benchmark.c (renamed from src/journal/test-compress-benchmark.c) | 0 | ||||
-rw-r--r-- | src/grp-journal/libjournal-core/test-compress.c (renamed from src/journal/test-compress.c) | 0 | ||||
-rw-r--r-- | src/grp-journal/libjournal-core/test-journal-enum.c (renamed from src/journal/test-journal-enum.c) | 2 | ||||
-rw-r--r-- | src/grp-journal/libjournal-core/test-journal-flush.c (renamed from src/journal/test-journal-flush.c) | 2 | ||||
-rw-r--r-- | src/grp-journal/libjournal-core/test-journal-init.c (renamed from src/journal/test-journal-init.c) | 2 | ||||
-rw-r--r-- | src/grp-journal/libjournal-core/test-journal-interleaving.c (renamed from src/journal/test-journal-interleaving.c) | 2 | ||||
-rw-r--r-- | src/grp-journal/libjournal-core/test-journal-match.c (renamed from src/journal/test-journal-match.c) | 2 | ||||
-rw-r--r-- | src/grp-journal/libjournal-core/test-journal-send.c (renamed from src/journal/test-journal-send.c) | 2 | ||||
-rw-r--r-- | src/grp-journal/libjournal-core/test-journal-stream.c (renamed from src/journal/test-journal-stream.c) | 2 | ||||
-rw-r--r-- | src/grp-journal/libjournal-core/test-journal-syslog.c (renamed from src/journal/test-journal-syslog.c) | 0 | ||||
-rw-r--r-- | src/grp-journal/libjournal-core/test-journal-verify.c (renamed from src/journal/test-journal-verify.c) | 0 | ||||
-rw-r--r-- | src/grp-journal/libjournal-core/test-journal.c (renamed from src/journal/test-journal.c) | 0 | ||||
-rw-r--r-- | src/grp-journal/libjournal-core/test-mmap-cache.c (renamed from src/journal/test-mmap-cache.c) | 0 | ||||
-rw-r--r-- | src/grp-journal/systemd-journald/Makefile | 94 | ||||
-rw-r--r-- | src/grp-journal/systemd-journald/journald.c (renamed from src/journal/journald.c) | 4 | ||||
-rw-r--r-- | src/grp-locale/.gitignore (renamed from src/locale/.gitignore) | 0 | ||||
-rw-r--r-- | src/grp-locale/Makefile | 90 | ||||
-rw-r--r-- | src/grp-locale/kbd-model-map (renamed from src/locale/kbd-model-map) | 0 | ||||
-rw-r--r-- | src/grp-locale/language-fallback-map (renamed from src/locale/language-fallback-map) | 0 | ||||
-rw-r--r-- | src/grp-locale/localectl.c (renamed from src/locale/localectl.c) | 2 | ||||
-rw-r--r-- | src/grp-locale/localed.c (renamed from src/locale/localed.c) | 2 | ||||
-rw-r--r-- | src/grp-locale/org.freedesktop.locale1.conf (renamed from src/locale/org.freedesktop.locale1.conf) | 0 | ||||
-rw-r--r-- | src/grp-locale/org.freedesktop.locale1.policy.in (renamed from src/locale/org.freedesktop.locale1.policy.in) | 0 | ||||
-rw-r--r-- | src/grp-locale/org.freedesktop.locale1.service (renamed from src/locale/org.freedesktop.locale1.service) | 0 | ||||
-rw-r--r-- | src/grp-login/.gitignore (renamed from src/login/.gitignore) | 0 | ||||
-rw-r--r-- | src/grp-login/70-power-switch.rules (renamed from src/login/70-power-switch.rules) | 0 | ||||
-rw-r--r-- | src/grp-login/70-uaccess.rules (renamed from src/login/70-uaccess.rules) | 0 | ||||
-rw-r--r-- | src/grp-login/71-seat.rules.in (renamed from src/login/71-seat.rules.in) | 0 | ||||
-rw-r--r-- | src/grp-login/73-seat-late.rules.in (renamed from src/login/73-seat-late.rules.in) | 0 | ||||
-rw-r--r-- | src/grp-login/Makefile | 115 | ||||
-rw-r--r-- | src/grp-login/liblogind-core/Makefile | 62 | ||||
-rw-r--r-- | src/grp-login/liblogind-core/logind-acl.c (renamed from src/login/logind-acl.c) | 0 | ||||
-rw-r--r-- | src/grp-login/liblogind-core/logind-acl.h (renamed from src/login/logind-acl.h) | 0 | ||||
-rw-r--r-- | src/grp-login/liblogind-core/logind-action.c (renamed from src/login/logind-action.c) | 0 | ||||
-rw-r--r-- | src/grp-login/liblogind-core/logind-action.h (renamed from src/login/logind-action.h) | 0 | ||||
-rw-r--r-- | src/grp-login/liblogind-core/logind-button.c (renamed from src/login/logind-button.c) | 2 | ||||
-rw-r--r-- | src/grp-login/liblogind-core/logind-button.h (renamed from src/login/logind-button.h) | 0 | ||||
-rw-r--r-- | src/grp-login/liblogind-core/logind-core.c (renamed from src/login/logind-core.c) | 0 | ||||
-rw-r--r-- | src/grp-login/liblogind-core/logind-dbus.c (renamed from src/login/logind-dbus.c) | 2 | ||||
-rw-r--r-- | src/grp-login/liblogind-core/logind-device.c (renamed from src/login/logind-device.c) | 0 | ||||
-rw-r--r-- | src/grp-login/liblogind-core/logind-device.h (renamed from src/login/logind-device.h) | 0 | ||||
-rw-r--r-- | src/grp-login/liblogind-core/logind-gperf.gperf (renamed from src/login/logind-gperf.gperf) | 0 | ||||
-rw-r--r-- | src/grp-login/liblogind-core/logind-inhibit.c (renamed from src/login/logind-inhibit.c) | 0 | ||||
-rw-r--r-- | src/grp-login/liblogind-core/logind-inhibit.h (renamed from src/login/logind-inhibit.h) | 0 | ||||
-rw-r--r-- | src/grp-login/liblogind-core/logind-seat-dbus.c (renamed from src/login/logind-seat-dbus.c) | 0 | ||||
-rw-r--r-- | src/grp-login/liblogind-core/logind-seat.c (renamed from src/login/logind-seat.c) | 2 | ||||
-rw-r--r-- | src/grp-login/liblogind-core/logind-seat.h (renamed from src/login/logind-seat.h) | 0 | ||||
-rw-r--r-- | src/grp-login/liblogind-core/logind-session-dbus.c (renamed from src/login/logind-session-dbus.c) | 0 | ||||
-rw-r--r-- | src/grp-login/liblogind-core/logind-session-device.c (renamed from src/login/logind-session-device.c) | 0 | ||||
-rw-r--r-- | src/grp-login/liblogind-core/logind-session-device.h (renamed from src/login/logind-session-device.h) | 0 | ||||
-rw-r--r-- | src/grp-login/liblogind-core/logind-session.c (renamed from src/login/logind-session.c) | 2 | ||||
-rw-r--r-- | src/grp-login/liblogind-core/logind-session.h (renamed from src/login/logind-session.h) | 0 | ||||
-rw-r--r-- | src/grp-login/liblogind-core/logind-user-dbus.c (renamed from src/login/logind-user-dbus.c) | 0 | ||||
-rw-r--r-- | src/grp-login/liblogind-core/logind-user.c (renamed from src/login/logind-user.c) | 0 | ||||
-rw-r--r-- | src/grp-login/liblogind-core/logind-user.h (renamed from src/login/logind-user.h) | 0 | ||||
-rw-r--r-- | src/grp-login/liblogind-core/logind-utmp.c (renamed from src/login/logind-utmp.c) | 2 | ||||
-rw-r--r-- | src/grp-login/loginctl/Makefile | 41 | ||||
-rw-r--r-- | src/grp-login/loginctl/loginctl.c (renamed from src/login/loginctl.c) | 2 | ||||
-rw-r--r-- | src/grp-login/loginctl/sysfs-show.c (renamed from src/login/sysfs-show.c) | 0 | ||||
-rw-r--r-- | src/grp-login/loginctl/sysfs-show.h (renamed from src/login/sysfs-show.h) | 0 | ||||
-rw-r--r-- | src/grp-login/logind.conf.in (renamed from src/login/logind.conf.in) | 0 | ||||
-rw-r--r-- | src/grp-login/org.freedesktop.login1.conf (renamed from src/login/org.freedesktop.login1.conf) | 0 | ||||
-rw-r--r-- | src/grp-login/org.freedesktop.login1.policy.in (renamed from src/login/org.freedesktop.login1.policy.in) | 0 | ||||
-rw-r--r-- | src/grp-login/org.freedesktop.login1.service (renamed from src/login/org.freedesktop.login1.service) | 0 | ||||
-rw-r--r-- | src/grp-login/pam_systemd/Makefile | 56 | ||||
-rw-r--r-- | src/grp-login/pam_systemd/pam_systemd.c (renamed from src/login/pam_systemd.c) | 0 | ||||
-rw-r--r-- | src/grp-login/pam_systemd/pam_systemd.sym (renamed from src/login/pam_systemd.sym) | 0 | ||||
-rw-r--r-- | src/grp-login/systemd-inhibit/Makefile | 37 | ||||
-rw-r--r-- | src/grp-login/systemd-inhibit/inhibit.c (renamed from src/login/inhibit.c) | 2 | ||||
-rw-r--r-- | src/grp-login/systemd-logind/Makefile | 39 | ||||
-rw-r--r-- | src/grp-login/systemd-logind/logind.c (renamed from src/login/logind.c) | 2 | ||||
-rw-r--r-- | src/grp-login/systemd-logind/logind.h (renamed from src/login/logind.h) | 4 | ||||
-rw-r--r-- | src/grp-login/systemd-user.m4 (renamed from src/login/systemd-user.m4) | 0 | ||||
-rw-r--r-- | src/grp-login/test-inhibit.c (renamed from src/login/test-inhibit.c) | 2 | ||||
-rw-r--r-- | src/grp-login/test-login-shared.c (renamed from src/login/test-login-shared.c) | 0 | ||||
-rw-r--r-- | src/grp-login/test-login-tables.c (renamed from src/login/test-login-tables.c) | 0 | ||||
-rw-r--r-- | src/grp-machine/Makefile | 29 | ||||
-rw-r--r-- | src/grp-machine/libmachine-core/.gitignore (renamed from src/machine/.gitignore) | 0 | ||||
-rw-r--r-- | src/grp-machine/libmachine-core/Makefile | 52 | ||||
-rw-r--r-- | src/grp-machine/libmachine-core/image-dbus.c (renamed from src/machine/image-dbus.c) | 0 | ||||
-rw-r--r-- | src/grp-machine/libmachine-core/image-dbus.h (renamed from src/machine/image-dbus.h) | 0 | ||||
-rw-r--r-- | src/grp-machine/libmachine-core/machine-dbus.c (renamed from src/machine/machine-dbus.c) | 0 | ||||
-rw-r--r-- | src/grp-machine/libmachine-core/machine-dbus.h (renamed from src/machine/machine-dbus.h) | 2 | ||||
-rw-r--r-- | src/grp-machine/libmachine-core/machine.c (renamed from src/machine/machine.c) | 2 | ||||
-rw-r--r-- | src/grp-machine/libmachine-core/machine.h (renamed from src/machine/machine.h) | 0 | ||||
-rw-r--r-- | src/grp-machine/libmachine-core/machined-dbus.c (renamed from src/machine/machined-dbus.c) | 2 | ||||
-rw-r--r-- | src/grp-machine/libmachine-core/machined.h (renamed from src/machine/machined.h) | 4 | ||||
-rw-r--r-- | src/grp-machine/libmachine-core/operation.c (renamed from src/machine/operation.c) | 0 | ||||
-rw-r--r-- | src/grp-machine/libmachine-core/operation.h (renamed from src/machine/operation.h) | 4 | ||||
-rw-r--r-- | src/grp-machine/libmachine-core/org.freedesktop.machine1.conf (renamed from src/machine/org.freedesktop.machine1.conf) | 0 | ||||
-rw-r--r-- | src/grp-machine/libmachine-core/org.freedesktop.machine1.policy.in (renamed from src/machine/org.freedesktop.machine1.policy.in) | 0 | ||||
-rw-r--r-- | src/grp-machine/libmachine-core/org.freedesktop.machine1.service (renamed from src/machine/org.freedesktop.machine1.service) | 0 | ||||
-rw-r--r-- | src/grp-machine/libmachine-core/test-machine-tables.c (renamed from src/machine/test-machine-tables.c) | 0 | ||||
-rw-r--r-- | src/grp-machine/machinectl/Makefile | 42 | ||||
-rw-r--r-- | src/grp-machine/machinectl/machinectl.c (renamed from src/machine/machinectl.c) | 2 | ||||
-rw-r--r-- | src/grp-machine/nss-mymachines/Makefile | 46 | ||||
-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/Makefile | 67 | ||||
-rw-r--r-- | src/grp-machine/systemd-machined/machined.c (renamed from src/machine/machined.c) | 2 | ||||
-rw-r--r-- | src/grp-network/.gitignore (renamed from src/network/.gitignore) | 0 | ||||
-rw-r--r-- | src/grp-network/Makefile | 107 | ||||
-rw-r--r-- | src/grp-network/libnetworkd-core/Makefile | 93 | ||||
-rw-r--r-- | src/grp-network/libnetworkd-core/networkd-address-pool.c (renamed from src/network/networkd-address-pool.c) | 0 | ||||
-rw-r--r-- | src/grp-network/libnetworkd-core/networkd-address-pool.h (renamed from src/network/networkd-address-pool.h) | 0 | ||||
-rw-r--r-- | src/grp-network/libnetworkd-core/networkd-address.c (renamed from src/network/networkd-address.c) | 0 | ||||
-rw-r--r-- | src/grp-network/libnetworkd-core/networkd-address.h (renamed from src/network/networkd-address.h) | 0 | ||||
-rw-r--r-- | src/grp-network/libnetworkd-core/networkd-conf.c (renamed from src/network/networkd-conf.c) | 0 | ||||
-rw-r--r-- | src/grp-network/libnetworkd-core/networkd-conf.h (renamed from src/network/networkd-conf.h) | 0 | ||||
-rw-r--r-- | src/grp-network/libnetworkd-core/networkd-dhcp4.c (renamed from src/network/networkd-dhcp4.c) | 0 | ||||
-rw-r--r-- | src/grp-network/libnetworkd-core/networkd-dhcp6.c (renamed from src/network/networkd-dhcp6.c) | 2 | ||||
-rw-r--r-- | src/grp-network/libnetworkd-core/networkd-fdb.c (renamed from src/network/networkd-fdb.c) | 0 | ||||
-rw-r--r-- | src/grp-network/libnetworkd-core/networkd-fdb.h (renamed from src/network/networkd-fdb.h) | 0 | ||||
-rw-r--r-- | src/grp-network/libnetworkd-core/networkd-gperf.gperf (renamed from src/network/networkd-gperf.gperf) | 0 | ||||
-rw-r--r-- | src/grp-network/libnetworkd-core/networkd-ipv4ll.c (renamed from src/network/networkd-ipv4ll.c) | 0 | ||||
-rw-r--r-- | src/grp-network/libnetworkd-core/networkd-link-bus.c (renamed from src/network/networkd-link-bus.c) | 0 | ||||
-rw-r--r-- | src/grp-network/libnetworkd-core/networkd-link.c (renamed from src/network/networkd-link.c) | 0 | ||||
-rw-r--r-- | src/grp-network/libnetworkd-core/networkd-link.h (renamed from src/network/networkd-link.h) | 16 | ||||
-rw-r--r-- | src/grp-network/libnetworkd-core/networkd-lldp-tx.c (renamed from src/network/networkd-lldp-tx.c) | 0 | ||||
-rw-r--r-- | src/grp-network/libnetworkd-core/networkd-lldp-tx.h (renamed from src/network/networkd-lldp-tx.h) | 0 | ||||
-rw-r--r-- | src/grp-network/libnetworkd-core/networkd-manager-bus.c (renamed from src/network/networkd-manager-bus.c) | 0 | ||||
-rw-r--r-- | src/grp-network/libnetworkd-core/networkd-manager.c (renamed from src/network/networkd-manager.c) | 4 | ||||
-rw-r--r-- | src/grp-network/libnetworkd-core/networkd-ndisc.c (renamed from src/network/networkd-ndisc.c) | 2 | ||||
-rw-r--r-- | src/grp-network/libnetworkd-core/networkd-netdev-bond.c (renamed from src/network/networkd-netdev-bond.c) | 2 | ||||
-rw-r--r-- | src/grp-network/libnetworkd-core/networkd-netdev-bond.h (renamed from src/network/networkd-netdev-bond.h) | 0 | ||||
-rw-r--r-- | src/grp-network/libnetworkd-core/networkd-netdev-bridge.c (renamed from src/network/networkd-netdev-bridge.c) | 0 | ||||
-rw-r--r-- | src/grp-network/libnetworkd-core/networkd-netdev-bridge.h (renamed from src/network/networkd-netdev-bridge.h) | 0 | ||||
-rw-r--r-- | src/grp-network/libnetworkd-core/networkd-netdev-dummy.c (renamed from src/network/networkd-netdev-dummy.c) | 0 | ||||
-rw-r--r-- | src/grp-network/libnetworkd-core/networkd-netdev-dummy.h (renamed from src/network/networkd-netdev-dummy.h) | 0 | ||||
-rw-r--r-- | src/grp-network/libnetworkd-core/networkd-netdev-gperf.gperf (renamed from src/network/networkd-netdev-gperf.gperf) | 0 | ||||
-rw-r--r-- | src/grp-network/libnetworkd-core/networkd-netdev-ipvlan.c (renamed from src/network/networkd-netdev-ipvlan.c) | 0 | ||||
-rw-r--r-- | src/grp-network/libnetworkd-core/networkd-netdev-ipvlan.h (renamed from src/network/networkd-netdev-ipvlan.h) | 0 | ||||
-rw-r--r-- | src/grp-network/libnetworkd-core/networkd-netdev-macvlan.c (renamed from src/network/networkd-netdev-macvlan.c) | 0 | ||||
-rw-r--r-- | src/grp-network/libnetworkd-core/networkd-netdev-macvlan.h (renamed from src/network/networkd-netdev-macvlan.h) | 0 | ||||
-rw-r--r-- | src/grp-network/libnetworkd-core/networkd-netdev-tunnel.c (renamed from src/network/networkd-netdev-tunnel.c) | 2 | ||||
-rw-r--r-- | src/grp-network/libnetworkd-core/networkd-netdev-tunnel.h (renamed from src/network/networkd-netdev-tunnel.h) | 0 | ||||
-rw-r--r-- | src/grp-network/libnetworkd-core/networkd-netdev-tuntap.c (renamed from src/network/networkd-netdev-tuntap.c) | 0 | ||||
-rw-r--r-- | src/grp-network/libnetworkd-core/networkd-netdev-tuntap.h (renamed from src/network/networkd-netdev-tuntap.h) | 0 | ||||
-rw-r--r-- | src/grp-network/libnetworkd-core/networkd-netdev-veth.c (renamed from src/network/networkd-netdev-veth.c) | 2 | ||||
-rw-r--r-- | src/grp-network/libnetworkd-core/networkd-netdev-veth.h (renamed from src/network/networkd-netdev-veth.h) | 0 | ||||
-rw-r--r-- | src/grp-network/libnetworkd-core/networkd-netdev-vlan.c (renamed from src/network/networkd-netdev-vlan.c) | 0 | ||||
-rw-r--r-- | src/grp-network/libnetworkd-core/networkd-netdev-vlan.h (renamed from src/network/networkd-netdev-vlan.h) | 0 | ||||
-rw-r--r-- | src/grp-network/libnetworkd-core/networkd-netdev-vxlan.c (renamed from src/network/networkd-netdev-vxlan.c) | 2 | ||||
-rw-r--r-- | src/grp-network/libnetworkd-core/networkd-netdev-vxlan.h (renamed from src/network/networkd-netdev-vxlan.h) | 0 | ||||
-rw-r--r-- | src/grp-network/libnetworkd-core/networkd-netdev.c (renamed from src/network/networkd-netdev.c) | 0 | ||||
-rw-r--r-- | src/grp-network/libnetworkd-core/networkd-netdev.h (renamed from src/network/networkd-netdev.h) | 2 | ||||
-rw-r--r-- | src/grp-network/libnetworkd-core/networkd-network-bus.c (renamed from src/network/networkd-network-bus.c) | 0 | ||||
-rw-r--r-- | src/grp-network/libnetworkd-core/networkd-network-gperf.gperf (renamed from src/network/networkd-network-gperf.gperf) | 0 | ||||
-rw-r--r-- | src/grp-network/libnetworkd-core/networkd-network.c (renamed from src/network/networkd-network.c) | 0 | ||||
-rw-r--r-- | src/grp-network/libnetworkd-core/networkd-network.h (renamed from src/network/networkd-network.h) | 2 | ||||
-rw-r--r-- | src/grp-network/libnetworkd-core/networkd-route.c (renamed from src/network/networkd-route.c) | 0 | ||||
-rw-r--r-- | src/grp-network/libnetworkd-core/networkd-route.h (renamed from src/network/networkd-route.h) | 0 | ||||
-rw-r--r-- | src/grp-network/libnetworkd-core/networkd-util.c (renamed from src/network/networkd-util.c) | 0 | ||||
-rw-r--r-- | src/grp-network/libnetworkd-core/networkd-util.h (renamed from src/network/networkd-util.h) | 0 | ||||
-rw-r--r-- | src/grp-network/libnetworkd-core/networkd.h (renamed from src/network/networkd.h) | 6 | ||||
-rw-r--r-- | src/grp-network/networkctl/Makefile | 39 | ||||
-rw-r--r-- | src/grp-network/networkctl/networkctl.c (renamed from src/network/networkctl.c) | 10 | ||||
-rw-r--r-- | src/grp-network/org.freedesktop.network1.conf (renamed from src/network/org.freedesktop.network1.conf) | 0 | ||||
-rw-r--r-- | src/grp-network/org.freedesktop.network1.service (renamed from src/network/org.freedesktop.network1.service) | 0 | ||||
-rw-r--r-- | src/grp-network/systemd-networkd-wait-online/Makefile | 44 | ||||
-rw-r--r-- | src/grp-network/systemd-networkd-wait-online/networkd-wait-online-link.c (renamed from src/network/networkd-wait-online-link.c) | 2 | ||||
-rw-r--r-- | src/grp-network/systemd-networkd-wait-online/networkd-wait-online-link.h (renamed from src/network/networkd-wait-online-link.h) | 0 | ||||
-rw-r--r-- | src/grp-network/systemd-networkd-wait-online/networkd-wait-online-manager.c (renamed from src/network/networkd-wait-online-manager.c) | 0 | ||||
-rw-r--r-- | src/grp-network/systemd-networkd-wait-online/networkd-wait-online.c (renamed from src/network/networkd-wait-online.c) | 2 | ||||
-rw-r--r-- | src/grp-network/systemd-networkd-wait-online/networkd-wait-online.h (renamed from src/network/networkd-wait-online.h) | 6 | ||||
-rw-r--r-- | src/grp-network/systemd-networkd/Makefile | 40 | ||||
-rw-r--r-- | src/grp-network/systemd-networkd/networkd.c (renamed from src/network/networkd.c) | 2 | ||||
-rw-r--r-- | src/grp-network/test-network-tables.c (renamed from src/network/test-network-tables.c) | 0 | ||||
-rw-r--r-- | src/grp-network/test-network.c (renamed from src/network/test-network.c) | 0 | ||||
-rw-r--r-- | src/grp-network/test-networkd-conf.c (renamed from src/network/test-networkd-conf.c) | 0 | ||||
-rw-r--r-- | src/grp-resolve/Makefile | 28 | ||||
-rw-r--r-- | src/grp-resolve/nss-resolve/Makefile | 46 | ||||
-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 | 227 | ||||
-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) | 2 | ||||
-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) | 2 | ||||
-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) | 2 | ||||
-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-data/_443._tcp.fedoraproject.org.pkts (renamed from src/resolve/test-data/_443._tcp.fedoraproject.org.pkts) | bin | 169 -> 169 bytes | |||
-rw-r--r-- | src/grp-resolve/systemd-resolved/test-data/_openpgpkey.fedoraproject.org.pkts (renamed from src/resolve/test-data/_openpgpkey.fedoraproject.org.pkts) | bin | 986 -> 986 bytes | |||
-rw-r--r-- | src/grp-resolve/systemd-resolved/test-data/fake-caa.pkts (renamed from src/resolve/test-data/fake-caa.pkts) | bin | 196 -> 196 bytes | |||
-rw-r--r-- | src/grp-resolve/systemd-resolved/test-data/fedoraproject.org.pkts (renamed from src/resolve/test-data/fedoraproject.org.pkts) | bin | 1483 -> 1483 bytes | |||
-rw-r--r-- | src/grp-resolve/systemd-resolved/test-data/gandi.net.pkts (renamed from src/resolve/test-data/gandi.net.pkts) | bin | 1010 -> 1010 bytes | |||
-rw-r--r-- | src/grp-resolve/systemd-resolved/test-data/google.com.pkts (renamed from src/resolve/test-data/google.com.pkts) | bin | 747 -> 747 bytes | |||
-rw-r--r-- | src/grp-resolve/systemd-resolved/test-data/kyhwana.org.pkts (renamed from src/resolve/test-data/kyhwana.org.pkts) | bin | 1803 -> 1803 bytes | |||
-rw-r--r-- | src/grp-resolve/systemd-resolved/test-data/root.pkts (renamed from src/resolve/test-data/root.pkts) | bin | 1061 -> 1061 bytes | |||
-rw-r--r-- | src/grp-resolve/systemd-resolved/test-data/sw1a1aa-sw1a2aa-sw1a2ab-sw1a2ac.find.me.uk.pkts (renamed from src/resolve/test-data/sw1a1aa-sw1a2aa-sw1a2ab-sw1a2ac.find.me.uk.pkts) | bin | 330 -> 330 bytes | |||
-rw-r--r-- | src/grp-resolve/systemd-resolved/test-data/teamits.com.pkts (renamed from src/resolve/test-data/teamits.com.pkts) | bin | 1021 -> 1021 bytes | |||
-rw-r--r-- | src/grp-resolve/systemd-resolved/test-data/zbyszek@fedoraproject.org.pkts (renamed from src/resolve/test-data/zbyszek@fedoraproject.org.pkts) | bin | 2533 -> 2533 bytes | |||
-rw-r--r-- | src/grp-resolve/systemd-resolved/test-dns-packet.c (renamed from src/resolve/test-dns-packet.c) | 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/Makefile | 28 | ||||
-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 | 71 | ||||
-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/Makefile | 28 | ||||
-rw-r--r-- | src/grp-timedate/systemd-timedated/.gitignore (renamed from src/timedate/.gitignore) | 0 | ||||
-rw-r--r-- | src/grp-timedate/systemd-timedated/Makefile | 65 | ||||
-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 | 42 | ||||
-rw-r--r-- | src/grp-timedate/timedatectl/timedatectl.c (renamed from src/timedate/timedatectl.c) | 2 | ||||
-rw-r--r-- | src/grp-udev/.gitignore (renamed from src/udev/.gitignore) | 0 | ||||
-rw-r--r-- | src/grp-udev/.vimrc (renamed from src/udev/.vimrc) | 0 | ||||
-rw-r--r-- | src/grp-udev/Makefile | 72 | ||||
-rw-r--r-- | src/grp-udev/ata_id/Makefile | 35 | ||||
-rw-r--r-- | src/grp-udev/ata_id/ata_id.c (renamed from src/udev/ata_id/ata_id.c) | 0 | ||||
-rw-r--r-- | src/grp-udev/cdrom_id/Makefile | 38 | ||||
-rw-r--r-- | src/grp-udev/cdrom_id/cdrom_id.c (renamed from src/udev/cdrom_id/cdrom_id.c) | 0 | ||||
-rw-r--r-- | src/grp-udev/collect/Makefile | 35 | ||||
-rw-r--r-- | src/grp-udev/collect/collect.c (renamed from src/udev/collect/collect.c) | 0 | ||||
-rw-r--r-- | src/grp-udev/libudev-core/Makefile | 101 | ||||
-rw-r--r-- | src/grp-udev/libudev-core/net/.gitignore (renamed from src/udev/net/.gitignore) | 0 | ||||
-rw-r--r-- | src/grp-udev/libudev-core/net/ethtool-util.c (renamed from src/udev/net/ethtool-util.c) | 0 | ||||
-rw-r--r-- | src/grp-udev/libudev-core/net/ethtool-util.h (renamed from src/udev/net/ethtool-util.h) | 0 | ||||
-rw-r--r-- | src/grp-udev/libudev-core/net/link-config-gperf.gperf (renamed from src/udev/net/link-config-gperf.gperf) | 0 | ||||
-rw-r--r-- | src/grp-udev/libudev-core/net/link-config.c (renamed from src/udev/net/link-config.c) | 2 | ||||
-rw-r--r-- | src/grp-udev/libudev-core/net/link-config.h (renamed from src/udev/net/link-config.h) | 0 | ||||
-rw-r--r-- | src/grp-udev/libudev-core/udev-builtin-blkid.c (renamed from src/udev/udev-builtin-blkid.c) | 2 | ||||
-rw-r--r-- | src/grp-udev/libudev-core/udev-builtin-btrfs.c (renamed from src/udev/udev-builtin-btrfs.c) | 0 | ||||
-rw-r--r-- | src/grp-udev/libudev-core/udev-builtin-hwdb.c (renamed from src/udev/udev-builtin-hwdb.c) | 2 | ||||
-rw-r--r-- | src/grp-udev/libudev-core/udev-builtin-input_id.c (renamed from src/udev/udev-builtin-input_id.c) | 0 | ||||
-rw-r--r-- | src/grp-udev/libudev-core/udev-builtin-keyboard.c (renamed from src/udev/udev-builtin-keyboard.c) | 0 | ||||
-rw-r--r-- | src/grp-udev/libudev-core/udev-builtin-kmod.c (renamed from src/udev/udev-builtin-kmod.c) | 0 | ||||
-rw-r--r-- | src/grp-udev/libudev-core/udev-builtin-net_id.c (renamed from src/udev/udev-builtin-net_id.c) | 0 | ||||
-rw-r--r-- | src/grp-udev/libudev-core/udev-builtin-net_setup_link.c (renamed from src/udev/udev-builtin-net_setup_link.c) | 0 | ||||
-rw-r--r-- | src/grp-udev/libudev-core/udev-builtin-path_id.c (renamed from src/udev/udev-builtin-path_id.c) | 0 | ||||
-rw-r--r-- | src/grp-udev/libudev-core/udev-builtin-uaccess.c (renamed from src/udev/udev-builtin-uaccess.c) | 2 | ||||
-rw-r--r-- | src/grp-udev/libudev-core/udev-builtin-usb_id.c (renamed from src/udev/udev-builtin-usb_id.c) | 0 | ||||
-rw-r--r-- | src/grp-udev/libudev-core/udev-builtin.c (renamed from src/udev/udev-builtin.c) | 0 | ||||
-rw-r--r-- | src/grp-udev/libudev-core/udev-ctrl.c (renamed from src/udev/udev-ctrl.c) | 0 | ||||
-rw-r--r-- | src/grp-udev/libudev-core/udev-event.c (renamed from src/udev/udev-event.c) | 0 | ||||
-rw-r--r-- | src/grp-udev/libudev-core/udev-node.c (renamed from src/udev/udev-node.c) | 0 | ||||
-rw-r--r-- | src/grp-udev/libudev-core/udev-rules.c (renamed from src/udev/udev-rules.c) | 0 | ||||
-rw-r--r-- | src/grp-udev/libudev-core/udev-watch.c (renamed from src/udev/udev-watch.c) | 0 | ||||
-rw-r--r-- | src/grp-udev/libudev-core/udev.conf (renamed from src/udev/udev.conf) | 0 | ||||
-rw-r--r-- | src/grp-udev/libudev-core/udev.pc.in (renamed from src/udev/udev.pc.in) | 0 | ||||
-rw-r--r-- | src/grp-udev/mtd_probe/Makefile | 37 | ||||
-rw-r--r-- | src/grp-udev/mtd_probe/mtd_probe.c (renamed from src/udev/mtd_probe/mtd_probe.c) | 0 | ||||
-rw-r--r-- | src/grp-udev/mtd_probe/mtd_probe.h (renamed from src/udev/mtd_probe/mtd_probe.h) | 0 | ||||
-rw-r--r-- | src/grp-udev/mtd_probe/probe_smartmedia.c (renamed from src/udev/mtd_probe/probe_smartmedia.c) | 0 | ||||
-rw-r--r-- | src/grp-udev/scsi_id/.gitignore (renamed from src/udev/scsi_id/.gitignore) | 0 | ||||
-rw-r--r-- | src/grp-udev/scsi_id/Makefile | 41 | ||||
-rw-r--r-- | src/grp-udev/scsi_id/README (renamed from src/udev/scsi_id/README) | 0 | ||||
-rw-r--r-- | src/grp-udev/scsi_id/scsi.h (renamed from src/udev/scsi_id/scsi.h) | 0 | ||||
-rw-r--r-- | src/grp-udev/scsi_id/scsi_id.c (renamed from src/udev/scsi_id/scsi_id.c) | 0 | ||||
-rw-r--r-- | src/grp-udev/scsi_id/scsi_id.h (renamed from src/udev/scsi_id/scsi_id.h) | 0 | ||||
-rw-r--r-- | src/grp-udev/scsi_id/scsi_serial.c (renamed from src/udev/scsi_id/scsi_serial.c) | 0 | ||||
-rw-r--r-- | src/grp-udev/systemd-udevd/Makefile | 35 | ||||
-rw-r--r-- | src/grp-udev/systemd-udevd/udevd.c (renamed from src/udev/udevd.c) | 4 | ||||
-rw-r--r-- | src/grp-udev/udevadm/Makefile | 45 | ||||
-rw-r--r-- | src/grp-udev/udevadm/udevadm-control.c (renamed from src/udev/udevadm-control.c) | 0 | ||||
-rw-r--r-- | src/grp-udev/udevadm/udevadm-hwdb.c (renamed from src/udev/udevadm-hwdb.c) | 0 | ||||
-rw-r--r-- | src/grp-udev/udevadm/udevadm-info.c (renamed from src/udev/udevadm-info.c) | 0 | ||||
-rw-r--r-- | src/grp-udev/udevadm/udevadm-monitor.c (renamed from src/udev/udevadm-monitor.c) | 0 | ||||
-rw-r--r-- | src/grp-udev/udevadm/udevadm-settle.c (renamed from src/udev/udevadm-settle.c) | 0 | ||||
-rw-r--r-- | src/grp-udev/udevadm/udevadm-test-builtin.c (renamed from src/udev/udevadm-test-builtin.c) | 0 | ||||
-rw-r--r-- | src/grp-udev/udevadm/udevadm-test.c (renamed from src/udev/udevadm-test.c) | 0 | ||||
-rw-r--r-- | src/grp-udev/udevadm/udevadm-trigger.c (renamed from src/udev/udevadm-trigger.c) | 0 | ||||
-rw-r--r-- | src/grp-udev/udevadm/udevadm-util.c (renamed from src/udev/udevadm-util.c) | 0 | ||||
-rw-r--r-- | src/grp-udev/udevadm/udevadm-util.h (renamed from src/udev/udevadm-util.h) | 0 | ||||
-rw-r--r-- | src/grp-udev/udevadm/udevadm.c (renamed from src/udev/udevadm.c) | 0 | ||||
-rw-r--r-- | src/grp-udev/v4l_id/Makefile | 38 | ||||
-rw-r--r-- | src/grp-udev/v4l_id/v4l_id.c (renamed from src/udev/v4l_id/v4l_id.c) | 0 | ||||
l--------- | src/hibernate-resume/Makefile | 1 | ||||
l--------- | src/hostname/Makefile | 1 | ||||
l--------- | src/hwdb/Makefile | 1 | ||||
l--------- | src/import/Makefile | 1 | ||||
l--------- | src/initctl/Makefile | 1 | ||||
l--------- | src/journal-remote/Makefile | 1 | ||||
l--------- | src/journal/Makefile | 1 | ||||
-rw-r--r--[l---------] | src/kernel-install/Makefile | 34 | ||||
-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 | 279 | ||||
-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/architecture.c (renamed from src/basic/architecture.c) | 0 | ||||
-rw-r--r-- | src/libbasic/architecture.h (renamed from src/basic/architecture.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/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/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/missing_syscall.h (renamed from src/basic/missing_syscall.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/libcore/.gitignore (renamed from src/core/.gitignore) | 0 | ||||
-rw-r--r-- | src/libcore/Makefile | 170 | ||||
-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-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/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) | 0 | ||||
-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/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 | 42 | ||||
-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 | 143 | ||||
-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/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-unit-util.c (renamed from src/shared/bus-unit-util.c) | 0 | ||||
-rw-r--r-- | src/libshared/bus-unit-util.h (renamed from src/shared/bus-unit-util.h) | 2 | ||||
-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) | 4 | ||||
-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/gcrypt-util.c (renamed from src/shared/gcrypt-util.c) | 0 | ||||
-rw-r--r-- | src/libshared/gcrypt-util.h (renamed from src/shared/gcrypt-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.c (renamed from src/shared/output-mode.c) | 0 | ||||
-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/tests.c (renamed from src/shared/tests.c) | 0 | ||||
-rw-r--r-- | src/libshared/tests.h (renamed from src/shared/tests.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 | 174 | ||||
-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.h | 4 | ||||
-rw-r--r-- | src/libsystemd-network/lldp-neighbor.h | 2 | ||||
-rw-r--r-- | src/libsystemd-network/lldp-network.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 | 111 | ||||
-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 | ||||
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 | ||||
-rw-r--r-- | src/libsystemd/src/Makefile | 329 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/DIFFERENCES (renamed from src/libsystemd/sd-bus/DIFFERENCES) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/GVARIANT-SERIALIZATION (renamed from src/libsystemd/sd-bus/GVARIANT-SERIALIZATION) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/PORTING-DBUS1 (renamed from src/libsystemd/sd-bus/PORTING-DBUS1) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/bus-bloom.c (renamed from src/libsystemd/sd-bus/bus-bloom.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/bus-bloom.h (renamed from src/libsystemd/sd-bus/bus-bloom.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/bus-common-errors.c (renamed from src/libsystemd/sd-bus/bus-common-errors.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/bus-common-errors.h (renamed from src/libsystemd/sd-bus/bus-common-errors.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/bus-container.c (renamed from src/libsystemd/sd-bus/bus-container.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/bus-container.h (renamed from src/libsystemd/sd-bus/bus-container.h) | 2 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/bus-control.c (renamed from src/libsystemd/sd-bus/bus-control.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/bus-control.h (renamed from src/libsystemd/sd-bus/bus-control.h) | 2 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/bus-convenience.c (renamed from src/libsystemd/sd-bus/bus-convenience.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/bus-creds.c (renamed from src/libsystemd/sd-bus/bus-creds.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/bus-creds.h (renamed from src/libsystemd/sd-bus/bus-creds.h) | 2 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/bus-dump.c (renamed from src/libsystemd/sd-bus/bus-dump.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/bus-dump.h (renamed from src/libsystemd/sd-bus/bus-dump.h) | 2 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/bus-error.c (renamed from src/libsystemd/sd-bus/bus-error.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/bus-error.h (renamed from src/libsystemd/sd-bus/bus-error.h) | 2 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/bus-gvariant.c (renamed from src/libsystemd/sd-bus/bus-gvariant.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/bus-gvariant.h (renamed from src/libsystemd/sd-bus/bus-gvariant.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/bus-internal.c (renamed from src/libsystemd/sd-bus/bus-internal.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/bus-internal.h (renamed from src/libsystemd/sd-bus/bus-internal.h) | 2 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/bus-introspect.c (renamed from src/libsystemd/sd-bus/bus-introspect.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/bus-introspect.h (renamed from src/libsystemd/sd-bus/bus-introspect.h) | 2 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/bus-kernel.c (renamed from src/libsystemd/sd-bus/bus-kernel.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/bus-kernel.h (renamed from src/libsystemd/sd-bus/bus-kernel.h) | 2 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/bus-match.c (renamed from src/libsystemd/sd-bus/bus-match.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/bus-match.h (renamed from src/libsystemd/sd-bus/bus-match.h) | 2 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/bus-message.c (renamed from src/libsystemd/sd-bus/bus-message.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/bus-message.h (renamed from src/libsystemd/sd-bus/bus-message.h) | 2 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/bus-objects.c (renamed from src/libsystemd/sd-bus/bus-objects.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/bus-objects.h (renamed from src/libsystemd/sd-bus/bus-objects.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/bus-protocol.h (renamed from src/libsystemd/sd-bus/bus-protocol.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/bus-signature.c (renamed from src/libsystemd/sd-bus/bus-signature.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/bus-signature.h (renamed from src/libsystemd/sd-bus/bus-signature.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/bus-slot.c (renamed from src/libsystemd/sd-bus/bus-slot.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/bus-slot.h (renamed from src/libsystemd/sd-bus/bus-slot.h) | 2 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/bus-socket.c (renamed from src/libsystemd/sd-bus/bus-socket.c) | 4 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/bus-socket.h (renamed from src/libsystemd/sd-bus/bus-socket.h) | 2 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/bus-track.c (renamed from src/libsystemd/sd-bus/bus-track.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/bus-track.h (renamed from src/libsystemd/sd-bus/bus-track.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/bus-type.c (renamed from src/libsystemd/sd-bus/bus-type.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/bus-type.h (renamed from src/libsystemd/sd-bus/bus-type.h) | 2 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/kdbus.h (renamed from src/libsystemd/sd-bus/kdbus.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/sd-bus.c (renamed from src/libsystemd/sd-bus/sd-bus.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/test-bus-benchmark.c (renamed from src/libsystemd/sd-bus/test-bus-benchmark.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/test-bus-chat.c (renamed from src/libsystemd/sd-bus/test-bus-chat.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/test-bus-cleanup.c (renamed from src/libsystemd/sd-bus/test-bus-cleanup.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/test-bus-creds.c (renamed from src/libsystemd/sd-bus/test-bus-creds.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/test-bus-error.c (renamed from src/libsystemd/sd-bus/test-bus-error.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/test-bus-gvariant.c (renamed from src/libsystemd/sd-bus/test-bus-gvariant.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/test-bus-introspect.c (renamed from src/libsystemd/sd-bus/test-bus-introspect.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/test-bus-kernel-bloom.c (renamed from src/libsystemd/sd-bus/test-bus-kernel-bloom.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/test-bus-kernel.c (renamed from src/libsystemd/sd-bus/test-bus-kernel.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/test-bus-marshal.c (renamed from src/libsystemd/sd-bus/test-bus-marshal.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/test-bus-match.c (renamed from src/libsystemd/sd-bus/test-bus-match.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/test-bus-objects.c (renamed from src/libsystemd/sd-bus/test-bus-objects.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/test-bus-server.c (renamed from src/libsystemd/sd-bus/test-bus-server.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/test-bus-signature.c (renamed from src/libsystemd/sd-bus/test-bus-signature.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-bus/test-bus-zero-copy.c (renamed from src/libsystemd/sd-bus/test-bus-zero-copy.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/src/sd-daemon/sd-daemon.c (renamed from src/libsystemd/sd-daemon/sd-daemon.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/src/sd-device/device-enumerator-private.h (renamed from src/libsystemd/sd-device/device-enumerator-private.h) | 2 | ||||
-rw-r--r-- | src/libsystemd/src/sd-device/device-enumerator.c (renamed from src/libsystemd/sd-device/device-enumerator.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/src/sd-device/device-internal.h (renamed from src/libsystemd/sd-device/device-internal.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-device/device-private.c (renamed from src/libsystemd/sd-device/device-private.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/src/sd-device/device-private.h (renamed from src/libsystemd/sd-device/device-private.h) | 2 | ||||
-rw-r--r-- | src/libsystemd/src/sd-device/device-util.h (renamed from src/libsystemd/sd-device/device-util.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-device/sd-device.c (renamed from src/libsystemd/sd-device/sd-device.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/src/sd-event/sd-event.c (renamed from src/libsystemd/sd-event/sd-event.c) | 6 | ||||
-rw-r--r-- | src/libsystemd/src/sd-event/test-event.c (renamed from src/libsystemd/sd-event/test-event.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/src/sd-hwdb/hwdb-internal.h (renamed from src/libsystemd/sd-hwdb/hwdb-internal.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-hwdb/hwdb-util.h (renamed from src/libsystemd/sd-hwdb/hwdb-util.h) | 2 | ||||
-rw-r--r-- | src/libsystemd/src/sd-hwdb/sd-hwdb.c (renamed from src/libsystemd/sd-hwdb/sd-hwdb.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/src/sd-id128/sd-id128.c (renamed from src/libsystemd/sd-id128/sd-id128.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/src/sd-journal/Makefile | 39 | ||||
-rw-r--r-- | src/libsystemd/src/sd-journal/audit-type.c (renamed from src/journal/audit-type.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-journal/audit-type.h (renamed from src/journal/audit-type.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-journal/catalog.c (renamed from src/journal/catalog.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/src/sd-journal/catalog.h (renamed from src/journal/catalog.h) | 2 | ||||
-rw-r--r-- | src/libsystemd/src/sd-journal/compress.c (renamed from src/journal/compress.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-journal/compress.h (renamed from src/journal/compress.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-journal/fsprg.c (renamed from src/journal/fsprg.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-journal/fsprg.h (renamed from src/journal/fsprg.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-journal/journal-authenticate.c (renamed from src/journal/journal-authenticate.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-journal/journal-authenticate.h (renamed from src/journal/journal-authenticate.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-journal/journal-def.h (renamed from src/journal/journal-def.h) | 2 | ||||
-rw-r--r-- | src/libsystemd/src/sd-journal/journal-file.c (renamed from src/journal/journal-file.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/src/sd-journal/journal-file.h (renamed from src/journal/journal-file.h) | 4 | ||||
-rw-r--r-- | src/libsystemd/src/sd-journal/journal-internal.h (renamed from src/journal/journal-internal.h) | 4 | ||||
-rw-r--r-- | src/libsystemd/src/sd-journal/journal-send.c (renamed from src/journal/journal-send.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/src/sd-journal/journal-vacuum.c (renamed from src/journal/journal-vacuum.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/src/sd-journal/journal-vacuum.h (renamed from src/journal/journal-vacuum.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-journal/journal-verify.c (renamed from src/journal/journal-verify.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-journal/journal-verify.h (renamed from src/journal/journal-verify.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-journal/lookup3.c (renamed from src/journal/lookup3.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-journal/lookup3.h (renamed from src/journal/lookup3.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-journal/mmap-cache.c (renamed from src/journal/mmap-cache.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-journal/mmap-cache.h (renamed from src/journal/mmap-cache.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-journal/sd-journal.c (renamed from src/journal/sd-journal.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/src/sd-login/sd-login.c (renamed from src/libsystemd/sd-login/sd-login.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/src/sd-login/test-login.c (renamed from src/libsystemd/sd-login/test-login.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/src/sd-netlink/local-addresses.c (renamed from src/libsystemd/sd-netlink/local-addresses.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/src/sd-netlink/local-addresses.h (renamed from src/libsystemd/sd-netlink/local-addresses.h) | 2 | ||||
-rw-r--r-- | src/libsystemd/src/sd-netlink/netlink-internal.h (renamed from src/libsystemd/sd-netlink/netlink-internal.h) | 2 | ||||
-rw-r--r-- | src/libsystemd/src/sd-netlink/netlink-message.c (renamed from src/libsystemd/sd-netlink/netlink-message.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/src/sd-netlink/netlink-socket.c (renamed from src/libsystemd/sd-netlink/netlink-socket.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/src/sd-netlink/netlink-types.c (renamed from src/libsystemd/sd-netlink/netlink-types.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-netlink/netlink-types.h (renamed from src/libsystemd/sd-netlink/netlink-types.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-netlink/netlink-util.c (renamed from src/libsystemd/sd-netlink/netlink-util.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/src/sd-netlink/netlink-util.h (renamed from src/libsystemd/sd-netlink/netlink-util.h) | 2 | ||||
-rw-r--r-- | src/libsystemd/src/sd-netlink/rtnl-message.c (renamed from src/libsystemd/sd-netlink/rtnl-message.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/src/sd-netlink/sd-netlink.c (renamed from src/libsystemd/sd-netlink/sd-netlink.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/src/sd-netlink/test-local-addresses.c (renamed from src/libsystemd/sd-netlink/test-local-addresses.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-netlink/test-netlink.c (renamed from src/libsystemd/sd-netlink/test-netlink.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/src/sd-network/network-util.c (renamed from src/libsystemd/sd-network/network-util.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/src/sd-network/network-util.h (renamed from src/libsystemd/sd-network/network-util.h) | 2 | ||||
-rw-r--r-- | src/libsystemd/src/sd-network/sd-network.c (renamed from src/libsystemd/sd-network/sd-network.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/src/sd-path/sd-path.c (renamed from src/libsystemd/sd-path/sd-path.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/src/sd-resolve/sd-resolve.c (renamed from src/libsystemd/sd-resolve/sd-resolve.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/src/sd-resolve/test-resolve.c (renamed from src/libsystemd/sd-resolve/test-resolve.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/src/sd-utf8/sd-utf8.c (renamed from src/libsystemd/sd-utf8/sd-utf8.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/src/subdir.mk | 29 | ||||
-rw-r--r--[l---------] | src/libudev/Makefile | 29 | ||||
-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 | 83 | ||||
-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 | ||||
l--------- | src/locale/Makefile | 1 | ||||
l--------- | src/login/Makefile | 1 | ||||
l--------- | src/machine-id-setup/Makefile | 1 | ||||
l--------- | src/machine/Makefile | 1 | ||||
l--------- | src/modules-load/Makefile | 1 | ||||
l--------- | src/network/Makefile | 1 | ||||
l--------- | src/notify/Makefile | 1 | ||||
l--------- | src/nspawn/Makefile | 1 | ||||
-rw-r--r--[l---------] | src/nss-myhostname/Makefile | 48 | ||||
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 | ||||
l--------- | src/sleep/Makefile | 1 | ||||
l--------- | src/socket-proxy/Makefile | 1 | ||||
l--------- | src/sysctl/Makefile | 1 | ||||
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 | 36 | ||||
-rw-r--r-- | src/systemd-activate/activate.c (renamed from src/activate/activate.c) | 2 | ||||
-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-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) | 0 | ||||
-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 | 59 | ||||
-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 | 49 | ||||
-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 | 34 | ||||
-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-escape/Makefile | 34 | ||||
-rw-r--r-- | src/systemd-escape/escape.c (renamed from src/escape/escape.c) | 0 | ||||
-rw-r--r-- | src/systemd-firstboot/Makefile | 47 | ||||
-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 | 43 | ||||
-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 | 60 | ||||
-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 | 76 | ||||
-rw-r--r-- | src/systemd-hwdb/hwdb.c (renamed from src/hwdb/hwdb.c) | 0 | ||||
-rw-r--r-- | src/systemd-initctl/Makefile | 33 | ||||
-rw-r--r-- | src/systemd-initctl/initctl.c (renamed from src/initctl/initctl.c) | 4 | ||||
-rw-r--r-- | src/systemd-machine-id-setup/Makefile | 38 | ||||
-rw-r--r-- | src/systemd-machine-id-setup/machine-id-setup-main.c (renamed from src/machine-id-setup/machine-id-setup-main.c) | 0 | ||||
-rw-r--r-- | src/systemd-modules-load/Makefile | 60 | ||||
-rw-r--r-- | src/systemd-modules-load/modules-load.c (renamed from src/modules-load/modules-load.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 | 85 | ||||
-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-patch-uid.c (renamed from src/nspawn/nspawn-patch-uid.c) | 0 | ||||
-rw-r--r-- | src/systemd-nspawn/nspawn-patch-uid.h (renamed from src/nspawn/nspawn-patch-uid.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-nspawn/test-patch-uid.c (renamed from src/nspawn/test-patch-uid.c) | 0 | ||||
-rw-r--r-- | src/systemd-path/Makefile | 34 | ||||
-rw-r--r-- | src/systemd-path/path.c (renamed from src/path/path.c) | 2 | ||||
-rw-r--r-- | src/systemd-rc-local-generator/Makefile | 32 | ||||
-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-run/Makefile | 33 | ||||
-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-shutdown/shutdown.c (renamed from src/core/shutdown.c) | 0 | ||||
-rw-r--r-- | src/systemd-shutdown/umount.c (renamed from src/core/umount.c) | 0 | ||||
-rw-r--r-- | src/systemd-shutdown/umount.h (renamed from src/core/umount.h) | 0 | ||||
-rw-r--r-- | src/systemd-socket-proxyd/Makefile | 34 | ||||
-rw-r--r-- | src/systemd-socket-proxyd/socket-proxyd.c (renamed from src/socket-proxy/socket-proxyd.c) | 6 | ||||
-rw-r--r-- | src/systemd-stdio-bridge/Makefile | 33 | ||||
-rw-r--r-- | src/systemd-stdio-bridge/stdio-bridge.c (renamed from src/stdio-bridge/stdio-bridge.c) | 4 | ||||
-rw-r--r-- | src/systemd-sysctl/Makefile | 33 | ||||
-rw-r--r-- | src/systemd-sysctl/sysctl.c (renamed from src/sysctl/sysctl.c) | 0 | ||||
-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-sysusers/Makefile | 61 | ||||
-rw-r--r-- | src/systemd-sysusers/sysusers.c (renamed from src/sysusers/sysusers.c) | 0 | ||||
-rw-r--r-- | src/systemd-sysv-generator/Makefile | 32 | ||||
-rw-r--r-- | src/systemd-sysv-generator/sysv-generator.c (renamed from src/sysv-generator/sysv-generator.c) | 0 | ||||
-rw-r--r-- | src/systemd-timesyncd/.gitignore (renamed from src/timesync/.gitignore) | 0 | ||||
-rw-r--r-- | src/systemd-timesyncd/Makefile | 64 | ||||
-rw-r--r-- | src/systemd-timesyncd/timesyncd-conf.c (renamed from src/timesync/timesyncd-conf.c) | 0 | ||||
-rw-r--r-- | src/systemd-timesyncd/timesyncd-conf.h (renamed from src/timesync/timesyncd-conf.h) | 0 | ||||
-rw-r--r-- | src/systemd-timesyncd/timesyncd-gperf.gperf (renamed from src/timesync/timesyncd-gperf.gperf) | 0 | ||||
-rw-r--r-- | src/systemd-timesyncd/timesyncd-manager.c (renamed from src/timesync/timesyncd-manager.c) | 2 | ||||
-rw-r--r-- | src/systemd-timesyncd/timesyncd-manager.h (renamed from src/timesync/timesyncd-manager.h) | 6 | ||||
-rw-r--r-- | src/systemd-timesyncd/timesyncd-server.c (renamed from src/timesync/timesyncd-server.c) | 0 | ||||
-rw-r--r-- | src/systemd-timesyncd/timesyncd-server.h (renamed from src/timesync/timesyncd-server.h) | 0 | ||||
-rw-r--r-- | src/systemd-timesyncd/timesyncd.c (renamed from src/timesync/timesyncd.c) | 4 | ||||
-rw-r--r-- | src/systemd-timesyncd/timesyncd.conf.in (renamed from src/timesync/timesyncd.conf.in) | 0 | ||||
-rw-r--r-- | src/systemd-tmpfiles/Makefile | 84 | ||||
-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 | 34 | ||||
-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 | 42 | ||||
-rw-r--r-- | src/systemd-update-utmp/update-utmp.c (renamed from src/update-utmp/update-utmp.c) | 2 | ||||
l--------- | src/systemd/Makefile | 1 | ||||
l--------- | src/sysusers/Makefile | 1 | ||||
l--------- | src/sysv-generator/Makefile | 1 | ||||
-rw-r--r--[l---------] | src/test/Makefile | 36 | ||||
-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 | ||||
l--------- | src/udev/Makefile | 1 | ||||
l--------- | src/udev/ata_id/Makefile | 1 | ||||
l--------- | src/udev/cdrom_id/Makefile | 1 | ||||
l--------- | src/udev/collect/Makefile | 1 | ||||
l--------- | src/udev/mtd_probe/Makefile | 1 | ||||
l--------- | src/udev/net/Makefile | 1 | ||||
l--------- | src/udev/scsi_id/Makefile | 1 | ||||
l--------- | src/udev/v4l_id/Makefile | 1 | ||||
l--------- | src/update-done/Makefile | 1 | ||||
l--------- | src/update-utmp/Makefile | 1 | ||||
l--------- | src/user-sessions/Makefile | 1 | ||||
l--------- | src/vconsole/Makefile | 1 |
1325 files changed, 12412 insertions, 486 deletions
diff --git a/src/Makefile b/src/Makefile index 9d07505194..b84e6076a0 100644 --- a/src/Makefile +++ b/src/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,8 @@ # # 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 .. - -clean: - $(MAKE) -C .. clean -.PHONY: all clean +include $(topsrcdir)/build-aux/Makefile.tail.mk 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/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/busctl/Makefile b/src/busctl/Makefile new file mode 100644 index 0000000000..e7ef92824c --- /dev/null +++ b/src/busctl/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 + +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 + +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 bfe967bfb0..0281409edf 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/Makefile b/src/grp-boot/Makefile new file mode 100644 index 0000000000..922d8a32d3 --- /dev/null +++ b/src/grp-boot/Makefile @@ -0,0 +1,28 @@ +# -*- 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 + +at.subdirs += bootctl systemd-boot + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-boot/bootctl/Makefile b/src/grp-boot/bootctl/Makefile new file mode 100644 index 0000000000..84253d2387 --- /dev/null +++ b/src/grp-boot/bootctl/Makefile @@ -0,0 +1,54 @@ +# -*- 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 +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/boot/bootctl.c b/src/grp-boot/bootctl/bootctl.c index 4a356d25d1..4a356d25d1 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..5b53fdc7e4 --- /dev/null +++ b/src/grp-boot/systemd-boot/Makefile @@ -0,0 +1,194 @@ +# -*- 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/measure.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/measure.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/measure.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/measure.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 + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/boot/efi/boot.c b/src/grp-boot/systemd-boot/boot.c index 30c1ead1aa..30c1ead1aa 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/measure.c b/src/grp-boot/systemd-boot/measure.c index 7c016387c1..7c016387c1 100644 --- a/src/boot/efi/measure.c +++ b/src/grp-boot/systemd-boot/measure.c diff --git a/src/boot/efi/measure.h b/src/grp-boot/systemd-boot/measure.h index a2cfe817d0..a2cfe817d0 100644 --- a/src/boot/efi/measure.h +++ b/src/grp-boot/systemd-boot/measure.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 c0ef7f64fe..c0ef7f64fe 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 1e250f34f4..1e250f34f4 100644 --- a/src/boot/efi/stub.c +++ b/src/grp-boot/systemd-boot/stub.c diff --git a/src/grp-boot/systemd-boot/test-efi-create-disk.sh b/src/grp-boot/systemd-boot/test-efi-create-disk.sh new file mode 100755 index 0000000000..56dd09abd7 --- /dev/null +++ b/src/grp-boot/systemd-boot/test-efi-create-disk.sh @@ -0,0 +1,42 @@ +#!/bin/bash -e + +# create GPT table with EFI System Partition +rm -f test-efi-disk.img +dd if=/dev/null of=test-efi-disk.img bs=1M seek=512 count=1 +parted --script test-efi-disk.img "mklabel gpt" "mkpart ESP fat32 1MiB 511MiB" "set 1 boot on" + +# create FAT32 file system +LOOP=$(losetup --show -f -P test-efi-disk.img) +mkfs.vfat -F32 ${LOOP}p1 +mkdir -p mnt +mount ${LOOP}p1 mnt + +mkdir -p mnt/EFI/{Boot,systemd} +cp systemd-bootx64.efi mnt/EFI/Boot/bootx64.efi + +[ -e /boot/shellx64.efi ] && cp /boot/shellx64.efi mnt/ + +mkdir mnt/EFI/Linux +echo -n "foo=yes bar=no root=/dev/fakeroot debug rd.break=initqueue" > mnt/cmdline.txt +objcopy \ + --add-section .osrel=/etc/os-release --change-section-vma .osrel=0x20000 \ + --add-section .cmdline=mnt/cmdline.txt --change-section-vma .cmdline=0x30000 \ + --add-section .splash=test/splash.bmp --change-section-vma .splash=0x40000 \ + --add-section .linux=/boot/$(cat /etc/machine-id)/$(uname -r)/linux --change-section-vma .linux=0x2000000 \ + --add-section .initrd=/boot/$(cat /etc/machine-id)/$(uname -r)/initrd --change-section-vma .initrd=0x3000000 \ + linuxx64.efi.stub mnt/EFI/Linux/linux-test.efi + +# install entries +mkdir -p mnt/loader/entries +echo -e "timeout 3\n" > mnt/loader/loader.conf +echo -e "title Test\nefi /test\n" > mnt/loader/entries/test.conf +echo -e "title Test2\nlinux /test2\noptions option=yes word number=1000 more\n" > mnt/loader/entries/test2.conf +echo -e "title Test3\nlinux /test3\n" > mnt/loader/entries/test3.conf +echo -e "title Test4\nlinux /test4\n" > mnt/loader/entries/test4.conf +echo -e "title Test5\nefi /test5\n" > mnt/loader/entries/test5.conf +echo -e "title Test6\nlinux /test6\n" > mnt/loader/entries/test6.conf + +sync +umount mnt +rmdir mnt +losetup -d $LOOP 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/Makefile b/src/grp-coredump/Makefile new file mode 100644 index 0000000000..2e604d7b86 --- /dev/null +++ b/src/grp-coredump/Makefile @@ -0,0 +1,28 @@ +# -*- 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 + +at.subdirs += coredumpctl systemd-coredump + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-coredump/coredumpctl/Makefile b/src/grp-coredump/coredumpctl/Makefile new file mode 100644 index 0000000000..47a4397fa4 --- /dev/null +++ b/src/grp-coredump/coredumpctl/Makefile @@ -0,0 +1,41 @@ +# -*- 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 + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/coredump/coredumpctl.c b/src/grp-coredump/coredumpctl/coredumpctl.c index 27b1e0fb3f..dc95da3613 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..bc71db120e --- /dev/null +++ b/src/grp-coredump/systemd-coredump/Makefile @@ -0,0 +1,81 @@ +# -*- 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 + +rootlibexec_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 + +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 999de63900..bf0e0a038b 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 cc4dad9465..cc4dad9465 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-helperunits/systemd-backlight/Makefile b/src/grp-helperunits/systemd-backlight/Makefile new file mode 100644 index 0000000000..cf55ac4db9 --- /dev/null +++ b/src/grp-helperunits/systemd-backlight/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_BACKLIGHT),) +rootlibexec_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 + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/backlight/backlight.c b/src/grp-helperunits/systemd-backlight/backlight.c index 45be135a23..45be135a23 100644 --- a/src/backlight/backlight.c +++ b/src/grp-helperunits/systemd-backlight/backlight.c diff --git a/src/grp-helperunits/systemd-binfmt/Makefile b/src/grp-helperunits/systemd-binfmt/Makefile new file mode 100644 index 0000000000..3e5c1ac270 --- /dev/null +++ b/src/grp-helperunits/systemd-binfmt/Makefile @@ -0,0 +1,56 @@ +# -*- 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 + +rootlibexec_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 + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/binfmt/binfmt.c b/src/grp-helperunits/systemd-binfmt/binfmt.c index eeef04fb1c..eeef04fb1c 100644 --- a/src/binfmt/binfmt.c +++ b/src/grp-helperunits/systemd-binfmt/binfmt.c diff --git a/src/grp-helperunits/systemd-detect-virt/Makefile b/src/grp-helperunits/systemd-detect-virt/Makefile new file mode 100644 index 0000000000..7b9b9f667b --- /dev/null +++ b/src/grp-helperunits/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 + +bin_PROGRAMS += systemd-detect-virt +systemd_detect_virt_SOURCES = \ + src/detect-virt/detect-virt.c + +systemd_detect_virt_LDADD = \ + libshared.la + +INSTALL_EXEC_HOOKS += \ + systemd-detect-virt-install-hook + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/detect-virt/detect-virt.c b/src/grp-helperunits/systemd-detect-virt/detect-virt.c index 5d51589a31..5d51589a31 100644 --- a/src/detect-virt/detect-virt.c +++ b/src/grp-helperunits/systemd-detect-virt/detect-virt.c diff --git a/src/grp-helperunits/systemd-quotacheck/Makefile b/src/grp-helperunits/systemd-quotacheck/Makefile new file mode 100644 index 0000000000..4220946f39 --- /dev/null +++ b/src/grp-helperunits/systemd-quotacheck/Makefile @@ -0,0 +1,46 @@ +# -*- 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),) +rootlibexec_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 + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/quotacheck/quotacheck.c b/src/grp-helperunits/systemd-quotacheck/quotacheck.c index 6d8c05f046..6d8c05f046 100644 --- a/src/quotacheck/quotacheck.c +++ b/src/grp-helperunits/systemd-quotacheck/quotacheck.c diff --git a/src/grp-helperunits/systemd-random-seed/Makefile b/src/grp-helperunits/systemd-random-seed/Makefile new file mode 100644 index 0000000000..56d1af7431 --- /dev/null +++ b/src/grp-helperunits/systemd-random-seed/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_RANDOMSEED),) +rootlibexec_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 + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/random-seed/random-seed.c b/src/grp-helperunits/systemd-random-seed/random-seed.c index 6748bb9dd3..6748bb9dd3 100644 --- a/src/random-seed/random-seed.c +++ b/src/grp-helperunits/systemd-random-seed/random-seed.c diff --git a/src/grp-helperunits/systemd-rfkill/Makefile b/src/grp-helperunits/systemd-rfkill/Makefile new file mode 100644 index 0000000000..2b4430b712 --- /dev/null +++ b/src/grp-helperunits/systemd-rfkill/Makefile @@ -0,0 +1,46 @@ +# -*- 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),) +rootlibexec_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 + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/rfkill/rfkill.c b/src/grp-helperunits/systemd-rfkill/rfkill.c index 0acdf229ed..f0b0ad9275 100644 --- a/src/rfkill/rfkill.c +++ b/src/grp-helperunits/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/grp-helperunits/systemd-sleep/Makefile b/src/grp-helperunits/systemd-sleep/Makefile new file mode 100644 index 0000000000..3c9106638f --- /dev/null +++ b/src/grp-helperunits/systemd-sleep/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 + +rootlibexec_PROGRAMS += systemd-sleep +systemd_sleep_SOURCES = \ + src/sleep/sleep.c + +systemd_sleep_LDADD = \ + libshared.la + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/sleep/sleep.c b/src/grp-helperunits/systemd-sleep/sleep.c index c8f0742183..7f8a95728d 100644 --- a/src/sleep/sleep.c +++ b/src/grp-helperunits/systemd-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/grp-helperunits/systemd-user-sessions/Makefile b/src/grp-helperunits/systemd-user-sessions/Makefile new file mode 100644 index 0000000000..66fa3b7059 --- /dev/null +++ b/src/grp-helperunits/systemd-user-sessions/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 ($(HAVE_PAM),) + +systemd_user_sessions_SOURCES = \ + src/user-sessions/user-sessions.c + +systemd_user_sessions_LDADD = \ + libshared.la + +rootlibexec_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 + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/user-sessions/user-sessions.c b/src/grp-helperunits/systemd-user-sessions/user-sessions.c index 9b29b5ba1d..9b29b5ba1d 100644 --- a/src/user-sessions/user-sessions.c +++ b/src/grp-helperunits/systemd-user-sessions/user-sessions.c diff --git a/src/vconsole/.gitignore b/src/grp-helperunits/systemd-vconsole-setup/.gitignore index 82741b2fb3..82741b2fb3 100644 --- a/src/vconsole/.gitignore +++ b/src/grp-helperunits/systemd-vconsole-setup/.gitignore diff --git a/src/vconsole/90-vconsole.rules.in b/src/grp-helperunits/systemd-vconsole-setup/90-vconsole.rules.in index 35b9ad5151..35b9ad5151 100644 --- a/src/vconsole/90-vconsole.rules.in +++ b/src/grp-helperunits/systemd-vconsole-setup/90-vconsole.rules.in diff --git a/src/grp-helperunits/systemd-vconsole-setup/Makefile b/src/grp-helperunits/systemd-vconsole-setup/Makefile new file mode 100644 index 0000000000..99b369967e --- /dev/null +++ b/src/grp-helperunits/systemd-vconsole-setup/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 + +ifneq ($(ENABLE_VCONSOLE),) +systemd_vconsole_setup_SOURCES = \ + src/vconsole/vconsole-setup.c + +systemd_vconsole_setup_LDADD = \ + libshared.la + +rootlibexec_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 + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/vconsole/vconsole-setup.c b/src/grp-helperunits/systemd-vconsole-setup/vconsole-setup.c index 1118118450..1118118450 100644 --- a/src/vconsole/vconsole-setup.c +++ b/src/grp-helperunits/systemd-vconsole-setup/vconsole-setup.c diff --git a/src/hostname/.gitignore b/src/grp-hostname/.gitignore index 1ff281b231..1ff281b231 100644 --- a/src/hostname/.gitignore +++ b/src/grp-hostname/.gitignore diff --git a/src/grp-hostname/Makefile b/src/grp-hostname/Makefile new file mode 100644 index 0000000000..911188454c --- /dev/null +++ b/src/grp-hostname/Makefile @@ -0,0 +1,79 @@ +# -*- 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 + +rootlibexec_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 + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/hostname/hostnamectl.c b/src/grp-hostname/hostnamectl.c index c16a324232..aabc3b30c0 100644 --- a/src/hostname/hostnamectl.c +++ b/src/grp-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/hostname/hostnamed.c b/src/grp-hostname/hostnamed.c index d11756e615..d11756e615 100644 --- a/src/hostname/hostnamed.c +++ b/src/grp-hostname/hostnamed.c diff --git a/src/hostname/org.freedesktop.hostname1.conf b/src/grp-hostname/org.freedesktop.hostname1.conf index 46b4aadc83..46b4aadc83 100644 --- a/src/hostname/org.freedesktop.hostname1.conf +++ b/src/grp-hostname/org.freedesktop.hostname1.conf diff --git a/src/hostname/org.freedesktop.hostname1.policy.in b/src/grp-hostname/org.freedesktop.hostname1.policy.in index c32c1d4fda..c32c1d4fda 100644 --- a/src/hostname/org.freedesktop.hostname1.policy.in +++ b/src/grp-hostname/org.freedesktop.hostname1.policy.in diff --git a/src/hostname/org.freedesktop.hostname1.service b/src/grp-hostname/org.freedesktop.hostname1.service index 6041ed60ca..6041ed60ca 100644 --- a/src/hostname/org.freedesktop.hostname1.service +++ b/src/grp-hostname/org.freedesktop.hostname1.service diff --git a/src/import/.gitignore b/src/grp-import/.gitignore index 01106e2e68..01106e2e68 100644 --- a/src/import/.gitignore +++ b/src/grp-import/.gitignore diff --git a/src/grp-import/Makefile b/src/grp-import/Makefile new file mode 100644 index 0000000000..46be93c42f --- /dev/null +++ b/src/grp-import/Makefile @@ -0,0 +1,89 @@ +# -*- 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),) + +dist_rootlibexec_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 + + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/import/curl-util.c b/src/grp-import/curl-util.c index 6990c47f48..6990c47f48 100644 --- a/src/import/curl-util.c +++ b/src/grp-import/curl-util.c diff --git a/src/import/curl-util.h b/src/grp-import/curl-util.h index a758cc5640..2e71bd3b5d 100644 --- a/src/import/curl-util.h +++ b/src/grp-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/org.freedesktop.import1.conf b/src/grp-import/org.freedesktop.import1.conf index ed2539a03b..ed2539a03b 100644 --- a/src/import/org.freedesktop.import1.conf +++ b/src/grp-import/org.freedesktop.import1.conf diff --git a/src/import/org.freedesktop.import1.policy.in b/src/grp-import/org.freedesktop.import1.policy.in index 85924ed743..85924ed743 100644 --- a/src/import/org.freedesktop.import1.policy.in +++ b/src/grp-import/org.freedesktop.import1.policy.in diff --git a/src/import/org.freedesktop.import1.service b/src/grp-import/org.freedesktop.import1.service index 8fc4c47881..8fc4c47881 100644 --- a/src/import/org.freedesktop.import1.service +++ b/src/grp-import/org.freedesktop.import1.service diff --git a/src/import/qcow2-util.c b/src/grp-import/qcow2-util.c index ee2121cc36..ee2121cc36 100644 --- a/src/import/qcow2-util.c +++ b/src/grp-import/qcow2-util.c diff --git a/src/import/qcow2-util.h b/src/grp-import/qcow2-util.h index 6dddac8cdf..6dddac8cdf 100644 --- a/src/import/qcow2-util.h +++ b/src/grp-import/qcow2-util.h diff --git a/src/grp-import/systemd-export/Makefile b/src/grp-import/systemd-export/Makefile new file mode 100644 index 0000000000..d0e8781faf --- /dev/null +++ b/src/grp-import/systemd-export/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 + +rootlibexec_PROGRAMS += systemd-export + +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) + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/import/export-raw.c b/src/grp-import/systemd-export/export-raw.c index db06e11b87..658f835132 100644 --- a/src/import/export-raw.c +++ b/src/grp-import/systemd-export/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/grp-import/systemd-export/export-raw.h index 8e723d4908..c7ac134603 100644 --- a/src/import/export-raw.h +++ b/src/grp-import/systemd-export/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/grp-import/systemd-export/export-tar.c index d79c27f2d0..9c511984c1 100644 --- a/src/import/export-tar.c +++ b/src/grp-import/systemd-export/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/grp-import/systemd-export/export-tar.h index 1e3c8bb80c..50206cabb3 100644 --- a/src/import/export-tar.h +++ b/src/grp-import/systemd-export/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/grp-import/systemd-export/export.c index cc98c33ef6..0a5efe5476 100644 --- a/src/import/export.c +++ b/src/grp-import/systemd-export/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/grp-import/systemd-import/Makefile b/src/grp-import/systemd-import/Makefile new file mode 100644 index 0000000000..301556ffd5 --- /dev/null +++ b/src/grp-import/systemd-import/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 + +rootlibexec_PROGRAMS += systemd-import +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) + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/import/import-common.c b/src/grp-import/systemd-import/import-common.c index 287a3382a1..287a3382a1 100644 --- a/src/import/import-common.c +++ b/src/grp-import/systemd-import/import-common.c diff --git a/src/import/import-common.h b/src/grp-import/systemd-import/import-common.h index 07d3250e71..07d3250e71 100644 --- a/src/import/import-common.h +++ b/src/grp-import/systemd-import/import-common.h diff --git a/src/import/import-compress.c b/src/grp-import/systemd-import/import-compress.c index f1766bbe3b..f1766bbe3b 100644 --- a/src/import/import-compress.c +++ b/src/grp-import/systemd-import/import-compress.c diff --git a/src/import/import-compress.h b/src/grp-import/systemd-import/import-compress.h index 6b59d0724b..6b59d0724b 100644 --- a/src/import/import-compress.h +++ b/src/grp-import/systemd-import/import-compress.h diff --git a/src/import/import-pubring.gpg b/src/grp-import/systemd-import/import-pubring.gpg Binary files differindex be27776896..be27776896 100644 --- a/src/import/import-pubring.gpg +++ b/src/grp-import/systemd-import/import-pubring.gpg diff --git a/src/import/import-raw.c b/src/grp-import/systemd-import/import-raw.c index fd6b9f7703..ce37392707 100644 --- a/src/import/import-raw.c +++ b/src/grp-import/systemd-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/grp-import/systemd-import/import-raw.h index 4f543e0883..f0a315c088 100644 --- a/src/import/import-raw.h +++ b/src/grp-import/systemd-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/grp-import/systemd-import/import-tar.c index 8b81324fde..016d05e77d 100644 --- a/src/import/import-tar.c +++ b/src/grp-import/systemd-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/grp-import/systemd-import/import-tar.h index 24abe06c8f..b66b00ddfd 100644 --- a/src/import/import-tar.h +++ b/src/grp-import/systemd-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/grp-import/systemd-import/import.c index 4e442ee84a..338847dbc2 100644 --- a/src/import/import.c +++ b/src/grp-import/systemd-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/grp-import/systemd-importd/Makefile b/src/grp-import/systemd-importd/Makefile new file mode 100644 index 0000000000..7911bfce82 --- /dev/null +++ b/src/grp-import/systemd-importd/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 + +rootlibexec_PROGRAMS += systemd-importd +systemd_importd_SOURCES = \ + src/import/importd.c + +systemd_importd_CFLAGS = \ + $(AM_CFLAGS) \ + -D SYSTEMD_PULL_PATH=\"$(rootlibexecdir)/systemd-pull\" \ + -D SYSTEMD_IMPORT_PATH=\"$(rootlibexecdir)/systemd-import\" \ + -D SYSTEMD_EXPORT_PATH=\"$(rootlibexecdir)/systemd-export\" + +systemd_importd_LDADD = \ + libshared.la + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/import/importd.c b/src/grp-import/systemd-importd/importd.c index 956a82945c..e30dfdf805 100644 --- a/src/import/importd.c +++ b/src/grp-import/systemd-importd/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/grp-import/systemd-pull/Makefile b/src/grp-import/systemd-pull/Makefile new file mode 100644 index 0000000000..36505edb5b --- /dev/null +++ b/src/grp-import/systemd-pull/Makefile @@ -0,0 +1,64 @@ +# -*- 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 + +rootlibexec_PROGRAMS += systemd-pull +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/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=\"$(rootlibexecdir)/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) + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/import/pull-common.c b/src/grp-import/systemd-pull/pull-common.c index dc4e4667a9..dc4e4667a9 100644 --- a/src/import/pull-common.c +++ b/src/grp-import/systemd-pull/pull-common.c diff --git a/src/import/pull-common.h b/src/grp-import/systemd-pull/pull-common.h index 929a131c88..929a131c88 100644 --- a/src/import/pull-common.h +++ b/src/grp-import/systemd-pull/pull-common.h diff --git a/src/import/pull-job.c b/src/grp-import/systemd-pull/pull-job.c index 6bcf35ef4e..6bcf35ef4e 100644 --- a/src/import/pull-job.c +++ b/src/grp-import/systemd-pull/pull-job.c diff --git a/src/import/pull-job.h b/src/grp-import/systemd-pull/pull-job.h index 3a152a50e3..3a152a50e3 100644 --- a/src/import/pull-job.h +++ b/src/grp-import/systemd-pull/pull-job.h diff --git a/src/import/pull-raw.c b/src/grp-import/systemd-pull/pull-raw.c index 8993402821..19155cc53a 100644 --- a/src/import/pull-raw.c +++ b/src/grp-import/systemd-pull/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/grp-import/systemd-pull/pull-raw.h index 8f6d16eb3a..6bafa6dafd 100644 --- a/src/import/pull-raw.h +++ b/src/grp-import/systemd-pull/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/grp-import/systemd-pull/pull-tar.c index 8c61c46f73..e0205c3841 100644 --- a/src/import/pull-tar.c +++ b/src/grp-import/systemd-pull/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/grp-import/systemd-pull/pull-tar.h index 7e63e496d8..9ff5bd5953 100644 --- a/src/import/pull-tar.h +++ b/src/grp-import/systemd-pull/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/grp-import/systemd-pull/pull.c index 72604a6a74..74df24f993 100644 --- a/src/import/pull.c +++ b/src/grp-import/systemd-pull/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/import/test-qcow2.c b/src/grp-import/test-qcow2.c index b820253d71..b820253d71 100644 --- a/src/import/test-qcow2.c +++ b/src/grp-import/test-qcow2.c diff --git a/src/journal-remote/.gitignore b/src/grp-journal-remote/.gitignore index 06847b65d4..06847b65d4 100644 --- a/src/journal-remote/.gitignore +++ b/src/grp-journal-remote/.gitignore diff --git a/src/grp-journal-remote/Makefile b/src/grp-journal-remote/Makefile new file mode 100644 index 0000000000..7885bea0fc --- /dev/null +++ b/src/grp-journal-remote/Makefile @@ -0,0 +1,30 @@ +# -*- 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 + +at.subdirs += systemd-journa-gatewayd +at.subdirs += systemd-journa-remote +at.subdirs += systemd-journa-upload + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/journal-remote/browse.html b/src/grp-journal-remote/browse.html index 32848c7673..32848c7673 100644 --- a/src/journal-remote/browse.html +++ b/src/grp-journal-remote/browse.html diff --git a/src/journal-remote/log-generator.py b/src/grp-journal-remote/log-generator.py index fd6964e758..fd6964e758 100755 --- a/src/journal-remote/log-generator.py +++ b/src/grp-journal-remote/log-generator.py diff --git a/src/journal-remote/microhttpd-util.c b/src/grp-journal-remote/microhttpd-util.c index c65c43186f..c65c43186f 100644 --- a/src/journal-remote/microhttpd-util.c +++ b/src/grp-journal-remote/microhttpd-util.c diff --git a/src/journal-remote/microhttpd-util.h b/src/grp-journal-remote/microhttpd-util.h index ea160f212b..ea160f212b 100644 --- a/src/journal-remote/microhttpd-util.h +++ b/src/grp-journal-remote/microhttpd-util.h diff --git a/src/grp-journal-remote/systemd-journal-gatewayd/Makefile b/src/grp-journal-remote/systemd-journal-gatewayd/Makefile new file mode 100644 index 0000000000..05df34a71d --- /dev/null +++ b/src/grp-journal-remote/systemd-journal-gatewayd/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 + +ifneq ($(HAVE_MICROHTTPD),) +gatewayddocumentrootdir=$(pkgdatadir)/gatewayd + +rootlibexec_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 + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/journal-remote/journal-gatewayd.c b/src/grp-journal-remote/systemd-journal-gatewayd/journal-gatewayd.c index e265027a04..1cfb5e2c9c 100644 --- a/src/journal-remote/journal-gatewayd.c +++ b/src/grp-journal-remote/systemd-journal-gatewayd/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/grp-journal-remote/systemd-journal-remote/Makefile b/src/grp-journal-remote/systemd-journal-remote/Makefile new file mode 100644 index 0000000000..05af76afc2 --- /dev/null +++ b/src/grp-journal-remote/systemd-journal-remote/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 ($(HAVE_MICROHTTPD),) +rootlibexec_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 + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/journal-remote/journal-remote-parse.c b/src/grp-journal-remote/systemd-journal-remote/journal-remote-parse.c index 9ba9ee3fc0..9ba9ee3fc0 100644 --- a/src/journal-remote/journal-remote-parse.c +++ b/src/grp-journal-remote/systemd-journal-remote/journal-remote-parse.c diff --git a/src/journal-remote/journal-remote-parse.h b/src/grp-journal-remote/systemd-journal-remote/journal-remote-parse.h index 1740a21f92..4f47ea89d6 100644 --- a/src/journal-remote/journal-remote-parse.h +++ b/src/grp-journal-remote/systemd-journal-remote/journal-remote-parse.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 "journal-remote-write.h" diff --git a/src/journal-remote/journal-remote-write.c b/src/grp-journal-remote/systemd-journal-remote/journal-remote-write.c index 7bba52566e..7bba52566e 100644 --- a/src/journal-remote/journal-remote-write.c +++ b/src/grp-journal-remote/systemd-journal-remote/journal-remote-write.c diff --git a/src/journal-remote/journal-remote-write.h b/src/grp-journal-remote/systemd-journal-remote/journal-remote-write.h index 53ba45fc04..53ba45fc04 100644 --- a/src/journal-remote/journal-remote-write.h +++ b/src/grp-journal-remote/systemd-journal-remote/journal-remote-write.h diff --git a/src/journal-remote/journal-remote.c b/src/grp-journal-remote/systemd-journal-remote/journal-remote.c index 35a1e55f9e..9b4d12d336 100644 --- a/src/journal-remote/journal-remote.c +++ b/src/grp-journal-remote/systemd-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.conf.in b/src/grp-journal-remote/systemd-journal-remote/journal-remote.conf.in index 7122d63362..7122d63362 100644 --- a/src/journal-remote/journal-remote.conf.in +++ b/src/grp-journal-remote/systemd-journal-remote/journal-remote.conf.in diff --git a/src/journal-remote/journal-remote.h b/src/grp-journal-remote/systemd-journal-remote/journal-remote.h index 30ad7df996..58487e498a 100644 --- a/src/journal-remote/journal-remote.h +++ b/src/grp-journal-remote/systemd-journal-remote/journal-remote.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 "hashmap.h" #include "journal-remote-parse.h" diff --git a/src/grp-journal-remote/systemd-journal-upload/Makefile b/src/grp-journal-remote/systemd-journal-upload/Makefile new file mode 100644 index 0000000000..c47fcf0128 --- /dev/null +++ b/src/grp-journal-remote/systemd-journal-upload/Makefile @@ -0,0 +1,54 @@ +# -*- 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_LIBCURL),) +rootlibexec_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 + +EXTRA_DIST += \ + units/systemd-journal-upload.service.in \ + src/journal-remote/journal-upload.conf.in + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/journal-remote/journal-upload-journal.c b/src/grp-journal-remote/systemd-journal-upload/journal-upload-journal.c index 8ce8e1895e..aef095c8c9 100644 --- a/src/journal-remote/journal-upload-journal.c +++ b/src/grp-journal-remote/systemd-journal-upload/journal-upload-journal.c @@ -25,7 +25,7 @@ #include "log.h" #include "utf8.h" #include "util.h" -#include "sd-daemon.h" +#include <systemd/sd-daemon.h> /** * Write up to size bytes to buf. Return negative on error, and number of diff --git a/src/journal-remote/journal-upload.c b/src/grp-journal-remote/systemd-journal-upload/journal-upload.c index 4647cfdeb3..e622f6c1e1 100644 --- a/src/journal-remote/journal-upload.c +++ b/src/grp-journal-remote/systemd-journal-upload/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.conf.in b/src/grp-journal-remote/systemd-journal-upload/journal-upload.conf.in index c5670682e8..c5670682e8 100644 --- a/src/journal-remote/journal-upload.conf.in +++ b/src/grp-journal-remote/systemd-journal-upload/journal-upload.conf.in diff --git a/src/journal-remote/journal-upload.h b/src/grp-journal-remote/systemd-journal-upload/journal-upload.h index 5711905f86..4a521bf78f 100644 --- a/src/journal-remote/journal-upload.h +++ b/src/grp-journal-remote/systemd-journal-upload/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> #include "time-util.h" typedef enum { diff --git a/src/journal/.gitignore b/src/grp-journal/.gitignore index 04d5852547..04d5852547 100644 --- a/src/journal/.gitignore +++ b/src/grp-journal/.gitignore diff --git a/src/grp-journal/Makefile b/src/grp-journal/Makefile new file mode 100644 index 0000000000..fcefb81581 --- /dev/null +++ b/src/grp-journal/Makefile @@ -0,0 +1,170 @@ +# -*- 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_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 + +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)" || $(rootbindir)/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 + +tests += \ + test-journal \ + test-journal-enum \ + 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 + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-journal/catalog/systemd.be.catalog b/src/grp-journal/catalog/systemd.be.catalog new file mode 100644 index 0000000000..051f49492f --- /dev/null +++ b/src/grp-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) + +Сэрвіс адправіў занадта штат паведамленняў за кароткі прамежак часу. +Частка паведамленняў была адкінута. + +Майце на ўвазе, што былі адкінуты паведамлення толькі гэтага сэрвісу. +Паведамленні іншых сэрвісаў засталіся. + +Мяжа, пасля якой паведамленні будуць адкінуты, наладжваецца з +дапамогай RateLimitIntervalSec= і 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/grp-journal/catalog/systemd.be@latin.catalog b/src/grp-journal/catalog/systemd.be@latin.catalog new file mode 100644 index 0000000000..6ab361aafb --- /dev/null +++ b/src/grp-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 RateLimitIntervalSec= 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/grp-journal/catalog/systemd.bg.catalog b/src/grp-journal/catalog/systemd.bg.catalog new file mode 100644 index 0000000000..30246c0bbe --- /dev/null +++ b/src/grp-journal/catalog/systemd.bg.catalog @@ -0,0 +1,324 @@ +# This file is part of systemd. +# +# Copyright 2012 Lennart Poettering +# Copyright 2016 Alexander Shopov <ash@kambanaria.org> +# +# 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: Журналният процес е пуснат +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 + +Журналният процес на системата е спрян, затворени са всички отворени +журнални файлове. + +-- 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)“ от ръководството. + +-- 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 + +За потребителя „@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 + +Часовникът на системата е сверен да сочи @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 + +Започна процедурата на 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@“ завърши презареждането на настройките си. + +Резултатът e: @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“, или чрез директивата „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@ +е спряна. + +-- 36db2dfa5a9045e1bd4af5f93e1cf057 +Subject: Режимът DNSSEC е изключен, защото сървърът не го поддържа +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=allow-downgrade“ е включена във +файла „resolved.conf“ и зададеният сървър за DNS не е съвместим с DNSSEC. + +Внимавайте, защото това може да позволи атака, при която трета страна ви +връща отговори, които да предизвикат понижаването на сигурността от DNSSEC +до DNS. + +Такова събитие означава, че или сървърът за DNS не е съвместим с DNSSEC, +или някой успешно ви е атакувал за понижаване на сигурността на имената. + +-- 1675d7f172174098b1108bf8c7dc8f5d +Subject: Неуспешна проверка на DNSSEC +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: man:systemd-resolved.service(8) + +Заявка или запис в DNS не издържа проверка с DNSSEC. + +Това обикновено показва вмешателство на трета страна в канала ви за връзка. + +-- 4d4408cfd0d144859184d1e65d7c8a65 +Subject: Анулирана доверена котва в DNSSEC +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: man:systemd-resolved.service(8) + +Анулирана е доверена котва за DNSSEC и трябва да настроите нова. + +Понякога новата идва с обновяване на системата. diff --git a/src/grp-journal/catalog/systemd.catalog b/src/grp-journal/catalog/systemd.catalog new file mode 100644 index 0000000000..90929bca6d --- /dev/null +++ b/src/grp-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 RateLimitIntervalSec= 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/grp-journal/catalog/systemd.da.catalog b/src/grp-journal/catalog/systemd.da.catalog new file mode 100644 index 0000000000..093e8139da --- /dev/null +++ b/src/grp-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 RateLimitIntervalSec= 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/grp-journal/catalog/systemd.fr.catalog b/src/grp-journal/catalog/systemd.fr.catalog new file mode 100644 index 0000000000..0cea629c31 --- /dev/null +++ b/src/grp-journal/catalog/systemd.fr.catalog @@ -0,0 +1,320 @@ +# 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. + +-- ec387f577b844b8fa948f33cad9a75e6 +Subject: Espace disque utilisé par le journal +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: man:journald.conf(5) + +@JOURNAL_NAME@ (@JOURNAL_PATH@) utilise actuellement @CURRENT_USE_PRETTY@. +Le maximum autorisé est défini à @MAX_USE_PRETTY@. +Au moins @DISK_KEEP_FREE_PRETTY@ doivent être laissés libres +(sur @DISK_AVAILABLE_PRETTY@ d'espace disque actuellement libre). +La limite appliquée est donc @LIMIT_PRETTY@, dont @AVAILABLE_PRETTY@ +sont toujours disponibles. + +Les limites définissant la quantité d'espace disque que peut utiliser le +journal peuvent être configurées avec les paramètres SystemMaxUse=, +SystemKeepFree=, SystemMaxFileSize=, RuntimeMaxUse=, RuntimeKeepFree=, +RuntimeMaxFileSize= dans le fichier /etc/systemd/journald.conf. +Voir journald.conf(5) pour plus de détails. + +-- 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 RateLimitIntervalSec= 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. + +-- 36db2dfa5a9045e1bd4af5f93e1cf057 +Subject: Le mode DNSSEC a été désactivé, car il n'est pas supporté par le serveur +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: man:systemd-resolved.service(8) resolved.conf(5) + +Le service de résolution (systemd-resolved.service) a détecté que le serveur +DNS configuré ne supporte pas DNSSEC, et la validation DNSSEC a donc été +désactivée. + +Cet évènement se produit si DNSSEC=allow-downgrade est configuré dans +resolved.conf et que le serveur DNS configuré n'est pas compatible avec +DNSSEC. +Veuillez noter que ce mode permet des attaques de rétrogradation DNSSEC, +car un attaquant peut être capable de désactiver la validation DNSSEC sur +le système en injectant des réponses DNS dans le canal de communication. + +Cet évènement indique que le serveur DNS est effectivement incompatible avec +DNSSEC, ou qu'un attaquant a peut-être conduit une telle attaque avec succès. + +-- 1675d7f172174098b1108bf8c7dc8f5d +Subject: La validation DNSSEC a échoué +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: man:systemd-resolved.service(8) + +Une requête ou une ressource DNS n'a pas passé la validation DNSSEC. +Ceci est généralement une indication que le canal de communication a été +altéré. + +-- 4d4408cfd0d144859184d1e65d7c8a65 +Subject: Une ancre de confiance DNSSEC a été révoquée +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: man:systemd-resolved.service(8) + +Une ancre de confiance DNSSEC a été révoquée. Une nouvelle ancre de +confiance doit être configurée, ou le système d'exploitation a besoin +d'être mis à jour, pour fournir une version à jour de l'ancre de confiance. diff --git a/src/grp-journal/catalog/systemd.hr.catalog b/src/grp-journal/catalog/systemd.hr.catalog new file mode 100644 index 0000000000..350988dd87 --- /dev/null +++ b/src/grp-journal/catalog/systemd.hr.catalog @@ -0,0 +1,314 @@ +# 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 +# Croatian translation + +# Format kataloga je dokumentiran na +# http://www.freedesktop.org/wiki/Software/systemd/catalog + +# Za pojašnjenje zašto ovo radimo, posjetite https://xkcd.com/1024/ + +-- f77379a8490b408bbe5f6940505a777b +Subject: journal je pokrenut +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Journal proces sustava se pokrenuo, otvorio je journal + datoteke za upis i spreman je za obradu zahtjeva. + +-- d93fb3c9c24d451a97cea615ce59c00b +Subject: journal je zaustavljen +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Journal proces sustava je isključio i zatvorio sve trenutno +aktivne journal datoteke. + +-- ec387f577b844b8fa948f33cad9a75e6 +Subject: Diskovni prostor koji koristi journal +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +@JOURNAL_NAME@ (@JOURNAL_PATH@) trenutno koristi @CURRENT_USE_PRETTY@. +Najveća dopuštena upotreba je postavljena na @MAX_USE_PRETTY@. +Ostavljam najmanje @DISK_KEEP_FREE_PRETTY@ slobodno (trenutno dostupno @DISK_AVAILABLE_PRETTY@ diskovnog prostora). +Prisilno ograničenje upotrebe je @LIMIT_PRETTY@, od kojeg je @AVAILABLE_PRETTY@ još dostupno. + +Ograničenja kontroliraju koliko diskovnog prostora koristi journal mogu +se podesiti sa SystemMaxUse=, SystemKeepFree=, SystemMaxFileSize=, +RuntimeMaxUse=, RuntimeKeepFree=, RuntimeMaxFileSize= settings u +/etc/systemd/journald.conf. Pogledajte journald.conf(5) za više pojedinosti. + +-- a596d6fe7bfa4994828e72309e95d61e +Subject: Poruka iz usluge je potisnuta +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: man:journald.conf(5) + +Usluga je prijavila previše poruka u određenom vremenskom razdoblju. Poruke +iz usluge su odbačene. + +Zapamtite da samo poruke iz usluge u upitu su +odbačene, ostale poruke usluga nisu zahvaćene. + +Ograničenja koja kontroliraju kada je poruka odbačena mogu se podesiti +sa RateLimitIntervalSec= i RateLimitBurst= u +/etc/systemd/journald.conf. Pogledajte journald.conf(5) za više pojedinosti. + +-- e9bf28e6e834481bb6f48f548ad13606 +Subject: Journal poruka je propuštena +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Kernel poruka je izgubljena zato jer ih journal sustav nije mogao +dovoljno brzo obraditi. + +-- fc2e22bc6ee647b6b90729ab34a250b1 +Subject: Proces @COREDUMP_PID@ (@COREDUMP_COMM@) je izbacio jezgru +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: man:core(5) + +Proces @COREDUMP_PID@ (@COREDUMP_COMM@) se srušio i izbacio jezgru. + +Rušenje programa je uobičajeno uzrokovano greškom u programiranju i +trebalo bi se prijaviti razvijatelju kao greška. + +-- 8d45620c1a4348dbb17410da57c60c66 +Subject: Nova sesija @SESSION_ID@ je stvorena za korisnika @USER_ID@ +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat + +Nova sesija sa ID @SESSION_ID@ je stvorena za korisnika @USER_ID@. + +Glavni proces sesije je @LEADER@. + +-- 3354939424b4456d9802ca8333ed424a +Subject: Sesija @SESSION_ID@ je prekinuta +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat + +Sesija sa ID @SESSION_ID@ je prekinuta. + +-- fcbefc5da23d428093f97c82a9290f7b +Subject: Novo sjedište @SEAT_ID@ je sada dostupno +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat + +Novo sjedište @SEAT_ID@ je podešeno i sada je dostupno. + +-- e7852bfe46784ed0accde04bc864c2d5 +Subject: Sjedište @SEAT_ID@ je sada uklonjeno +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat + +Sjedište @SEAT_ID@ je uklonjeno i više nije dostupno. + +-- c7a787079b354eaaa9e77b371893cd27 +Subject: Vrijeme promjene +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Sat sustava je promijenjen na @REALTIME@ microsekundi nakon 1. Siječnja, 1970 godine. + +-- 45f82f4aef7a4bbf942ce861d1f20990 +Subject: Vremenska zona je promijenjena u @TIMEZONE@ +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Vremenska zona je promijenjena u @TIMEZONE@. + +-- b07a249cd024414a82dd00cd181378ff +Subject: Pokretanje sustava je sada završeno +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Sve usluge sustava koje su zadane za pokretanje pri pokretanju sustava +su uspješno pokrenute. Zapamtite da ovo ne znači da sada računalo +miruje zato jer se neke usluge još uvijek mogu pokretati. + +Pokretanje kernela zahtijeva @KERNEL_USEC@ mikrosekundi. + +Pokretanje početnog RAM diska zahtijeva @INITRD_USEC@ mikrosekundi. + +Pokretanje prostora korisnika zahtijeva @USERSPACE_USEC@ mikrosekundi. + +-- 6bbd95ee977941e497c48be27c254128 +Subject: Pokrenuto je stanje spavanja @SLEEP@ +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Sustav je sada pokrenuo stanje spavanja @SLEEP@ + +-- 8811e6df2a8e40f58a94cea26f8ebf14 +Subject: Završeno je stanje spavanja @SLEEP@ +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Sustav je sada završio stanje spavanja @SLEEP@ + +-- 98268866d1d54a499c4e98921d93bc40 +Subject: Pokrenuto je isključivanje sustava +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Pokrenuto je isključivanje sustava. Isključivanje je sada pokrenuto, +sve usluge sustava su prekinute i svi datotečni sustavi su odmontirani. + +-- 7d4958e842da4a758f6c1cdc7b36dcc5 +Subject: Jedinica @UNIT@ je započela pokretanje +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Jedinica @UNIT@ je započela pokretanje. + +-- 39f53479d3a045ac8e11786248231fbf +Subject: Jedinica @UNIT@ je završila pokretanje +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Jedinica @UNIT@ je završila pokretanje. + +Rezultat pokretanja je @RESULT@. + +-- de5b426a63be47a7b6ac3eaac82e2f6f +Subject: Jedinica @UNIT@ je započela isključivanje +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Jedinica @UNIT@ je započela isključivanje. + +-- 9d1aaa27d60140bd96365438aad20286 +Subject: Jedinica @UNIT@ je završila isključivanje +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Jedinica @UNIT@ je završila isključivanje. + +-- be02cf6855d2428ba40df7e9d022f03d +Subject: Jedinica @UNIT@ nije uspjela +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Jedinica @UNIT@ nije uspjela. + +Rezultat je @RESULT@. + +-- d34d037fff1847e6ae669a370e694725 +Subject: Jedinica @UNIT@ je započela ponovno učitavati podešavanja +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Jedinica @UNIT@ je započela ponovno učitavati podešavanja + +-- 7b05ebc668384222baa8881179cfda54 +Subject: Jedinica @UNIT@ je završila ponovno učitavati podešavanja +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Jedinica @UNIT@ je završila ponovno učitavati podešavanja + +Rezultat je @RESULT@. + +-- 641257651c1b4ec9a8624d7a40a9e1e7 +Subject: Proces @EXECUTABLE@ se ne može pokrenuti +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Proces @EXECUTABLE@ se ne može pokrenuti i nije uspio. + +Broj greške vraćen ovim procesom je @ERRNO@. + +-- 0027229ca0644181a76c4e92458afa2e +Subject: Jedna ili više poruka se ne mogu proslijediti u dnevnik sustava +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Jedna ili više poruka se ne mogu proslijediti u dnevnik sustava, usluge +su pokrenute istovremeno s journalom. Ovo uobičajeno označava da +implementacija dnevnika sustava ne može slijediti brzinu +zahtjeva poruka. + +-- 1dee0369c7fc4736b7099b38ecb46ee7 +Subject: Točka montiranja nije prazna +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Direktorij @WHERE@ je određen za točku montiranja (drugi redak u +/etc/fstab ili Where= redak u datoteci systemd jedinice) i nije prazan. +To ne utječe na montiranje, ali postojeće datoteke u ovom direktoriju +postaju nedostupne. Kako bi vidjeli datoteke preko kojih je montirano, +ručno montirajte osnovni datotečni sustav na drugu lokaciju. + +-- 24d8d4452573402496068381a6312df2 +Subject: Virtualni stroj ili spremnik su pokrenuti +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Virtualni stroj @NAME@ sa vodećim @LEADER@ PID-om je +pokrenut i spreman je za korištenje. + +-- 58432bd3bace477cb514b56381b8a758 +Subject: Virtualni stroj ili spremnik su isključeni +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +Virtualni stroj @NAME@ sa vodećim PID-om @LEADER@ je +isključen. + +-- 36db2dfa5a9045e1bd4af5f93e1cf057 +Subject: DNSSEC način je isključen, jer ga poslužitelj ne podržava +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: man:systemd-resolved.service(8) resolved.conf(5) + +Usluga razrješavanja (systemd-resolved.service) je otkrila da +podešeni DNS poslužitelj ne podržava DNSSEC, i DNSSEC, kao rezultat +provjera je isključena. + +Ovaj događaj će zauzeti mjesto ako je DNSSEC=allow-downgrade podešen u +resolved.conf i podešeni DNS poslužitelj je nekompatibilan s DNSSEC. Zapamtite +da korištenje ovog načina dopušta povećanje DNSSEC napada, napadač bi mogao +isključiti DNSSEC provjeru na sustavu umetanjem DNS odgovora u +komunikacijski kanal što rezultira povećanjem napada poput ovog. + +Ovaj događaj bi mogao označavati da je DNS poslužitelj uistinu nekompatibilan s +DNSSEC ili da je napadač uspješno izvršio takav napad. + +-- 1675d7f172174098b1108bf8c7dc8f5d +Subject: DNSSEC provjera neuspješna +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: man:systemd-resolved.service(8) + +DNS zahtjev ili snimak resursa nije prošao DNSSEC provjeru. To uobičajeno +označava da je komunikacijski kanal mijenjan. + +-- 4d4408cfd0d144859184d1e65d7c8a65 +Subject: DNSSEC pouzdano sidro je opozvano +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/grp-journal/catalog/systemd.hu.catalog b/src/grp-journal/catalog/systemd.hu.catalog new file mode 100644 index 0000000000..68e8c2572e --- /dev/null +++ b/src/grp-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 +RateLimitIntervalSec= é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/grp-journal/catalog/systemd.it.catalog b/src/grp-journal/catalog/systemd.it.catalog new file mode 100644 index 0000000000..b6fca48221 --- /dev/null +++ b/src/grp-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 RateLimitIntervalSec= 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/grp-journal/catalog/systemd.ko.catalog b/src/grp-journal/catalog/systemd.ko.catalog new file mode 100644 index 0000000000..2fc6b60b1b --- /dev/null +++ b/src/grp-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 의 +RateLimitIntervalSec= 변수와 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/grp-journal/catalog/systemd.pl.catalog b/src/grp-journal/catalog/systemd.pl.catalog new file mode 100644 index 0000000000..d8059e93cd --- /dev/null +++ b/src/grp-journal/catalog/systemd.pl.catalog @@ -0,0 +1,315 @@ +# This file is part of systemd. +# +# Copyright 2012 Lennart Poettering +# Copyright 2014, 2015, 2016 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. + +-- ec387f577b844b8fa948f33cad9a75e6 +Subject: Miejsce na dysku używane przez dziennik +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel + +@JOURNAL_NAME@ (@JOURNAL_PATH@) obecnie używa @CURRENT_USE_PRETTY@. +Maksymalnie może używać @MAX_USE_PRETTY@. +Zostawianie co najmniej @DISK_KEEP_FREE_PRETTY@ wolnego (z obecnie dostępnego @DISK_AVAILABLE_PRETTY@ miejsca na dysku). +Wymuszone ograniczenie użycia wynosi więc @LIMIT_PRETTY@, z czego @AVAILABLE_PRETTY@ jest nadal dostępne. + +Ograniczenia kontrolujące ilość miejsca na dysku używanego przez dziennik +można konfigurować za pomocą ustawień SystemMaxUse=, SystemKeepFree=, +SystemMaxFileSize=, RuntimeMaxUse=, RuntimeKeepFree=, RuntimeMaxFileSize= +w pliku /etc/systemd/journald.conf. Strona journald.conf(5) zawiera więcej +informacji. + +-- 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 RateLimitIntervalSec= 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. + +-- 36db2dfa5a9045e1bd4af5f93e1cf057 +Subject: Wyłączono tryb DNSSEC, ponieważ serwer go nie obsługuje +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: man:systemd-resolved.service(8) resolved.conf(5) + +Usługa resolver (systemd-resolved.service) wykryła, że skonfigurowany serwer +DNS nie obsługuje DNSSEC, w wyniku czego walidacja DNSSEC została wyłączona. + +To zdarzenie będzie miało miejsce, jeśli skonfigurowano DNSSEC=allow-downgrade +w pliku resolved.conf, a skonfigurowany serwer DNS jest niezgodny z DNSSEC. +Proszę zauważyć, że używanie tego trybu umożliwia ataki wyłączające DNSSEC, +ponieważ atakujący będzie mógł wyłączyć walidację DNSSEC na komputerze przez +umieszczenie odpowiednich odpowiedzi DNS w kanale komunikacji. + +To zdarzenie może wskazywać, że serwer DNS jest faktycznie niezgodny z DNSSEC, +albo że atakującemu udało się upozorować atak tego typu. + +-- 1675d7f172174098b1108bf8c7dc8f5d +Subject: Walidacja DNSSEC się nie powiodła +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: man:systemd-resolved.service(8) + +Zapytanie DNS lub ustawiony wpis zasobu nie przeszedł walidacji DNSSEC. +Zwykle wskazuje to, że ktoś manipulował używanym kanałem komunikacji. + +-- 4d4408cfd0d144859184d1e65d7c8a65 +Subject: Unieważniono kotwicę zaufania DNSSEC +Defined-By: systemd +Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel +Documentation: man:systemd-resolved.service(8) + +Kotwica zaufania DNSSEC została unieważniona. Należy skonfigurować nową, albo +system operacyjny musi zostać zaktualizowany, aby dostarczyć zaktualizowaną +kotwicę zaufania DNSSEC. diff --git a/src/grp-journal/catalog/systemd.pt_BR.catalog b/src/grp-journal/catalog/systemd.pt_BR.catalog new file mode 100644 index 0000000000..8b856e8355 --- /dev/null +++ b/src/grp-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 RateLimitIntervalSec= 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/grp-journal/catalog/systemd.ru.catalog b/src/grp-journal/catalog/systemd.ru.catalog new file mode 100644 index 0000000000..e56dbe3acc --- /dev/null +++ b/src/grp-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) + +Служба отправила слишком много сообщений за короткий промежуток времени. +Часть сообщений была пропущена. + +Обратите внимание, что были пропущены сообщения только от этой службы, +сообщения других служб не затронуты. + +Предел, после которого служба журнала начинает игнорировать сообщения, +настраивается параметрами RateLimitIntervalSec= и 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/grp-journal/catalog/systemd.sr.catalog b/src/grp-journal/catalog/systemd.sr.catalog new file mode 100644 index 0000000000..cc689b7956 --- /dev/null +++ b/src/grp-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) + +Услуга је уписала сувише порука за једно време. Поруке +од услуге су одбачене. + +Знајте да су само поруке од ове услуге одбачене, друге +услуге нису захваћене овим. + +Ограничења која подешавају начин на који се поруке одбацују се могу подесити +помоћу „RateLimitIntervalSec=“ и „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/grp-journal/catalog/systemd.zh_CN.catalog b/src/grp-journal/catalog/systemd.zh_CN.catalog new file mode 100644 index 0000000000..ed59fc9250 --- /dev/null +++ b/src/grp-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 中设定 RateLimitIntervalSec= +以及 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/grp-journal/catalog/systemd.zh_TW.catalog b/src/grp-journal/catalog/systemd.zh_TW.catalog new file mode 100644 index 0000000000..aa5004db08 --- /dev/null +++ b/src/grp-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 中設定 +RateLimitIntervalSec= 以及 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/grp-journal/journalctl/Makefile b/src/grp-journal/journalctl/Makefile new file mode 100644 index 0000000000..c3cdb6b27a --- /dev/null +++ b/src/grp-journal/journalctl/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 + +# 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 + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/journal/journalctl.c b/src/grp-journal/journalctl/journalctl.c index f67c556783..3602bd0556 100644 --- a/src/journal/journalctl.c +++ b/src/grp-journal/journalctl/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/grp-journal/libjournal-core/Makefile b/src/grp-journal/libjournal-core/Makefile new file mode 100644 index 0000000000..d55aebfb49 --- /dev/null +++ b/src/grp-journal/libjournal-core/Makefile @@ -0,0 +1,56 @@ +# -*- 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 + +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 + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/journal/cat.c b/src/grp-journal/libjournal-core/cat.c index 08c844d44f..93ab6e7f96 100644 --- a/src/journal/cat.c +++ b/src/grp-journal/libjournal-core/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/journal-qrcode.c b/src/grp-journal/libjournal-core/journal-qrcode.c index e38730d65c..e38730d65c 100644 --- a/src/journal/journal-qrcode.c +++ b/src/grp-journal/libjournal-core/journal-qrcode.c diff --git a/src/journal/journal-qrcode.h b/src/grp-journal/libjournal-core/journal-qrcode.h index ef39085561..34a779d5be 100644 --- a/src/journal/journal-qrcode.h +++ b/src/grp-journal/libjournal-core/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/journald-audit.c b/src/grp-journal/libjournal-core/journald-audit.c index a433c91c54..a433c91c54 100644 --- a/src/journal/journald-audit.c +++ b/src/grp-journal/libjournal-core/journald-audit.c diff --git a/src/journal/journald-audit.h b/src/grp-journal/libjournal-core/journald-audit.h index 8c7457778c..8c7457778c 100644 --- a/src/journal/journald-audit.h +++ b/src/grp-journal/libjournal-core/journald-audit.h diff --git a/src/journal/journald-console.c b/src/grp-journal/libjournal-core/journald-console.c index fcc9f25814..fcc9f25814 100644 --- a/src/journal/journald-console.c +++ b/src/grp-journal/libjournal-core/journald-console.c diff --git a/src/journal/journald-console.h b/src/grp-journal/libjournal-core/journald-console.h index dda07e2c28..dda07e2c28 100644 --- a/src/journal/journald-console.h +++ b/src/grp-journal/libjournal-core/journald-console.h diff --git a/src/journal/journald-gperf.gperf b/src/grp-journal/libjournal-core/journald-gperf.gperf index 7fecd7a964..7fecd7a964 100644 --- a/src/journal/journald-gperf.gperf +++ b/src/grp-journal/libjournal-core/journald-gperf.gperf diff --git a/src/journal/journald-kmsg.c b/src/grp-journal/libjournal-core/journald-kmsg.c index f64abdd431..3712636de2 100644 --- a/src/journal/journald-kmsg.c +++ b/src/grp-journal/libjournal-core/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-kmsg.h b/src/grp-journal/libjournal-core/journald-kmsg.h index dab49f1e8c..dab49f1e8c 100644 --- a/src/journal/journald-kmsg.h +++ b/src/grp-journal/libjournal-core/journald-kmsg.h diff --git a/src/journal/journald-native.c b/src/grp-journal/libjournal-core/journald-native.c index 0a1ce205c2..0a1ce205c2 100644 --- a/src/journal/journald-native.c +++ b/src/grp-journal/libjournal-core/journald-native.c diff --git a/src/journal/journald-native.h b/src/grp-journal/libjournal-core/journald-native.h index c13b80aa4f..c13b80aa4f 100644 --- a/src/journal/journald-native.h +++ b/src/grp-journal/libjournal-core/journald-native.h diff --git a/src/journal/journald-rate-limit.c b/src/grp-journal/libjournal-core/journald-rate-limit.c index fce799a6ce..fce799a6ce 100644 --- a/src/journal/journald-rate-limit.c +++ b/src/grp-journal/libjournal-core/journald-rate-limit.c diff --git a/src/journal/journald-rate-limit.h b/src/grp-journal/libjournal-core/journald-rate-limit.h index bb0abb7ee9..bb0abb7ee9 100644 --- a/src/journal/journald-rate-limit.h +++ b/src/grp-journal/libjournal-core/journald-rate-limit.h diff --git a/src/journal/journald-server.c b/src/grp-journal/libjournal-core/journald-server.c index 8f82d2a838..cc29443e66 100644 --- a/src/journal/journald-server.c +++ b/src/grp-journal/libjournal-core/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/grp-journal/libjournal-core/journald-server.h index e025a4cf90..bebb056aa7 100644 --- a/src/journal/journald-server.h +++ b/src/grp-journal/libjournal-core/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/grp-journal/libjournal-core/journald-stream.c index 4ad16ee41c..99d856301c 100644 --- a/src/journal/journald-stream.c +++ b/src/grp-journal/libjournal-core/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-stream.h b/src/grp-journal/libjournal-core/journald-stream.h index db4c67fae3..db4c67fae3 100644 --- a/src/journal/journald-stream.h +++ b/src/grp-journal/libjournal-core/journald-stream.h diff --git a/src/journal/journald-syslog.c b/src/grp-journal/libjournal-core/journald-syslog.c index 0609b4b694..86fe81d179 100644 --- a/src/journal/journald-syslog.c +++ b/src/grp-journal/libjournal-core/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-syslog.h b/src/grp-journal/libjournal-core/journald-syslog.h index 46ad715314..46ad715314 100644 --- a/src/journal/journald-syslog.h +++ b/src/grp-journal/libjournal-core/journald-syslog.h diff --git a/src/journal/journald-wall.c b/src/grp-journal/libjournal-core/journald-wall.c index 4d91fafffe..4d91fafffe 100644 --- a/src/journal/journald-wall.c +++ b/src/grp-journal/libjournal-core/journald-wall.c diff --git a/src/journal/journald-wall.h b/src/grp-journal/libjournal-core/journald-wall.h index ebc2b89fa8..ebc2b89fa8 100644 --- a/src/journal/journald-wall.h +++ b/src/grp-journal/libjournal-core/journald-wall.h diff --git a/src/journal/journald.conf b/src/grp-journal/libjournal-core/journald.conf index 2541b949be..2541b949be 100644 --- a/src/journal/journald.conf +++ b/src/grp-journal/libjournal-core/journald.conf diff --git a/src/journal/test-audit-type.c b/src/grp-journal/libjournal-core/test-audit-type.c index 88a2e6d9d9..88a2e6d9d9 100644 --- a/src/journal/test-audit-type.c +++ b/src/grp-journal/libjournal-core/test-audit-type.c diff --git a/src/journal/test-catalog.c b/src/grp-journal/libjournal-core/test-catalog.c index 898c876450..f939fcdc2a 100644 --- a/src/journal/test-catalog.c +++ b/src/grp-journal/libjournal-core/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-compress-benchmark.c b/src/grp-journal/libjournal-core/test-compress-benchmark.c index 6f6d71435d..6f6d71435d 100644 --- a/src/journal/test-compress-benchmark.c +++ b/src/grp-journal/libjournal-core/test-compress-benchmark.c diff --git a/src/journal/test-compress.c b/src/grp-journal/libjournal-core/test-compress.c index 68c9a4d76c..68c9a4d76c 100644 --- a/src/journal/test-compress.c +++ b/src/grp-journal/libjournal-core/test-compress.c diff --git a/src/journal/test-journal-enum.c b/src/grp-journal/libjournal-core/test-journal-enum.c index 354c2c3c00..54df59f477 100644 --- a/src/journal/test-journal-enum.c +++ b/src/grp-journal/libjournal-core/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/grp-journal/libjournal-core/test-journal-flush.c index ba8b20b228..7e9814f8fa 100644 --- a/src/journal/test-journal-flush.c +++ b/src/grp-journal/libjournal-core/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/grp-journal/libjournal-core/test-journal-init.c index ef21e2d05f..e6713034dd 100644 --- a/src/journal/test-journal-init.c +++ b/src/grp-journal/libjournal-core/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/grp-journal/libjournal-core/test-journal-interleaving.c index 5e063f4d04..d09ef011a6 100644 --- a/src/journal/test-journal-interleaving.c +++ b/src/grp-journal/libjournal-core/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/grp-journal/libjournal-core/test-journal-match.c index 3ab554b9b0..5ee2adb827 100644 --- a/src/journal/test-journal-match.c +++ b/src/grp-journal/libjournal-core/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/grp-journal/libjournal-core/test-journal-send.c index d70f0b0bc8..169082f9a4 100644 --- a/src/journal/test-journal-send.c +++ b/src/grp-journal/libjournal-core/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/grp-journal/libjournal-core/test-journal-stream.c index 7e5a980719..0a1da47861 100644 --- a/src/journal/test-journal-stream.c +++ b/src/grp-journal/libjournal-core/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/journal/test-journal-syslog.c b/src/grp-journal/libjournal-core/test-journal-syslog.c index 4ff7f3ec2e..4ff7f3ec2e 100644 --- a/src/journal/test-journal-syslog.c +++ b/src/grp-journal/libjournal-core/test-journal-syslog.c diff --git a/src/journal/test-journal-verify.c b/src/grp-journal/libjournal-core/test-journal-verify.c index 3d2312fc55..3d2312fc55 100644 --- a/src/journal/test-journal-verify.c +++ b/src/grp-journal/libjournal-core/test-journal-verify.c diff --git a/src/journal/test-journal.c b/src/grp-journal/libjournal-core/test-journal.c index 2543d64b5b..2543d64b5b 100644 --- a/src/journal/test-journal.c +++ b/src/grp-journal/libjournal-core/test-journal.c diff --git a/src/journal/test-mmap-cache.c b/src/grp-journal/libjournal-core/test-mmap-cache.c index 009aabf55e..009aabf55e 100644 --- a/src/journal/test-mmap-cache.c +++ b/src/grp-journal/libjournal-core/test-mmap-cache.c diff --git a/src/grp-journal/systemd-journald/Makefile b/src/grp-journal/systemd-journald/Makefile new file mode 100644 index 0000000000..755e2d2c36 --- /dev/null +++ b/src/grp-journal/systemd-journald/Makefile @@ -0,0 +1,94 @@ +# -*- 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_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 + + +rootlibexec_PROGRAMS += \ + systemd-journald + +rootbin_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.bg.catalog \ + 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 + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/journal/journald.c b/src/grp-journal/systemd-journald/journald.c index 272acb71c4..1afe44fa8e 100644 --- a/src/journal/journald.c +++ b/src/grp-journal/systemd-journald/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/locale/.gitignore b/src/grp-locale/.gitignore index b1e0ba755e..b1e0ba755e 100644 --- a/src/locale/.gitignore +++ b/src/grp-locale/.gitignore diff --git a/src/grp-locale/Makefile b/src/grp-locale/Makefile new file mode 100644 index 0000000000..b34c066ec2 --- /dev/null +++ b/src/grp-locale/Makefile @@ -0,0 +1,90 @@ +# -*- 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 \ + -ldl + +systemd_localed_CFLAGS = \ + $(AM_CFLAGS) \ + $(XKBCOMMON_CFLAGS) + +nodist_systemunit_DATA += \ + units/systemd-localed.service + +dist_systemunit_DATA_busnames += \ + units/org.freedesktop.locale1.busname + +rootlibexec_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 + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/locale/kbd-model-map b/src/grp-locale/kbd-model-map index 8fa984f83b..8fa984f83b 100644 --- a/src/locale/kbd-model-map +++ b/src/grp-locale/kbd-model-map diff --git a/src/locale/language-fallback-map b/src/grp-locale/language-fallback-map index d0b02a6b98..d0b02a6b98 100644 --- a/src/locale/language-fallback-map +++ b/src/grp-locale/language-fallback-map diff --git a/src/locale/localectl.c b/src/grp-locale/localectl.c index 4865335349..c1b0a56346 100644 --- a/src/locale/localectl.c +++ b/src/grp-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/grp-locale/localed.c index 3b22a582ac..7b4cbadfd0 100644 --- a/src/locale/localed.c +++ b/src/grp-locale/localed.c @@ -27,7 +27,7 @@ #include <dlfcn.h> #endif -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "alloc-util.h" #include "bus-error.h" diff --git a/src/locale/org.freedesktop.locale1.conf b/src/grp-locale/org.freedesktop.locale1.conf index 79d0ecd2bb..79d0ecd2bb 100644 --- a/src/locale/org.freedesktop.locale1.conf +++ b/src/grp-locale/org.freedesktop.locale1.conf diff --git a/src/locale/org.freedesktop.locale1.policy.in b/src/grp-locale/org.freedesktop.locale1.policy.in index df63845e9b..df63845e9b 100644 --- a/src/locale/org.freedesktop.locale1.policy.in +++ b/src/grp-locale/org.freedesktop.locale1.policy.in diff --git a/src/locale/org.freedesktop.locale1.service b/src/grp-locale/org.freedesktop.locale1.service index 025f9a0fc2..025f9a0fc2 100644 --- a/src/locale/org.freedesktop.locale1.service +++ b/src/grp-locale/org.freedesktop.locale1.service diff --git a/src/login/.gitignore b/src/grp-login/.gitignore index 3a8ba497c1..3a8ba497c1 100644 --- a/src/login/.gitignore +++ b/src/grp-login/.gitignore diff --git a/src/login/70-power-switch.rules b/src/grp-login/70-power-switch.rules index e2855b50f7..e2855b50f7 100644 --- a/src/login/70-power-switch.rules +++ b/src/grp-login/70-power-switch.rules diff --git a/src/login/70-uaccess.rules b/src/grp-login/70-uaccess.rules index 50dcd2e275..50dcd2e275 100644 --- a/src/login/70-uaccess.rules +++ b/src/grp-login/70-uaccess.rules diff --git a/src/login/71-seat.rules.in b/src/grp-login/71-seat.rules.in index de55c9a4ec..de55c9a4ec 100644 --- a/src/login/71-seat.rules.in +++ b/src/grp-login/71-seat.rules.in diff --git a/src/login/73-seat-late.rules.in b/src/grp-login/73-seat-late.rules.in index 901df750fd..901df750fd 100644 --- a/src/login/73-seat-late.rules.in +++ b/src/grp-login/73-seat-late.rules.in diff --git a/src/grp-login/Makefile b/src/grp-login/Makefile new file mode 100644 index 0000000000..381d653166 --- /dev/null +++ b/src/grp-login/Makefile @@ -0,0 +1,115 @@ +# -*- 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),) +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 + + +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 + +nodist_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 \ + src/login/logind.conf.in + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-login/liblogind-core/Makefile b/src/grp-login/liblogind-core/Makefile new file mode 100644 index 0000000000..1575518aec --- /dev/null +++ b/src/grp-login/liblogind-core/Makefile @@ -0,0 +1,62 @@ +# -*- 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 + +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 + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/login/logind-acl.c b/src/grp-login/liblogind-core/logind-acl.c index 0cef88a82d..0cef88a82d 100644 --- a/src/login/logind-acl.c +++ b/src/grp-login/liblogind-core/logind-acl.c diff --git a/src/login/logind-acl.h b/src/grp-login/liblogind-core/logind-acl.h index 1286c6a3cd..1286c6a3cd 100644 --- a/src/login/logind-acl.h +++ b/src/grp-login/liblogind-core/logind-acl.h diff --git a/src/login/logind-action.c b/src/grp-login/liblogind-core/logind-action.c index 9a8089f97c..9a8089f97c 100644 --- a/src/login/logind-action.c +++ b/src/grp-login/liblogind-core/logind-action.c diff --git a/src/login/logind-action.h b/src/grp-login/liblogind-core/logind-action.h index fb40ae48d2..fb40ae48d2 100644 --- a/src/login/logind-action.h +++ b/src/grp-login/liblogind-core/logind-action.h diff --git a/src/login/logind-button.c b/src/grp-login/liblogind-core/logind-button.c index baa6b7113c..acf7504a2e 100644 --- a/src/login/logind-button.c +++ b/src/grp-login/liblogind-core/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-button.h b/src/grp-login/liblogind-core/logind-button.h index f30cba2959..f30cba2959 100644 --- a/src/login/logind-button.h +++ b/src/grp-login/liblogind-core/logind-button.h diff --git a/src/login/logind-core.c b/src/grp-login/liblogind-core/logind-core.c index cbf8d757fe..cbf8d757fe 100644 --- a/src/login/logind-core.c +++ b/src/grp-login/liblogind-core/logind-core.c diff --git a/src/login/logind-dbus.c b/src/grp-login/liblogind-core/logind-dbus.c index 0a84d75e24..90dcd94710 100644 --- a/src/login/logind-dbus.c +++ b/src/grp-login/liblogind-core/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-device.c b/src/grp-login/liblogind-core/logind-device.c index eb5edd1cd5..eb5edd1cd5 100644 --- a/src/login/logind-device.c +++ b/src/grp-login/liblogind-core/logind-device.c diff --git a/src/login/logind-device.h b/src/grp-login/liblogind-core/logind-device.h index 927068e00a..927068e00a 100644 --- a/src/login/logind-device.h +++ b/src/grp-login/liblogind-core/logind-device.h diff --git a/src/login/logind-gperf.gperf b/src/grp-login/liblogind-core/logind-gperf.gperf index 6bd08adc05..6bd08adc05 100644 --- a/src/login/logind-gperf.gperf +++ b/src/grp-login/liblogind-core/logind-gperf.gperf diff --git a/src/login/logind-inhibit.c b/src/grp-login/liblogind-core/logind-inhibit.c index 6c78e0dddc..6c78e0dddc 100644 --- a/src/login/logind-inhibit.c +++ b/src/grp-login/liblogind-core/logind-inhibit.c diff --git a/src/login/logind-inhibit.h b/src/grp-login/liblogind-core/logind-inhibit.h index 70de199c60..70de199c60 100644 --- a/src/login/logind-inhibit.h +++ b/src/grp-login/liblogind-core/logind-inhibit.h diff --git a/src/login/logind-seat-dbus.c b/src/grp-login/liblogind-core/logind-seat-dbus.c index f934a5326a..f934a5326a 100644 --- a/src/login/logind-seat-dbus.c +++ b/src/grp-login/liblogind-core/logind-seat-dbus.c diff --git a/src/login/logind-seat.c b/src/grp-login/liblogind-core/logind-seat.c index b5192320e4..aec67718a1 100644 --- a/src/login/logind-seat.c +++ b/src/grp-login/liblogind-core/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-seat.h b/src/grp-login/liblogind-core/logind-seat.h index 9a4fbc5bc5..9a4fbc5bc5 100644 --- a/src/login/logind-seat.h +++ b/src/grp-login/liblogind-core/logind-seat.h diff --git a/src/login/logind-session-dbus.c b/src/grp-login/liblogind-core/logind-session-dbus.c index 22dea5db1f..22dea5db1f 100644 --- a/src/login/logind-session-dbus.c +++ b/src/grp-login/liblogind-core/logind-session-dbus.c diff --git a/src/login/logind-session-device.c b/src/grp-login/liblogind-core/logind-session-device.c index 4055a23277..4055a23277 100644 --- a/src/login/logind-session-device.c +++ b/src/grp-login/liblogind-core/logind-session-device.c diff --git a/src/login/logind-session-device.h b/src/grp-login/liblogind-core/logind-session-device.h index 7c8503583f..7c8503583f 100644 --- a/src/login/logind-session-device.h +++ b/src/grp-login/liblogind-core/logind-session-device.h diff --git a/src/login/logind-session.c b/src/grp-login/liblogind-core/logind-session.c index 1e0666884a..11a83106b1 100644 --- a/src/login/logind-session.c +++ b/src/grp-login/liblogind-core/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-session.h b/src/grp-login/liblogind-core/logind-session.h index ffb7cd2d41..ffb7cd2d41 100644 --- a/src/login/logind-session.h +++ b/src/grp-login/liblogind-core/logind-session.h diff --git a/src/login/logind-user-dbus.c b/src/grp-login/liblogind-core/logind-user-dbus.c index af6392e025..af6392e025 100644 --- a/src/login/logind-user-dbus.c +++ b/src/grp-login/liblogind-core/logind-user-dbus.c diff --git a/src/login/logind-user.c b/src/grp-login/liblogind-core/logind-user.c index a826321bf0..a826321bf0 100644 --- a/src/login/logind-user.c +++ b/src/grp-login/liblogind-core/logind-user.c diff --git a/src/login/logind-user.h b/src/grp-login/liblogind-core/logind-user.h index 4f0966dc77..4f0966dc77 100644 --- a/src/login/logind-user.h +++ b/src/grp-login/liblogind-core/logind-user.h diff --git a/src/login/logind-utmp.c b/src/grp-login/liblogind-core/logind-utmp.c index 29ab00eb1f..47599fd466 100644 --- a/src/login/logind-utmp.c +++ b/src/grp-login/liblogind-core/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/grp-login/loginctl/Makefile b/src/grp-login/loginctl/Makefile new file mode 100644 index 0000000000..7c8c3d91a0 --- /dev/null +++ b/src/grp-login/loginctl/Makefile @@ -0,0 +1,41 @@ +# -*- 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 + +loginctl_SOURCES = \ + src/login/loginctl.c \ + src/login/sysfs-show.h \ + src/login/sysfs-show.c + +loginctl_LDADD = \ + libshared.la + +rootbin_PROGRAMS += \ + loginctl + +dist_bashcompletion_data += \ + shell-completion/bash/loginctl + +dist_zshcompletion_data += shell-completion/zsh/_loginctl +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/login/loginctl.c b/src/grp-login/loginctl/loginctl.c index 1c75565636..f3f57b4b13 100644 --- a/src/login/loginctl.c +++ b/src/grp-login/loginctl/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/sysfs-show.c b/src/grp-login/loginctl/sysfs-show.c index 29785e2f11..29785e2f11 100644 --- a/src/login/sysfs-show.c +++ b/src/grp-login/loginctl/sysfs-show.c diff --git a/src/login/sysfs-show.h b/src/grp-login/loginctl/sysfs-show.h index 3e94bc3ed5..3e94bc3ed5 100644 --- a/src/login/sysfs-show.h +++ b/src/grp-login/loginctl/sysfs-show.h diff --git a/src/login/logind.conf.in b/src/grp-login/logind.conf.in index 32c0844cb6..32c0844cb6 100644 --- a/src/login/logind.conf.in +++ b/src/grp-login/logind.conf.in diff --git a/src/login/org.freedesktop.login1.conf b/src/grp-login/org.freedesktop.login1.conf index c89e40457e..c89e40457e 100644 --- a/src/login/org.freedesktop.login1.conf +++ b/src/grp-login/org.freedesktop.login1.conf diff --git a/src/login/org.freedesktop.login1.policy.in b/src/grp-login/org.freedesktop.login1.policy.in index 1fa6441629..1fa6441629 100644 --- a/src/login/org.freedesktop.login1.policy.in +++ b/src/grp-login/org.freedesktop.login1.policy.in diff --git a/src/login/org.freedesktop.login1.service b/src/grp-login/org.freedesktop.login1.service index 762dae2bb3..762dae2bb3 100644 --- a/src/login/org.freedesktop.login1.service +++ b/src/grp-login/org.freedesktop.login1.service diff --git a/src/grp-login/pam_systemd/Makefile b/src/grp-login/pam_systemd/Makefile new file mode 100644 index 0000000000..8c87421bb0 --- /dev/null +++ b/src/grp-login/pam_systemd/Makefile @@ -0,0 +1,56 @@ +# -*- 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_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=$(srcdir)/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 +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/login/pam_systemd.c b/src/grp-login/pam_systemd/pam_systemd.c index 98dc201340..98dc201340 100644 --- a/src/login/pam_systemd.c +++ b/src/grp-login/pam_systemd/pam_systemd.c diff --git a/src/login/pam_systemd.sym b/src/grp-login/pam_systemd/pam_systemd.sym index 23ff75f688..23ff75f688 100644 --- a/src/login/pam_systemd.sym +++ b/src/grp-login/pam_systemd/pam_systemd.sym diff --git a/src/grp-login/systemd-inhibit/Makefile b/src/grp-login/systemd-inhibit/Makefile new file mode 100644 index 0000000000..93440da575 --- /dev/null +++ b/src/grp-login/systemd-inhibit/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 + +dist_zshcompletion_data += shell-completion/zsh/_systemd-inhibit + +systemd_inhibit_SOURCES = \ + src/login/inhibit.c + +systemd_inhibit_LDADD = \ + libshared.la + +rootbin_PROGRAMS += \ + systemd-inhibit + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/login/inhibit.c b/src/grp-login/systemd-inhibit/inhibit.c index f2c37a8623..905e757a32 100644 --- a/src/login/inhibit.c +++ b/src/grp-login/systemd-inhibit/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/grp-login/systemd-logind/Makefile b/src/grp-login/systemd-logind/Makefile new file mode 100644 index 0000000000..9dd5855e88 --- /dev/null +++ b/src/grp-login/systemd-logind/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_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 + +rootlibexec_PROGRAMS += \ + systemd-logind + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/login/logind.c b/src/grp-login/systemd-logind/logind.c index caf149cfb7..925c04a344 100644 --- a/src/login/logind.c +++ b/src/grp-login/systemd-logind/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/grp-login/systemd-logind/logind.h index 90431eb4b0..9d43c2e7ee 100644 --- a/src/login/logind.h +++ b/src/grp-login/systemd-logind/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/systemd-user.m4 b/src/grp-login/systemd-user.m4 index f188a8e548..f188a8e548 100644 --- a/src/login/systemd-user.m4 +++ b/src/grp-login/systemd-user.m4 diff --git a/src/login/test-inhibit.c b/src/grp-login/test-inhibit.c index a3cf9d293b..be7145b4bc 100644 --- a/src/login/test-inhibit.c +++ b/src/grp-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/login/test-login-shared.c b/src/grp-login/test-login-shared.c index 3d233f017c..3d233f017c 100644 --- a/src/login/test-login-shared.c +++ b/src/grp-login/test-login-shared.c diff --git a/src/login/test-login-tables.c b/src/grp-login/test-login-tables.c index 4fbc893a9a..4fbc893a9a 100644 --- a/src/login/test-login-tables.c +++ b/src/grp-login/test-login-tables.c diff --git a/src/grp-machine/Makefile b/src/grp-machine/Makefile new file mode 100644 index 0000000000..7412341233 --- /dev/null +++ b/src/grp-machine/Makefile @@ -0,0 +1,29 @@ +# -*- 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 + +at.subdirs += machinectl systemd-machined +at.subdirs += nss-mymachines + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/machine/.gitignore b/src/grp-machine/libmachine-core/.gitignore index e1065b5894..e1065b5894 100644 --- a/src/machine/.gitignore +++ b/src/grp-machine/libmachine-core/.gitignore diff --git a/src/grp-machine/libmachine-core/Makefile b/src/grp-machine/libmachine-core/Makefile new file mode 100644 index 0000000000..3881224746 --- /dev/null +++ b/src/grp-machine/libmachine-core/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 + +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 \ + src/machine/operation.c \ + src/machine/operation.h + +libmachine_core_la_LIBADD = \ + libshared.la + +noinst_LTLIBRARIES += \ + libmachine-core.la + +test_machine_tables_SOURCES = \ + src/machine/test-machine-tables.c + +test_machine_tables_LDADD = \ + libmachine-core.la + +tests += \ + test-machine-tables + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/machine/image-dbus.c b/src/grp-machine/libmachine-core/image-dbus.c index 0eed9b81bb..0eed9b81bb 100644 --- a/src/machine/image-dbus.c +++ b/src/grp-machine/libmachine-core/image-dbus.c diff --git a/src/machine/image-dbus.h b/src/grp-machine/libmachine-core/image-dbus.h index b62da996c6..b62da996c6 100644 --- a/src/machine/image-dbus.h +++ b/src/grp-machine/libmachine-core/image-dbus.h diff --git a/src/machine/machine-dbus.c b/src/grp-machine/libmachine-core/machine-dbus.c index 7b9aa66d63..7b9aa66d63 100644 --- a/src/machine/machine-dbus.c +++ b/src/grp-machine/libmachine-core/machine-dbus.c diff --git a/src/machine/machine-dbus.h b/src/grp-machine/libmachine-core/machine-dbus.h index 241b23c7ec..d3faf5cb07 100644 --- a/src/machine/machine-dbus.h +++ b/src/grp-machine/libmachine-core/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/libmachine-core/machine.c index c1fae57084..135f47dafc 100644 --- a/src/machine/machine.c +++ b/src/grp-machine/libmachine-core/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/libmachine-core/machine.h index e5d75361a9..e5d75361a9 100644 --- a/src/machine/machine.h +++ b/src/grp-machine/libmachine-core/machine.h diff --git a/src/machine/machined-dbus.c b/src/grp-machine/libmachine-core/machined-dbus.c index 31efa3695b..41f138882b 100644 --- a/src/machine/machined-dbus.c +++ b/src/grp-machine/libmachine-core/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.h b/src/grp-machine/libmachine-core/machined.h index 7b9b148044..777571ebc0 100644 --- a/src/machine/machined.h +++ b/src/grp-machine/libmachine-core/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/operation.c b/src/grp-machine/libmachine-core/operation.c index e6ddc41a55..e6ddc41a55 100644 --- a/src/machine/operation.c +++ b/src/grp-machine/libmachine-core/operation.c diff --git a/src/machine/operation.h b/src/grp-machine/libmachine-core/operation.h index 7ca47bc3af..9397cd5f6d 100644 --- a/src/machine/operation.h +++ b/src/grp-machine/libmachine-core/operation.h @@ -21,8 +21,8 @@ #include <sys/types.h> -#include "sd-bus.h" -#include "sd-event.h" +#include <systemd/sd-bus.h> +#include <systemd/sd-event.h> #include "list.h" diff --git a/src/machine/org.freedesktop.machine1.conf b/src/grp-machine/libmachine-core/org.freedesktop.machine1.conf index 9d40b90151..9d40b90151 100644 --- a/src/machine/org.freedesktop.machine1.conf +++ b/src/grp-machine/libmachine-core/org.freedesktop.machine1.conf diff --git a/src/machine/org.freedesktop.machine1.policy.in b/src/grp-machine/libmachine-core/org.freedesktop.machine1.policy.in index 69f78a5c25..69f78a5c25 100644 --- a/src/machine/org.freedesktop.machine1.policy.in +++ b/src/grp-machine/libmachine-core/org.freedesktop.machine1.policy.in diff --git a/src/machine/org.freedesktop.machine1.service b/src/grp-machine/libmachine-core/org.freedesktop.machine1.service index d3dc99852b..d3dc99852b 100644 --- a/src/machine/org.freedesktop.machine1.service +++ b/src/grp-machine/libmachine-core/org.freedesktop.machine1.service diff --git a/src/machine/test-machine-tables.c b/src/grp-machine/libmachine-core/test-machine-tables.c index f851a4d37d..f851a4d37d 100644 --- a/src/machine/test-machine-tables.c +++ b/src/grp-machine/libmachine-core/test-machine-tables.c diff --git a/src/grp-machine/machinectl/Makefile b/src/grp-machine/machinectl/Makefile new file mode 100644 index 0000000000..a3ad40e59c --- /dev/null +++ b/src/grp-machine/machinectl/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 + +machinectl_SOURCES = \ + src/machine/machinectl.c + +machinectl_LDADD = \ + libshared.la + +rootbin_PROGRAMS += \ + machinectl + +dist_bashcompletion_data += \ + shell-completion/bash/machinectl + +dist_zshcompletion_data += \ + shell-completion/zsh/_machinectl \ + shell-completion/zsh/_sd_machines + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/machine/machinectl.c b/src/grp-machine/machinectl/machinectl.c index 8e4ffa9a39..92ffa8b83d 100644 --- a/src/machine/machinectl.c +++ b/src/grp-machine/machinectl/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/grp-machine/nss-mymachines/Makefile b/src/grp-machine/nss-mymachines/Makefile new file mode 100644 index 0000000000..c7c0d76907 --- /dev/null +++ b/src/grp-machine/nss-mymachines/Makefile @@ -0,0 +1,46 @@ +# -*- 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 + + +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=$(srcdir)/nss-mymachines.sym + +libnss_mymachines_la_LIBADD = \ + libsystemd-internal.la + +lib_LTLIBRARIES += \ + libnss_mymachines.la + +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 8d57b26cbc..da09035fe7 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/grp-machine/systemd-machined/Makefile b/src/grp-machine/systemd-machined/Makefile new file mode 100644 index 0000000000..8aac7b0f4f --- /dev/null +++ b/src/grp-machine/systemd-machined/Makefile @@ -0,0 +1,67 @@ +# -*- 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_machined_SOURCES = \ + src/machine/machined.c \ + src/machine/machined.h + +systemd_machined_LDADD = \ + libmachine-core.la + +rootlibexec_PROGRAMS += \ + systemd-machined + +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 + +SYSTEM_UNIT_ALIASES += \ + systemd-machined.service dbus-org.freedesktop.machine1.service + +BUSNAMES_TARGET_WANTS += \ + org.freedesktop.machine1.busname + + +polkitpolicy_in_files += \ + src/machine/org.freedesktop.machine1.policy.in + +EXTRA_DIST += \ + units/systemd-machined.service.in + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/machine/machined.c b/src/grp-machine/systemd-machined/machined.c index f7ceb5e603..151f0983ec 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/network/.gitignore b/src/grp-network/.gitignore index aca55206b7..aca55206b7 100644 --- a/src/network/.gitignore +++ b/src/grp-network/.gitignore diff --git a/src/grp-network/Makefile b/src/grp-network/Makefile new file mode 100644 index 0000000000..7cbd9142d0 --- /dev/null +++ b/src/grp-network/Makefile @@ -0,0 +1,107 @@ +# -*- 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_network_DATA = \ + network/99-default.link \ + network/80-container-host0.network \ + network/80-container-ve.network \ + network/80-container-vz.network + +ifneq ($(ENABLE_NETWORKD),) +test_networkd_conf_SOURCES = \ + src/network/test-networkd-conf.c + +test_networkd_conf_LDADD = \ + libnetworkd-core.la + +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-networkd-conf \ + 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-gperf.gperf \ + 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 + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-network/libnetworkd-core/Makefile b/src/grp-network/libnetworkd-core/Makefile new file mode 100644 index 0000000000..53d65460f2 --- /dev/null +++ b/src/grp-network/libnetworkd-core/Makefile @@ -0,0 +1,93 @@ +# -*- 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 += \ + 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-conf.h \ + src/network/networkd-conf.c \ + 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 \ + src/network/networkd-lldp-tx.h \ + src/network/networkd-lldp-tx.c + +nodist_libnetworkd_core_la_SOURCES = \ + src/network/networkd-gperf.c \ + src/network/networkd-network-gperf.c \ + src/network/networkd-netdev-gperf.c + +libnetworkd_core_la_LIBADD = \ + libsystemd-network.la \ + libshared.la + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/network/networkd-address-pool.c b/src/grp-network/libnetworkd-core/networkd-address-pool.c index ebc6c9eb9e..ebc6c9eb9e 100644 --- a/src/network/networkd-address-pool.c +++ b/src/grp-network/libnetworkd-core/networkd-address-pool.c diff --git a/src/network/networkd-address-pool.h b/src/grp-network/libnetworkd-core/networkd-address-pool.h index af30decfe0..af30decfe0 100644 --- a/src/network/networkd-address-pool.h +++ b/src/grp-network/libnetworkd-core/networkd-address-pool.h diff --git a/src/network/networkd-address.c b/src/grp-network/libnetworkd-core/networkd-address.c index 367c340e08..367c340e08 100644 --- a/src/network/networkd-address.c +++ b/src/grp-network/libnetworkd-core/networkd-address.c diff --git a/src/network/networkd-address.h b/src/grp-network/libnetworkd-core/networkd-address.h index 784ab18b27..784ab18b27 100644 --- a/src/network/networkd-address.h +++ b/src/grp-network/libnetworkd-core/networkd-address.h diff --git a/src/network/networkd-conf.c b/src/grp-network/libnetworkd-core/networkd-conf.c index b67a1f6d09..b67a1f6d09 100644 --- a/src/network/networkd-conf.c +++ b/src/grp-network/libnetworkd-core/networkd-conf.c diff --git a/src/network/networkd-conf.h b/src/grp-network/libnetworkd-core/networkd-conf.h index c7bfb42a72..c7bfb42a72 100644 --- a/src/network/networkd-conf.h +++ b/src/grp-network/libnetworkd-core/networkd-conf.h diff --git a/src/network/networkd-dhcp4.c b/src/grp-network/libnetworkd-core/networkd-dhcp4.c index 2ddcee9db8..2ddcee9db8 100644 --- a/src/network/networkd-dhcp4.c +++ b/src/grp-network/libnetworkd-core/networkd-dhcp4.c diff --git a/src/network/networkd-dhcp6.c b/src/grp-network/libnetworkd-core/networkd-dhcp6.c index 37e13e639e..c5a3c52e94 100644 --- a/src/network/networkd-dhcp6.c +++ b/src/grp-network/libnetworkd-core/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.h" diff --git a/src/network/networkd-fdb.c b/src/grp-network/libnetworkd-core/networkd-fdb.c index 241f486211..241f486211 100644 --- a/src/network/networkd-fdb.c +++ b/src/grp-network/libnetworkd-core/networkd-fdb.c diff --git a/src/network/networkd-fdb.h b/src/grp-network/libnetworkd-core/networkd-fdb.h index 84410714f5..84410714f5 100644 --- a/src/network/networkd-fdb.h +++ b/src/grp-network/libnetworkd-core/networkd-fdb.h diff --git a/src/network/networkd-gperf.gperf b/src/grp-network/libnetworkd-core/networkd-gperf.gperf index 3fdfe74955..3fdfe74955 100644 --- a/src/network/networkd-gperf.gperf +++ b/src/grp-network/libnetworkd-core/networkd-gperf.gperf diff --git a/src/network/networkd-ipv4ll.c b/src/grp-network/libnetworkd-core/networkd-ipv4ll.c index ae323d595b..ae323d595b 100644 --- a/src/network/networkd-ipv4ll.c +++ b/src/grp-network/libnetworkd-core/networkd-ipv4ll.c diff --git a/src/network/networkd-link-bus.c b/src/grp-network/libnetworkd-core/networkd-link-bus.c index 532557ed6c..532557ed6c 100644 --- a/src/network/networkd-link-bus.c +++ b/src/grp-network/libnetworkd-core/networkd-link-bus.c diff --git a/src/network/networkd-link.c b/src/grp-network/libnetworkd-core/networkd-link.c index a021fc886f..a021fc886f 100644 --- a/src/network/networkd-link.c +++ b/src/grp-network/libnetworkd-core/networkd-link.c diff --git a/src/network/networkd-link.h b/src/grp-network/libnetworkd-core/networkd-link.h index 14c4a02c7e..90cb9b93f6 100644 --- a/src/network/networkd-link.h +++ b/src/grp-network/libnetworkd-core/networkd-link.h @@ -21,14 +21,14 @@ #include <endian.h> -#include "sd-bus.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 "sd-netlink.h" +#include <systemd/sd-bus.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> +#include <systemd/sd-netlink.h> #include "list.h" #include "set.h" diff --git a/src/network/networkd-lldp-tx.c b/src/grp-network/libnetworkd-core/networkd-lldp-tx.c index 3aa768388b..3aa768388b 100644 --- a/src/network/networkd-lldp-tx.c +++ b/src/grp-network/libnetworkd-core/networkd-lldp-tx.c diff --git a/src/network/networkd-lldp-tx.h b/src/grp-network/libnetworkd-core/networkd-lldp-tx.h index 4680c9d950..4680c9d950 100644 --- a/src/network/networkd-lldp-tx.h +++ b/src/grp-network/libnetworkd-core/networkd-lldp-tx.h diff --git a/src/network/networkd-manager-bus.c b/src/grp-network/libnetworkd-core/networkd-manager-bus.c index 0c429b9471..0c429b9471 100644 --- a/src/network/networkd-manager-bus.c +++ b/src/grp-network/libnetworkd-core/networkd-manager-bus.c diff --git a/src/network/networkd-manager.c b/src/grp-network/libnetworkd-core/networkd-manager.c index 9174dcc7f4..7af7abaa81 100644 --- a/src/network/networkd-manager.c +++ b/src/grp-network/libnetworkd-core/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/grp-network/libnetworkd-core/networkd-ndisc.c index 1a380bd214..f3a4fc0fa5 100644 --- a/src/network/networkd-ndisc.c +++ b/src/grp-network/libnetworkd-core/networkd-ndisc.c @@ -22,7 +22,7 @@ #include <netinet/in.h> #include <linux/if.h> -#include "sd-ndisc.h" +#include <systemd/sd-ndisc.h> #include "networkd.h" diff --git a/src/network/networkd-netdev-bond.c b/src/grp-network/libnetworkd-core/networkd-netdev-bond.c index 7913b0088e..7005b165d9 100644 --- a/src/network/networkd-netdev-bond.c +++ b/src/grp-network/libnetworkd-core/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-bond.h b/src/grp-network/libnetworkd-core/networkd-netdev-bond.h index b941edb344..b941edb344 100644 --- a/src/network/networkd-netdev-bond.h +++ b/src/grp-network/libnetworkd-core/networkd-netdev-bond.h diff --git a/src/network/networkd-netdev-bridge.c b/src/grp-network/libnetworkd-core/networkd-netdev-bridge.c index 4cfd00413f..4cfd00413f 100644 --- a/src/network/networkd-netdev-bridge.c +++ b/src/grp-network/libnetworkd-core/networkd-netdev-bridge.c diff --git a/src/network/networkd-netdev-bridge.h b/src/grp-network/libnetworkd-core/networkd-netdev-bridge.h index f2ae21fc50..f2ae21fc50 100644 --- a/src/network/networkd-netdev-bridge.h +++ b/src/grp-network/libnetworkd-core/networkd-netdev-bridge.h diff --git a/src/network/networkd-netdev-dummy.c b/src/grp-network/libnetworkd-core/networkd-netdev-dummy.c index 6617a86c20..6617a86c20 100644 --- a/src/network/networkd-netdev-dummy.c +++ b/src/grp-network/libnetworkd-core/networkd-netdev-dummy.c diff --git a/src/network/networkd-netdev-dummy.h b/src/grp-network/libnetworkd-core/networkd-netdev-dummy.h index efe302267e..efe302267e 100644 --- a/src/network/networkd-netdev-dummy.h +++ b/src/grp-network/libnetworkd-core/networkd-netdev-dummy.h diff --git a/src/network/networkd-netdev-gperf.gperf b/src/grp-network/libnetworkd-core/networkd-netdev-gperf.gperf index ba04bb0165..ba04bb0165 100644 --- a/src/network/networkd-netdev-gperf.gperf +++ b/src/grp-network/libnetworkd-core/networkd-netdev-gperf.gperf diff --git a/src/network/networkd-netdev-ipvlan.c b/src/grp-network/libnetworkd-core/networkd-netdev-ipvlan.c index af4177e43a..af4177e43a 100644 --- a/src/network/networkd-netdev-ipvlan.c +++ b/src/grp-network/libnetworkd-core/networkd-netdev-ipvlan.c diff --git a/src/network/networkd-netdev-ipvlan.h b/src/grp-network/libnetworkd-core/networkd-netdev-ipvlan.h index 10d4079844..10d4079844 100644 --- a/src/network/networkd-netdev-ipvlan.h +++ b/src/grp-network/libnetworkd-core/networkd-netdev-ipvlan.h diff --git a/src/network/networkd-netdev-macvlan.c b/src/grp-network/libnetworkd-core/networkd-netdev-macvlan.c index 48e98aa51b..48e98aa51b 100644 --- a/src/network/networkd-netdev-macvlan.c +++ b/src/grp-network/libnetworkd-core/networkd-netdev-macvlan.c diff --git a/src/network/networkd-netdev-macvlan.h b/src/grp-network/libnetworkd-core/networkd-netdev-macvlan.h index 3663f4f051..3663f4f051 100644 --- a/src/network/networkd-netdev-macvlan.h +++ b/src/grp-network/libnetworkd-core/networkd-netdev-macvlan.h diff --git a/src/network/networkd-netdev-tunnel.c b/src/grp-network/libnetworkd-core/networkd-netdev-tunnel.c index 7aaa041ba3..26a9a972f1 100644 --- a/src/network/networkd-netdev-tunnel.c +++ b/src/grp-network/libnetworkd-core/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-tunnel.h b/src/grp-network/libnetworkd-core/networkd-netdev-tunnel.h index 7d31e7b687..7d31e7b687 100644 --- a/src/network/networkd-netdev-tunnel.h +++ b/src/grp-network/libnetworkd-core/networkd-netdev-tunnel.h diff --git a/src/network/networkd-netdev-tuntap.c b/src/grp-network/libnetworkd-core/networkd-netdev-tuntap.c index 088a4d8d32..088a4d8d32 100644 --- a/src/network/networkd-netdev-tuntap.c +++ b/src/grp-network/libnetworkd-core/networkd-netdev-tuntap.c diff --git a/src/network/networkd-netdev-tuntap.h b/src/grp-network/libnetworkd-core/networkd-netdev-tuntap.h index 120f00a353..120f00a353 100644 --- a/src/network/networkd-netdev-tuntap.h +++ b/src/grp-network/libnetworkd-core/networkd-netdev-tuntap.h diff --git a/src/network/networkd-netdev-veth.c b/src/grp-network/libnetworkd-core/networkd-netdev-veth.c index b122a06c25..185b441c5a 100644 --- a/src/network/networkd-netdev-veth.c +++ b/src/grp-network/libnetworkd-core/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-veth.h b/src/grp-network/libnetworkd-core/networkd-netdev-veth.h index e69bfbc8f0..e69bfbc8f0 100644 --- a/src/network/networkd-netdev-veth.h +++ b/src/grp-network/libnetworkd-core/networkd-netdev-veth.h diff --git a/src/network/networkd-netdev-vlan.c b/src/grp-network/libnetworkd-core/networkd-netdev-vlan.c index b1f4714afa..b1f4714afa 100644 --- a/src/network/networkd-netdev-vlan.c +++ b/src/grp-network/libnetworkd-core/networkd-netdev-vlan.c diff --git a/src/network/networkd-netdev-vlan.h b/src/grp-network/libnetworkd-core/networkd-netdev-vlan.h index 73aacf4a0f..73aacf4a0f 100644 --- a/src/network/networkd-netdev-vlan.h +++ b/src/grp-network/libnetworkd-core/networkd-netdev-vlan.h diff --git a/src/network/networkd-netdev-vxlan.c b/src/grp-network/libnetworkd-core/networkd-netdev-vxlan.c index 724f9861be..363a6bdde6 100644 --- a/src/network/networkd-netdev-vxlan.c +++ b/src/grp-network/libnetworkd-core/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-netdev-vxlan.h b/src/grp-network/libnetworkd-core/networkd-netdev-vxlan.h index 4614c66fd1..4614c66fd1 100644 --- a/src/network/networkd-netdev-vxlan.h +++ b/src/grp-network/libnetworkd-core/networkd-netdev-vxlan.h diff --git a/src/network/networkd-netdev.c b/src/grp-network/libnetworkd-core/networkd-netdev.c index 851a36290c..851a36290c 100644 --- a/src/network/networkd-netdev.c +++ b/src/grp-network/libnetworkd-core/networkd-netdev.c diff --git a/src/network/networkd-netdev.h b/src/grp-network/libnetworkd-core/networkd-netdev.h index 20244c0309..ab3f068167 100644 --- a/src/network/networkd-netdev.h +++ b/src/grp-network/libnetworkd-core/networkd-netdev.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 "list.h" #include "time-util.h" diff --git a/src/network/networkd-network-bus.c b/src/grp-network/libnetworkd-core/networkd-network-bus.c index d6b7448a43..d6b7448a43 100644 --- a/src/network/networkd-network-bus.c +++ b/src/grp-network/libnetworkd-core/networkd-network-bus.c diff --git a/src/network/networkd-network-gperf.gperf b/src/grp-network/libnetworkd-core/networkd-network-gperf.gperf index 03e4e3b39f..03e4e3b39f 100644 --- a/src/network/networkd-network-gperf.gperf +++ b/src/grp-network/libnetworkd-core/networkd-network-gperf.gperf diff --git a/src/network/networkd-network.c b/src/grp-network/libnetworkd-core/networkd-network.c index dd89b3770c..dd89b3770c 100644 --- a/src/network/networkd-network.c +++ b/src/grp-network/libnetworkd-core/networkd-network.c diff --git a/src/network/networkd-network.h b/src/grp-network/libnetworkd-core/networkd-network.h index 91099161ce..177bc11ec4 100644 --- a/src/network/networkd-network.h +++ b/src/grp-network/libnetworkd-core/networkd-network.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 "udev.h" #include "condition.h" diff --git a/src/network/networkd-route.c b/src/grp-network/libnetworkd-core/networkd-route.c index f001de772a..f001de772a 100644 --- a/src/network/networkd-route.c +++ b/src/grp-network/libnetworkd-core/networkd-route.c diff --git a/src/network/networkd-route.h b/src/grp-network/libnetworkd-core/networkd-route.h index 39de8363ed..39de8363ed 100644 --- a/src/network/networkd-route.h +++ b/src/grp-network/libnetworkd-core/networkd-route.h diff --git a/src/network/networkd-util.c b/src/grp-network/libnetworkd-core/networkd-util.c index 555a7c68a1..555a7c68a1 100644 --- a/src/network/networkd-util.c +++ b/src/grp-network/libnetworkd-core/networkd-util.c diff --git a/src/network/networkd-util.h b/src/grp-network/libnetworkd-core/networkd-util.h index d5c385bea4..d5c385bea4 100644 --- a/src/network/networkd-util.h +++ b/src/grp-network/libnetworkd-core/networkd-util.h diff --git a/src/network/networkd.h b/src/grp-network/libnetworkd-core/networkd.h index ab512f0d08..b61e03920e 100644 --- a/src/network/networkd.h +++ b/src/grp-network/libnetworkd-core/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 "udev.h" #include "dhcp-identifier.h" diff --git a/src/grp-network/networkctl/Makefile b/src/grp-network/networkctl/Makefile new file mode 100644 index 0000000000..f92d402f78 --- /dev/null +++ b/src/grp-network/networkctl/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 + +rootbin_PROGRAMS += \ + networkctl + +networkctl_SOURCES = \ + src/network/networkctl.c + +networkctl_LDADD = \ + libshared.la \ + libsystemd-network.la + +dist_bashcompletion_data += \ + shell-completion/bash/networkctl + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/network/networkctl.c b/src/grp-network/networkctl/networkctl.c index d2df9b7560..85635b59bc 100644 --- a/src/network/networkctl.c +++ b/src/grp-network/networkctl/networkctl.c @@ -21,11 +21,11 @@ #include <net/if.h> #include <stdbool.h> -#include "sd-device.h" -#include "sd-hwdb.h" -#include "sd-lldp.h" -#include "sd-netlink.h" -#include "sd-network.h" +#include <systemd/sd-device.h> +#include <systemd/sd-hwdb.h> +#include <systemd/sd-lldp.h> +#include <systemd/sd-netlink.h> +#include <systemd/sd-network.h> #include "alloc-util.h" #include "arphrd-list.h" diff --git a/src/network/org.freedesktop.network1.conf b/src/grp-network/org.freedesktop.network1.conf index 52dad33668..52dad33668 100644 --- a/src/network/org.freedesktop.network1.conf +++ b/src/grp-network/org.freedesktop.network1.conf diff --git a/src/network/org.freedesktop.network1.service b/src/grp-network/org.freedesktop.network1.service index bea885fe53..bea885fe53 100644 --- a/src/network/org.freedesktop.network1.service +++ b/src/grp-network/org.freedesktop.network1.service diff --git a/src/grp-network/systemd-networkd-wait-online/Makefile b/src/grp-network/systemd-networkd-wait-online/Makefile new file mode 100644 index 0000000000..12aa13c48f --- /dev/null +++ b/src/grp-network/systemd-networkd-wait-online/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 + +rootlibexec_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 + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/network/networkd-wait-online-link.c b/src/grp-network/systemd-networkd-wait-online/networkd-wait-online-link.c index 5727422e3d..971545296f 100644 --- a/src/network/networkd-wait-online-link.c +++ b/src/grp-network/systemd-networkd-wait-online/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-link.h b/src/grp-network/systemd-networkd-wait-online/networkd-wait-online-link.h index dc35085c55..dc35085c55 100644 --- a/src/network/networkd-wait-online-link.h +++ b/src/grp-network/systemd-networkd-wait-online/networkd-wait-online-link.h diff --git a/src/network/networkd-wait-online-manager.c b/src/grp-network/systemd-networkd-wait-online/networkd-wait-online-manager.c index 2ff7ddb044..2ff7ddb044 100644 --- a/src/network/networkd-wait-online-manager.c +++ b/src/grp-network/systemd-networkd-wait-online/networkd-wait-online-manager.c diff --git a/src/network/networkd-wait-online.c b/src/grp-network/systemd-networkd-wait-online/networkd-wait-online.c index 3220c4b7ef..a08272463e 100644 --- a/src/network/networkd-wait-online.c +++ b/src/grp-network/systemd-networkd-wait-online/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/grp-network/systemd-networkd-wait-online/networkd-wait-online.h index f91995c306..7ac7f4018a 100644 --- a/src/network/networkd-wait-online.h +++ b/src/grp-network/systemd-networkd-wait-online/networkd-wait-online.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" diff --git a/src/grp-network/systemd-networkd/Makefile b/src/grp-network/systemd-networkd/Makefile new file mode 100644 index 0000000000..8b7e44062b --- /dev/null +++ b/src/grp-network/systemd-networkd/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 + +rootlibexec_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 + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/network/networkd.c b/src/grp-network/systemd-networkd/networkd.c index c8f81a2ca6..9f5c75ac3d 100644 --- a/src/network/networkd.c +++ b/src/grp-network/systemd-networkd/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/test-network-tables.c b/src/grp-network/test-network-tables.c index adbe09a5e1..adbe09a5e1 100644 --- a/src/network/test-network-tables.c +++ b/src/grp-network/test-network-tables.c diff --git a/src/network/test-network.c b/src/grp-network/test-network.c index 855646173f..855646173f 100644 --- a/src/network/test-network.c +++ b/src/grp-network/test-network.c diff --git a/src/network/test-networkd-conf.c b/src/grp-network/test-networkd-conf.c index 0e1a18457d..0e1a18457d 100644 --- a/src/network/test-networkd-conf.c +++ b/src/grp-network/test-networkd-conf.c diff --git a/src/grp-resolve/Makefile b/src/grp-resolve/Makefile new file mode 100644 index 0000000000..ae0c5a2466 --- /dev/null +++ b/src/grp-resolve/Makefile @@ -0,0 +1,28 @@ +# -*- 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 + +at.subdirs += systemd-resolved nss-resolve + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-resolve/nss-resolve/Makefile b/src/grp-resolve/nss-resolve/Makefile new file mode 100644 index 0000000000..acfbe831ae --- /dev/null +++ b/src/grp-resolve/nss-resolve/Makefile @@ -0,0 +1,46 @@ +# -*- 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 + +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=$(srcdir)/nss-resolve.sym + +libnss_resolve_la_LIBADD = \ + libsystemd-internal.la \ + -ldl + +lib_LTLIBRARIES += \ + libnss_resolve.la + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/nss-resolve/nss-resolve.c b/src/grp-resolve/nss-resolve/nss-resolve.c index 5ce10f1cbd..4c2101d856 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..e18b1b3d90 --- /dev/null +++ b/src/grp-resolve/systemd-resolved/Makefile @@ -0,0 +1,227 @@ +# -*- 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 }' <$< >$@ + +ifneq ($(ENABLE_RESOLVED),) + +basic_dns_sources = \ + 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 + +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 \ + $(basic_dns_sources) \ + 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-trust-anchor.h \ + src/resolve/resolved-dns-trust-anchor.c \ + src/resolve/resolved-etc-hosts.h \ + src/resolve/resolved-etc-hosts.c \ + src/shared/gcrypt-util.c \ + src/shared/gcrypt-util.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 + +rootlibexec_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 + +systemd_resolve_SOURCES = \ + src/resolve/resolve-tool.c \ + $(basic_dns_sources) \ + src/shared/gcrypt-util.c \ + src/shared/gcrypt-util.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 + +dist_bashcompletion_data += \ + shell-completion/bash/systemd-resolve + +dist_zshcompletion_data += \ + shell-completion/zsh/_systemd-resolve + +tests += \ + test-dns-packet \ + test-resolve-tables \ + test-dnssec + +manual_tests += \ + test-dnssec-complex + +test_resolve_tables_SOURCES = \ + src/resolve/test-resolve-tables.c \ + src/resolve/dns_type-from-name.h \ + src/resolve/dns_type-to-name.h \ + $(basic_dns_sources) \ + src/shared/test-tables.h + +test_resolve_tables_LDADD = \ + libshared.la + +test_dns_packet_SOURCES = \ + src/resolve/test-dns-packet.c \ + $(basic_dns_sources) + +test_dns_packet_CPPFLAGS = \ + $(AM_CPPFLAGS) \ + -DRESOLVE_TEST_DIR=\"$(abs_top_srcdir)/src/resolve/test-data\" + +test_dns_packet_LDADD = \ + libshared.la + +EXTRA_DIST += \ + src/resolve/test-data/_openpgpkey.fedoraproject.org.pkts \ + src/resolve/test-data/fedoraproject.org.pkts \ + src/resolve/test-data/gandi.net.pkts \ + src/resolve/test-data/google.com.pkts \ + src/resolve/test-data/root.pkts \ + src/resolve/test-data/sw1a1aa-sw1a2aa-sw1a2ab-sw1a2ac.find.me.uk.pkts \ + src/resolve/test-data/teamits.com.pkts \ + src/resolve/test-data/zbyszek@fedoraproject.org.pkts \ + src/resolve/test-data/_443._tcp.fedoraproject.org.pkts \ + src/resolve/test-data/kyhwana.org.pkts \ + src/resolve/test-data/fake-caa.pkts + +test_dnssec_SOURCES = \ + src/resolve/test-dnssec.c \ + $(basic_dns_sources) + +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 + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/resolve/RFCs b/src/grp-resolve/systemd-resolved/RFCs index 09c85f9518..09c85f9518 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 78d9d5733f..78d9d5733f 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 7b79d29d7e..7b79d29d7e 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 14ee01c49d..fbf7b0e4f6 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 33f7c61557..33f7c61557 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 990dc03b60..990dc03b60 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 0dadf8b1dd..0dadf8b1dd 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 0679c610f5..0679c610f5 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 77c42d7aad..77c42d7aad 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 a54aed3a63..a54aed3a63 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 b7907bb511..b7907bb511 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 416335d0a2..416335d0a2 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 ea04e58d61..ea04e58d61 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 c8b502d1cd..c8b502d1cd 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 6a29a93a26..6a29a93a26 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 020a2abd77..020a2abd77 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 66e4585c18..66e4585c18 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 3095c042db..dedc9beb19 100644 --- a/src/resolve/resolved-dns-server.c +++ b/src/grp-resolve/systemd-resolved/resolved-dns-server.c @@ -17,7 +17,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include <sd-messages.h> +#include <systemd/sd-messages.h> #include "alloc-util.h" #include "resolved-dns-server.h" 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 e3003411f7..e3003411f7 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 a4a67623e7..1b4b2b804b 100644 --- a/src/resolve/resolved-dns-transaction.c +++ b/src/grp-resolve/systemd-resolved/resolved-dns-transaction.c @@ -17,7 +17,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include <sd-messages.h> +#include <systemd/sd-messages.h> #include "af-list.h" #include "alloc-util.h" diff --git a/src/resolve/resolved-dns-transaction.h b/src/grp-resolve/systemd-resolved/resolved-dns-transaction.h index eaece91533..eaece91533 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 77370e7dd5..0972792341 100644 --- a/src/resolve/resolved-dns-trust-anchor.c +++ b/src/grp-resolve/systemd-resolved/resolved-dns-trust-anchor.c @@ -17,7 +17,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include <sd-messages.h> +#include <systemd/sd-messages.h> #include "alloc-util.h" #include "conf-files.h" 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 850eed8cb8..850eed8cb8 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 40d650949d..40d650949d 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 7f21891819..7f21891819 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 646031b631..b1ac57961d 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 b0dc65036d..4eef20599a 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 8b1d71a3eb..8b1d71a3eb 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 7166b94d71..7166b94d71 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 b13b1d0144..b13b1d0144 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 ff03acc772..ff03acc772 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 161ea03412..086a2fcac7 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 a288588924..a288588924 100644 --- a/src/resolve/resolved.conf.in +++ b/src/grp-resolve/systemd-resolved/resolved.conf.in diff --git a/src/resolve/test-data/_443._tcp.fedoraproject.org.pkts b/src/grp-resolve/systemd-resolved/test-data/_443._tcp.fedoraproject.org.pkts Binary files differindex a383c6286d..a383c6286d 100644 --- a/src/resolve/test-data/_443._tcp.fedoraproject.org.pkts +++ b/src/grp-resolve/systemd-resolved/test-data/_443._tcp.fedoraproject.org.pkts diff --git a/src/resolve/test-data/_openpgpkey.fedoraproject.org.pkts b/src/grp-resolve/systemd-resolved/test-data/_openpgpkey.fedoraproject.org.pkts Binary files differindex 15de02e997..15de02e997 100644 --- a/src/resolve/test-data/_openpgpkey.fedoraproject.org.pkts +++ b/src/grp-resolve/systemd-resolved/test-data/_openpgpkey.fedoraproject.org.pkts diff --git a/src/resolve/test-data/fake-caa.pkts b/src/grp-resolve/systemd-resolved/test-data/fake-caa.pkts Binary files differindex 1c3ecc5491..1c3ecc5491 100644 --- a/src/resolve/test-data/fake-caa.pkts +++ b/src/grp-resolve/systemd-resolved/test-data/fake-caa.pkts diff --git a/src/resolve/test-data/fedoraproject.org.pkts b/src/grp-resolve/systemd-resolved/test-data/fedoraproject.org.pkts Binary files differindex 17874844d9..17874844d9 100644 --- a/src/resolve/test-data/fedoraproject.org.pkts +++ b/src/grp-resolve/systemd-resolved/test-data/fedoraproject.org.pkts diff --git a/src/resolve/test-data/gandi.net.pkts b/src/grp-resolve/systemd-resolved/test-data/gandi.net.pkts Binary files differindex 5ef51e0c8e..5ef51e0c8e 100644 --- a/src/resolve/test-data/gandi.net.pkts +++ b/src/grp-resolve/systemd-resolved/test-data/gandi.net.pkts diff --git a/src/resolve/test-data/google.com.pkts b/src/grp-resolve/systemd-resolved/test-data/google.com.pkts Binary files differindex f98c4cd855..f98c4cd855 100644 --- a/src/resolve/test-data/google.com.pkts +++ b/src/grp-resolve/systemd-resolved/test-data/google.com.pkts diff --git a/src/resolve/test-data/kyhwana.org.pkts b/src/grp-resolve/systemd-resolved/test-data/kyhwana.org.pkts Binary files differindex e28a725c9a..e28a725c9a 100644 --- a/src/resolve/test-data/kyhwana.org.pkts +++ b/src/grp-resolve/systemd-resolved/test-data/kyhwana.org.pkts diff --git a/src/resolve/test-data/root.pkts b/src/grp-resolve/systemd-resolved/test-data/root.pkts Binary files differindex 54ba668c75..54ba668c75 100644 --- a/src/resolve/test-data/root.pkts +++ b/src/grp-resolve/systemd-resolved/test-data/root.pkts diff --git a/src/resolve/test-data/sw1a1aa-sw1a2aa-sw1a2ab-sw1a2ac.find.me.uk.pkts b/src/grp-resolve/systemd-resolved/test-data/sw1a1aa-sw1a2aa-sw1a2ab-sw1a2ac.find.me.uk.pkts Binary files differindex a854249532..a854249532 100644 --- a/src/resolve/test-data/sw1a1aa-sw1a2aa-sw1a2ab-sw1a2ac.find.me.uk.pkts +++ b/src/grp-resolve/systemd-resolved/test-data/sw1a1aa-sw1a2aa-sw1a2ab-sw1a2ac.find.me.uk.pkts diff --git a/src/resolve/test-data/teamits.com.pkts b/src/grp-resolve/systemd-resolved/test-data/teamits.com.pkts Binary files differindex 11deb39677..11deb39677 100644 --- a/src/resolve/test-data/teamits.com.pkts +++ b/src/grp-resolve/systemd-resolved/test-data/teamits.com.pkts diff --git a/src/resolve/test-data/zbyszek@fedoraproject.org.pkts b/src/grp-resolve/systemd-resolved/test-data/zbyszek@fedoraproject.org.pkts Binary files differindex f0a6f982df..f0a6f982df 100644 --- a/src/resolve/test-data/zbyszek@fedoraproject.org.pkts +++ b/src/grp-resolve/systemd-resolved/test-data/zbyszek@fedoraproject.org.pkts diff --git a/src/resolve/test-dns-packet.c b/src/grp-resolve/systemd-resolved/test-dns-packet.c index c232a69ce1..c232a69ce1 100644 --- a/src/resolve/test-dns-packet.c +++ b/src/grp-resolve/systemd-resolved/test-dns-packet.c 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 b3018e8239..b3018e8239 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 2d615130e1..2d615130e1 100644 --- a/src/resolve/test-resolve-tables.c +++ b/src/grp-resolve/systemd-resolved/test-resolve-tables.c diff --git a/src/grp-system/Makefile b/src/grp-system/Makefile new file mode 100644 index 0000000000..ea8b031596 --- /dev/null +++ b/src/grp-system/Makefile @@ -0,0 +1,28 @@ +# -*- 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 + +at.subdirs += systemctl systemd + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-system/systemctl/Makefile b/src/grp-system/systemctl/Makefile new file mode 100644 index 0000000000..24585cc12b --- /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 + +rootbin_PROGRAMS += systemctl +systemctl_SOURCES = \ + src/systemctl/systemctl.c + +systemctl_LDADD = \ + libshared.la + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/systemctl/systemctl.c b/src/grp-system/systemctl/systemctl.c index 2480f69a75..c7c00bbbc3 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..cfef258c6d --- /dev/null +++ b/src/grp-system/systemd/Makefile @@ -0,0 +1,71 @@ +# -*- 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 + +rootlibexec_PROGRAMS += systemd +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 + +BUILT_SOURCES += \ + src/core/triggers.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 + +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 5ed8c3d3f5..042cce49dd 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 3c64f20872..3c64f20872 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 db8b7acd78..db8b7acd78 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 0d8c303136..0d8c303136 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 b427f1ef6d..b427f1ef6d 100644 --- a/src/core/user.conf +++ b/src/grp-system/systemd/user.conf diff --git a/src/grp-timedate/Makefile b/src/grp-timedate/Makefile new file mode 100644 index 0000000000..bb8be753da --- /dev/null +++ b/src/grp-timedate/Makefile @@ -0,0 +1,28 @@ +# -*- 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 + +at.subdirs += timedatectl systemd-timedated + +include $(topsrcdir)/build-aux/Makefile.tail.mk 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..798e3ba5a4 --- /dev/null +++ b/src/grp-timedate/systemd-timedated/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_TIMEDATED),) +systemd_timedated_SOURCES = \ + src/timedate/timedated.c + +systemd_timedated_LDADD = \ + libshared.la + +rootlibexec_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 + +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 ffec609c69..51a13fcf49 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..c1be945443 --- /dev/null +++ b/src/grp-timedate/timedatectl/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 + +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 +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/timedate/timedatectl.c b/src/grp-timedate/timedatectl/timedatectl.c index a2270aff46..1fd542fb49 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/udev/.gitignore b/src/grp-udev/.gitignore index f5d8be3dc1..f5d8be3dc1 100644 --- a/src/udev/.gitignore +++ b/src/grp-udev/.gitignore diff --git a/src/udev/.vimrc b/src/grp-udev/.vimrc index 366fbdca4b..366fbdca4b 100644 --- a/src/udev/.vimrc +++ b/src/grp-udev/.vimrc diff --git a/src/grp-udev/Makefile b/src/grp-udev/Makefile new file mode 100644 index 0000000000..cc85f0317f --- /dev/null +++ b/src/grp-udev/Makefile @@ -0,0 +1,72 @@ +# -*- 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_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 + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-udev/ata_id/Makefile b/src/grp-udev/ata_id/Makefile new file mode 100644 index 0000000000..00a8c37ac2 --- /dev/null +++ b/src/grp-udev/ata_id/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 + +ata_id_SOURCES = \ + src/udev/ata_id/ata_id.c + +ata_id_LDADD = \ + libshared.la + +udevlibexec_PROGRAMS += \ + ata_id + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/udev/ata_id/ata_id.c b/src/grp-udev/ata_id/ata_id.c index 1e414664ce..1e414664ce 100644 --- a/src/udev/ata_id/ata_id.c +++ b/src/grp-udev/ata_id/ata_id.c diff --git a/src/grp-udev/cdrom_id/Makefile b/src/grp-udev/cdrom_id/Makefile new file mode 100644 index 0000000000..a9297413d3 --- /dev/null +++ b/src/grp-udev/cdrom_id/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 + +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 + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/udev/cdrom_id/cdrom_id.c b/src/grp-udev/cdrom_id/cdrom_id.c index 72f284f710..72f284f710 100644 --- a/src/udev/cdrom_id/cdrom_id.c +++ b/src/grp-udev/cdrom_id/cdrom_id.c diff --git a/src/grp-udev/collect/Makefile b/src/grp-udev/collect/Makefile new file mode 100644 index 0000000000..60af3b7627 --- /dev/null +++ b/src/grp-udev/collect/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 + +collect_SOURCES = \ + src/udev/collect/collect.c + +collect_LDADD = \ + libshared.la + +udevlibexec_PROGRAMS += \ + collect + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/udev/collect/collect.c b/src/grp-udev/collect/collect.c index 349585b634..349585b634 100644 --- a/src/udev/collect/collect.c +++ b/src/grp-udev/collect/collect.c diff --git a/src/grp-udev/libudev-core/Makefile b/src/grp-udev/libudev-core/Makefile new file mode 100644 index 0000000000..e95d53120a --- /dev/null +++ b/src/grp-udev/libudev-core/Makefile @@ -0,0 +1,101 @@ +# -*- 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 += \ + libudev-core.la + +$(outdir)/keyboard-keys-list.txt: + $(AM_V_GEN)$(CPP) $(ALL_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: $(outdir)/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: $(outdir)/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 + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/udev/net/.gitignore b/src/grp-udev/libudev-core/net/.gitignore index 9ca85bacc9..9ca85bacc9 100644 --- a/src/udev/net/.gitignore +++ b/src/grp-udev/libudev-core/net/.gitignore diff --git a/src/udev/net/ethtool-util.c b/src/grp-udev/libudev-core/net/ethtool-util.c index c00ff79123..c00ff79123 100644 --- a/src/udev/net/ethtool-util.c +++ b/src/grp-udev/libudev-core/net/ethtool-util.c diff --git a/src/udev/net/ethtool-util.h b/src/grp-udev/libudev-core/net/ethtool-util.h index 7716516e76..7716516e76 100644 --- a/src/udev/net/ethtool-util.h +++ b/src/grp-udev/libudev-core/net/ethtool-util.h diff --git a/src/udev/net/link-config-gperf.gperf b/src/grp-udev/libudev-core/net/link-config-gperf.gperf index b25e4b3344..b25e4b3344 100644 --- a/src/udev/net/link-config-gperf.gperf +++ b/src/grp-udev/libudev-core/net/link-config-gperf.gperf diff --git a/src/udev/net/link-config.c b/src/grp-udev/libudev-core/net/link-config.c index c66504102f..350cd24e9c 100644 --- a/src/udev/net/link-config.c +++ b/src/grp-udev/libudev-core/net/link-config.c @@ -19,7 +19,7 @@ #include <netinet/ether.h> -#include "sd-netlink.h" +#include <systemd/sd-netlink.h> #include "alloc-util.h" #include "conf-files.h" diff --git a/src/udev/net/link-config.h b/src/grp-udev/libudev-core/net/link-config.h index 9df5529d05..9df5529d05 100644 --- a/src/udev/net/link-config.h +++ b/src/grp-udev/libudev-core/net/link-config.h diff --git a/src/udev/udev-builtin-blkid.c b/src/grp-udev/libudev-core/udev-builtin-blkid.c index ed0ea5ce5f..62cd93264b 100644 --- a/src/udev/udev-builtin-blkid.c +++ b/src/grp-udev/libudev-core/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-btrfs.c b/src/grp-udev/libudev-core/udev-builtin-btrfs.c index cfaa463804..cfaa463804 100644 --- a/src/udev/udev-builtin-btrfs.c +++ b/src/grp-udev/libudev-core/udev-builtin-btrfs.c diff --git a/src/udev/udev-builtin-hwdb.c b/src/grp-udev/libudev-core/udev-builtin-hwdb.c index f4a065a97d..b96f39ba20 100644 --- a/src/udev/udev-builtin-hwdb.c +++ b/src/grp-udev/libudev-core/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-input_id.c b/src/grp-udev/libudev-core/udev-builtin-input_id.c index 51a55cdbc4..51a55cdbc4 100644 --- a/src/udev/udev-builtin-input_id.c +++ b/src/grp-udev/libudev-core/udev-builtin-input_id.c diff --git a/src/udev/udev-builtin-keyboard.c b/src/grp-udev/libudev-core/udev-builtin-keyboard.c index aa10beafb0..aa10beafb0 100644 --- a/src/udev/udev-builtin-keyboard.c +++ b/src/grp-udev/libudev-core/udev-builtin-keyboard.c diff --git a/src/udev/udev-builtin-kmod.c b/src/grp-udev/libudev-core/udev-builtin-kmod.c index 9665f678fd..9665f678fd 100644 --- a/src/udev/udev-builtin-kmod.c +++ b/src/grp-udev/libudev-core/udev-builtin-kmod.c diff --git a/src/udev/udev-builtin-net_id.c b/src/grp-udev/libudev-core/udev-builtin-net_id.c index a7be2a4eed..a7be2a4eed 100644 --- a/src/udev/udev-builtin-net_id.c +++ b/src/grp-udev/libudev-core/udev-builtin-net_id.c diff --git a/src/udev/udev-builtin-net_setup_link.c b/src/grp-udev/libudev-core/udev-builtin-net_setup_link.c index 8e47775135..8e47775135 100644 --- a/src/udev/udev-builtin-net_setup_link.c +++ b/src/grp-udev/libudev-core/udev-builtin-net_setup_link.c diff --git a/src/udev/udev-builtin-path_id.c b/src/grp-udev/libudev-core/udev-builtin-path_id.c index 6e9adc6e96..6e9adc6e96 100644 --- a/src/udev/udev-builtin-path_id.c +++ b/src/grp-udev/libudev-core/udev-builtin-path_id.c diff --git a/src/udev/udev-builtin-uaccess.c b/src/grp-udev/libudev-core/udev-builtin-uaccess.c index 3ebe36f043..2c27116ae9 100644 --- a/src/udev/udev-builtin-uaccess.c +++ b/src/grp-udev/libudev-core/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/udev-builtin-usb_id.c b/src/grp-udev/libudev-core/udev-builtin-usb_id.c index 587649eff0..587649eff0 100644 --- a/src/udev/udev-builtin-usb_id.c +++ b/src/grp-udev/libudev-core/udev-builtin-usb_id.c diff --git a/src/udev/udev-builtin.c b/src/grp-udev/libudev-core/udev-builtin.c index e6b36f124f..e6b36f124f 100644 --- a/src/udev/udev-builtin.c +++ b/src/grp-udev/libudev-core/udev-builtin.c diff --git a/src/udev/udev-ctrl.c b/src/grp-udev/libudev-core/udev-ctrl.c index f68a09d7a8..f68a09d7a8 100644 --- a/src/udev/udev-ctrl.c +++ b/src/grp-udev/libudev-core/udev-ctrl.c diff --git a/src/udev/udev-event.c b/src/grp-udev/libudev-core/udev-event.c index 8d601c9c2c..8d601c9c2c 100644 --- a/src/udev/udev-event.c +++ b/src/grp-udev/libudev-core/udev-event.c diff --git a/src/udev/udev-node.c b/src/grp-udev/libudev-core/udev-node.c index 5d2997fd8f..5d2997fd8f 100644 --- a/src/udev/udev-node.c +++ b/src/grp-udev/libudev-core/udev-node.c diff --git a/src/udev/udev-rules.c b/src/grp-udev/libudev-core/udev-rules.c index 26fa52cf6c..26fa52cf6c 100644 --- a/src/udev/udev-rules.c +++ b/src/grp-udev/libudev-core/udev-rules.c diff --git a/src/udev/udev-watch.c b/src/grp-udev/libudev-core/udev-watch.c index 9ce5e975de..9ce5e975de 100644 --- a/src/udev/udev-watch.c +++ b/src/grp-udev/libudev-core/udev-watch.c diff --git a/src/udev/udev.conf b/src/grp-udev/libudev-core/udev.conf index 47d1433002..47d1433002 100644 --- a/src/udev/udev.conf +++ b/src/grp-udev/libudev-core/udev.conf diff --git a/src/udev/udev.pc.in b/src/grp-udev/libudev-core/udev.pc.in index a0c2e82d47..a0c2e82d47 100644 --- a/src/udev/udev.pc.in +++ b/src/grp-udev/libudev-core/udev.pc.in diff --git a/src/grp-udev/mtd_probe/Makefile b/src/grp-udev/mtd_probe/Makefile new file mode 100644 index 0000000000..d7392a8a3b --- /dev/null +++ b/src/grp-udev/mtd_probe/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 + +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 + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/udev/mtd_probe/mtd_probe.c b/src/grp-udev/mtd_probe/mtd_probe.c index 462fab7623..462fab7623 100644 --- a/src/udev/mtd_probe/mtd_probe.c +++ b/src/grp-udev/mtd_probe/mtd_probe.c diff --git a/src/udev/mtd_probe/mtd_probe.h b/src/grp-udev/mtd_probe/mtd_probe.h index 68e4954537..68e4954537 100644 --- a/src/udev/mtd_probe/mtd_probe.h +++ b/src/grp-udev/mtd_probe/mtd_probe.h diff --git a/src/udev/mtd_probe/probe_smartmedia.c b/src/grp-udev/mtd_probe/probe_smartmedia.c index 2a7ba17637..2a7ba17637 100644 --- a/src/udev/mtd_probe/probe_smartmedia.c +++ b/src/grp-udev/mtd_probe/probe_smartmedia.c diff --git a/src/udev/scsi_id/.gitignore b/src/grp-udev/scsi_id/.gitignore index 6aebddd809..6aebddd809 100644 --- a/src/udev/scsi_id/.gitignore +++ b/src/grp-udev/scsi_id/.gitignore diff --git a/src/grp-udev/scsi_id/Makefile b/src/grp-udev/scsi_id/Makefile new file mode 100644 index 0000000000..7064a864f7 --- /dev/null +++ b/src/grp-udev/scsi_id/Makefile @@ -0,0 +1,41 @@ +# -*- 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 + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/udev/scsi_id/README b/src/grp-udev/scsi_id/README index 9cfe73991c..9cfe73991c 100644 --- a/src/udev/scsi_id/README +++ b/src/grp-udev/scsi_id/README diff --git a/src/udev/scsi_id/scsi.h b/src/grp-udev/scsi_id/scsi.h index a27a84a40a..a27a84a40a 100644 --- a/src/udev/scsi_id/scsi.h +++ b/src/grp-udev/scsi_id/scsi.h diff --git a/src/udev/scsi_id/scsi_id.c b/src/grp-udev/scsi_id/scsi_id.c index 4655691642..4655691642 100644 --- a/src/udev/scsi_id/scsi_id.c +++ b/src/grp-udev/scsi_id/scsi_id.c diff --git a/src/udev/scsi_id/scsi_id.h b/src/grp-udev/scsi_id/scsi_id.h index 5c2e1c28ee..5c2e1c28ee 100644 --- a/src/udev/scsi_id/scsi_id.h +++ b/src/grp-udev/scsi_id/scsi_id.h diff --git a/src/udev/scsi_id/scsi_serial.c b/src/grp-udev/scsi_id/scsi_serial.c index e079e28698..e079e28698 100644 --- a/src/udev/scsi_id/scsi_serial.c +++ b/src/grp-udev/scsi_id/scsi_serial.c diff --git a/src/grp-udev/systemd-udevd/Makefile b/src/grp-udev/systemd-udevd/Makefile new file mode 100644 index 0000000000..5bbc548cfe --- /dev/null +++ b/src/grp-udev/systemd-udevd/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 + +rootlibexec_PROGRAMS += \ + systemd-udevd + +systemd_udevd_SOURCES = \ + src/udev/udevd.c + +systemd_udevd_LDADD = \ + libudev-core.la + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/udev/udevd.c b/src/grp-udev/systemd-udevd/udevd.c index e9dd2f47c7..89006e6e3a 100644 --- a/src/udev/udevd.c +++ b/src/grp-udev/systemd-udevd/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/grp-udev/udevadm/Makefile b/src/grp-udev/udevadm/Makefile new file mode 100644 index 0000000000..ba3b466935 --- /dev/null +++ b/src/grp-udev/udevadm/Makefile @@ -0,0 +1,45 @@ +# -*- 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 + +rootbin_PROGRAMS += \ + udevadm + +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 + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/udev/udevadm-control.c b/src/grp-udev/udevadm/udevadm-control.c index 989decbe95..989decbe95 100644 --- a/src/udev/udevadm-control.c +++ b/src/grp-udev/udevadm/udevadm-control.c diff --git a/src/udev/udevadm-hwdb.c b/src/grp-udev/udevadm/udevadm-hwdb.c index 948ad0f5a5..948ad0f5a5 100644 --- a/src/udev/udevadm-hwdb.c +++ b/src/grp-udev/udevadm/udevadm-hwdb.c diff --git a/src/udev/udevadm-info.c b/src/grp-udev/udevadm/udevadm-info.c index 7182668f23..7182668f23 100644 --- a/src/udev/udevadm-info.c +++ b/src/grp-udev/udevadm/udevadm-info.c diff --git a/src/udev/udevadm-monitor.c b/src/grp-udev/udevadm/udevadm-monitor.c index c0ef073476..c0ef073476 100644 --- a/src/udev/udevadm-monitor.c +++ b/src/grp-udev/udevadm/udevadm-monitor.c diff --git a/src/udev/udevadm-settle.c b/src/grp-udev/udevadm/udevadm-settle.c index 6a5dc6e9e4..6a5dc6e9e4 100644 --- a/src/udev/udevadm-settle.c +++ b/src/grp-udev/udevadm/udevadm-settle.c diff --git a/src/udev/udevadm-test-builtin.c b/src/grp-udev/udevadm/udevadm-test-builtin.c index 0b180d03eb..0b180d03eb 100644 --- a/src/udev/udevadm-test-builtin.c +++ b/src/grp-udev/udevadm/udevadm-test-builtin.c diff --git a/src/udev/udevadm-test.c b/src/grp-udev/udevadm/udevadm-test.c index 702dbe5282..702dbe5282 100644 --- a/src/udev/udevadm-test.c +++ b/src/grp-udev/udevadm/udevadm-test.c diff --git a/src/udev/udevadm-trigger.c b/src/grp-udev/udevadm/udevadm-trigger.c index 9d52345d92..9d52345d92 100644 --- a/src/udev/udevadm-trigger.c +++ b/src/grp-udev/udevadm/udevadm-trigger.c diff --git a/src/udev/udevadm-util.c b/src/grp-udev/udevadm/udevadm-util.c index 3539c1d6ab..3539c1d6ab 100644 --- a/src/udev/udevadm-util.c +++ b/src/grp-udev/udevadm/udevadm-util.c diff --git a/src/udev/udevadm-util.h b/src/grp-udev/udevadm/udevadm-util.h index dc712b0d93..dc712b0d93 100644 --- a/src/udev/udevadm-util.h +++ b/src/grp-udev/udevadm/udevadm-util.h diff --git a/src/udev/udevadm.c b/src/grp-udev/udevadm/udevadm.c index a6a873e5de..a6a873e5de 100644 --- a/src/udev/udevadm.c +++ b/src/grp-udev/udevadm/udevadm.c diff --git a/src/grp-udev/v4l_id/Makefile b/src/grp-udev/v4l_id/Makefile new file mode 100644 index 0000000000..0641af8065 --- /dev/null +++ b/src/grp-udev/v4l_id/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 + +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 + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/udev/v4l_id/v4l_id.c b/src/grp-udev/v4l_id/v4l_id.c index aec6676a33..aec6676a33 100644 --- a/src/udev/v4l_id/v4l_id.c +++ b/src/grp-udev/v4l_id/v4l_id.c 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 deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/hostname/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile
\ No newline at end of file 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 deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/import/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile
\ No newline at end of file diff --git a/src/initctl/Makefile b/src/initctl/Makefile deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/initctl/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile
\ No newline at end of file diff --git a/src/journal-remote/Makefile b/src/journal-remote/Makefile deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/journal-remote/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile
\ No newline at end of file diff --git a/src/journal/Makefile b/src/journal/Makefile deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/journal/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile
\ No newline at end of file diff --git a/src/kernel-install/Makefile b/src/kernel-install/Makefile index d0b0e8e008..d50b684d01 120000..100644 --- a/src/kernel-install/Makefile +++ b/src/kernel-install/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 + +dist_bin_SCRIPTS = \ + src/kernel-install/kernel-install + +dist_kernelinstall_SCRIPTS = \ + src/kernel-install/50-depmod.install \ + src/kernel-install/90-loaderentry.install + +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..9f8d4ec995 --- /dev/null +++ b/src/libbasic/Makefile @@ -0,0 +1,279 @@ +# -*- 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/missing_syscall.h \ + src/basic/capability-util.c \ + src/basic/capability-util.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/architecture.c \ + src/basic/architecture.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/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 <$< >$@ + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/basic/MurmurHash2.c b/src/libbasic/MurmurHash2.c index 9020793930..9020793930 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 6a4cc03839..6a4cc03839 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 ceeee519b7..ceeee519b7 100644 --- a/src/basic/alloc-util.h +++ b/src/libbasic/alloc-util.h diff --git a/src/basic/architecture.c b/src/libbasic/architecture.c index b1c8e91f50..b1c8e91f50 100644 --- a/src/basic/architecture.c +++ b/src/libbasic/architecture.c diff --git a/src/basic/architecture.h b/src/libbasic/architecture.h index b3e4d85906..b3e4d85906 100644 --- a/src/basic/architecture.h +++ b/src/libbasic/architecture.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 1d852d502c..db431f5b74 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/calendarspec.c b/src/libbasic/calendarspec.c index 6e0bab9b94..6e0bab9b94 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 7cdc97ee3c..7cdc97ee3c 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 4bb5291296..4bb5291296 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 7fe8d35ea5..7fe8d35ea5 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 8830cd2f38..8830cd2f38 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 c3586728d0..c3586728d0 100644 --- a/src/basic/copy.c +++ b/src/libbasic/copy.c diff --git a/src/basic/copy.h b/src/libbasic/copy.h index b5d08ebafe..b5d08ebafe 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 1a7a0f4928..1a7a0f4928 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 59067121b7..59067121b7 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 b91d04908f..b91d04908f 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 01daf11ce7..01daf11ce7 100644 --- a/src/basic/escape.c +++ b/src/libbasic/escape.c diff --git a/src/basic/escape.h b/src/libbasic/escape.h index deaa4def28..deaa4def28 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 5697e8d132..5697e8d132 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 74e125a95f..74e125a95f 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 92fa5ace61..92fa5ace61 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 1208c8feed..1208c8feed 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 d6c1228463..d6c1228463 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 8b466cff15..8b466cff15 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 b86e41698a..b86e41698a 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 527f27bc67..b52bf1ad05 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 16efe5bdf2..16efe5bdf2 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 29f5374222..29f5374222 100644 --- a/src/basic/fileio.c +++ b/src/libbasic/fileio.c diff --git a/src/basic/fileio.h b/src/libbasic/fileio.h index 58dbc80c24..58dbc80c24 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 9b4e8e98fa..9b4e8e98fa 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 e24e7036f7..e24e7036f7 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 517b599d6f..517b599d6f 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 5975bc8fc9..5975bc8fc9 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 49a0479592..49a0479592 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 c5bda6c4d6..c5bda6c4d6 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 13c3bb6446..13c3bb6446 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 7af4e6c7ec..7af4e6c7ec 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 cc6dfa8c1b..cc6dfa8c1b 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 4684ed3bfc..4684ed3bfc 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/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 5962aa4211..5962aa4211 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 ada0a28cd8..ada0a28cd8 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 0630a034ab..0630a034ab 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 3ea643b6e6..05c4896f55 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 b6356228d9..d2a22b5829 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 b01ee25c88..b01ee25c88 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 e41aa4260f..e41aa4260f 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 0618b8dd22..0618b8dd22 100644 --- a/src/basic/mempool.h +++ b/src/libbasic/mempool.h diff --git a/src/basic/missing.h b/src/libbasic/missing.h index 651e414395..651e414395 100644 --- a/src/basic/missing.h +++ b/src/libbasic/missing.h diff --git a/src/basic/missing_syscall.h b/src/libbasic/missing_syscall.h index d502d3b9ca..d502d3b9ca 100644 --- a/src/basic/missing_syscall.h +++ b/src/libbasic/missing_syscall.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 ba698959b7..ba698959b7 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 bf7c4854fc..bf7c4854fc 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 6c11b605a9..6c11b605a9 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 7dc579a159..7dc579a159 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 b2fa81a294..b2fa81a294 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 a27c13fcc3..a27c13fcc3 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 1ad8816206..1ad8816206 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 9f75088796..9f75088796 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 ee063720ed..ee063720ed 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 f693a5bb7c..f693a5bb7c 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 10c2f39369..10c2f39369 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 ce6bc8e44c..ce6bc8e44c 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 e0d9dd001c..e0d9dd001c 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 980243d9ce..980243d9ce 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 280b5c3251..280b5c3251 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 dfd6eb564d..dfd6eb564d 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 6d1dc83874..6d1dc83874 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 c8769a54f4..c8769a54f4 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 e9230e4a9f..e9230e4a9f 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 084d3dfa23..084d3dfa23 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 bd1144b4c9..bd1144b4c9 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 4bef87d3c2..4bef87d3c2 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 d88625fca7..d88625fca7 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 293a15f9c0..293a15f9c0 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 139cc8c91b..139cc8c91b 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 97a96e5762..97a96e5762 100644 --- a/src/basic/strv.c +++ b/src/libbasic/strv.c diff --git a/src/basic/strv.h b/src/libbasic/strv.h index f61bbb5386..f61bbb5386 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 9521b79daa..9521b79daa 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 edd9179cb8..edd9179cb8 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 a5e3f567ec..a5e3f567ec 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 f65ca3edaa..f65ca3edaa 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 8026eca3f4..8026eca3f4 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 6eae2b983d..6eae2b983d 100644 --- a/src/basic/utf8.c +++ b/src/libbasic/utf8.c diff --git a/src/basic/utf8.h b/src/libbasic/utf8.h index f9b9c9468b..f9b9c9468b 100644 --- a/src/basic/utf8.h +++ b/src/libbasic/utf8.h diff --git a/src/basic/util.c b/src/libbasic/util.c index 756c663be4..756c663be4 100644 --- a/src/basic/util.c +++ b/src/libbasic/util.c diff --git a/src/basic/util.h b/src/libbasic/util.h index 1c032c15c9..1c032c15c9 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 dace1f4328..dace1f4328 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 8256899eda..8256899eda 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/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..f40a115042 --- /dev/null +++ b/src/libcore/Makefile @@ -0,0 +1,170 @@ +# -*- 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-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 ";" }' < $< > $@ + +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 f06d837e30..f06d837e30 100644 --- a/src/core/automount.c +++ b/src/libcore/automount.c diff --git a/src/core/automount.h b/src/libcore/automount.h index 76a201178e..76a201178e 100644 --- a/src/core/automount.h +++ b/src/libcore/automount.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 f03a95c24e..f03a95c24e 100644 --- a/src/core/busname.c +++ b/src/libcore/busname.c diff --git a/src/core/busname.h b/src/libcore/busname.h index a8562db458..a8562db458 100644 --- a/src/core/busname.h +++ b/src/libcore/busname.h diff --git a/src/core/cgroup.c b/src/libcore/cgroup.c index 0fb63b1bd1..0fb63b1bd1 100644 --- a/src/core/cgroup.c +++ b/src/libcore/cgroup.c diff --git a/src/core/cgroup.h b/src/libcore/cgroup.h index 2b1edbafc4..2b1edbafc4 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 eef1c47c14..eef1c47c14 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 06943c6365..06943c6365 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 ccf7453d47..1d739787bb 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 0f54c6b84b..0f54c6b84b 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 86722e1162..86722e1162 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 961340608d..961340608d 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 a0e61b023e..a0e61b023e 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 e912fe2192..dcd8db0898 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 4db88dbebc..758045a47c 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 3422a02d68..1b217da303 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 6baaffbd75..6baaffbd75 100644 --- a/src/core/dbus.h +++ b/src/libcore/dbus.h diff --git a/src/core/device.c b/src/libcore/device.c index 16e56efcc3..16e56efcc3 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 5eb3f13695..b58fb80be2 100644 --- a/src/core/execute.c +++ b/src/libcore/execute.c @@ -49,7 +49,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 41148bcea2..41148bcea2 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 ddae46190f..ddae46190f 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 d1b0ce76ef..d1b0ce76ef 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 472b58cb00..472b58cb00 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 7557874d4d..42fdcb988a 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 d359e8bb3e..68c2089b91 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 f83fa09301..f83fa09301 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 942d26724e..942d26724e 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 8193418980..8193418980 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 86b4fb071b..86b4fb071b 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 b36a2e3a02..b36a2e3a02 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 0145fe2894..812e4b038c 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 7838f56fd2..831fdbaabf 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 6ed15c1a41..70d79ce549 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 40fc548b42..40fc548b42 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 665a60bb55..7db9d1325b 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 da529c44f4..da529c44f4 100644 --- a/src/core/mount.h +++ b/src/libcore/mount.h diff --git a/src/core/namespace.c b/src/libcore/namespace.c index 203d122810..203d122810 100644 --- a/src/core/namespace.c +++ b/src/libcore/namespace.c diff --git a/src/core/namespace.h b/src/libcore/namespace.h index b54b7b47d6..b54b7b47d6 100644 --- a/src/core/namespace.h +++ b/src/libcore/namespace.h diff --git a/src/core/path.c b/src/libcore/path.c index 0dd0d375d8..0dd0d375d8 100644 --- a/src/core/path.c +++ b/src/libcore/path.c diff --git a/src/core/path.h b/src/libcore/path.h index 4230c8fb99..4230c8fb99 100644 --- a/src/core/path.h +++ b/src/libcore/path.h diff --git a/src/core/scope.c b/src/libcore/scope.c index 238f63a729..238f63a729 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 cc287d602d..2c04fb0a8f 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 4072df58e6..4072df58e6 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 7ebabca5d6..7ebabca5d6 100644 --- a/src/core/service.c +++ b/src/libcore/service.c diff --git a/src/core/service.h b/src/libcore/service.h index 4af3d40439..4af3d40439 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/slice.c b/src/libcore/slice.c index c7700b8857..c7700b8857 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 5a6d11cfa1..5a6d11cfa1 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 f6204d04bf..f6204d04bf 100644 --- a/src/core/socket.c +++ b/src/libcore/socket.c diff --git a/src/core/socket.h b/src/libcore/socket.h index 0f1ac69c6f..0f1ac69c6f 100644 --- a/src/core/socket.h +++ b/src/libcore/socket.h diff --git a/src/core/swap.c b/src/libcore/swap.c index a532b15be8..a532b15be8 100644 --- a/src/core/swap.c +++ b/src/libcore/swap.c diff --git a/src/core/swap.h b/src/libcore/swap.h index fbf66debdc..fbf66debdc 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 3206296f09..3206296f09 100644 --- a/src/core/timer.c +++ b/src/libcore/timer.c diff --git a/src/core/timer.h b/src/libcore/timer.h index 9c4b64f898..9c4b64f898 100644 --- a/src/core/timer.h +++ b/src/libcore/timer.h diff --git a/src/core/transaction.c b/src/libcore/transaction.c index e06a48a2f1..e06a48a2f1 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/unit-printf.c b/src/libcore/unit-printf.c index f11df42af3..f11df42af3 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 2fff3f2d8b..8bd39f87f9 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 08a927962d..08a927962d 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..ced0f7e476 --- /dev/null +++ b/src/libfirewall/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 + +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 + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/shared/firewall-util.c b/src/libfirewall/firewall-util.c index f73108eaa3..f73108eaa3 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..1d5dbd394d --- /dev/null +++ b/src/libshared/Makefile @@ -0,0 +1,143 @@ +# -*- 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/output-mode.c \ + 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/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 \ + src/shared/bus-unit-util.c \ + src/shared/bus-unit-util.h \ + src/shared/tests.h \ + src/shared/tests.c + +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) + +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 6779691c28..6779691c28 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/ask-password-api.c b/src/libshared/ask-password-api.c index 4a4bd8d3b8..4a4bd8d3b8 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-unit-util.c b/src/libshared/bus-unit-util.c index f68c4a41ac..f68c4a41ac 100644 --- a/src/shared/bus-unit-util.c +++ b/src/libshared/bus-unit-util.c diff --git a/src/shared/bus-unit-util.h b/src/libshared/bus-unit-util.h index c0c172f336..8327189a63 100644 --- a/src/shared/bus-unit-util.h +++ b/src/libshared/bus-unit-util.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 "output-mode.h" #include "install.h" diff --git a/src/shared/bus-util.c b/src/libshared/bus-util.c index 4efbf3710f..62b5585e84 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 d792258ecd..f2b46530ba 100644 --- a/src/shared/bus-util.h +++ b/src/libshared/bus-util.h @@ -24,8 +24,8 @@ #include <stdint.h> #include <sys/types.h> -#include "sd-bus.h" -#include "sd-event.h" +#include <systemd/sd-bus.h> +#include <systemd/sd-event.h> #include "hashmap.h" #include "macro.h" diff --git a/src/shared/cgroup-show.c b/src/libshared/cgroup-show.c index 3e451db715..3e451db715 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 5c1d6e6d98..5c1d6e6d98 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 3a45ed265c..33ca6e029e 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 83be79a4f5..83be79a4f5 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 f6964e3fd4..f6964e3fd4 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 835557c6b2..835557c6b2 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 af780f0b8b..af780f0b8b 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 b9cd952ac8..b9cd952ac8 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/gcrypt-util.c b/src/libshared/gcrypt-util.c index 39b544b6f0..39b544b6f0 100644 --- a/src/shared/gcrypt-util.c +++ b/src/libshared/gcrypt-util.c diff --git a/src/shared/gcrypt-util.h b/src/libshared/gcrypt-util.h index cf33b3c59c..cf33b3c59c 100644 --- a/src/shared/gcrypt-util.h +++ b/src/libshared/gcrypt-util.h diff --git a/src/shared/generator.c b/src/libshared/generator.c index 70afc6a285..70afc6a285 100644 --- a/src/shared/generator.c +++ b/src/libshared/generator.c diff --git a/src/shared/generator.h b/src/libshared/generator.h index a6017c1b76..a6017c1b76 100644 --- a/src/shared/generator.h +++ b/src/libshared/generator.h diff --git a/src/shared/gpt.h b/src/libshared/gpt.h index 55b41bbcd8..07153b51f4 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 8a570fc265..8a570fc265 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 64d66a45d3..64d66a45d3 100644 --- a/src/shared/install.c +++ b/src/libshared/install.c diff --git a/src/shared/install.h b/src/libshared/install.h index c6aa4f6ef1..c6aa4f6ef1 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 9351b85eed..294fa3bede 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 6643440881..15fe5b6e5c 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 529d89ee2a..529d89ee2a 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 7410168c4f..7410168c4f 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 23890c63a0..c36efa0102 100644 --- a/src/shared/machine-pool.c +++ b/src/libshared/machine-pool.c @@ -33,8 +33,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.c b/src/libshared/output-mode.c index bec53ee0ae..bec53ee0ae 100644 --- a/src/shared/output-mode.c +++ b/src/libshared/output-mode.c diff --git a/src/shared/output-mode.h b/src/libshared/output-mode.h index f37189e57f..f37189e57f 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 c16bc027be..c16bc027be 100644 --- a/src/shared/pager.c +++ b/src/libshared/pager.c diff --git a/src/shared/pager.h b/src/libshared/pager.h index 893e1d2bb6..893e1d2bb6 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 ca593b6963..ca593b6963 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 f9bb2fe237..f9bb2fe237 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 02c03b98d8..9629b50ed9 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 f00624d0f2..f00624d0f2 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 ad10039ff4..ad10039ff4 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 7dae4d14fe..7dae4d14fe 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/tests.c b/src/libshared/tests.c index 409116290d..409116290d 100644 --- a/src/shared/tests.c +++ b/src/libshared/tests.c diff --git a/src/shared/tests.h b/src/libshared/tests.h index 93f09013a1..93f09013a1 100644 --- a/src/shared/tests.h +++ b/src/libshared/tests.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 b6ec474390..b6ec474390 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..6b16906c17 120000..100644 --- a/src/libsystemd-network/Makefile +++ b/src/libsystemd-network/Makefile @@ -1 +1,173 @@ -../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-internal.h \ + src/libsystemd-network/lldp-network.h \ + src/libsystemd-network/lldp-network.c \ + src/libsystemd-network/lldp-neighbor.h \ + src/libsystemd-network/lldp-neighbor.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/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 + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/libsystemd-network/dhcp-identifier.c b/src/libsystemd-network/dhcp-identifier.c index a21efc4d06..906d960171 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 1cc0f9fb71..802a0d6bc2 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 4662b0d847..dda4c13919 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 0c76956fad..7ba1e72155 100644 --- a/src/libsystemd-network/dhcp-server-internal.h +++ b/src/libsystemd-network/dhcp-server-internal.h @@ -20,8 +20,8 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#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 945c3b9721..4228053ade 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 5462e03476..0ae381ad22 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.h b/src/libsystemd-network/lldp-internal.h index 7592bc4305..a6be995e3b 100644 --- a/src/libsystemd-network/lldp-internal.h +++ b/src/libsystemd-network/lldp-internal.h @@ -20,8 +20,8 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-event.h" -#include "sd-lldp.h" +#include <systemd/sd-event.h> +#include <systemd/sd-lldp.h> #include "hashmap.h" #include "log.h" diff --git a/src/libsystemd-network/lldp-neighbor.h b/src/libsystemd-network/lldp-neighbor.h index f203bfa604..050159ab73 100644 --- a/src/libsystemd-network/lldp-neighbor.h +++ b/src/libsystemd-network/lldp-neighbor.h @@ -23,7 +23,7 @@ #include <stdbool.h> #include <sys/types.h> -#include "sd-lldp.h" +#include <systemd/sd-lldp.h> #include "hash-funcs.h" #include "lldp-internal.h" diff --git a/src/libsystemd-network/lldp-network.h b/src/libsystemd-network/lldp-network.h index c4cf8c79f1..43ed54b3b2 100644 --- a/src/libsystemd-network/lldp-network.h +++ b/src/libsystemd-network/lldp-network.h @@ -20,6 +20,6 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-event.h" +#include <systemd/sd-event.h> int lldp_network_bind_raw_socket(int ifindex); diff --git a/src/libsystemd-network/network-internal.c b/src/libsystemd-network/network-internal.c index 046b0f9393..d57baf8fff 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 5bcd577167..1cafb0747f 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 ad79c6cc2c..193f31880f 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 ef50ed17a1..d4c680d485 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 fb335337c4..5e8b4e4823 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 05972e01c9..2760b039ba 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 cc7436db6b..f1ed7ca747 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 2a06418c53..fc27408989 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 9d4587c80e..5a7380cd3f 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 fb4ef55673..1c0d300cb3 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 1aae2253c0..8c6d214d6f 100644 --- a/src/libsystemd-network/test-lldp.c +++ b/src/libsystemd-network/test-lldp.c @@ -24,8 +24,8 @@ #include <string.h> #include <unistd.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..2c6505918b 120000..100644 --- a/src/libsystemd/Makefile +++ b/src/libsystemd/Makefile @@ -1 +1,110 @@ -../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=15 +LIBSYSTEMD_REVISION=0 +LIBSYSTEMD_AGE=15 + +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=$(srcdir)/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-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 + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/systemd/_sd-common.h b/src/libsystemd/include/systemd/_sd-common.h index 3bb886be75..3bb886be75 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 623cee0c50..623cee0c50 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 e8f84eb545..2b684b5678 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 295989cd69..3c1b4b97a4 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 c1d07561d7..c1d07561d7 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 20b8c2873f..f7bd5c4b7a 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 d4517a26d6..bbb2bb203c 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 90f62eaca4..6bcd9862c9 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 531ace1c34..531ace1c34 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 4dff0b9b81..4dff0b9b81 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 9e3e14a30c..93db7a4a6c 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 6fa38a2243..9167623167 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 9c36b27157..3e61feb81f 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 5772d5794a..391e7c2a2e 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 e3ecbd8378..e3ecbd8378 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 3c44d63021..1865e0492f 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 29bcbe8e3e..c77a435d17 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 3ae110c080..c4cefe4e30 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 0f13e2bae7..0f13e2bae7 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 1c792dab39..fe3b910671 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/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/libsystemd/src/Makefile b/src/libsystemd/src/Makefile new file mode 100644 index 0000000000..dceadf81da --- /dev/null +++ b/src/libsystemd/src/Makefile @@ -0,0 +1,329 @@ +# -*- 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_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 + +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 \ + src/shared/gcrypt-util.h \ + src/shared/gcrypt-util.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 +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/libsystemd/sd-bus/DIFFERENCES b/src/libsystemd/src/sd-bus/DIFFERENCES index db269675a7..db269675a7 100644 --- a/src/libsystemd/sd-bus/DIFFERENCES +++ b/src/libsystemd/src/sd-bus/DIFFERENCES diff --git a/src/libsystemd/sd-bus/GVARIANT-SERIALIZATION b/src/libsystemd/src/sd-bus/GVARIANT-SERIALIZATION index 6aeb11364a..6aeb11364a 100644 --- a/src/libsystemd/sd-bus/GVARIANT-SERIALIZATION +++ b/src/libsystemd/src/sd-bus/GVARIANT-SERIALIZATION diff --git a/src/libsystemd/sd-bus/PORTING-DBUS1 b/src/libsystemd/src/sd-bus/PORTING-DBUS1 index 2dedb28bcf..2dedb28bcf 100644 --- a/src/libsystemd/sd-bus/PORTING-DBUS1 +++ b/src/libsystemd/src/sd-bus/PORTING-DBUS1 diff --git a/src/libsystemd/sd-bus/bus-bloom.c b/src/libsystemd/src/sd-bus/bus-bloom.c index 112769fcb6..112769fcb6 100644 --- a/src/libsystemd/sd-bus/bus-bloom.c +++ b/src/libsystemd/src/sd-bus/bus-bloom.c diff --git a/src/libsystemd/sd-bus/bus-bloom.h b/src/libsystemd/src/sd-bus/bus-bloom.h index c824622b95..c824622b95 100644 --- a/src/libsystemd/sd-bus/bus-bloom.h +++ b/src/libsystemd/src/sd-bus/bus-bloom.h diff --git a/src/libsystemd/sd-bus/bus-common-errors.c b/src/libsystemd/src/sd-bus/bus-common-errors.c index 02e3bf904c..a19e98e94b 100644 --- a/src/libsystemd/sd-bus/bus-common-errors.c +++ b/src/libsystemd/src/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/src/sd-bus/bus-common-errors.h index c8f369cb78..c8f369cb78 100644 --- a/src/libsystemd/sd-bus/bus-common-errors.h +++ b/src/libsystemd/src/sd-bus/bus-common-errors.h diff --git a/src/libsystemd/sd-bus/bus-container.c b/src/libsystemd/src/sd-bus/bus-container.c index 3191d27ded..3191d27ded 100644 --- a/src/libsystemd/sd-bus/bus-container.c +++ b/src/libsystemd/src/sd-bus/bus-container.c diff --git a/src/libsystemd/sd-bus/bus-container.h b/src/libsystemd/src/sd-bus/bus-container.h index 509ef45624..5cd6d15ede 100644 --- a/src/libsystemd/sd-bus/bus-container.h +++ b/src/libsystemd/src/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/src/sd-bus/bus-control.c index 52128e7b5c..00de530d58 100644 --- a/src/libsystemd/sd-bus/bus-control.c +++ b/src/libsystemd/src/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/src/sd-bus/bus-control.h index c181aa7959..229c95efb0 100644 --- a/src/libsystemd/sd-bus/bus-control.h +++ b/src/libsystemd/src/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/src/sd-bus/bus-convenience.c index 2d06bf541f..2d06bf541f 100644 --- a/src/libsystemd/sd-bus/bus-convenience.c +++ b/src/libsystemd/src/sd-bus/bus-convenience.c diff --git a/src/libsystemd/sd-bus/bus-creds.c b/src/libsystemd/src/sd-bus/bus-creds.c index c4f693dee9..c4f693dee9 100644 --- a/src/libsystemd/sd-bus/bus-creds.c +++ b/src/libsystemd/src/sd-bus/bus-creds.c diff --git a/src/libsystemd/sd-bus/bus-creds.h b/src/libsystemd/src/sd-bus/bus-creds.h index df8a1f1005..3e2311f91d 100644 --- a/src/libsystemd/sd-bus/bus-creds.h +++ b/src/libsystemd/src/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/src/sd-bus/bus-dump.c index 21a6b20a11..21a6b20a11 100644 --- a/src/libsystemd/sd-bus/bus-dump.c +++ b/src/libsystemd/src/sd-bus/bus-dump.c diff --git a/src/libsystemd/sd-bus/bus-dump.h b/src/libsystemd/src/sd-bus/bus-dump.h index 874e86d09c..68fa043786 100644 --- a/src/libsystemd/sd-bus/bus-dump.h +++ b/src/libsystemd/src/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/src/sd-bus/bus-error.c index 26219bdeed..b6bb0c4a83 100644 --- a/src/libsystemd/sd-bus/bus-error.c +++ b/src/libsystemd/src/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/src/sd-bus/bus-error.h index e2c4cf4b3f..b7aedf406d 100644 --- a/src/libsystemd/sd-bus/bus-error.h +++ b/src/libsystemd/src/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/src/sd-bus/bus-gvariant.c index 58782767fa..58782767fa 100644 --- a/src/libsystemd/sd-bus/bus-gvariant.c +++ b/src/libsystemd/src/sd-bus/bus-gvariant.c diff --git a/src/libsystemd/sd-bus/bus-gvariant.h b/src/libsystemd/src/sd-bus/bus-gvariant.h index 6da637fb05..6da637fb05 100644 --- a/src/libsystemd/sd-bus/bus-gvariant.h +++ b/src/libsystemd/src/sd-bus/bus-gvariant.h diff --git a/src/libsystemd/sd-bus/bus-internal.c b/src/libsystemd/src/sd-bus/bus-internal.c index caca679086..caca679086 100644 --- a/src/libsystemd/sd-bus/bus-internal.c +++ b/src/libsystemd/src/sd-bus/bus-internal.c diff --git a/src/libsystemd/sd-bus/bus-internal.h b/src/libsystemd/src/sd-bus/bus-internal.h index 216d9f62bc..8c4c6fa772 100644 --- a/src/libsystemd/sd-bus/bus-internal.h +++ b/src/libsystemd/src/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/src/sd-bus/bus-introspect.c index 8f93edb8da..8f93edb8da 100644 --- a/src/libsystemd/sd-bus/bus-introspect.c +++ b/src/libsystemd/src/sd-bus/bus-introspect.c diff --git a/src/libsystemd/sd-bus/bus-introspect.h b/src/libsystemd/src/sd-bus/bus-introspect.h index 8e2f3800ca..87ac03b26a 100644 --- a/src/libsystemd/sd-bus/bus-introspect.h +++ b/src/libsystemd/src/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/src/sd-bus/bus-kernel.c index 59398b841d..59398b841d 100644 --- a/src/libsystemd/sd-bus/bus-kernel.c +++ b/src/libsystemd/src/sd-bus/bus-kernel.c diff --git a/src/libsystemd/sd-bus/bus-kernel.h b/src/libsystemd/src/sd-bus/bus-kernel.h index 53ba3bdcf3..2927ba26a5 100644 --- a/src/libsystemd/sd-bus/bus-kernel.h +++ b/src/libsystemd/src/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/src/sd-bus/bus-match.c index 397baf6f33..397baf6f33 100644 --- a/src/libsystemd/sd-bus/bus-match.c +++ b/src/libsystemd/src/sd-bus/bus-match.c diff --git a/src/libsystemd/sd-bus/bus-match.h b/src/libsystemd/src/sd-bus/bus-match.h index 8cbbb63b11..3f71720185 100644 --- a/src/libsystemd/sd-bus/bus-match.h +++ b/src/libsystemd/src/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/src/sd-bus/bus-message.c index b8958ec7bb..a9359c1528 100644 --- a/src/libsystemd/sd-bus/bus-message.c +++ b/src/libsystemd/src/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/src/sd-bus/bus-message.h index 4710c106b9..6a2c2d533c 100644 --- a/src/libsystemd/sd-bus/bus-message.h +++ b/src/libsystemd/src/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/src/sd-bus/bus-objects.c index 9bd07ffcab..9bd07ffcab 100644 --- a/src/libsystemd/sd-bus/bus-objects.c +++ b/src/libsystemd/src/sd-bus/bus-objects.c diff --git a/src/libsystemd/sd-bus/bus-objects.h b/src/libsystemd/src/sd-bus/bus-objects.h index e0b8c534ed..e0b8c534ed 100644 --- a/src/libsystemd/sd-bus/bus-objects.h +++ b/src/libsystemd/src/sd-bus/bus-objects.h diff --git a/src/libsystemd/sd-bus/bus-protocol.h b/src/libsystemd/src/sd-bus/bus-protocol.h index 9d180cb284..9d180cb284 100644 --- a/src/libsystemd/sd-bus/bus-protocol.h +++ b/src/libsystemd/src/sd-bus/bus-protocol.h diff --git a/src/libsystemd/sd-bus/bus-signature.c b/src/libsystemd/src/sd-bus/bus-signature.c index 7bc243494a..7bc243494a 100644 --- a/src/libsystemd/sd-bus/bus-signature.c +++ b/src/libsystemd/src/sd-bus/bus-signature.c diff --git a/src/libsystemd/sd-bus/bus-signature.h b/src/libsystemd/src/sd-bus/bus-signature.h index 1e0cd7f587..1e0cd7f587 100644 --- a/src/libsystemd/sd-bus/bus-signature.h +++ b/src/libsystemd/src/sd-bus/bus-signature.h diff --git a/src/libsystemd/sd-bus/bus-slot.c b/src/libsystemd/src/sd-bus/bus-slot.c index 8e9074c7df..75c1692bf5 100644 --- a/src/libsystemd/sd-bus/bus-slot.c +++ b/src/libsystemd/src/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/src/sd-bus/bus-slot.h index 3b8b94dc6b..b862799d1c 100644 --- a/src/libsystemd/sd-bus/bus-slot.h +++ b/src/libsystemd/src/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/src/sd-bus/bus-socket.c index f1e2a06050..1486d7cd55 100644 --- a/src/libsystemd/sd-bus/bus-socket.c +++ b/src/libsystemd/src/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/src/sd-bus/bus-socket.h index 684feead74..6e1d32e6a7 100644 --- a/src/libsystemd/sd-bus/bus-socket.h +++ b/src/libsystemd/src/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/src/sd-bus/bus-track.c index 1f436fe560..81e6d22816 100644 --- a/src/libsystemd/sd-bus/bus-track.c +++ b/src/libsystemd/src/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/src/sd-bus/bus-track.h index 7d93a727d6..7d93a727d6 100644 --- a/src/libsystemd/sd-bus/bus-track.h +++ b/src/libsystemd/src/sd-bus/bus-track.h diff --git a/src/libsystemd/sd-bus/bus-type.c b/src/libsystemd/src/sd-bus/bus-type.c index c692afc580..c692afc580 100644 --- a/src/libsystemd/sd-bus/bus-type.c +++ b/src/libsystemd/src/sd-bus/bus-type.c diff --git a/src/libsystemd/sd-bus/bus-type.h b/src/libsystemd/src/sd-bus/bus-type.h index 5c87eb5f08..7169b0f765 100644 --- a/src/libsystemd/sd-bus/bus-type.h +++ b/src/libsystemd/src/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/src/sd-bus/kdbus.h index ecffc6b13c..ecffc6b13c 100644 --- a/src/libsystemd/sd-bus/kdbus.h +++ b/src/libsystemd/src/sd-bus/kdbus.h diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/src/sd-bus/sd-bus.c index ed5f94e136..d3c194e135 100644 --- a/src/libsystemd/sd-bus/sd-bus.c +++ b/src/libsystemd/src/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/src/sd-bus/test-bus-benchmark.c index 56ac2ab3dd..a222d36bb4 100644 --- a/src/libsystemd/sd-bus/test-bus-benchmark.c +++ b/src/libsystemd/src/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/src/sd-bus/test-bus-chat.c index 048c0d19e2..1f028d2b23 100644 --- a/src/libsystemd/sd-bus/test-bus-chat.c +++ b/src/libsystemd/src/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/src/sd-bus/test-bus-cleanup.c index 250a5b2908..bd4a3fbf34 100644 --- a/src/libsystemd/sd-bus/test-bus-cleanup.c +++ b/src/libsystemd/src/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/src/sd-bus/test-bus-creds.c index e9ef483bdd..c58b76c258 100644 --- a/src/libsystemd/sd-bus/test-bus-creds.c +++ b/src/libsystemd/src/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/src/sd-bus/test-bus-error.c index 66a3874f10..bce3cc31c9 100644 --- a/src/libsystemd/sd-bus/test-bus-error.c +++ b/src/libsystemd/src/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/src/sd-bus/test-bus-gvariant.c index 83f114a0fe..3c9ec9fef0 100644 --- a/src/libsystemd/sd-bus/test-bus-gvariant.c +++ b/src/libsystemd/src/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/src/sd-bus/test-bus-introspect.c index 4425cfae26..4425cfae26 100644 --- a/src/libsystemd/sd-bus/test-bus-introspect.c +++ b/src/libsystemd/src/sd-bus/test-bus-introspect.c diff --git a/src/libsystemd/sd-bus/test-bus-kernel-bloom.c b/src/libsystemd/src/sd-bus/test-bus-kernel-bloom.c index eb6179d7d2..f16e14a310 100644 --- a/src/libsystemd/sd-bus/test-bus-kernel-bloom.c +++ b/src/libsystemd/src/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/src/sd-bus/test-bus-kernel.c index 2214817312..2a5ba60cc9 100644 --- a/src/libsystemd/sd-bus/test-bus-kernel.c +++ b/src/libsystemd/src/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/src/sd-bus/test-bus-marshal.c index a28cc5b79e..45db4764a0 100644 --- a/src/libsystemd/sd-bus/test-bus-marshal.c +++ b/src/libsystemd/src/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/src/sd-bus/test-bus-match.c index 29c4529f95..29c4529f95 100644 --- a/src/libsystemd/sd-bus/test-bus-match.c +++ b/src/libsystemd/src/sd-bus/test-bus-match.c diff --git a/src/libsystemd/sd-bus/test-bus-objects.c b/src/libsystemd/src/sd-bus/test-bus-objects.c index f11cafd888..e9bb655665 100644 --- a/src/libsystemd/sd-bus/test-bus-objects.c +++ b/src/libsystemd/src/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-server.c b/src/libsystemd/src/sd-bus/test-bus-server.c index b6272efc30..190410674b 100644 --- a/src/libsystemd/sd-bus/test-bus-server.c +++ b/src/libsystemd/src/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/src/sd-bus/test-bus-signature.c index 4f4fd093bf..4f4fd093bf 100644 --- a/src/libsystemd/sd-bus/test-bus-signature.c +++ b/src/libsystemd/src/sd-bus/test-bus-signature.c diff --git a/src/libsystemd/sd-bus/test-bus-zero-copy.c b/src/libsystemd/src/sd-bus/test-bus-zero-copy.c index 3380e8500a..9e20d67670 100644 --- a/src/libsystemd/sd-bus/test-bus-zero-copy.c +++ b/src/libsystemd/src/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/src/sd-daemon/sd-daemon.c index 4da9dbfd63..fa92199c43 100644 --- a/src/libsystemd/sd-daemon/sd-daemon.c +++ b/src/libsystemd/src/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/src/sd-device/device-enumerator-private.h index eb06f9542d..d46e26b56e 100644 --- a/src/libsystemd/sd-device/device-enumerator-private.h +++ b/src/libsystemd/src/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/src/sd-device/device-enumerator.c index 4a7a8b1f9e..796728ee0e 100644 --- a/src/libsystemd/sd-device/device-enumerator.c +++ b/src/libsystemd/src/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/src/sd-device/device-internal.h index ab222e27de..ab222e27de 100644 --- a/src/libsystemd/sd-device/device-internal.h +++ b/src/libsystemd/src/sd-device/device-internal.h diff --git a/src/libsystemd/sd-device/device-private.c b/src/libsystemd/src/sd-device/device-private.c index 9082d377f4..51cabcb048 100644 --- a/src/libsystemd/sd-device/device-private.c +++ b/src/libsystemd/src/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/src/sd-device/device-private.h index 29b3e155fb..d6add2f7b2 100644 --- a/src/libsystemd/sd-device/device-private.h +++ b/src/libsystemd/src/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/src/sd-device/device-util.h index 5b42e11de6..5b42e11de6 100644 --- a/src/libsystemd/sd-device/device-util.h +++ b/src/libsystemd/src/sd-device/device-util.h diff --git a/src/libsystemd/sd-device/sd-device.c b/src/libsystemd/src/sd-device/sd-device.c index b1c3d5f228..d21a67cd4c 100644 --- a/src/libsystemd/sd-device/sd-device.c +++ b/src/libsystemd/src/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/src/sd-event/sd-event.c index 7ba6527f63..7f6f485353 100644 --- a/src/libsystemd/sd-event/sd-event.c +++ b/src/libsystemd/src/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/src/sd-event/test-event.c index 289114490c..324ad7ee02 100644 --- a/src/libsystemd/sd-event/test-event.c +++ b/src/libsystemd/src/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/src/sd-hwdb/hwdb-internal.h index 8ffb5e5c74..8ffb5e5c74 100644 --- a/src/libsystemd/sd-hwdb/hwdb-internal.h +++ b/src/libsystemd/src/sd-hwdb/hwdb-internal.h diff --git a/src/libsystemd/sd-hwdb/hwdb-util.h b/src/libsystemd/src/sd-hwdb/hwdb-util.h index 5e21e5008b..05dc47962b 100644 --- a/src/libsystemd/sd-hwdb/hwdb-util.h +++ b/src/libsystemd/src/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/src/sd-hwdb/sd-hwdb.c index 062fa97b17..7dcfe95b87 100644 --- a/src/libsystemd/sd-hwdb/sd-hwdb.c +++ b/src/libsystemd/src/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/src/sd-id128/sd-id128.c index d9c0116f60..cda3e9f0df 100644 --- a/src/libsystemd/sd-id128/sd-id128.c +++ b/src/libsystemd/src/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/src/sd-journal/Makefile b/src/libsystemd/src/sd-journal/Makefile new file mode 100644 index 0000000000..5b1b4af5ba --- /dev/null +++ b/src/libsystemd/src/sd-journal/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 + +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_at)$(MKDIR_P) $(dir $@) + $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(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: src/journal/audit_type-list.txt + $(AM_V_at)$(MKDIR_P) $(dir $@) + $(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" }' <$< >$@ + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/journal/audit-type.c b/src/libsystemd/src/sd-journal/audit-type.c index 71e8790ca8..71e8790ca8 100644 --- a/src/journal/audit-type.c +++ b/src/libsystemd/src/sd-journal/audit-type.c diff --git a/src/journal/audit-type.h b/src/libsystemd/src/sd-journal/audit-type.h index 1dd2163707..1dd2163707 100644 --- a/src/journal/audit-type.h +++ b/src/libsystemd/src/sd-journal/audit-type.h diff --git a/src/journal/catalog.c b/src/libsystemd/src/sd-journal/catalog.c index 886f6efd8b..70838d958c 100644 --- a/src/journal/catalog.c +++ b/src/libsystemd/src/sd-journal/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/src/sd-journal/catalog.h index 1b1014b335..b621de3068 100644 --- a/src/journal/catalog.h +++ b/src/libsystemd/src/sd-journal/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/src/sd-journal/compress.c index ba734b5561..ba734b5561 100644 --- a/src/journal/compress.c +++ b/src/libsystemd/src/sd-journal/compress.c diff --git a/src/journal/compress.h b/src/libsystemd/src/sd-journal/compress.h index c138099d9a..c138099d9a 100644 --- a/src/journal/compress.h +++ b/src/libsystemd/src/sd-journal/compress.h diff --git a/src/journal/fsprg.c b/src/libsystemd/src/sd-journal/fsprg.c index 612b10f3a9..612b10f3a9 100644 --- a/src/journal/fsprg.c +++ b/src/libsystemd/src/sd-journal/fsprg.c diff --git a/src/journal/fsprg.h b/src/libsystemd/src/sd-journal/fsprg.h index 829b56e240..829b56e240 100644 --- a/src/journal/fsprg.h +++ b/src/libsystemd/src/sd-journal/fsprg.h diff --git a/src/journal/journal-authenticate.c b/src/libsystemd/src/sd-journal/journal-authenticate.c index d8af113d3f..d8af113d3f 100644 --- a/src/journal/journal-authenticate.c +++ b/src/libsystemd/src/sd-journal/journal-authenticate.c diff --git a/src/journal/journal-authenticate.h b/src/libsystemd/src/sd-journal/journal-authenticate.h index 6c87319ede..6c87319ede 100644 --- a/src/journal/journal-authenticate.h +++ b/src/libsystemd/src/sd-journal/journal-authenticate.h diff --git a/src/journal/journal-def.h b/src/libsystemd/src/sd-journal/journal-def.h index 67edb43960..a0a052ce4f 100644 --- a/src/journal/journal-def.h +++ b/src/libsystemd/src/sd-journal/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/src/sd-journal/journal-file.c index 7504326bff..13db5c53de 100644 --- a/src/journal/journal-file.c +++ b/src/libsystemd/src/sd-journal/journal-file.c @@ -39,7 +39,7 @@ #include "parse-util.h" #include "path-util.h" #include "random-util.h" -#include "sd-event.h" +#include <systemd/sd-event.h> #include "set.h" #include "string-util.h" #include "xattr-util.h" diff --git a/src/journal/journal-file.h b/src/libsystemd/src/sd-journal/journal-file.h index 564e1a8179..e48e98f424 100644 --- a/src/journal/journal-file.h +++ b/src/libsystemd/src/sd-journal/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/src/sd-journal/journal-internal.h index 34a48141f5..d8eb11ad06 100644 --- a/src/journal/journal-internal.h +++ b/src/libsystemd/src/sd-journal/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/src/sd-journal/journal-send.c index 5e8a3e3200..5a49211f85 100644 --- a/src/journal/journal-send.c +++ b/src/libsystemd/src/sd-journal/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/src/sd-journal/journal-vacuum.c index f09dc66e03..cd2676ab63 100644 --- a/src/journal/journal-vacuum.c +++ b/src/libsystemd/src/sd-journal/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/src/sd-journal/journal-vacuum.h index 1e750a2170..1e750a2170 100644 --- a/src/journal/journal-vacuum.h +++ b/src/libsystemd/src/sd-journal/journal-vacuum.h diff --git a/src/journal/journal-verify.c b/src/libsystemd/src/sd-journal/journal-verify.c index 26572ddd76..26572ddd76 100644 --- a/src/journal/journal-verify.c +++ b/src/libsystemd/src/sd-journal/journal-verify.c diff --git a/src/journal/journal-verify.h b/src/libsystemd/src/sd-journal/journal-verify.h index 8f0eaf6daa..8f0eaf6daa 100644 --- a/src/journal/journal-verify.h +++ b/src/libsystemd/src/sd-journal/journal-verify.h diff --git a/src/journal/lookup3.c b/src/libsystemd/src/sd-journal/lookup3.c index 3d791234f4..3d791234f4 100644 --- a/src/journal/lookup3.c +++ b/src/libsystemd/src/sd-journal/lookup3.c diff --git a/src/journal/lookup3.h b/src/libsystemd/src/sd-journal/lookup3.h index 787921ffbf..787921ffbf 100644 --- a/src/journal/lookup3.h +++ b/src/libsystemd/src/sd-journal/lookup3.h diff --git a/src/journal/mmap-cache.c b/src/libsystemd/src/sd-journal/mmap-cache.c index 6bcd9b6ac8..6bcd9b6ac8 100644 --- a/src/journal/mmap-cache.c +++ b/src/libsystemd/src/sd-journal/mmap-cache.c diff --git a/src/journal/mmap-cache.h b/src/libsystemd/src/sd-journal/mmap-cache.h index 199d944647..199d944647 100644 --- a/src/journal/mmap-cache.h +++ b/src/libsystemd/src/sd-journal/mmap-cache.h diff --git a/src/journal/sd-journal.c b/src/libsystemd/src/sd-journal/sd-journal.c index 1cea68ad42..930486d65f 100644 --- a/src/journal/sd-journal.c +++ b/src/libsystemd/src/sd-journal/sd-journal.c @@ -27,7 +27,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-login/sd-login.c b/src/libsystemd/src/sd-login/sd-login.c index 9d4f187502..84831d5e95 100644 --- a/src/libsystemd/sd-login/sd-login.c +++ b/src/libsystemd/src/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/src/sd-login/test-login.c index c1fd7dd33e..994c76df4a 100644 --- a/src/libsystemd/sd-login/test-login.c +++ b/src/libsystemd/src/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/src/sd-netlink/local-addresses.c index ed9ee041ab..1abce75b01 100644 --- a/src/libsystemd/sd-netlink/local-addresses.c +++ b/src/libsystemd/src/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/src/sd-netlink/local-addresses.h index 18d71e797e..1ddc50ace5 100644 --- a/src/libsystemd/sd-netlink/local-addresses.h +++ b/src/libsystemd/src/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/src/sd-netlink/netlink-internal.h index dcfb080ad3..1d29c3a369 100644 --- a/src/libsystemd/sd-netlink/netlink-internal.h +++ b/src/libsystemd/src/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/src/sd-netlink/netlink-message.c index 86d8dee867..c00785ea41 100644 --- a/src/libsystemd/sd-netlink/netlink-message.c +++ b/src/libsystemd/src/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/src/sd-netlink/netlink-socket.c index c165fa3359..d28a413c65 100644 --- a/src/libsystemd/sd-netlink/netlink-socket.c +++ b/src/libsystemd/src/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/src/sd-netlink/netlink-types.c index 3a4bac2ced..3a4bac2ced 100644 --- a/src/libsystemd/sd-netlink/netlink-types.c +++ b/src/libsystemd/src/sd-netlink/netlink-types.c diff --git a/src/libsystemd/sd-netlink/netlink-types.h b/src/libsystemd/src/sd-netlink/netlink-types.h index ecb20bfcdc..ecb20bfcdc 100644 --- a/src/libsystemd/sd-netlink/netlink-types.h +++ b/src/libsystemd/src/sd-netlink/netlink-types.h diff --git a/src/libsystemd/sd-netlink/netlink-util.c b/src/libsystemd/src/sd-netlink/netlink-util.c index 73b9ac0258..828ae7db7f 100644 --- a/src/libsystemd/sd-netlink/netlink-util.c +++ b/src/libsystemd/src/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/src/sd-netlink/netlink-util.h index f49bf4eaa6..e8f932549f 100644 --- a/src/libsystemd/sd-netlink/netlink-util.h +++ b/src/libsystemd/src/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/src/sd-netlink/rtnl-message.c index 09240c7b2a..f6482a6157 100644 --- a/src/libsystemd/sd-netlink/rtnl-message.c +++ b/src/libsystemd/src/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/src/sd-netlink/sd-netlink.c index 91701405a5..3c7488463c 100644 --- a/src/libsystemd/sd-netlink/sd-netlink.c +++ b/src/libsystemd/src/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/src/sd-netlink/test-local-addresses.c index e0e28cc0cc..e0e28cc0cc 100644 --- a/src/libsystemd/sd-netlink/test-local-addresses.c +++ b/src/libsystemd/src/sd-netlink/test-local-addresses.c diff --git a/src/libsystemd/sd-netlink/test-netlink.c b/src/libsystemd/src/sd-netlink/test-netlink.c index 58c2e892f5..aadd0f06a8 100644 --- a/src/libsystemd/sd-netlink/test-netlink.c +++ b/src/libsystemd/src/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/src/sd-network/network-util.c index a0d9b5f1a4..a0d9b5f1a4 100644 --- a/src/libsystemd/sd-network/network-util.c +++ b/src/libsystemd/src/sd-network/network-util.c diff --git a/src/libsystemd/sd-network/network-util.h b/src/libsystemd/src/sd-network/network-util.h index 26780dce28..8c4dbc68b1 100644 --- a/src/libsystemd/sd-network/network-util.h +++ b/src/libsystemd/src/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/src/sd-network/sd-network.c index f8e18f23fd..70083213f9 100644 --- a/src/libsystemd/sd-network/sd-network.c +++ b/src/libsystemd/src/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/src/sd-path/sd-path.c index b7aec1f20a..6d9f3e2a61 100644 --- a/src/libsystemd/sd-path/sd-path.c +++ b/src/libsystemd/src/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/src/sd-resolve/sd-resolve.c index d8303e2e69..6eacf2b69a 100644 --- a/src/libsystemd/sd-resolve/sd-resolve.c +++ b/src/libsystemd/src/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/src/sd-resolve/test-resolve.c index 1be1a7f8a7..0209cc77e7 100644 --- a/src/libsystemd/sd-resolve/test-resolve.c +++ b/src/libsystemd/src/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/src/sd-utf8/sd-utf8.c index 33a5a04ea1..77be8e1996 100644 --- a/src/libsystemd/sd-utf8/sd-utf8.c +++ b/src/libsystemd/src/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/src/subdir.mk b/src/libsystemd/src/subdir.mk new file mode 100644 index 0000000000..35def00fdc --- /dev/null +++ b/src/libsystemd/src/subdir.mk @@ -0,0 +1,29 @@ +# -*- 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.CPPFLAGS += -DLIBDIR=\"$(libdir)\" +systemd.CPPFLAGS += -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/libudev/Makefile b/src/libudev/Makefile index d0b0e8e008..8d9fecb1fb 120000..100644 --- a/src/libudev/Makefile +++ b/src/libudev/Makefile @@ -1 +1,28 @@ -../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 + +at.subdirs += src + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/libudev/libudev.h b/src/libudev/include/libudev.h index 3f6d0ed16c..3f6d0ed16c 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..ed606315e1 --- /dev/null +++ b/src/libudev/src/Makefile @@ -0,0 +1,83 @@ +# -*- 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=$(srcdir)/libudev.sym + +libudev_la_LIBADD = \ + libsystemd-internal.la + +pkgconfiglib_DATA += \ + src/libudev/libudev.pc + +EXTRA_DIST += \ + src/libudev/libudev.pc.in + +noinst_LTLIBRARIES += \ + libudev-internal.la + +libudev_internal_la_SOURCES =\ + $(libudev_la_SOURCES) + +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 + +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 0e9af8ec09..f76da09407 100644 --- a/src/libudev/libudev-device-internal.h +++ b/src/libudev/src/libudev-device-internal.h @@ -21,7 +21,7 @@ ***/ #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 3b8abfb260..9910cea957 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 8433e8d9f2..00de88972a 100644 --- a/src/udev/udev.h +++ b/src/libudev/src/udev.h @@ -23,7 +23,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 deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/locale/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile
\ No newline at end of file diff --git a/src/login/Makefile b/src/login/Makefile deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/login/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile
\ No newline at end of file diff --git a/src/machine-id-setup/Makefile b/src/machine-id-setup/Makefile deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/machine-id-setup/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile
\ No newline at end of file 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 deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/modules-load/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile
\ No newline at end of file diff --git a/src/network/Makefile b/src/network/Makefile deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/network/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile
\ No newline at end of file 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..b5f6ff62aa 120000..100644 --- a/src/nss-myhostname/Makefile +++ b/src/nss-myhostname/Makefile @@ -1 +1,47 @@ -../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=$(srcdir)/nss-myhostname.sym + +libnss_myhostname_la_LIBADD = \ + libsystemd-internal.la + +lib_LTLIBRARIES += \ + libnss_myhostname.la +endif # HAVE_MYHOSTNAME + +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 deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/sleep/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile
\ No newline at end of file diff --git a/src/socket-proxy/Makefile b/src/socket-proxy/Makefile deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/socket-proxy/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile
\ No newline at end of file diff --git a/src/sysctl/Makefile b/src/sysctl/Makefile deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/sysctl/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile
\ No newline at end of file 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..aa8912d711 --- /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 + +rootlibexec_PROGRAMS += systemd-ac-power +systemd_ac_power_SOURCES = \ + src/ac-power/ac-power.c + +systemd_ac_power_LDADD = \ + libshared.la + +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..5e2299f00e --- /dev/null +++ b/src/systemd-activate/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 + + +bin_PROGRAMS += \ + systemd-socket-activate + +systemd_socket_activate_SOURCES = \ + src/activate/activate.c + +systemd_socket_activate_LDADD = \ + libshared.la + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/activate/activate.c b/src/systemd-activate/activate.c index a0cfc22000..89cc1ee813 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 "escape.h" 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..2e4e7c0bb1 --- /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 + +bin_PROGRAMS += systemd-analyze +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 + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/analyze/analyze-verify.c b/src/systemd-analyze/analyze-verify.c index 5fd3ee49eb..5fd3ee49eb 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 d8204dc69c..d8204dc69c 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 53c97f957f..0e1eee16ec 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..4a79cd838a --- /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 + +rootbin_PROGRAMS += systemd-ask-password +systemd_ask_password_SOURCES = \ + src/ask-password/ask-password.c + +systemd_ask_password_LDADD = \ + libshared.la + +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 6d53dd982c..6d53dd982c 100644 --- a/src/ask-password/ask-password.c +++ b/src/systemd-ask-password/ask-password.c diff --git a/src/systemd-cgls/Makefile b/src/systemd-cgls/Makefile new file mode 100644 index 0000000000..40a7811632 --- /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 + +bin_PROGRAMS += systemd-cgls +systemd_cgls_SOURCES = \ + src/cgls/cgls.c + +systemd_cgls_LDADD = \ + libshared.la + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/cgls/cgls.c b/src/systemd-cgls/cgls.c index dcb5912b83..ed2846ee57 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..05ff1f6b49 --- /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 + +rootlibexec_PROGRAMS += systemd-cgroups-agent +systemd_cgroups_agent_SOURCES = \ + src/cgroups-agent/cgroups-agent.c + +systemd_cgroups_agent_LDADD = \ + libshared.la + +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 d7c722ac3d..d7c722ac3d 100644 --- a/src/cgroups-agent/cgroups-agent.c +++ b/src/systemd-cgroups-agent/cgroups-agent.c diff --git a/src/systemd-cgtop/Makefile b/src/systemd-cgtop/Makefile new file mode 100644 index 0000000000..4980eed15b --- /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 + +bin_PROGRAMS += systemd-cgtop +systemd_cgtop_SOURCES = \ + src/cgtop/cgtop.c + +systemd_cgtop_LDADD = \ + libshared.la + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/cgtop/cgtop.c b/src/systemd-cgtop/cgtop.c index e088e4b197..6cbea86070 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..73a46bf6da --- /dev/null +++ b/src/systemd-cryptsetup/Makefile @@ -0,0 +1,59 @@ +# -*- 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),) +rootlibexec_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 + +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 9927621ea0..8024f80e36 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..1d7f0d1a81 --- /dev/null +++ b/src/systemd-dbus1-generator/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 + +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 + +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..bba46c2905 --- /dev/null +++ b/src/systemd-debug-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 + +systemgenerator_PROGRAMS += systemd-debug-generator + +systemd_debug_generator_SOURCES = \ + src/debug-generator/debug-generator.c + +systemd_debug_generator_LDADD = \ + libshared.la + +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..62c18cd8d4 --- /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 + +bin_PROGRAMS += systemd-delta +systemd_delta_SOURCES = \ + src/delta/delta.c + +systemd_delta_LDADD = \ + libshared.la + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/delta/delta.c b/src/systemd-delta/delta.c index f32744def2..f32744def2 100644 --- a/src/delta/delta.c +++ b/src/systemd-delta/delta.c diff --git a/src/systemd-escape/Makefile b/src/systemd-escape/Makefile new file mode 100644 index 0000000000..f094a7e2a0 --- /dev/null +++ b/src/systemd-escape/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 + +rootbin_PROGRAMS += systemd-escape + +systemd_escape_SOURCES = \ + src/escape/escape.c + +systemd_escape_LDADD = \ + libshared.la + +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..09d9ebb1d7 --- /dev/null +++ b/src/systemd-firstboot/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_FIRSTBOOT),) +systemd_firstboot_SOURCES = \ + src/firstboot/firstboot.c + +systemd_firstboot_LDADD = \ + libshared.la \ + -lcrypt + +rootbin_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 + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/firstboot/firstboot.c b/src/systemd-firstboot/firstboot.c index 1e1a592b7c..1e1a592b7c 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..cc4e21055c --- /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 + +rootlibexec_PROGRAMS += systemd-fsck +systemd_fsck_SOURCES = \ + src/fsck/fsck.c + +systemd_fsck_LDADD = \ + libshared.la + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/fsck/fsck.c b/src/systemd-fsck/fsck.c index d32e1d923e..d7f0829ffc 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..0bfc70e464 --- /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 + +systemgenerator_PROGRAMS += systemd-fstab-generator +systemd_fstab_generator_SOURCES = \ + src/fstab-generator/fstab-generator.c \ + src/core/mount-setup.c + +systemd_fstab_generator_LDADD = \ + libshared.la + +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 108522873e..108522873e 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..14f7d02a86 --- /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 + +systemgenerator_PROGRAMS += systemd-getty-generator +systemd_getty_generator_SOURCES = \ + src/getty-generator/getty-generator.c + +systemd_getty_generator_LDADD = \ + libshared.la + +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..177db8da7c --- /dev/null +++ b/src/systemd-gpt-auto-generator/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_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 + +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 a4938a7c3a..73e32da751 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..386f372f78 --- /dev/null +++ b/src/systemd-hibernate-resume/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 ($(ENABLE_HIBERNATE),) +systemgenerator_PROGRAMS += \ + systemd-hibernate-resume-generator + +rootlibexec_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 + +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..ce10c46e99 --- /dev/null +++ b/src/systemd-hwdb/Makefile @@ -0,0 +1,76 @@ +# -*- 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 + +rootbin_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)" || $(rootbindir)/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 + +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-initctl/Makefile b/src/systemd-initctl/Makefile new file mode 100644 index 0000000000..bd19b4a090 --- /dev/null +++ b/src/systemd-initctl/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 + +rootlibexec_PROGRAMS += systemd-initctl +systemd_initctl_SOURCES = \ + src/initctl/initctl.c + +systemd_initctl_LDADD = \ + libshared.la + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/initctl/initctl.c b/src/systemd-initctl/initctl.c index 41b2237d16..05285e3846 100644 --- a/src/initctl/initctl.c +++ b/src/systemd-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/systemd-machine-id-setup/Makefile b/src/systemd-machine-id-setup/Makefile new file mode 100644 index 0000000000..8f210b3cdf --- /dev/null +++ b/src/systemd-machine-id-setup/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 + +rootbin_PROGRAMS += systemd-machine-id-setup +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 + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/machine-id-setup/machine-id-setup-main.c b/src/systemd-machine-id-setup/machine-id-setup-main.c index 1d55fa04af..1d55fa04af 100644 --- a/src/machine-id-setup/machine-id-setup-main.c +++ b/src/systemd-machine-id-setup/machine-id-setup-main.c diff --git a/src/systemd-modules-load/Makefile b/src/systemd-modules-load/Makefile new file mode 100644 index 0000000000..1c51b134ad --- /dev/null +++ b/src/systemd-modules-load/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_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) + +rootlibexec_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 + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/modules-load/modules-load.c b/src/systemd-modules-load/modules-load.c index f75015d8c3..f75015d8c3 100644 --- a/src/modules-load/modules-load.c +++ b/src/systemd-modules-load/modules-load.c diff --git a/src/systemd-notify/Makefile b/src/systemd-notify/Makefile new file mode 100644 index 0000000000..06a6604e5b --- /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 + +rootbin_PROGRAMS += systemd-notify +systemd_notify_SOURCES = \ + src/notify/notify.c + +systemd_notify_LDADD = \ + libshared.la + +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..d6f928ebd6 --- /dev/null +++ b/src/systemd-nspawn/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 + +bin_PROGRAMS += systemd-nspawn +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/nspawn/nspawn-patch-uid.c \ + src/nspawn/nspawn-patch-uid.h \ + src/core/mount-setup.c \ + src/core/mount-setup.h \ + src/core/loopback-setup.c \ + src/core/loopback-setup.h \ + src/core/machine-id-setup.c \ + src/core/machine-id-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 + +test_patch_uid_SOURCES = \ + src/nspawn/nspawn-patch-uid.c \ + src/nspawn/nspawn-patch-uid.h \ + src/nspawn/test-patch-uid.c + +test_patch_uid_LDADD = \ + libshared.la + +manual_tests += \ + test-patch-uid + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/nspawn/nspawn-cgroup.c b/src/systemd-nspawn/nspawn-cgroup.c index f50f1ad6c2..f50f1ad6c2 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 2b5d452662..2b5d452662 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 8e2d2d543c..8e2d2d543c 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 8da47a2ca6..7052fb5804 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 3d8861e1e5..3d8861e1e5 100644 --- a/src/nspawn/nspawn-network.h +++ b/src/systemd-nspawn/nspawn-network.h diff --git a/src/nspawn/nspawn-patch-uid.c b/src/systemd-nspawn/nspawn-patch-uid.c index c7382d412d..c7382d412d 100644 --- a/src/nspawn/nspawn-patch-uid.c +++ b/src/systemd-nspawn/nspawn-patch-uid.c diff --git a/src/nspawn/nspawn-patch-uid.h b/src/systemd-nspawn/nspawn-patch-uid.h index 55d0990016..55d0990016 100644 --- a/src/nspawn/nspawn-patch-uid.h +++ b/src/systemd-nspawn/nspawn-patch-uid.h diff --git a/src/nspawn/nspawn-register.c b/src/systemd-nspawn/nspawn-register.c index 20103c5e88..adef200cb5 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-unit-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 5f1522cfb6..5f1522cfb6 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 1c47e37912..1c47e37912 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 8ec058431b..bdf054e5c6 100644 --- a/src/nspawn/nspawn.c +++ b/src/systemd-nspawn/nspawn.c @@ -43,8 +43,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/nspawn/test-patch-uid.c b/src/systemd-nspawn/test-patch-uid.c index 11c5321788..11c5321788 100644 --- a/src/nspawn/test-patch-uid.c +++ b/src/systemd-nspawn/test-patch-uid.c diff --git a/src/systemd-path/Makefile b/src/systemd-path/Makefile new file mode 100644 index 0000000000..eb609cb1b9 --- /dev/null +++ b/src/systemd-path/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 + +bin_PROGRAMS += systemd-path + +systemd_path_SOURCES = \ + src/path/path.c + +systemd_path_LDADD = \ + libshared.la + +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-rc-local-generator/Makefile b/src/systemd-rc-local-generator/Makefile new file mode 100644 index 0000000000..2e9b3e7a64 --- /dev/null +++ b/src/systemd-rc-local-generator/Makefile @@ -0,0 +1,32 @@ +# -*- 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 + +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 618bbe428d..618bbe428d 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..49b10a879a --- /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 + +rootlibexec_PROGRAMS += systemd-remount-fs +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 + +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..b5c4698fd8 --- /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 + +rootlibexec_PROGRAMS += systemd-reply-password +systemd_reply_password_SOURCES = \ + src/reply-password/reply-password.c + +systemd_reply_password_LDADD = \ + libshared.la + +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 17eab9772e..17eab9772e 100644 --- a/src/reply-password/reply-password.c +++ b/src/systemd-reply-password/reply-password.c diff --git a/src/systemd-run/Makefile b/src/systemd-run/Makefile new file mode 100644 index 0000000000..a8edcf66c1 --- /dev/null +++ b/src/systemd-run/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 + +bin_PROGRAMS += systemd-run +systemd_run_SOURCES = \ + src/run/run.c + +systemd_run_LDADD = \ + libshared.la + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/run/run.c b/src/systemd-run/run.c index d6c9b6d37a..29b5131f70 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..72047133ce --- /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 + +rootlibexec_PROGRAMS += systemd-shutdown +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 + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/core/shutdown.c b/src/systemd-shutdown/shutdown.c index e14755d84e..e14755d84e 100644 --- a/src/core/shutdown.c +++ b/src/systemd-shutdown/shutdown.c diff --git a/src/core/umount.c b/src/systemd-shutdown/umount.c index c21a2be54e..c21a2be54e 100644 --- a/src/core/umount.c +++ b/src/systemd-shutdown/umount.c diff --git a/src/core/umount.h b/src/systemd-shutdown/umount.h index 4e2215a47d..4e2215a47d 100644 --- a/src/core/umount.h +++ b/src/systemd-shutdown/umount.h diff --git a/src/systemd-socket-proxyd/Makefile b/src/systemd-socket-proxyd/Makefile new file mode 100644 index 0000000000..e3d354bd30 --- /dev/null +++ b/src/systemd-socket-proxyd/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 + +rootlibexec_PROGRAMS += systemd-socket-proxyd + +systemd_socket_proxyd_SOURCES = \ + src/socket-proxy/socket-proxyd.c + +systemd_socket_proxyd_LDADD = \ + libshared.la + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/socket-proxy/socket-proxyd.c b/src/systemd-socket-proxyd/socket-proxyd.c index 52b4db8875..ce226c4d66 100644 --- a/src/socket-proxy/socket-proxyd.c +++ b/src/systemd-socket-proxyd/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/systemd-stdio-bridge/Makefile b/src/systemd-stdio-bridge/Makefile new file mode 100644 index 0000000000..8aeb20b41a --- /dev/null +++ b/src/systemd-stdio-bridge/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 + +bin_PROGRAMS += systemd-stdio-bridge +systemd_stdio_bridge_SOURCES = \ + src/stdio-bridge/stdio-bridge.c + +systemd_stdio_bridge_LDADD = \ + libshared.la + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/stdio-bridge/stdio-bridge.c b/src/systemd-stdio-bridge/stdio-bridge.c index ce8efce3d5..dce959cae3 100644 --- a/src/stdio-bridge/stdio-bridge.c +++ b/src/systemd-stdio-bridge/stdio-bridge.c @@ -24,8 +24,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 "bus-internal.h" #include "bus-util.h" diff --git a/src/systemd-sysctl/Makefile b/src/systemd-sysctl/Makefile new file mode 100644 index 0000000000..39ce08d5e3 --- /dev/null +++ b/src/systemd-sysctl/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 + +rootlibexec_PROGRAMS += systemd-sysctl +systemd_sysctl_SOURCES = \ + src/sysctl/sysctl.c + +systemd_sysctl_LDADD = \ + libshared.la + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/sysctl/sysctl.c b/src/systemd-sysctl/sysctl.c index ce7c26e7d3..ce7c26e7d3 100644 --- a/src/sysctl/sysctl.c +++ b/src/systemd-sysctl/sysctl.c diff --git a/src/systemd-system-update-generator/Makefile b/src/systemd-system-update-generator/Makefile new file mode 100644 index 0000000000..fd44aef359 --- /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 + +systemgenerator_PROGRAMS += systemd-system-update-generator +systemd_system_update_generator_SOURCES = \ + src/system-update-generator/system-update-generator.c + +systemd_system_update_generator_LDADD = \ + libshared.la + +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-sysusers/Makefile b/src/systemd-sysusers/Makefile new file mode 100644 index 0000000000..d18e41b1d5 --- /dev/null +++ b/src/systemd-sysusers/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_SYSUSERS),) +systemd_sysusers_SOURCES = \ + src/sysusers/sysusers.c + +systemd_sysusers_LDADD = \ + libshared.la + +rootbin_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 + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/sysusers/sysusers.c b/src/systemd-sysusers/sysusers.c index 4377f1b910..4377f1b910 100644 --- a/src/sysusers/sysusers.c +++ b/src/systemd-sysusers/sysusers.c diff --git a/src/systemd-sysv-generator/Makefile b/src/systemd-sysv-generator/Makefile new file mode 100644 index 0000000000..f6de146408 --- /dev/null +++ b/src/systemd-sysv-generator/Makefile @@ -0,0 +1,32 @@ +# -*- 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 + +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 fe4bbeeb75..fe4bbeeb75 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-timesyncd/.gitignore index 35f4d76f79..35f4d76f79 100644 --- a/src/timesync/.gitignore +++ b/src/systemd-timesyncd/.gitignore diff --git a/src/systemd-timesyncd/Makefile b/src/systemd-timesyncd/Makefile new file mode 100644 index 0000000000..c9289846c4 --- /dev/null +++ b/src/systemd-timesyncd/Makefile @@ -0,0 +1,64 @@ +# -*- 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 + +rootlibexec_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 + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/timesync/timesyncd-conf.c b/src/systemd-timesyncd/timesyncd-conf.c index 20c64a3354..20c64a3354 100644 --- a/src/timesync/timesyncd-conf.c +++ b/src/systemd-timesyncd/timesyncd-conf.c diff --git a/src/timesync/timesyncd-conf.h b/src/systemd-timesyncd/timesyncd-conf.h index cba0724b1b..cba0724b1b 100644 --- a/src/timesync/timesyncd-conf.h +++ b/src/systemd-timesyncd/timesyncd-conf.h diff --git a/src/timesync/timesyncd-gperf.gperf b/src/systemd-timesyncd/timesyncd-gperf.gperf index 29a2cfeef6..29a2cfeef6 100644 --- a/src/timesync/timesyncd-gperf.gperf +++ b/src/systemd-timesyncd/timesyncd-gperf.gperf diff --git a/src/timesync/timesyncd-manager.c b/src/systemd-timesyncd/timesyncd-manager.c index d5e16db3a0..6a4b52af69 100644 --- a/src/timesync/timesyncd-manager.c +++ b/src/systemd-timesyncd/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-timesyncd/timesyncd-manager.h index efe3e60d3e..fd25647725 100644 --- a/src/timesync/timesyncd-manager.h +++ b/src/systemd-timesyncd/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-timesyncd/timesyncd-server.c index 6bda86fe6e..6bda86fe6e 100644 --- a/src/timesync/timesyncd-server.c +++ b/src/systemd-timesyncd/timesyncd-server.c diff --git a/src/timesync/timesyncd-server.h b/src/systemd-timesyncd/timesyncd-server.h index 8a19e41d67..8a19e41d67 100644 --- a/src/timesync/timesyncd-server.h +++ b/src/systemd-timesyncd/timesyncd-server.h diff --git a/src/timesync/timesyncd.c b/src/systemd-timesyncd/timesyncd.c index b67d672a6a..9e538a82f2 100644 --- a/src/timesync/timesyncd.c +++ b/src/systemd-timesyncd/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-timesyncd/timesyncd.conf.in index b6a2ada273..b6a2ada273 100644 --- a/src/timesync/timesyncd.conf.in +++ b/src/systemd-timesyncd/timesyncd.conf.in diff --git a/src/systemd-tmpfiles/Makefile b/src/systemd-tmpfiles/Makefile new file mode 100644 index 0000000000..1e72e31215 --- /dev/null +++ b/src/systemd-tmpfiles/Makefile @@ -0,0 +1,84 @@ +# -*- 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 + +rootbin_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 + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/tmpfiles/tmpfiles.c b/src/systemd-tmpfiles/tmpfiles.c index 2053d35a67..2053d35a67 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..b5119b5066 --- /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 + +rootbin_PROGRAMS += systemd-tty-ask-password-agent +systemd_tty_ask_password_agent_SOURCES = \ + src/tty-ask-password-agent/tty-ask-password-agent.c + +systemd_tty_ask_password_agent_LDADD = \ + libshared.la + +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 ee879c7b89..ee879c7b89 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..5045982316 --- /dev/null +++ b/src/systemd-update-done/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 + +rootlibexec_PROGRAMS += systemd-update-done + +systemd_update_done_SOURCES = \ + src/update-done/update-done.c + +systemd_update_done_LDADD = \ + libshared.la + +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 da306a4444..da306a4444 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..56f8d1f4b5 --- /dev/null +++ b/src/systemd-update-utmp/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 + +ifneq ($(HAVE_UTMP),) +rootlibexec_PROGRAMS += \ + systemd-update-utmp +endif # HAVE_UTMP + +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) + +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/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 deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/sysusers/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile
\ No newline at end of file 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..f416b4aadf 120000..100644 --- a/src/test/Makefile +++ b/src/test/Makefile @@ -1 +1,35 @@ -../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 + +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 a7cb426282..b2cd3c7663 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 bc6dd0926c..57e244eb79 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 deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/udev/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile
\ No newline at end of file diff --git a/src/udev/ata_id/Makefile b/src/udev/ata_id/Makefile deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/udev/ata_id/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile
\ No newline at end of file diff --git a/src/udev/cdrom_id/Makefile b/src/udev/cdrom_id/Makefile deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/udev/cdrom_id/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile
\ No newline at end of file diff --git a/src/udev/collect/Makefile b/src/udev/collect/Makefile deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/udev/collect/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile
\ No newline at end of file diff --git a/src/udev/mtd_probe/Makefile b/src/udev/mtd_probe/Makefile deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/udev/mtd_probe/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile
\ No newline at end of file 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/scsi_id/Makefile b/src/udev/scsi_id/Makefile deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/udev/scsi_id/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile
\ No newline at end of file diff --git a/src/udev/v4l_id/Makefile b/src/udev/v4l_id/Makefile deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/udev/v4l_id/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile
\ No newline at end of file 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 |