chiark / gitweb /
Build system: Fix various issues that came from errornous migration.
authorSven Eden <yamakuzure@gmx.net>
Fri, 10 Aug 2018 15:41:29 +0000 (17:41 +0200)
committerSven Eden <yamakuzure@gmx.net>
Fri, 24 Aug 2018 14:47:08 +0000 (16:47 +0200)
No matter how much advanced check_tree.pl is, there are plenty possibilities
where upstream changes can be transported wrong. Mainly adding something we then
have to mask out. But at the end of the day this is actually wanted, so we do
not miss important changes.

man/logind.conf.xml
man/rules/meson.build
meson.build
meson_options.txt
src/basic/meson.build
src/libelogind/meson.build
src/login/meson.build
src/login/org.freedesktop.login1.policy [moved from src/login/org.freedesktop.login1.policy.in with 62% similarity]
src/test/meson.build

index 3ba37e4d953594f429275cb47853cfb6bff9bd1f..abc97b356bf4f91c597832f1a25b5279b3b1bb32 100644 (file)
@@ -54,7 +54,7 @@
     <citerefentry><refentrytitle>systemd.syntax</refentrytitle><manvolnum>5</manvolnum></citerefentry>
     for a general description of the syntax.</para>
     --><!-- else -->
-    login manager.</para>
+    <para>This file configures various parameters of elogind.</para>
     <!-- // 0 -->
   </refsect1>
 
index 4aabf03d5bb5e89b4ea91fc830986a00e456831e..d458f119aa169d44f38a0d0568baef93e86ddb5a 100644 (file)
 # Do not edit. Generated by make-man-rules.py.
 manpages = [
-['binfmt.d', '5', [], 'ENABLE_BINFMT'],
- ['bootctl', '1', [], 'ENABLE_EFI'],
- ['bootup', '7', [], ''],
- ['busctl', '1', [], ''],
- ['coredump.conf', '5', ['coredump.conf.d'], 'ENABLE_COREDUMP'],
- ['coredumpctl', '1', [], 'ENABLE_COREDUMP'],
- ['crypttab', '5', [], 'HAVE_LIBCRYPTSETUP'],
- ['daemon', '7', [], ''],
- ['dnssec-trust-anchors.d',
-  '5',
-  ['elogind.negative', 'elogind.positive'],
-  'ENABLE_RESOLVE'],
- ['environment.d', '5', [], 'ENABLE_ENVIRONMENT_D'],
- ['file-hierarchy', '7', [], ''],
- ['halt', '8', ['poweroff', 'reboot'], ''],
- ['hostname', '5', [], ''],
- ['hostnamectl', '1', [], 'ENABLE_HOSTNAMED'],
- ['hwdb', '7', [], 'ENABLE_HWDB'],
- ['journal-remote.conf', '5', ['journal-remote.conf.d'], 'HAVE_MICROHTTPD'],
- ['journal-upload.conf', '5', ['journal-upload.conf.d'], 'HAVE_MICROHTTPD'],
- ['journalctl', '1', [], ''],
- ['journald.conf', '5', ['journald.conf.d'], ''],
- ['kernel-command-line', '7', [], ''],
- ['kernel-install', '8', [], ''],
- ['libudev', '3', [], ''],
- ['loader.conf', '5', [], 'ENABLE_EFI'],
- ['locale.conf', '5', [], ''],
- ['localectl', '1', [], 'ENABLE_LOCALED'],
- ['localtime', '5', [], ''],
- ['loginctl', '1', [], 'ENABLE_LOGIND'],
- ['logind.conf', '5', ['logind.conf.d'], 'ENABLE_LOGIND'],
- ['machine-id', '5', [], ''],
- ['machine-info', '5', [], ''],
- ['machinectl', '1', [], 'ENABLE_MACHINED'],
- ['modules-load.d', '5', [], 'HAVE_KMOD'],
- ['networkctl', '1', [], 'ENABLE_NETWORKD'],
- ['networkd.conf', '5', ['networkd.conf.d'], 'ENABLE_NETWORKD'],
- ['nss-myhostname', '8', ['libnss_myhostname.so.2'], 'ENABLE_MYHOSTNAME'],
- ['nss-mymachines', '8', ['libnss_mymachines.so.2'], 'ENABLE_MACHINED'],
- ['nss-resolve', '8', ['libnss_resolve.so.2'], 'ENABLE_RESOLVE'],
- ['nss-elogind', '8', ['libnss_elogind.so.2'], 'ENABLE_NSS_SYSTEMD'],
- ['os-release', '5', [], ''],
+['elogind-portabled.service', '8', ['elogind-portabled'], 'ENABLE_PORTABLED'],
+ ['elogind-rc-local-generator', '8', [], ''],
+ ['elogind-time-wait-sync.service',
+  '8',
+  ['elogind-time-wait-sync'],
+  'ENABLE_TIMESYNCD'],
+ ['elogind', '8', [], ''],
+ ['elogind.syntax', '7', [], ''],
+ ['loginctl', '1', [], ''],
+ ['logind.conf', '5', [], ''],
  ['pam_elogind', '8', [], 'HAVE_PAM'],
  ['portablectl', '1', [], 'ENABLE_PORTABLED'],
- ['resolvectl', '1', ['resolvconf'], 'ENABLE_RESOLVE'],
- ['resolved.conf', '5', ['resolved.conf.d'], 'ENABLE_RESOLVE'],
- ['runlevel', '8', [], 'ENABLE_UTMP'],
- ['sd-bus-errors',
-  '3',
-  ['SD_BUS_ERROR_ACCESS_DENIED',
-   'SD_BUS_ERROR_ADDRESS_IN_USE',
-   'SD_BUS_ERROR_AUTH_FAILED',
-   'SD_BUS_ERROR_BAD_ADDRESS',
-   'SD_BUS_ERROR_DISCONNECTED',
-   'SD_BUS_ERROR_FAILED',
-   'SD_BUS_ERROR_FILE_EXISTS',
-   'SD_BUS_ERROR_FILE_NOT_FOUND',
-   'SD_BUS_ERROR_INCONSISTENT_MESSAGE',
-   'SD_BUS_ERROR_INTERACTIVE_AUTHORIZATION_REQUIRED',
-   'SD_BUS_ERROR_INVALID_ARGS',
-   'SD_BUS_ERROR_INVALID_SIGNATURE',
-   'SD_BUS_ERROR_IO_ERROR',
-   'SD_BUS_ERROR_LIMITS_EXCEEDED',
-   'SD_BUS_ERROR_MATCH_RULE_INVALID',
-   'SD_BUS_ERROR_MATCH_RULE_NOT_FOUND',
-   'SD_BUS_ERROR_NAME_HAS_NO_OWNER',
-   'SD_BUS_ERROR_NOT_SUPPORTED',
-   'SD_BUS_ERROR_NO_MEMORY',
-   'SD_BUS_ERROR_NO_NETWORK',
-   'SD_BUS_ERROR_NO_REPLY',
-   'SD_BUS_ERROR_NO_SERVER',
-   'SD_BUS_ERROR_PROPERTY_READ_ONLY',
-   'SD_BUS_ERROR_SERVICE_UNKNOWN',
-   'SD_BUS_ERROR_TIMEOUT',
-   'SD_BUS_ERROR_UNIX_PROCESS_ID_UNKNOWN',
-   'SD_BUS_ERROR_UNKNOWN_INTERFACE',
-   'SD_BUS_ERROR_UNKNOWN_METHOD',
-   'SD_BUS_ERROR_UNKNOWN_OBJECT',
-   'SD_BUS_ERROR_UNKNOWN_PROPERTY'],
-  ''],
  ['sd-bus', '3', [], ''],
- ['sd-daemon',
-  '3',
-  ['SD_ALERT',
-   'SD_CRIT',
-   'SD_DEBUG',
-   'SD_EMERG',
-   'SD_ERR',
-   'SD_INFO',
-   'SD_NOTICE',
-   'SD_WARNING'],
-  ''],
  ['sd-event', '3', [], ''],
- ['sd-id128',
-  '3',
-  ['SD_ID128_CONST_STR',
-   'SD_ID128_FORMAT_STR',
-   'SD_ID128_FORMAT_VAL',
-   'SD_ID128_MAKE',
-   'SD_ID128_MAKE_STR',
-   'SD_ID128_NULL',
-   'sd_id128_equal',
-   'sd_id128_is_null',
-   'sd_id128_t'],
-  ''],
- ['sd-journal', '3', [], ''],
  ['sd-login', '3', [], 'HAVE_PAM'],
  ['sd_booted', '3', [], ''],
  ['sd_bus_add_match',
@@ -189,7 +97,6 @@ manpages = [
   ['SD_BUS_ERROR_END', 'SD_BUS_ERROR_MAP', 'sd_bus_error_map'],
   ''],
  ['sd_bus_get_fd', '3', [], ''],
- ['sd_bus_get_n_queued_read', '3', ['sd_bus_get_n_queued_write'], ''],
  ['sd_bus_is_open', '3', ['sd_bus_is_ready'], ''],
  ['sd_bus_message_append', '3', ['sd_bus_message_appendv'], ''],
  ['sd_bus_message_append_array',
@@ -210,7 +117,6 @@ manpages = [
   ['sd_bus_message_get_realtime_usec', 'sd_bus_message_get_seqnum'],
   ''],
  ['sd_bus_message_read_basic', '3', [], ''],
- ['sd_bus_message_set_destination', '3', ['sd_bus_message_set_sender'], ''],
  ['sd_bus_negotiate_fds',
   '3',
   ['sd_bus_negotiate_creds', 'sd_bus_negotiate_timestamp'],
@@ -377,88 +283,6 @@ manpages = [
    'sd_is_socket_unix',
    'sd_is_special'],
   ''],
- ['sd_journal_add_match',
-  '3',
-  ['sd_journal_add_conjunction',
-   'sd_journal_add_disjunction',
-   'sd_journal_flush_matches'],
-  ''],
- ['sd_journal_enumerate_fields',
-  '3',
-  ['SD_JOURNAL_FOREACH_FIELD', 'sd_journal_restart_fields'],
-  ''],
- ['sd_journal_get_catalog', '3', ['sd_journal_get_catalog_for_message_id'], ''],
- ['sd_journal_get_cursor', '3', ['sd_journal_test_cursor'], ''],
- ['sd_journal_get_cutoff_realtime_usec',
-  '3',
-  ['sd_journal_get_cutoff_monotonic_usec'],
-  ''],
- ['sd_journal_get_data',
-  '3',
-  ['SD_JOURNAL_FOREACH_DATA',
-   'sd_journal_enumerate_data',
-   'sd_journal_get_data_threshold',
-   'sd_journal_restart_data',
-   'sd_journal_set_data_threshold'],
-  ''],
- ['sd_journal_get_fd',
-  '3',
-  ['SD_JOURNAL_APPEND',
-   'SD_JOURNAL_INVALIDATE',
-   'SD_JOURNAL_NOP',
-   'sd_journal_get_events',
-   'sd_journal_get_timeout',
-   'sd_journal_process',
-   'sd_journal_reliable_fd',
-   'sd_journal_wait'],
-  ''],
- ['sd_journal_get_realtime_usec', '3', ['sd_journal_get_monotonic_usec'], ''],
- ['sd_journal_get_usage', '3', [], ''],
- ['sd_journal_has_runtime_files', '3', ['sd_journal_has_persistent_files'], ''],
- ['sd_journal_next',
-  '3',
-  ['SD_JOURNAL_FOREACH',
-   'SD_JOURNAL_FOREACH_BACKWARDS',
-   'sd_journal_next_skip',
-   'sd_journal_previous',
-   'sd_journal_previous_skip'],
-  ''],
- ['sd_journal_open',
-  '3',
-  ['SD_JOURNAL_CURRENT_USER',
-   'SD_JOURNAL_LOCAL_ONLY',
-   'SD_JOURNAL_OS_ROOT',
-   'SD_JOURNAL_RUNTIME_ONLY',
-   'SD_JOURNAL_SYSTEM',
-   'sd_journal',
-   'sd_journal_close',
-   'sd_journal_open_directory',
-   'sd_journal_open_directory_fd',
-   'sd_journal_open_files',
-   'sd_journal_open_files_fd'],
-  ''],
- ['sd_journal_print',
-  '3',
-  ['SD_JOURNAL_SUPPRESS_LOCATION',
-   'sd_journal_perror',
-   'sd_journal_printv',
-   'sd_journal_send',
-   'sd_journal_sendv'],
-  ''],
- ['sd_journal_query_unique',
-  '3',
-  ['SD_JOURNAL_FOREACH_UNIQUE',
-   'sd_journal_enumerate_unique',
-   'sd_journal_restart_unique'],
-  ''],
- ['sd_journal_seek_head',
-  '3',
-  ['sd_journal_seek_cursor',
-   'sd_journal_seek_monotonic_usec',
-   'sd_journal_seek_realtime_usec',
-   'sd_journal_seek_tail'],
-  ''],
- ['sd_journal_stream_fd', '3', [], ''],
  ['sd_listen_fds',
   '3',
   ['SD_LISTEN_FDS_START', 'sd_listen_fds_with_names'],
@@ -526,300 +350,6 @@ manpages = [
    'sd_uid_get_sessions',
    'sd_uid_is_on_seat'],
   'HAVE_PAM'],
- ['sd_watchdog_enabled', '3', [], ''],
- ['shutdown', '8', [], ''],
- ['sysctl.d', '5', [], ''],
- ['systemctl', '1', [], ''],
- ['elogind-analyze', '1', [], ''],
- ['elogind-ask-password-console.service',
-  '8',
-  ['elogind-ask-password-console.path',
-   'elogind-ask-password-wall.path',
-   'elogind-ask-password-wall.service'],
- ['elogind-ask-password', '1', [], ''],
- ['elogind-backlight@.service', '8', ['elogind-backlight'], 'ENABLE_BACKLIGHT'],
- ['elogind-binfmt.service', '8', ['elogind-binfmt'], 'ENABLE_BINFMT'],
- ['elogind-cat', '1', [], ''],
- ['elogind-cgls', '1', [], ''],
- ['elogind-cgtop', '1', [], ''],
- ['elogind-coredump',
-  ''],
- ['elogind-boot', '7', ['sd-boot'], 'ENABLE_EFI'],
-  '8',
-  ['elogind-coredump.socket', 'elogind-coredump@.service'],
-  'ENABLE_COREDUMP'],
- ['elogind-cryptsetup-generator', '8', [], 'HAVE_LIBCRYPTSETUP'],
- ['elogind-cryptsetup@.service',
-  '8',
-  ['elogind-cryptsetup'],
-  'HAVE_LIBCRYPTSETUP'],
- ['elogind-debug-generator', '8', [], ''],
- ['elogind-delta', '1', [], ''],
- ['elogind-detect-virt', '1', [], ''],
- ['elogind-environment-d-generator',
-  '8',
-  ['30-elogind-environment-d-generator'],
-  'ENABLE_ENVIRONMENT_D'],
- ['elogind-escape', '1', [], ''],
- ['elogind-firstboot', '1', ['elogind-firstboot.service'], 'ENABLE_FIRSTBOOT'],
- ['elogind-fsck@.service',
-  ['elogind-fsck', 'elogind-fsck-root.service'],
- ['elogind-fstab-generator', '8', [], ''],
- ['elogind-getty-generator', '8', [], ''],
- ['elogind-gpt-auto-generator', '8', [], ''],
- ['elogind-halt.service',
-  ['elogind-kexec.service',
-   'elogind-poweroff.service',
-   'elogind-reboot.service',
-   'elogind-shutdown'],
-  '8',
-  ''],
-  '8',
-  ''],
- ['elogind-hibernate-resume-generator', '8', [], 'ENABLE_HIBERNATE'],
- ['elogind-hibernate-resume@.service',
-  '8',
-  ['elogind-hibernate-resume'],
-  'ENABLE_HIBERNATE'],
- ['elogind-hostnamed.service', '8', ['elogind-hostnamed'], 'ENABLE_HOSTNAMED'],
- ['elogind-hwdb', '8', [], 'ENABLE_HWDB'],
- ['elogind-importd.service', '8', ['elogind-importd'], 'ENABLE_IMPORTD'],
- ['elogind-inhibit', '1', [], ''],
- ['elogind-initctl.service',
-  '8',
-  ['elogind-initctl', 'elogind-initctl.socket'],
-  ''],
- ['elogind-journal-gatewayd.service',
-  '8',
-  ['elogind-journal-gatewayd', 'elogind-journal-gatewayd.socket'],
-  'HAVE_MICROHTTPD'],
- ['elogind-journald.service',
-  ['elogind-journald',
-   'elogind-journald-audit.socket',
-   'elogind-journald-dev-log.socket',
-   'elogind-journald.socket'],
- ['elogind-localed.service', '8', ['elogind-localed'], 'ENABLE_LOCALED'],
- ['elogind.service', '8', ['elogind'], 'ENABLE_LOGIND'],
- ['elogind-machine-id-commit.service', '8', [], ''],
- ['elogind-machine-id-setup', '1', [], ''],
- ['elogind-machined.service', '8', ['elogind-machined'], 'ENABLE_MACHINED'],
- ['elogind-makefs@.service',
-  ['elogind-growfs',
-   'elogind-growfs@.service',
-   'elogind-makefs',
-   'elogind-makeswap@.service'],
- ['elogind-modules-load.service', '8', ['elogind-modules-load'], 'HAVE_KMOD'],
- ['elogind-mount', '1', ['elogind-umount'], ''],
- ['elogind-networkd-wait-online.service',
- ['elogind-journal-remote.service',
-  '8',
-  ['elogind-journal-remote', 'elogind-journal-remote.socket'],
-  'HAVE_MICROHTTPD'],
- ['elogind-journal-upload.service',
-  '8',
-  ['elogind-journal-upload'],
-  'HAVE_MICROHTTPD'],
-  '8',
-  ''],
-  '8',
-  ''],
-  '8',
-  ['elogind-networkd-wait-online'],
-  'ENABLE_NETWORKD'],
- ['elogind-networkd.service', '8', ['elogind-networkd'], 'ENABLE_NETWORKD'],
- ['elogind-notify', '1', [], ''],
- ['elogind-nspawn', '1', [], ''],
- ['elogind-path', '1', [], ''],
- ['elogind-quotacheck.service',
- ['elogind-portabled.service', '8', ['elogind-portabled'], 'ENABLE_PORTABLED'],
-  '8',
-  ['elogind-quotacheck'],
-  'ENABLE_QUOTACHECK'],
- ['elogind-random-seed.service',
-  '8',
-  ['elogind-random-seed'],
-  'ENABLE_RANDOMSEED'],
- ['elogind-rc-local-generator', '8', [], ''],
- ['elogind-remount-fs.service', '8', ['elogind-remount-fs'], ''],
- ['elogind-resolved.service', '8', ['elogind-resolved'], 'ENABLE_RESOLVE'],
- ['elogind-rfkill.service',
-  '8',
-  ['elogind-rfkill', 'elogind-rfkill.socket'],
-  'ENABLE_RFKILL'],
- ['elogind-run', '1', [], ''],
- ['elogind-sleep.conf', '5', ['sleep.conf.d'], ''],
- ['elogind-socket-activate', '1', [], ''],
- ['elogind-socket-proxyd', '8', [], ''],
- ['elogind-suspend.service',
-  ['elogind-hibernate.service',
-   'elogind-hybrid-sleep.service',
- ['elogind-sysctl.service', '8', ['elogind-sysctl'], ''],
- ['elogind-system-update-generator', '8', [], ''],
- ['elogind-system.conf',
-   'elogind-sleep',
-   'elogind-suspend-then-hibernate.service'],
-  '8',
-  ''],
-  '5',
-  ['system.conf.d', 'elogind-user.conf', 'user.conf.d'],
-  ''],
- ['elogind-sysusers', '8', ['elogind-sysusers.service'], ''],
- ['elogind-sysv-generator', '8', [], 'HAVE_SYSV_COMPAT'],
- ['elogind-timedated.service', '8', ['elogind-timedated'], 'ENABLE_TIMEDATED'],
- ['elogind-timesyncd.service', '8', ['elogind-timesyncd'], 'ENABLE_TIMESYNCD'],
- ['elogind-tmpfiles',
-  ['elogind-tmpfiles-clean.service',
-   'elogind-tmpfiles-clean.timer',
-   'elogind-tmpfiles-setup-dev.service',
-   'elogind-tmpfiles-setup.service'],
- ['elogind-tty-ask-password-agent', '1', [], ''],
- ['elogind-udevd.service',
-  ['elogind-udevd',
-   'elogind-udevd-control.socket',
-   'elogind-udevd-kernel.socket'],
- ['elogind-time-wait-sync.service',
-  '8',
-  ['elogind-time-wait-sync'],
-  'ENABLE_TIMESYNCD'],
-  '8',
-  ''],
-  '8',
-  ''],
- ['elogind-update-done.service', '8', ['elogind-update-done'], ''],
- ['elogind-update-utmp.service',
-  '8',
-  ['elogind-update-utmp', 'elogind-update-utmp-runlevel.service'],
-  'ENABLE_UTMP'],
- ['elogind-user-sessions.service', '8', ['elogind-user-sessions'], 'HAVE_PAM'],
- ['elogind-vconsole-setup.service',
-  '8',
-  ['elogind-vconsole-setup'],
-  'ENABLE_VCONSOLE'],
- ['elogind-veritysetup-generator', '8', [], 'HAVE_LIBCRYPTSETUP'],
- ['elogind-veritysetup@.service',
-  '8',
-  ['elogind-veritysetup'],
-  'HAVE_LIBCRYPTSETUP'],
- ['elogind-volatile-root.service', '8', ['elogind-volatile-root'], ''],
- ['elogind', '1', ['init'], ''],
- ['elogind.automount', '5', [], ''],
- ['elogind.device', '5', [], ''],
- ['elogind.dnssd', '5', [], 'ENABLE_RESOLVE'],
- ['elogind.environment-generator', '7', [], 'ENABLE_ENVIRONMENT_D'],
- ['elogind.exec', '5', [], ''],
- ['elogind.generator', '7', [], ''],
- ['elogind.journal-fields', '7', [], ''],
- ['elogind.kill', '5', [], ''],
- ['elogind.link', '5', [], ''],
- ['elogind.mount', '5', [], ''],
- ['elogind.netdev', '5', [], 'ENABLE_NETWORKD'],
- ['elogind.network', '5', [], 'ENABLE_NETWORKD'],
- ['elogind.nspawn', '5', [], ''],
- ['elogind.offline-updates', '7', [], ''],
- ['elogind.path', '5', [], ''],
- ['elogind.preset', '5', [], ''],
- ['elogind.resource-control', '5', [], ''],
- ['elogind.scope', '5', [], ''],
- ['elogind.service', '5', [], ''],
- ['elogind.slice', '5', [], ''],
- ['elogind.socket', '5', [], ''],
- ['elogind.special', '7', [], ''],
- ['elogind.swap', '5', [], ''],
- ['elogind.target', '5', [], ''],
- ['elogind.time', '7', [], ''],
- ['elogind.timer', '5', [], ''],
- ['elogind.unit', '5', [], ''],
- ['elogind.syntax', '7', [], ''],
- ['sysusers.d', '5', [], 'ENABLE_SYSUSERS'],
- ['telinit', '8', [], ''],
- ['timedatectl', '1', [], 'ENABLE_TIMEDATECTL'],
- ['timesyncd.conf', '5', ['timesyncd.conf.d'], 'ENABLE_TIMESYNCD'],
- ['tmpfiles.d', '5', [], ''],
- ['udev', '7', [], ''],
- ['udev.conf', '5', [], ''],
- ['udev_device_get_syspath',
-  '3',
-  ['udev_device_get_action',
-   'udev_device_get_devnode',
-   'udev_device_get_devnum',
-   'udev_device_get_devpath',
-   'udev_device_get_devtype',
-   'udev_device_get_driver',
-   'udev_device_get_is_initialized',
-   'udev_device_get_parent',
-   'udev_device_get_parent_with_subsystem_devtype',
-   'udev_device_get_subsystem',
-   'udev_device_get_sysname',
-   'udev_device_get_sysnum',
-   'udev_device_get_udev'],
-  ''],
- ['udev_device_has_tag',
-  '3',
-  ['udev_device_get_devlinks_list_entry',
-   'udev_device_get_properties_list_entry',
-   'udev_device_get_property_value',
-   'udev_device_get_sysattr_list_entry',
-   'udev_device_get_sysattr_value',
-   'udev_device_get_tags_list_entry',
-   'udev_device_set_sysattr_value'],
-  ''],
- ['udev_device_new_from_syspath',
-  '3',
-  ['udev_device_new_from_device_id',
-   'udev_device_new_from_devnum',
-   'udev_device_new_from_environment',
-   'udev_device_new_from_subsystem_sysname',
-   'udev_device_ref',
-   'udev_device_unref'],
-  ''],
- ['udev_enumerate_add_match_subsystem',
-  '3',
-  ['udev_enumerate_add_match_is_initialized',
-   'udev_enumerate_add_match_parent',
-   'udev_enumerate_add_match_property',
-   'udev_enumerate_add_match_sysattr',
-   'udev_enumerate_add_match_sysname',
-   'udev_enumerate_add_match_tag',
-   'udev_enumerate_add_nomatch_subsystem',
-   'udev_enumerate_add_nomatch_sysattr'],
-  ''],
- ['udev_enumerate_new',
-  '3',
-  ['udev_enumerate_ref', 'udev_enumerate_unref'],
-  ''],
- ['udev_enumerate_scan_devices',
-  '3',
-  ['udev_enumerate_add_syspath',
-   'udev_enumerate_get_list_entry',
-   'udev_enumerate_get_udev',
-   'udev_enumerate_scan_subsystems'],
-  ''],
- ['udev_list_entry',
-  '3',
-  ['udev_list_entry_get_by_name',
-   'udev_list_entry_get_name',
-   'udev_list_entry_get_next',
-   'udev_list_entry_get_value'],
-  ''],
- ['udev_monitor_filter_update',
-  '3',
-  ['udev_monitor_filter_add_match_subsystem_devtype',
-   'udev_monitor_filter_add_match_tag',
-   'udev_monitor_filter_remove'],
-  ''],
- ['udev_monitor_new_from_netlink',
-  '3',
-  ['udev_monitor_ref', 'udev_monitor_unref'],
-  ''],
- ['udev_monitor_receive_device',
-  '3',
-  ['udev_monitor_enable_receiving',
-   'udev_monitor_get_fd',
-   'udev_monitor_get_udev',
-   'udev_monitor_set_receive_buffer_size'],
-  ''],
- ['udev_new', '3', ['udev_ref', 'udev_unref'], ''],
- ['udevadm', '8', [], ''],
- ['vconsole.conf', '5', [], 'ENABLE_VCONSOLE']
+ ['sd_watchdog_enabled', '3', [], '']
 ]
 # Really, do not edit.
index 86de4f4934e42b89ca684c1c0380d43000d33455..e0276572f95c0db826f89fe29270333568a0b49b 100644 (file)
@@ -278,8 +278,8 @@ conf.set_quoted('ROOTLIBEXECDIR',                             rootlibexecdir)
 # conf.set_quoted('USER_KEYRING_PATH',                          join_paths(pkgsysconfdir, 'import-pubring.gpg'))
 # conf.set_quoted('DOCUMENT_ROOT',                              join_paths(pkgdatadir, 'gatewayd'))
 # conf.set('MEMORY_ACCOUNTING_DEFAULT',                         memory_accounting_default ? 'true' : 'false')
+# conf.set_quoted('MEMORY_ACCOUNTING_DEFAULT_YES_NO',           memory_accounting_default ? 'yes' : 'no')
 #endif // 0
-conf.set_quoted('MEMORY_ACCOUNTING_DEFAULT_YES_NO',           memory_accounting_default ? 'yes' : 'no')
 
 conf.set_quoted('ABS_BUILD_DIR',                              meson.build_root())
 conf.set_quoted('ABS_SRC_DIR',                                meson.source_root())
@@ -302,8 +302,8 @@ substs.set('rootlibexecdir',                                  rootlibexecdir)
 #endif // 0
 substs.set('udevrulesdir',                                    udevrulesdir)
 substs.set('udevlibexecdir',                                  udevlibexecdir)
-substs.set('environmentdir',                                  environmentdir)
 #if 0 /// UNNEEDED by elogind
+# substs.set('environmentdir',                                  environmentdir)
 # substs.set('catalogdir',                                      catalogdir)
 # substs.set('tmpfilesdir',                                     tmpfilesdir)
 # substs.set('sysusersdir',                                     sysusersdir)
@@ -358,56 +358,56 @@ endif
 # if want_ossfuzz
 #         fuzzing_engine = meson.get_compiler('cpp').find_library('FuzzingEngine')
 # endif
-# 
-# possible_cc_flags = [
-#         '-Wextra',
-#         '-Werror=undef',
-#         '-Wlogical-op',
-#         '-Wmissing-include-dirs',
-#         '-Wold-style-definition',
-#         '-Wpointer-arith',
-#         '-Winit-self',
-#         '-Wfloat-equal',
-#         '-Wsuggest-attribute=noreturn',
-#         '-Werror=missing-prototypes',
-#         '-Werror=implicit-function-declaration',
-#         '-Werror=missing-declarations',
-#         '-Werror=return-type',
-#         '-Werror=incompatible-pointer-types',
-#         '-Werror=format=2',
-#         '-Wstrict-prototypes',
-#         '-Wredundant-decls',
-#         '-Wmissing-noreturn',
-#         '-Wimplicit-fallthrough=5',
-#         '-Wshadow',
-#         '-Wendif-labels',
-#         '-Wstrict-aliasing=2',
-#         '-Wwrite-strings',
-#         '-Werror=overflow',
-#         '-Werror=shift-count-overflow',
-#         '-Werror=shift-overflow=2',
-#         '-Wdate-time',
-#         '-Wnested-externs',
-#         '-ffast-math',
-#         '-fno-common',
-#         '-fdiagnostics-show-option',
-#         '-fno-strict-aliasing',
-#         '-fvisibility=hidden',
-#         '-fstack-protector',
-#         '-fstack-protector-strong',
-#         '--param=ssp-buffer-size=4',
-# ]
-# 
-# # --as-needed and --no-undefined are provided by meson by default,
-# # run mesonconf to see what is enabled
-# possible_link_flags = [
-#         '-Wl,-z,relro',
-#         '-Wl,-z,now',
-# ]
 #else
 fuzzer_build = false
 #endif // 0
 
+possible_cc_flags = [
+        '-Wextra',
+        '-Werror=undef',
+        '-Wlogical-op',
+        '-Wmissing-include-dirs',
+        '-Wold-style-definition',
+        '-Wpointer-arith',
+        '-Winit-self',
+        '-Wfloat-equal',
+        '-Wsuggest-attribute=noreturn',
+        '-Werror=missing-prototypes',
+        '-Werror=implicit-function-declaration',
+        '-Werror=missing-declarations',
+        '-Werror=return-type',
+        '-Werror=incompatible-pointer-types',
+        '-Werror=format=2',
+        '-Wstrict-prototypes',
+        '-Wredundant-decls',
+        '-Wmissing-noreturn',
+        '-Wimplicit-fallthrough=5',
+        '-Wshadow',
+        '-Wendif-labels',
+        '-Wstrict-aliasing=2',
+        '-Wwrite-strings',
+        '-Werror=overflow',
+        '-Werror=shift-count-overflow',
+        '-Werror=shift-overflow=2',
+        '-Wdate-time',
+        '-Wnested-externs',
+        '-ffast-math',
+        '-fno-common',
+        '-fdiagnostics-show-option',
+        '-fno-strict-aliasing',
+        '-fvisibility=hidden',
+        '-fstack-protector',
+        '-fstack-protector-strong',
+        '--param=ssp-buffer-size=4',
+]
+
+# --as-needed and --no-undefined are provided by meson by default,
+# run mesonconf to see what is enabled
+possible_link_flags = [
+        '-Wl,-z,relro',
+        '-Wl,-z,now',
+]
+
 # the oss-fuzz fuzzers are not built with -fPIE, so don't
 # enable it when we are linking against them
 if not fuzzer_build
@@ -684,8 +684,10 @@ foreach header : ['crypt.h',
                   'linux/memfd.h',
                   'linux/vm_sockets.h',
                   'sys/auxv.h',
-                  'valgrind/memcheck.h',
-                  'valgrind/valgrind.h',
+#if 0 /// UNNEEDED by elogind
+#                   'valgrind/memcheck.h',
+#                   'valgrind/valgrind.h',
+#endif // 0
                  ]
 
         conf.set10('HAVE_' + header.underscorify().to_upper(),
@@ -888,15 +890,15 @@ enable_debug_mmap_cache = false
 #if 1 /// additional elogind debug mode
 enable_debug_elogind = false
 #endif // 1
-#if 1 /// additional elogind debug mode
-                elif name == 'elogind'
-                        enable_debug_elogind = true
-#endif // 1
 foreach name : get_option('debug')
         if name == 'hashmap'
                 enable_debug_hashmap = true
         elif name == 'mmap-cache'
                 enable_debug_mmap_cache = true
+#if 1 /// additional elogind debug mode
+        elif name == 'elogind'
+                enable_debug_elogind = true
+#endif // 1
         else
                 message('unknown debug option "@0@", ignoring'.format(name))
         endif
@@ -907,7 +909,9 @@ conf.set10('ENABLE_DEBUG_MMAP_CACHE', enable_debug_mmap_cache)
 conf.set10('ENABLE_DEBUG_ELOGIND', enable_debug_elogind)
 #endif // 1
 
-conf.set10('VALGRIND', get_option('valgrind'))
+#if 0 /// UNNEEDED by elogind
+# conf.set10('VALGRIND', get_option('valgrind'))
+#endif // 0
 
 #####################################################################
 
@@ -1395,7 +1399,9 @@ foreach term : ['utmp',
         conf.set10(name, have)
 endforeach
 
-conf.set10('ENABLE_TIMEDATECTL', get_option('timedated') or get_option('timesyncd'))
+#if 0 /// UNNEEDED by elogind
+# conf.set10('ENABLE_TIMEDATECTL', get_option('timedated') or get_option('timesyncd'))
+#endif // 0
 
 want_tests = get_option('tests')
 install_tests = get_option('install-tests')
@@ -1455,8 +1461,8 @@ includes = include_directories('src/basic',
 #                                'src/nspawn',
 #                                'src/resolve',
 #                                'src/timesync',
+#                                'src/time-wait-sync',
 #endif // 0
-                               'src/time-wait-sync',
                                'src/login',
 #if 0 /// UNNEEDED by elogind
 #                                'src/udev',
@@ -1541,9 +1547,13 @@ static_libelogind_pic = static_libelogind == 'true' or static_libelogind == 'pic
 install_libelogind_static = static_library(
         'elogind',
         libelogind_sources,
-        journal_client_sources,
+#if 0 /// No journald with elogind (And before you ask: NO!)
+#         journal_client_sources,
+#endif // 0
         basic_sources,
-        basic_gcrypt_sources,
+#if 0 /// No gcrypt with elogind
+#         basic_gcrypt_sources,
+#endif // 0
         include_directories : includes,
         build_by_default : static_libelogind != 'false',
         install : static_libelogind != 'false',
@@ -1555,9 +1565,15 @@ install_libelogind_static = static_library(
                         liblz4,
                         libcap,
                         libblkid,
-                        libmount,
+#if 0 /// libmount isn't built with elogind (and absolutely not needed anyway.)
+#                         libmount,
+#endif // 0
                         libselinux,
-                        libgcrypt],
+#if 0 /// No grypt with elogind
+#                         libgcrypt],
+#else
+                        ],
+#endif // 0
         c_args : libelogind_c_args + (static_libelogind_pic ? [] : ['-fno-PIC']))
 
 ############################################################
@@ -1901,6 +1917,14 @@ test_dlopen = executable(
 #         endif
 # endif
 # 
+# executable('systemd-user-runtime-dir',
+#            user_runtime_dir_sources,
+#            include_directories : includes,
+#            link_with : [libshared, liblogind_core],
+#            install_rpath : rootlibexecdir,
+#            install : true,
+#            install_dir : rootlibexecdir)
+# 
 #else
 
 executable('elogind',
@@ -1935,33 +1959,6 @@ exe = executable('elogind-inhibit',
                         install : true,
                         install_dir : rootbindir)
 public_programs += [exe]
-executable('elogind-user-runtime-dir',
-executable('elogind-user-runtime-dir',
-executable('elogind-user-runtime-dir',
-executable('elogind-user-runtime-dir',
-executable('elogind-user-runtime-dir',
-executable('elogind-user-runtime-dir',
-executable('elogind-user-runtime-dir',
-executable('elogind-user-runtime-dir',
-executable('elogind-user-runtime-dir',
-executable('elogind-user-runtime-dir',
-executable('elogind-user-runtime-dir',
-executable('elogind-user-runtime-dir',
-executable('elogind-user-runtime-dir',
-executable('elogind-user-runtime-dir',
-executable('elogind-user-runtime-dir',
-executable('elogind-user-runtime-dir',
-executable('elogind-user-runtime-dir',
-executable('elogind-user-runtime-dir',
-executable('elogind-user-runtime-dir',
-executable('elogind-user-runtime-dir',
-executable('elogind-user-runtime-dir',
-           user_runtime_dir_sources,
-           include_directories : includes,
-           link_with : [libshared, liblogind_core],
-           install_rpath : rootlibexecdir,
-           install : true,
-           install_dir : rootlibexecdir)
 
 if conf.get('HAVE_PAM') == 1
         version_script_arg = join_paths(meson.current_source_dir(), pam_elogind_sym)
@@ -3008,9 +3005,9 @@ subdir('man')
 subdir('shell-completion/bash')
 subdir('shell-completion/zsh')
 #if 0 /// UNNEEDED by elogind
+# subdir('doc/sysvinit')
+# subdir('doc/var-log')
 #endif // 0
-subdir('doc/sysvinit')
-subdir('doc/var-log')
 
 # FIXME: figure out if the warning is true:
 # https://github.com/mesonbuild/meson/wiki/Reference-manual#install_subdir
@@ -3384,9 +3381,11 @@ status += [
         '']
 message('\n         '.join(status))
 
-if rootprefixdir != rootprefix_default
-        warning('\n' +
-                'Note that the installation prefix was changed to "@0@".\n'.format(rootprefixdir) +
-                'elogind used fixed names for unit file directories and other paths, so anything\n' +
-                'except the default ("@0@") is strongly discouraged.'.format(rootprefix_default))
-endif
+#if 0 /// Nicely enough this isn't true for elogind. :-)
+# if rootprefixdir != rootprefix_default
+#         warning('\n' +
+#                 'Note that the installation prefix was changed to "@0@".\n'.format(rootprefixdir) +
+#                 'systemd used fixed names for unit file directories and other paths, so anything\n' +
+#                 'except the default ("@0@") is strongly discouraged.'.format(rootprefix_default))
+# endif
+#endif // 0
index 487c43c555e134856cf6b458dd2e4110157a9aa6..37d434191535d9cd7b52fd09f4d493fe6fd11b44 100644 (file)
@@ -14,9 +14,11 @@ option('rootprefix', type : 'string',
 #        description : 'link systemd-udev and its helpers to libsystemd-shared.so')
 # option('link-systemctl-shared', type: 'boolean',
 #        description : 'link systemctl against libsystemd-shared.so')
-# option('static-libsystemd', type : 'combo',
-#        choices : ['false', 'true', 'pic', 'no-pic'],
-#        description : '''install a static library for libsystemd''')
+#endif // 0
+option('static-libelogind', type : 'combo',
+       choices : ['false', 'true', 'pic', 'no-pic'],
+       description : '''install a static library for libelogind''')
+#if 0 /// UNNEEDED by elogind
 # option('static-libudev', type : 'combo',
 #        choices : ['false', 'true', 'pic', 'no-pic'],
 #        description : '''install a static library for libudev''')
@@ -77,8 +79,8 @@ option('kexec-path', type : 'string', description : 'path to kexec')
 # option('valgrind', type : 'boolean', value : false,
 #        description : 'do extra operations to avoid valgrind warnings')
 #else
-option('debug', type : 'string',
-       description : 'enable extra debugging (elogind,hashmap,mmap-cache)')
+option('debug', type : 'array', choices : ['elogind', 'hashmap', 'mmap-cache'], value : [],
+       description : 'enable extra debugging')
 #endif // 0
 
 option('utmp', type : 'boolean',
index 56b8b06b3e78bb8bb52e330ae6a8016d13486927..c4b495e1d316b17604ce486a889117167b1b357d 100644 (file)
@@ -459,9 +459,11 @@ foreach item : [['cap',    cap_list_txt,    'capability', ''],
 endforeach
 
 basic_sources += [missing_h] + generated_gperf_headers
-basic_gcrypt_sources = files(
-        'gcrypt-util.c',
-        'gcrypt-util.h')
+#if 0 /// elogind does not need gcrypt
+# basic_gcrypt_sources = files(
+#         'gcrypt-util.c',
+#         'gcrypt-util.h')
+#endif // 0
 
 libbasic = static_library(
         'basic',
@@ -469,7 +471,7 @@ libbasic = static_library(
         include_directories : includes,
         dependencies : [threads,
                         libcap,
-#if 0 /// no blkid in elogind
+#if 0 /// Neither blkid nor libmount in elogind
 #                         libblkid,
 #                         libmount,
 #endif // 0
index a54113d458dd58247b247a74cfe50f2c6dd180cf..dfecea3bcd324bc7e163b0850f5563e4288a3db4 100644 (file)
@@ -127,27 +127,27 @@ libelogind_sources = files('''
 '''.split()) + sd_login_c
 #endif // 0
 
-libelogind_static = static_library(
-        libelogind_sources,
 libelogind_c_args = ['-fvisibility=default']
 
+libelogind_static = static_library(
         'elogind_static',
+        libelogind_sources,
         install : false,
         include_directories : includes,
         link_with : libbasic,
 #if 0 /// elogind does not need librt
 #         dependencies : [threads,
 #                         librt],
-#         c_args : libsystemd_c_args)
-# 
-# libsystemd_sym = 'src/libsystemd/libsystemd.sym'
-# 
-# libsystemd_pc = configure_file(
-#         input : 'libsystemd.pc.in',
-#         output : 'libsystemd.pc',
-# install_data(libsystemd_pc,
 #else
         dependencies : [threads],
 #endif // 0
+        c_args : libelogind_c_args)
+
+libelogind_sym = 'src/libelogind/libelogind.sym'
+
+libelogind_pc = configure_file(
+        input : 'libelogind.pc.in',
+        output : 'libelogind.pc',
         configuration : substs)
+install_data(libelogind_pc,
              install_dir : pkgconfiglibdir)
index 2dfa648c3e9de62cf62b3a81069f3ef18418ef38..59083e6fcb3b508f8891016e19ebcf51087afe45 100644 (file)
@@ -83,115 +83,79 @@ loginctl_sources = files('''
         sysfs-show.c
 '''.split())
 
+#if 0 /// UNNEEDED by elogind
+# user_runtime_dir_sources = files('''
+#         user-runtime-dir.c
+#         logind.h
+# '''.split())
+#endif // 0
+
 #if 1 /// elogind has some additional files:
 loginctl_sources += files('''
         eloginctl.c
         eloginctl.h
-user_runtime_dir_sources = files('''
-        user-runtime-dir.c
-        logind.h
 '''.split())
 #endif // 1
 
-#if 0 /// elogind builds itself unconditionally and with some adaptations
+#if 0 /// elogind builds itself unconditionally
 # if conf.get('ENABLE_LOGIND') == 1
-#         logind_conf = configure_file(
-#                 input : 'logind.conf.in',
-#                 output : 'logind.conf',
-#                 configuration : substs)
-#         install_data(logind_conf,
-#                      install_dir : pkgsysconfdir)
-# 
-#         pam_systemd_sym = 'src/login/pam_systemd.sym'
-#         pam_systemd_c = files('pam_systemd.c')
-# 
-#         install_data('org.freedesktop.login1.conf',
-#                      install_dir : dbuspolicydir)
+#endif // 0
+        logind_conf = configure_file(
+                input : 'logind.conf.in',
+                output : 'logind.conf',
+                configuration : substs)
+        install_data(logind_conf,
+                     install_dir : pkgsysconfdir)
+
+        pam_elogind_sym = 'src/login/pam_elogind.sym'
+        pam_elogind_c = files('pam_elogind.c')
+
+        install_data('org.freedesktop.login1.conf',
+                     install_dir : dbuspolicydir)
+#if 0 /// Works a bit differently here, as elogind alows dbus activation.
 #         install_data('org.freedesktop.login1.service',
 #                      install_dir : dbussystemservicedir)
-#         install_data('org.freedesktop.login1.policy',
-#                      install_dir : polkitpolicydir)
-# 
-#         install_data('70-power-switch.rules', install_dir : udevrulesdir)
-# 
-#         if conf.get('HAVE_ACL') == 1
-#                 install_data('70-uaccess.rules', install_dir : udevrulesdir)
-#         endif
-# 
-#         seat_rules = configure_file(
-#                 input : '71-seat.rules.in',
-#                 output : '71-seat.rules',
-#                 configuration : substs)
-#         install_data(seat_rules,
-#                      install_dir : udevrulesdir)
-# 
-#         custom_target(
-#                 '73-seat-late.rules',
-#                 input : '73-seat-late.rules.m4',
-#                 output: '73-seat-late.rules',
-#                 command : [meson_apply_m4, config_h, '@INPUT@'],
-#                 capture : true,
-#                 install : true,
-#                 install_dir : udevrulesdir)
-# 
-#         custom_target(
-#                 'systemd-user',
-#                 input : 'systemd-user.m4',
-#                 output: 'systemd-user',
-#                 command : [meson_apply_m4, config_h, '@INPUT@'],
-#                 capture : true,
-#                 install : pamconfdir != 'no',
-#                 install_dir : pamconfdir)
-# endif
 #else
-logind_conf = configure_file(
-        input : 'logind.conf.in',
-        output : 'logind.conf',
-        configuration : substs)
-install_data(logind_conf,
-                install_dir : pkgsysconfdir)
-
-pam_elogind_sym = 'src/login/pam_elogind.sym'
-pam_elogind_c = files('pam_elogind.c')
-
-install_data('org.freedesktop.login1.conf',
-                install_dir : dbuspolicydir)
 logind_service = configure_file(
         input : 'org.freedesktop.login1.service.in',
         output : 'org.freedesktop.login1.service',
         configuration : substs)
 install_data(logind_service,
                 install_dir : dbussystemservicedir)
+#endif // 0
+        install_data('org.freedesktop.login1.policy',
+                     install_dir : polkitpolicydir)
 
-i18n.merge_file(
-        'org.freedesktop.login1.policy',
-        input : 'org.freedesktop.login1.policy.in',
-        output : 'org.freedesktop.login1.policy',
-        po_dir : po_dir,
-        data_dirs : po_dir,
-        install : install_polkit,
-        install_dir : polkitpolicydir)
-
-install_data('70-power-switch.rules',
-                '70-uaccess.rules',
-                install_dir : udevrulesdir)
+        install_data('70-power-switch.rules', install_dir : udevrulesdir)
+
+        if conf.get('HAVE_ACL') == 1
+                install_data('70-uaccess.rules', install_dir : udevrulesdir)
+        endif
 
-foreach file : ['71-seat.rules',
-                '73-seat-late.rules']
-        gen = configure_file(
-                input : file + '.in',
-                output : file,
+        seat_rules = configure_file(
+                input : '71-seat.rules.in',
+                output : '71-seat.rules',
                 configuration : substs)
-        install_data(gen,
-                        install_dir : udevrulesdir)
-endforeach
-
-custom_target(
-        'elogind-user',
-        input : 'elogind-user.m4',
-        output: 'elogind-user',
-        command : [m4, '-P'] + m4_defines + ['@INPUT@'],
-        capture : true,
-        install : pamconfdir != 'no',
-        install_dir : pamconfdir)
+        install_data(seat_rules,
+                     install_dir : udevrulesdir)
+
+        custom_target(
+                '73-seat-late.rules',
+                input : '73-seat-late.rules.m4',
+                output: '73-seat-late.rules',
+                command : [meson_apply_m4, config_h, '@INPUT@'],
+                capture : true,
+                install : true,
+                install_dir : udevrulesdir)
+
+        custom_target(
+                'elogind-user',
+                input : 'elogind-user.m4',
+                output: 'elogind-user',
+                command : [meson_apply_m4, config_h, '@INPUT@'],
+                capture : true,
+                install : pamconfdir != 'no',
+                install_dir : pamconfdir)
+#if 0 /// elogind builds itself unconditionally
+# endif
 #endif //0
similarity index 62%
rename from src/login/org.freedesktop.login1.policy.in
rename to src/login/org.freedesktop.login1.policy
index 997a7d70f2417f4014a299073fc9c9e97245bee6..f1d1f956d33abcdd9c121ffe14e3e1607e711e6d 100644 (file)
@@ -3,11 +3,11 @@
         "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
 
 <!--
-  This file is part of elogind.
   SPDX-License-Identifier: LGPL-2.1+
 
-  elogind is free software; you can redistribute it and/or modify it
+  This file is part of systemd.
 
+  systemd is free software; you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as published by
   the Free Software Foundation; either version 2.1 of the License, or
   (at your option) any later version.
 
 <policyconfig>
 
-        <vendor>The elogind Project</vendor>
-        <!-- 0 /// Need to set this to the elogind project url
+        <vendor>The systemd Project</vendor>
         <vendor_url>http://www.freedesktop.org/wiki/Software/systemd</vendor_url>
-        --><!-- else -->
-        <vendor_url>https://github.com/elogind/elogind</vendor_url>
-        <!-- // 0 -->
 
         <action id="org.freedesktop.login1.inhibit-block-shutdown">
-                <description>Allow applications to inhibit system shutdown</description>
-                <message>Authentication is required for an application to inhibit system shutdown.</message>
+                <description gettext-domain="systemd">Allow applications to inhibit system shutdown</description>
+                <message gettext-domain="systemd">Authentication is required for an application to inhibit system shutdown.</message>
                 <defaults>
                         <allow_any>no</allow_any>
                         <allow_inactive>yes</allow_inactive>
@@ -34,8 +30,8 @@
         </action>
 
         <action id="org.freedesktop.login1.inhibit-delay-shutdown">
-                <description>Allow applications to delay system shutdown</description>
-                <message>Authentication is required for an application to delay system shutdown.</message>
+                <description gettext-domain="systemd">Allow applications to delay system shutdown</description>
+                <message gettext-domain="systemd">Authentication is required for an application to delay system shutdown.</message>
                 <defaults>
                         <allow_any>yes</allow_any>
                         <allow_inactive>yes</allow_inactive>
@@ -45,8 +41,8 @@
         </action>
 
         <action id="org.freedesktop.login1.inhibit-block-sleep">
-                <description>Allow applications to inhibit system sleep</description>
-                <message>Authentication is required for an application to inhibit system sleep.</message>
+                <description gettext-domain="systemd">Allow applications to inhibit system sleep</description>
+                <message gettext-domain="systemd">Authentication is required for an application to inhibit system sleep.</message>
                 <defaults>
                         <allow_any>no</allow_any>
                         <allow_inactive>yes</allow_inactive>
@@ -56,8 +52,8 @@
         </action>
 
         <action id="org.freedesktop.login1.inhibit-delay-sleep">
-                <description>Allow applications to delay system sleep</description>
-                <message>Authentication is required for an application to delay system sleep.</message>
+                <description gettext-domain="systemd">Allow applications to delay system sleep</description>
+                <message gettext-domain="systemd">Authentication is required for an application to delay system sleep.</message>
                 <defaults>
                         <allow_any>yes</allow_any>
                         <allow_inactive>yes</allow_inactive>
@@ -66,8 +62,8 @@
         </action>
 
         <action id="org.freedesktop.login1.inhibit-block-idle">
-                <description>Allow applications to inhibit automatic system suspend</description>
-                <message>Authentication is required for an application to inhibit automatic system suspend.</message>
+                <description gettext-domain="systemd">Allow applications to inhibit automatic system suspend</description>
+                <message gettext-domain="systemd">Authentication is required for an application to inhibit automatic system suspend.</message>
                 <defaults>
                         <allow_any>yes</allow_any>
                         <allow_inactive>yes</allow_inactive>
@@ -76,8 +72,8 @@
         </action>
 
         <action id="org.freedesktop.login1.inhibit-handle-power-key">
-                <description>Allow applications to inhibit system handling of the power key</description>
-                <message>Authentication is required for an application to inhibit system handling of the power key.</message>
+                <description gettext-domain="systemd">Allow applications to inhibit system handling of the power key</description>
+                <message gettext-domain="systemd">Authentication is required for an application to inhibit system handling of the power key.</message>
                 <defaults>
                         <allow_any>no</allow_any>
                         <allow_inactive>yes</allow_inactive>
@@ -87,8 +83,8 @@
         </action>
 
         <action id="org.freedesktop.login1.inhibit-handle-suspend-key">
-                <description>Allow applications to inhibit system handling of the suspend key</description>
-                <message>Authentication is required for an application to inhibit system handling of the suspend key.</message>
+                <description gettext-domain="systemd">Allow applications to inhibit system handling of the suspend key</description>
+                <message gettext-domain="systemd">Authentication is required for an application to inhibit system handling of the suspend key.</message>
                 <defaults>
                         <allow_any>no</allow_any>
                         <allow_inactive>yes</allow_inactive>
@@ -98,8 +94,8 @@
         </action>
 
         <action id="org.freedesktop.login1.inhibit-handle-hibernate-key">
-                <description>Allow applications to inhibit system handling of the hibernate key</description>
-                <message>Authentication is required for an application to inhibit system handling of the hibernate key.</message>
+                <description gettext-domain="systemd">Allow applications to inhibit system handling of the hibernate key</description>
+                <message gettext-domain="systemd">Authentication is required for an application to inhibit system handling of the hibernate key.</message>
                 <defaults>
                         <allow_any>no</allow_any>
                         <allow_inactive>yes</allow_inactive>
         </action>
 
         <action id="org.freedesktop.login1.inhibit-handle-lid-switch">
-                <description>Allow applications to inhibit system handling of the lid switch</description>
-                <message>Authentication is required for an application to inhibit system handling of the lid switch.</message>
+                <description gettext-domain="systemd">Allow applications to inhibit system handling of the lid switch</description>
+                <message gettext-domain="systemd">Authentication is required for an application to inhibit system handling of the lid switch.</message>
                 <defaults>
                         <allow_any>no</allow_any>
                         <allow_inactive>yes</allow_inactive>
         </action>
 
         <action id="org.freedesktop.login1.set-self-linger">
-                <description>Allow non-logged-in user to run programs</description>
-                <message>Explicit request is required to run programs as a non-logged-in user.</message>
+                <description gettext-domain="systemd">Allow non-logged-in user to run programs</description>
+                <message gettext-domain="systemd">Explicit request is required to run programs as a non-logged-in user.</message>
                 <defaults>
                         <allow_any>yes</allow_any>
                         <allow_inactive>yes</allow_inactive>
         </action>
 
         <action id="org.freedesktop.login1.set-user-linger">
-                <description>Allow non-logged-in users to run programs</description>
-                <message>Authentication is required to run programs as a non-logged-in user.</message>
+                <description gettext-domain="systemd">Allow non-logged-in users to run programs</description>
+                <message gettext-domain="systemd">Authentication is required to run programs as a non-logged-in user.</message>
                 <defaults>
                         <allow_any>auth_admin_keep</allow_any>
                         <allow_inactive>auth_admin_keep</allow_inactive>
         </action>
 
         <action id="org.freedesktop.login1.attach-device">
-                <description>Allow attaching devices to seats</description>
-                <message>Authentication is required for attaching a device to a seat.</message>
+                <description gettext-domain="systemd">Allow attaching devices to seats</description>
+                <message gettext-domain="systemd">Authentication is required for attaching a device to a seat.</message>
                 <defaults>
                         <allow_any>auth_admin_keep</allow_any>
                         <allow_inactive>auth_admin_keep</allow_inactive>
         </action>
 
         <action id="org.freedesktop.login1.flush-devices">
-                <description>Flush device to seat attachments</description>
-                <message>Authentication is required for resetting how devices are attached to seats.</message>
+                <description gettext-domain="systemd">Flush device to seat attachments</description>
+                <message gettext-domain="systemd">Authentication is required for resetting how devices are attached to seats.</message>
                 <defaults>
                         <allow_any>auth_admin_keep</allow_any>
                         <allow_inactive>auth_admin_keep</allow_inactive>
         </action>
 
         <action id="org.freedesktop.login1.power-off">
-                <description>Power off the system</description>
-                <message>Authentication is required for powering off the system.</message>
+                <description gettext-domain="systemd">Power off the system</description>
+                <message gettext-domain="systemd">Authentication is required for powering off the system.</message>
                 <defaults>
                         <allow_any>auth_admin_keep</allow_any>
                         <allow_inactive>auth_admin_keep</allow_inactive>
         </action>
 
         <action id="org.freedesktop.login1.power-off-multiple-sessions">
-                <description>Power off the system while other users are logged in</description>
-                <message>Authentication is required for powering off the system while other users are logged in.</message>
+                <description gettext-domain="systemd">Power off the system while other users are logged in</description>
+                <message gettext-domain="systemd">Authentication is required for powering off the system while other users are logged in.</message>
                 <defaults>
                         <allow_any>auth_admin_keep</allow_any>
                         <allow_inactive>auth_admin_keep</allow_inactive>
         </action>
 
         <action id="org.freedesktop.login1.power-off-ignore-inhibit">
-                <description>Power off the system while an application asked to inhibit it</description>
-                <message>Authentication is required for powering off the system while an application asked to inhibit it.</message>
+                <description gettext-domain="systemd">Power off the system while an application asked to inhibit it</description>
+                <message gettext-domain="systemd">Authentication is required for powering off the system while an application asked to inhibit it.</message>
                 <defaults>
                         <allow_any>auth_admin_keep</allow_any>
                         <allow_inactive>auth_admin_keep</allow_inactive>
         </action>
 
         <action id="org.freedesktop.login1.reboot">
-                <description>Reboot the system</description>
-                <message>Authentication is required for rebooting the system.</message>
+                <description gettext-domain="systemd">Reboot the system</description>
+                <message gettext-domain="systemd">Authentication is required for rebooting the system.</message>
                 <defaults>
                         <allow_any>auth_admin_keep</allow_any>
                         <allow_inactive>auth_admin_keep</allow_inactive>
         </action>
 
         <action id="org.freedesktop.login1.reboot-multiple-sessions">
-                <description>Reboot the system while other users are logged in</description>
-                <message>Authentication is required for rebooting the system while other users are logged in.</message>
+                <description gettext-domain="systemd">Reboot the system while other users are logged in</description>
+                <message gettext-domain="systemd">Authentication is required for rebooting the system while other users are logged in.</message>
                 <defaults>
                         <allow_any>auth_admin_keep</allow_any>
                         <allow_inactive>auth_admin_keep</allow_inactive>
         </action>
 
         <action id="org.freedesktop.login1.reboot-ignore-inhibit">
-                <description>Reboot the system while an application asked to inhibit it</description>
-                <message>Authentication is required for rebooting the system while an application asked to inhibit it.</message>
+                <description gettext-domain="systemd">Reboot the system while an application asked to inhibit it</description>
+                <message gettext-domain="systemd">Authentication is required for rebooting the system while an application asked to inhibit it.</message>
                 <defaults>
                         <allow_any>auth_admin_keep</allow_any>
                         <allow_inactive>auth_admin_keep</allow_inactive>
         </action>
 
         <action id="org.freedesktop.login1.halt">
-                <description>Halt the system</description>
-                <message>Authentication is required for halting the system.</message>
+                <description gettext-domain="systemd">Halt the system</description>
+                <message gettext-domain="systemd">Authentication is required for halting the system.</message>
                 <defaults>
                         <allow_any>auth_admin_keep</allow_any>
                         <allow_inactive>auth_admin_keep</allow_inactive>
         </action>
 
         <action id="org.freedesktop.login1.halt-multiple-sessions">
-                <description>Halt the system while other users are logged in</description>
-                <message>Authentication is required for halting the system while other users are logged in.</message>
+                <description gettext-domain="systemd">Halt the system while other users are logged in</description>
+                <message gettext-domain="systemd">Authentication is required for halting the system while other users are logged in.</message>
                 <defaults>
                         <allow_any>auth_admin_keep</allow_any>
                         <allow_inactive>auth_admin_keep</allow_inactive>
         </action>
 
         <action id="org.freedesktop.login1.halt-ignore-inhibit">
-                <description>Halt the system while an application asked to inhibit it</description>
-                <message>Authentication is required for halting the system while an application asked to inhibit it.</message>
+                <description gettext-domain="systemd">Halt the system while an application asked to inhibit it</description>
+                <message gettext-domain="systemd">Authentication is required for halting the system while an application asked to inhibit it.</message>
                 <defaults>
                         <allow_any>auth_admin_keep</allow_any>
                         <allow_inactive>auth_admin_keep</allow_inactive>
         </action>
 
         <action id="org.freedesktop.login1.suspend">
-                <description>Suspend the system</description>
-                <message>Authentication is required for suspending the system.</message>
+                <description gettext-domain="systemd">Suspend the system</description>
+                <message gettext-domain="systemd">Authentication is required for suspending the system.</message>
                 <defaults>
                         <allow_any>auth_admin_keep</allow_any>
                         <allow_inactive>auth_admin_keep</allow_inactive>
         </action>
 
         <action id="org.freedesktop.login1.suspend-multiple-sessions">
-                <description>Suspend the system while other users are logged in</description>
-                <message>Authentication is required for suspending the system while other users are logged in.</message>
+                <description gettext-domain="systemd">Suspend the system while other users are logged in</description>
+                <message gettext-domain="systemd">Authentication is required for suspending the system while other users are logged in.</message>
                 <defaults>
                         <allow_any>auth_admin_keep</allow_any>
                         <allow_inactive>auth_admin_keep</allow_inactive>
         </action>
 
         <action id="org.freedesktop.login1.suspend-ignore-inhibit">
-                <description>Suspend the system while an application asked to inhibit it</description>
-                <message>Authentication is required for suspending the system while an application asked to inhibit it.</message>
+                <description gettext-domain="systemd">Suspend the system while an application asked to inhibit it</description>
+                <message gettext-domain="systemd">Authentication is required for suspending the system while an application asked to inhibit it.</message>
                 <defaults>
                         <allow_any>auth_admin_keep</allow_any>
                         <allow_inactive>auth_admin_keep</allow_inactive>
         </action>
 
         <action id="org.freedesktop.login1.hibernate">
-                <description>Hibernate the system</description>
-                <message>Authentication is required for hibernating the system.</message>
+                <description gettext-domain="systemd">Hibernate the system</description>
+                <message gettext-domain="systemd">Authentication is required for hibernating the system.</message>
                 <defaults>
                         <allow_any>auth_admin_keep</allow_any>
                         <allow_inactive>auth_admin_keep</allow_inactive>
         </action>
 
         <action id="org.freedesktop.login1.hibernate-multiple-sessions">
-                <description>Hibernate the system while other users are logged in</description>
-                <message>Authentication is required for hibernating the system while other users are logged in.</message>
+                <description gettext-domain="systemd">Hibernate the system while other users are logged in</description>
+                <message gettext-domain="systemd">Authentication is required for hibernating the system while other users are logged in.</message>
                 <defaults>
                         <allow_any>auth_admin_keep</allow_any>
                         <allow_inactive>auth_admin_keep</allow_inactive>
         </action>
 
         <action id="org.freedesktop.login1.hibernate-ignore-inhibit">
-                <description>Hibernate the system while an application asked to inhibit it</description>
-                <message>Authentication is required for hibernating the system while an application asked to inhibit it.</message>
+                <description gettext-domain="systemd">Hibernate the system while an application asked to inhibit it</description>
+                <message gettext-domain="systemd">Authentication is required for hibernating the system while an application asked to inhibit it.</message>
                 <defaults>
                         <allow_any>auth_admin_keep</allow_any>
                         <allow_inactive>auth_admin_keep</allow_inactive>
         </action>
 
         <action id="org.freedesktop.login1.manage">
-                <description>Manage active sessions, users and seats</description>
-                <message>Authentication is required for managing active sessions, users and seats.</message>
+                <description gettext-domain="systemd">Manage active sessions, users and seats</description>
+                <message gettext-domain="systemd">Authentication is required for managing active sessions, users and seats.</message>
                 <defaults>
                         <allow_any>auth_admin_keep</allow_any>
                         <allow_inactive>auth_admin_keep</allow_inactive>
         </action>
 
         <action id="org.freedesktop.login1.lock-sessions">
-                <description>Lock or unlock active sessions</description>
-                <message>Authentication is required to lock or unlock active sessions.</message>
+                <description gettext-domain="systemd">Lock or unlock active sessions</description>
+                <message gettext-domain="systemd">Authentication is required to lock or unlock active sessions.</message>
                 <defaults>
                         <allow_any>auth_admin_keep</allow_any>
                         <allow_inactive>auth_admin_keep</allow_inactive>
         </action>
 
         <action id="org.freedesktop.login1.set-reboot-to-firmware-setup">
-                <description>Allow indication to the firmware to boot to setup interface</description>
-                <message>Authentication is required to indicate to the firmware to boot to setup interface.</message>
+                <description gettext-domain="systemd">Allow indication to the firmware to boot to setup interface</description>
+                <message gettext-domain="systemd">Authentication is required to indicate to the firmware to boot to setup interface.</message>
                 <defaults>
                         <allow_any>auth_admin_keep</allow_any>
                         <allow_inactive>auth_admin_keep</allow_inactive>
         </action>
 
         <action id="org.freedesktop.login1.set-wall-message">
-                <description>Set a wall message</description>
-                <message>Authentication is required to set a wall message</message>
+                <description gettext-domain="systemd">Set a wall message</description>
+                <message gettext-domain="systemd">Authentication is required to set a wall message</message>
                 <defaults>
                         <allow_any>auth_admin_keep</allow_any>
                         <allow_inactive>auth_admin_keep</allow_inactive>
index 75bbc208f54c54674754a3f24983f5bfa7767fd7..9001a4002c286ace5507aecef0587ff41b5891ce 100644 (file)
@@ -607,9 +607,9 @@ tests += [
 #           libseccomp,
 #           libselinux,
 #           libmount,
+#           libblkid],
+#          '', 'timeout=360'],
 #endif // 0
-          libblkid],
-         '', 'timeout=360'],
 
         [['src/test/test-siphash24.c'],
          [],
@@ -700,16 +700,16 @@ tests += [
 #          [],
 #          [libdl],
 #          '', 'manual'],
+# 
+#         [['src/test/test-umount.c',
+#           'src/core/mount-setup.c',
+#           'src/core/mount-setup.h',
+#           'src/core/umount.c',
+#           'src/core/umount.h'],
+#          [],
+#          [libmount]],
 #endif // 0
 
-        [['src/test/test-umount.c',
-          'src/core/mount-setup.c',
-          'src/core/mount-setup.h',
-          'src/core/umount.c',
-          'src/core/umount.h'],
-         [],
-         [libmount]],
-
         [['src/test/test-bus-util.c'],
          [],
          []],