chiark / gitweb /
Prep v222: Update build system:
authorSven Eden <yamakuzure@gmx.net>
Fri, 30 Dec 2016 14:43:50 +0000 (15:43 +0100)
committerSven Eden <yamakuzure@gmx.net>
Tue, 14 Mar 2017 09:18:27 +0000 (10:18 +0100)
- The content of the man pages directory has been overhauled
- Makefile-man.am was regenerated
- Makefile.am and configure.ac needed a few addtitions and fixes
- Some masked functions had to be unmasked
- Now superfluous files have been removed

31 files changed:
Makefile-man.am
Makefile.am
configure.ac
man/Makefile [new file with mode: 0644]
man/custom-html.xsl
man/custom-man.xsl
man/elogind.conf.xml
man/loginctl.xml
man/pam_elogind.xml
man/sd-login.xml [deleted file]
man/sd_get_seats.xml
man/sd_id128_get_machine.xml [new file with mode: 0644]
man/sd_id128_randomize.xml [new file with mode: 0644]
man/sd_id128_to_string.xml [new file with mode: 0644]
man/sd_is_fifo.xml
man/sd_login_monitor_new.xml [deleted file]
man/sd_machine_get_class.xml [new file with mode: 0644]
man/sd_notify.xml [new file with mode: 0644]
man/sd_seat_get_active.xml
man/sd_session_is_active.xml
man/sd_uid_get_state.xml [deleted file]
man/sd_watchdog_enabled.xml [new file with mode: 0644]
src/basic/btrfs-util.h [deleted file]
src/basic/util.c
src/login/loginctl.c
src/shared/bus-util.c
src/shared/bus-util.h
src/shared/cgroup-show.h
src/shared/logs-show.h [deleted file]
src/systemd/sd-dhcp6-lease.h [deleted file]
src/systemd/sd-journal.h [deleted file]

index 74a1f4c..f807483 100644 (file)
 # attribute conditional="ENABLE_WHAT" or conditional="WITH_WHAT"
 # to <refentry> element.
 MANPAGES += \
-       man/bootup.7 \
-       man/busctl.1 \
-       man/daemon.7 \
-       man/file-hierarchy.7 \
-       man/halt.8 \
-       man/hostname.5 \
-       man/journalctl.1 \
-       man/journald.conf.5 \
-       man/kernel-command-line.7 \
-       man/kernel-install.8 \
-       man/libudev.3 \
-       man/locale.conf.5 \
-       man/localtime.5 \
-       man/machine-id.5 \
-       man/machine-info.5 \
-       man/os-release.5 \
-       man/sd-daemon.3 \
-       man/sd-id128.3 \
-       man/sd-journal.3 \
-       man/sd_booted.3 \
-       man/sd_bus_creds_get_pid.3 \
-       man/sd_bus_creds_new_from_pid.3 \
-       man/sd_bus_default.3 \
-       man/sd_bus_error.3 \
-       man/sd_bus_message_append.3 \
-       man/sd_bus_message_append_array.3 \
-       man/sd_bus_message_append_basic.3 \
-       man/sd_bus_message_append_string_memfd.3 \
-       man/sd_bus_message_append_strv.3 \
-       man/sd_bus_message_get_cookie.3 \
-       man/sd_bus_message_get_monotonic_usec.3 \
-       man/sd_bus_negotiate_fds.3 \
-       man/sd_bus_new.3 \
-       man/sd_bus_path_encode.3 \
-       man/sd_bus_request_name.3 \
-       man/sd_event_add_child.3 \
-       man/sd_event_add_defer.3 \
-       man/sd_event_add_signal.3 \
-       man/sd_event_add_time.3 \
-       man/sd_event_get_fd.3 \
-       man/sd_event_new.3 \
-       man/sd_event_run.3 \
-       man/sd_event_set_name.3 \
-       man/sd_event_wait.3 \
        man/sd_id128_get_machine.3 \
        man/sd_id128_randomize.3 \
        man/sd_id128_to_string.3 \
        man/sd_is_fifo.3 \
-       man/sd_journal_add_match.3 \
-       man/sd_journal_get_catalog.3 \
-       man/sd_journal_get_cursor.3 \
-       man/sd_journal_get_cutoff_realtime_usec.3 \
-       man/sd_journal_get_data.3 \
-       man/sd_journal_get_fd.3 \
-       man/sd_journal_get_realtime_usec.3 \
-       man/sd_journal_get_usage.3 \
-       man/sd_journal_next.3 \
-       man/sd_journal_open.3 \
-       man/sd_journal_print.3 \
-       man/sd_journal_query_unique.3 \
-       man/sd_journal_seek_head.3 \
-       man/sd_journal_stream_fd.3 \
-       man/sd_listen_fds.3 \
        man/sd_machine_get_class.3 \
        man/sd_notify.3 \
-       man/sd_watchdog_enabled.3 \
-       man/shutdown.8 \
-       man/sysctl.d.5 \
-       man/systemctl.1 \
-       man/systemd-activate.8 \
-       man/systemd-analyze.1 \
-       man/systemd-ask-password-console.service.8 \
-       man/systemd-ask-password.1 \
-       man/systemd-bus-proxyd.8 \
-       man/systemd-bus-proxyd.service.8 \
-       man/systemd-cat.1 \
-       man/systemd-cgls.1 \
-       man/systemd-cgtop.1 \
-       man/systemd-debug-generator.8 \
-       man/systemd-delta.1 \
-       man/systemd-detect-virt.1 \
-       man/systemd-efi-boot-generator.8 \
-       man/systemd-escape.1 \
-       man/systemd-fsck@.service.8 \
-       man/systemd-fstab-generator.8 \
-       man/systemd-getty-generator.8 \
-       man/systemd-gpt-auto-generator.8 \
-       man/systemd-halt.service.8 \
-       man/systemd-hibernate-resume-generator.8 \
-       man/systemd-hibernate-resume@.service.8 \
-       man/systemd-inhibit.1 \
-       man/systemd-initctl.service.8 \
-       man/systemd-journald.service.8 \
-       man/systemd-machine-id-commit.1 \
-       man/systemd-machine-id-commit.service.8 \
-       man/systemd-machine-id-setup.1 \
-       man/systemd-notify.1 \
-       man/systemd-nspawn.1 \
-       man/systemd-path.1 \
-       man/systemd-remount-fs.service.8 \
-       man/systemd-run.1 \
-       man/systemd-sleep.conf.5 \
-       man/systemd-socket-proxyd.8 \
-       man/systemd-suspend.service.8 \
-       man/systemd-sysctl.service.8 \
-       man/systemd-system-update-generator.8 \
-       man/systemd-system.conf.5 \
-       man/systemd-sysusers.8 \
-       man/systemd-tmpfiles.8 \
-       man/systemd-tty-ask-password-agent.1 \
-       man/systemd-udevd.service.8 \
-       man/systemd-update-done.service.8 \
-       man/systemd.1 \
-       man/systemd.automount.5 \
-       man/systemd.device.5 \
-       man/systemd.exec.5 \
-       man/systemd.generator.7 \
-       man/systemd.journal-fields.7 \
-       man/systemd.kill.5 \
-       man/systemd.link.5 \
-       man/systemd.mount.5 \
-       man/systemd.path.5 \
-       man/systemd.preset.5 \
-       man/systemd.resource-control.5 \
-       man/systemd.scope.5 \
-       man/systemd.service.5 \
-       man/systemd.slice.5 \
-       man/systemd.snapshot.5 \
-       man/systemd.socket.5 \
-       man/systemd.special.7 \
-       man/systemd.swap.5 \
-       man/systemd.target.5 \
-       man/systemd.time.7 \
-       man/systemd.timer.5 \
-       man/systemd.unit.5 \
-       man/telinit.8 \
-       man/tmpfiles.d.5 \
-       man/udev.7 \
-       man/udev.conf.5 \
-       man/udev_device_get_syspath.3 \
-       man/udev_device_has_tag.3 \
-       man/udev_device_new_from_syspath.3 \
-       man/udev_enumerate_add_match_subsystem.3 \
-       man/udev_enumerate_new.3 \
-       man/udev_enumerate_scan_devices.3 \
-       man/udev_list_entry.3 \
-       man/udev_monitor_filter_update.3 \
-       man/udev_monitor_new_from_netlink.3 \
-       man/udev_monitor_receive_device.3 \
-       man/udev_new.3 \
-       man/udevadm.8
+       man/sd_watchdog_enabled.3
 MANPAGES_ALIAS += \
-       man/SD_ALERT.3 \
-       man/SD_CRIT.3 \
-       man/SD_DEBUG.3 \
-       man/SD_EMERG.3 \
-       man/SD_ERR.3 \
-       man/SD_ID128_CONST_STR.3 \
-       man/SD_ID128_FORMAT_STR.3 \
-       man/SD_ID128_FORMAT_VAL.3 \
-       man/SD_ID128_MAKE.3 \
-       man/SD_INFO.3 \
-       man/SD_JOURNAL_APPEND.3 \
-       man/SD_JOURNAL_CURRENT_USER.3 \
-       man/SD_JOURNAL_FOREACH.3 \
-       man/SD_JOURNAL_FOREACH_BACKWARDS.3 \
-       man/SD_JOURNAL_FOREACH_DATA.3 \
-       man/SD_JOURNAL_FOREACH_UNIQUE.3 \
-       man/SD_JOURNAL_INVALIDATE.3 \
-       man/SD_JOURNAL_LOCAL_ONLY.3 \
-       man/SD_JOURNAL_NOP.3 \
-       man/SD_JOURNAL_RUNTIME_ONLY.3 \
-       man/SD_JOURNAL_SUPPRESS_LOCATION.3 \
-       man/SD_JOURNAL_SYSTEM.3 \
-       man/SD_LISTEN_FDS_START.3 \
-       man/SD_NOTICE.3 \
-       man/SD_WARNING.3 \
-       man/init.1 \
-       man/journald.conf.d.5 \
-       man/poweroff.8 \
-       man/reboot.8 \
-       man/sd_bus_creds_get_audit_login_uid.3 \
-       man/sd_bus_creds_get_audit_session_id.3 \
-       man/sd_bus_creds_get_cgroup.3 \
-       man/sd_bus_creds_get_cmdline.3 \
-       man/sd_bus_creds_get_comm.3 \
-       man/sd_bus_creds_get_description.3 \
-       man/sd_bus_creds_get_egid.3 \
-       man/sd_bus_creds_get_euid.3 \
-       man/sd_bus_creds_get_exe.3 \
-       man/sd_bus_creds_get_fsgid.3 \
-       man/sd_bus_creds_get_fsuid.3 \
-       man/sd_bus_creds_get_gid.3 \
-       man/sd_bus_creds_get_mask.3 \
-       man/sd_bus_creds_get_owner_uid.3 \
-       man/sd_bus_creds_get_ppid.3 \
-       man/sd_bus_creds_get_selinux_context.3 \
-       man/sd_bus_creds_get_session.3 \
-       man/sd_bus_creds_get_sgid.3 \
-       man/sd_bus_creds_get_slice.3 \
-       man/sd_bus_creds_get_suid.3 \
-       man/sd_bus_creds_get_supplementary_gids.3 \
-       man/sd_bus_creds_get_tid.3 \
-       man/sd_bus_creds_get_tid_comm.3 \
-       man/sd_bus_creds_get_tty.3 \
-       man/sd_bus_creds_get_uid.3 \
-       man/sd_bus_creds_get_unique_name.3 \
-       man/sd_bus_creds_get_unit.3 \
-       man/sd_bus_creds_get_user_unit.3 \
-       man/sd_bus_creds_get_well_known_names.3 \
-       man/sd_bus_creds_has_bounding_cap.3 \
-       man/sd_bus_creds_has_effective_cap.3 \
-       man/sd_bus_creds_has_inheritable_cap.3 \
-       man/sd_bus_creds_has_permitted_cap.3 \
-       man/sd_bus_creds_ref.3 \
-       man/sd_bus_creds_unref.3 \
-       man/sd_bus_default_system.3 \
-       man/sd_bus_default_user.3 \
-       man/sd_bus_error_copy.3 \
-       man/sd_bus_error_free.3 \
-       man/sd_bus_error_get_errno.3 \
-       man/sd_bus_error_has_name.3 \
-       man/sd_bus_error_is_set.3 \
-       man/sd_bus_error_set.3 \
-       man/sd_bus_error_set_const.3 \
-       man/sd_bus_error_set_errno.3 \
-       man/sd_bus_error_set_errnof.3 \
-       man/sd_bus_message_append_array_iovec.3 \
-       man/sd_bus_message_append_array_memfd.3 \
-       man/sd_bus_message_append_array_space.3 \
-       man/sd_bus_message_append_string_iovec.3 \
-       man/sd_bus_message_append_string_space.3 \
-       man/sd_bus_message_get_realtime_usec.3 \
-       man/sd_bus_message_get_reply_cookie.3 \
-       man/sd_bus_message_get_seqnum.3 \
-       man/sd_bus_negotiate_creds.3 \
-       man/sd_bus_negotiate_timestamps.3 \
-       man/sd_bus_open.3 \
-       man/sd_bus_open_system.3 \
-       man/sd_bus_open_system_machine.3 \
-       man/sd_bus_open_system_remote.3 \
-       man/sd_bus_open_user.3 \
-       man/sd_bus_path_decode.3 \
-       man/sd_bus_ref.3 \
-       man/sd_bus_release_name.3 \
-       man/sd_bus_unref.3 \
-       man/sd_event_add_exit.3 \
-       man/sd_event_add_post.3 \
-       man/sd_event_default.3 \
-       man/sd_event_dispatch.3 \
-       man/sd_event_get_name.3 \
-       man/sd_event_loop.3 \
-       man/sd_event_prepare.3 \
-       man/sd_event_ref.3 \
-       man/sd_event_source_get_child_pid.3 \
-       man/sd_event_source_get_signal.3 \
-       man/sd_event_source_get_time.3 \
-       man/sd_event_source_get_time_accuracy.3 \
-       man/sd_event_source_get_time_clock.3 \
-       man/sd_event_source_set_time.3 \
-       man/sd_event_source_set_time_accuracy.3 \
-       man/sd_event_unref.3 \
-       man/sd_id128_equal.3 \
        man/sd_id128_from_string.3 \
        man/sd_id128_get_boot.3 \
-       man/sd_id128_t.3 \
        man/sd_is_mq.3 \
        man/sd_is_socket.3 \
        man/sd_is_socket_inet.3 \
        man/sd_is_socket_unix.3 \
        man/sd_is_special.3 \
-       man/sd_journal.3 \
-       man/sd_journal_add_conjunction.3 \
-       man/sd_journal_add_disjunction.3 \
-       man/sd_journal_close.3 \
-       man/sd_journal_enumerate_data.3 \
-       man/sd_journal_enumerate_unique.3 \
-       man/sd_journal_flush_matches.3 \
-       man/sd_journal_get_catalog_for_message_id.3 \
-       man/sd_journal_get_cutoff_monotonic_usec.3 \
-       man/sd_journal_get_data_threshold.3 \
-       man/sd_journal_get_events.3 \
-       man/sd_journal_get_monotonic_usec.3 \
-       man/sd_journal_get_timeout.3 \
-       man/sd_journal_next_skip.3 \
-       man/sd_journal_open_container.3 \
-       man/sd_journal_open_directory.3 \
-       man/sd_journal_open_files.3 \
-       man/sd_journal_perror.3 \
-       man/sd_journal_previous.3 \
-       man/sd_journal_previous_skip.3 \
-       man/sd_journal_printv.3 \
-       man/sd_journal_process.3 \
-       man/sd_journal_reliable_fd.3 \
-       man/sd_journal_restart_data.3 \
-       man/sd_journal_restart_unique.3 \
-       man/sd_journal_seek_cursor.3 \
-       man/sd_journal_seek_monotonic_usec.3 \
-       man/sd_journal_seek_realtime_usec.3 \
-       man/sd_journal_seek_tail.3 \
-       man/sd_journal_send.3 \
-       man/sd_journal_sendv.3 \
-       man/sd_journal_set_data_threshold.3 \
-       man/sd_journal_test_cursor.3 \
-       man/sd_journal_wait.3 \
        man/sd_machine_get_ifindices.3 \
        man/sd_notifyf.3 \
        man/sd_pid_notify.3 \
        man/sd_pid_notify_with_fds.3 \
-       man/sd_pid_notifyf.3 \
-       man/sleep.conf.d.5 \
-       man/system.conf.d.5 \
-       man/systemd-ask-password-console.path.8 \
-       man/systemd-ask-password-wall.path.8 \
-       man/systemd-ask-password-wall.service.8 \
-       man/systemd-bus-proxyd.socket.8 \
-       man/systemd-fsck-root.service.8 \
-       man/systemd-fsck.8 \
-       man/systemd-hibernate-resume.8 \
-       man/systemd-hibernate.service.8 \
-       man/systemd-hybrid-sleep.service.8 \
-       man/systemd-initctl.8 \
-       man/systemd-initctl.socket.8 \
-       man/systemd-journald-dev-log.socket.8 \
-       man/systemd-journald.8 \
-       man/systemd-journald.socket.8 \
-       man/systemd-kexec.service.8 \
-       man/systemd-poweroff.service.8 \
-       man/systemd-reboot.service.8 \
-       man/systemd-remount-fs.8 \
-       man/systemd-shutdown.8 \
-       man/systemd-sleep.8 \
-       man/systemd-sysctl.8 \
-       man/systemd-sysusers.service.8 \
-       man/systemd-tmpfiles-clean.service.8 \
-       man/systemd-tmpfiles-clean.timer.8 \
-       man/systemd-tmpfiles-setup-dev.service.8 \
-       man/systemd-tmpfiles-setup.service.8 \
-       man/systemd-udevd-control.socket.8 \
-       man/systemd-udevd-kernel.socket.8 \
-       man/systemd-udevd.8 \
-       man/systemd-update-done.8 \
-       man/systemd-user.conf.5 \
-       man/udev_device_get_action.3 \
-       man/udev_device_get_devlinks_list_entry.3 \
-       man/udev_device_get_devnode.3 \
-       man/udev_device_get_devnum.3 \
-       man/udev_device_get_devpath.3 \
-       man/udev_device_get_devtype.3 \
-       man/udev_device_get_driver.3 \
-       man/udev_device_get_is_initialized.3 \
-       man/udev_device_get_parent.3 \
-       man/udev_device_get_parent_with_subsystem_devtype.3 \
-       man/udev_device_get_properties_list_entry.3 \
-       man/udev_device_get_property_value.3 \
-       man/udev_device_get_subsystem.3 \
-       man/udev_device_get_sysattr_list_entry.3 \
-       man/udev_device_get_sysattr_value.3 \
-       man/udev_device_get_sysname.3 \
-       man/udev_device_get_sysnum.3 \
-       man/udev_device_get_tags_list_entry.3 \
-       man/udev_device_get_udev.3 \
-       man/udev_device_new_from_device_id.3 \
-       man/udev_device_new_from_devnum.3 \
-       man/udev_device_new_from_environment.3 \
-       man/udev_device_new_from_subsystem_sysname.3 \
-       man/udev_device_ref.3 \
-       man/udev_device_set_sysattr_value.3 \
-       man/udev_device_unref.3 \
-       man/udev_enumerate_add_match_is_initialized.3 \
-       man/udev_enumerate_add_match_parent.3 \
-       man/udev_enumerate_add_match_property.3 \
-       man/udev_enumerate_add_match_sysattr.3 \
-       man/udev_enumerate_add_match_sysname.3 \
-       man/udev_enumerate_add_match_tag.3 \
-       man/udev_enumerate_add_nomatch_subsystem.3 \
-       man/udev_enumerate_add_nomatch_sysattr.3 \
-       man/udev_enumerate_add_syspath.3 \
-       man/udev_enumerate_get_list_entry.3 \
-       man/udev_enumerate_get_udev.3 \
-       man/udev_enumerate_ref.3 \
-       man/udev_enumerate_scan_subsystems.3 \
-       man/udev_enumerate_unref.3 \
-       man/udev_list_entry_get_by_name.3 \
-       man/udev_list_entry_get_name.3 \
-       man/udev_list_entry_get_next.3 \
-       man/udev_list_entry_get_value.3 \
-       man/udev_monitor_enable_receiving.3 \
-       man/udev_monitor_filter_add_match_subsystem_devtype.3 \
-       man/udev_monitor_filter_add_match_tag.3 \
-       man/udev_monitor_filter_remove.3 \
-       man/udev_monitor_get_fd.3 \
-       man/udev_monitor_get_udev.3 \
-       man/udev_monitor_ref.3 \
-       man/udev_monitor_set_receive_buffer_size.3 \
-       man/udev_monitor_unref.3 \
-       man/udev_ref.3 \
-       man/udev_unref.3 \
-       man/user.conf.d.5
-man/SD_ALERT.3: man/sd-daemon.3
-man/SD_CRIT.3: man/sd-daemon.3
-man/SD_DEBUG.3: man/sd-daemon.3
-man/SD_EMERG.3: man/sd-daemon.3
-man/SD_ERR.3: man/sd-daemon.3
-man/SD_ID128_CONST_STR.3: man/sd-id128.3
-man/SD_ID128_FORMAT_STR.3: man/sd-id128.3
-man/SD_ID128_FORMAT_VAL.3: man/sd-id128.3
-man/SD_ID128_MAKE.3: man/sd-id128.3
-man/SD_INFO.3: man/sd-daemon.3
-man/SD_JOURNAL_APPEND.3: man/sd_journal_get_fd.3
-man/SD_JOURNAL_CURRENT_USER.3: man/sd_journal_open.3
-man/SD_JOURNAL_FOREACH.3: man/sd_journal_next.3
-man/SD_JOURNAL_FOREACH_BACKWARDS.3: man/sd_journal_next.3
-man/SD_JOURNAL_FOREACH_DATA.3: man/sd_journal_get_data.3
-man/SD_JOURNAL_FOREACH_UNIQUE.3: man/sd_journal_query_unique.3
-man/SD_JOURNAL_INVALIDATE.3: man/sd_journal_get_fd.3
-man/SD_JOURNAL_LOCAL_ONLY.3: man/sd_journal_open.3
-man/SD_JOURNAL_NOP.3: man/sd_journal_get_fd.3
-man/SD_JOURNAL_RUNTIME_ONLY.3: man/sd_journal_open.3
-man/SD_JOURNAL_SUPPRESS_LOCATION.3: man/sd_journal_print.3
-man/SD_JOURNAL_SYSTEM.3: man/sd_journal_open.3
-man/SD_LISTEN_FDS_START.3: man/sd_listen_fds.3
-man/SD_NOTICE.3: man/sd-daemon.3
-man/SD_WARNING.3: man/sd-daemon.3
-man/init.1: man/systemd.1
-man/journald.conf.d.5: man/journald.conf.5
-man/poweroff.8: man/halt.8
-man/reboot.8: man/halt.8
-man/sd_bus_creds_get_audit_login_uid.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_audit_session_id.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_cgroup.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_cmdline.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_comm.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_description.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_egid.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_euid.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_exe.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_fsgid.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_fsuid.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_gid.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_mask.3: man/sd_bus_creds_new_from_pid.3
-man/sd_bus_creds_get_owner_uid.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_ppid.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_selinux_context.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_session.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_sgid.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_slice.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_suid.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_supplementary_gids.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_tid.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_tid_comm.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_tty.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_uid.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_unique_name.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_unit.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_user_unit.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_well_known_names.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_has_bounding_cap.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_has_effective_cap.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_has_inheritable_cap.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_has_permitted_cap.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_ref.3: man/sd_bus_creds_new_from_pid.3
-man/sd_bus_creds_unref.3: man/sd_bus_creds_new_from_pid.3
-man/sd_bus_default_system.3: man/sd_bus_default.3
-man/sd_bus_default_user.3: man/sd_bus_default.3
-man/sd_bus_error_copy.3: man/sd_bus_error.3
-man/sd_bus_error_free.3: man/sd_bus_error.3
-man/sd_bus_error_get_errno.3: man/sd_bus_error.3
-man/sd_bus_error_has_name.3: man/sd_bus_error.3
-man/sd_bus_error_is_set.3: man/sd_bus_error.3
-man/sd_bus_error_set.3: man/sd_bus_error.3
-man/sd_bus_error_set_const.3: man/sd_bus_error.3
-man/sd_bus_error_set_errno.3: man/sd_bus_error.3
-man/sd_bus_error_set_errnof.3: man/sd_bus_error.3
-man/sd_bus_message_append_array_iovec.3: man/sd_bus_message_append_array.3
-man/sd_bus_message_append_array_memfd.3: man/sd_bus_message_append_array.3
-man/sd_bus_message_append_array_space.3: man/sd_bus_message_append_array.3
-man/sd_bus_message_append_string_iovec.3: man/sd_bus_message_append_string_memfd.3
-man/sd_bus_message_append_string_space.3: man/sd_bus_message_append_string_memfd.3
-man/sd_bus_message_get_realtime_usec.3: man/sd_bus_message_get_monotonic_usec.3
-man/sd_bus_message_get_reply_cookie.3: man/sd_bus_message_get_cookie.3
-man/sd_bus_message_get_seqnum.3: man/sd_bus_message_get_monotonic_usec.3
-man/sd_bus_negotiate_creds.3: man/sd_bus_negotiate_fds.3
-man/sd_bus_negotiate_timestamps.3: man/sd_bus_negotiate_fds.3
-man/sd_bus_open.3: man/sd_bus_default.3
-man/sd_bus_open_system.3: man/sd_bus_default.3
-man/sd_bus_open_system_machine.3: man/sd_bus_default.3
-man/sd_bus_open_system_remote.3: man/sd_bus_default.3
-man/sd_bus_open_user.3: man/sd_bus_default.3
-man/sd_bus_path_decode.3: man/sd_bus_path_encode.3
-man/sd_bus_ref.3: man/sd_bus_new.3
-man/sd_bus_release_name.3: man/sd_bus_request_name.3
-man/sd_bus_unref.3: man/sd_bus_new.3
-man/sd_event_add_exit.3: man/sd_event_add_defer.3
-man/sd_event_add_post.3: man/sd_event_add_defer.3
-man/sd_event_default.3: man/sd_event_new.3
-man/sd_event_dispatch.3: man/sd_event_wait.3
-man/sd_event_get_name.3: man/sd_event_set_name.3
-man/sd_event_loop.3: man/sd_event_run.3
-man/sd_event_prepare.3: man/sd_event_wait.3
-man/sd_event_ref.3: man/sd_event_new.3
-man/sd_event_source_get_child_pid.3: man/sd_event_add_child.3
-man/sd_event_source_get_signal.3: man/sd_event_add_signal.3
-man/sd_event_source_get_time.3: man/sd_event_add_time.3
-man/sd_event_source_get_time_accuracy.3: man/sd_event_add_time.3
-man/sd_event_source_get_time_clock.3: man/sd_event_add_time.3
-man/sd_event_source_set_time.3: man/sd_event_add_time.3
-man/sd_event_source_set_time_accuracy.3: man/sd_event_add_time.3
-man/sd_event_unref.3: man/sd_event_new.3
-man/sd_id128_equal.3: man/sd-id128.3
+       man/sd_pid_notifyf.3
 man/sd_id128_from_string.3: man/sd_id128_to_string.3
 man/sd_id128_get_boot.3: man/sd_id128_get_machine.3
-man/sd_id128_t.3: man/sd-id128.3
 man/sd_is_mq.3: man/sd_is_fifo.3
 man/sd_is_socket.3: man/sd_is_fifo.3
 man/sd_is_socket_inet.3: man/sd_is_fifo.3
 man/sd_is_socket_unix.3: man/sd_is_fifo.3
 man/sd_is_special.3: man/sd_is_fifo.3
-man/sd_journal.3: man/sd_journal_open.3
-man/sd_journal_add_conjunction.3: man/sd_journal_add_match.3
-man/sd_journal_add_disjunction.3: man/sd_journal_add_match.3
-man/sd_journal_close.3: man/sd_journal_open.3
-man/sd_journal_enumerate_data.3: man/sd_journal_get_data.3
-man/sd_journal_enumerate_unique.3: man/sd_journal_query_unique.3
-man/sd_journal_flush_matches.3: man/sd_journal_add_match.3
-man/sd_journal_get_catalog_for_message_id.3: man/sd_journal_get_catalog.3
-man/sd_journal_get_cutoff_monotonic_usec.3: man/sd_journal_get_cutoff_realtime_usec.3
-man/sd_journal_get_data_threshold.3: man/sd_journal_get_data.3
-man/sd_journal_get_events.3: man/sd_journal_get_fd.3
-man/sd_journal_get_monotonic_usec.3: man/sd_journal_get_realtime_usec.3
-man/sd_journal_get_timeout.3: man/sd_journal_get_fd.3
-man/sd_journal_next_skip.3: man/sd_journal_next.3
-man/sd_journal_open_container.3: man/sd_journal_open.3
-man/sd_journal_open_directory.3: man/sd_journal_open.3
-man/sd_journal_open_files.3: man/sd_journal_open.3
-man/sd_journal_perror.3: man/sd_journal_print.3
-man/sd_journal_previous.3: man/sd_journal_next.3
-man/sd_journal_previous_skip.3: man/sd_journal_next.3
-man/sd_journal_printv.3: man/sd_journal_print.3
-man/sd_journal_process.3: man/sd_journal_get_fd.3
-man/sd_journal_reliable_fd.3: man/sd_journal_get_fd.3
-man/sd_journal_restart_data.3: man/sd_journal_get_data.3
-man/sd_journal_restart_unique.3: man/sd_journal_query_unique.3
-man/sd_journal_seek_cursor.3: man/sd_journal_seek_head.3
-man/sd_journal_seek_monotonic_usec.3: man/sd_journal_seek_head.3
-man/sd_journal_seek_realtime_usec.3: man/sd_journal_seek_head.3
-man/sd_journal_seek_tail.3: man/sd_journal_seek_head.3
-man/sd_journal_send.3: man/sd_journal_print.3
-man/sd_journal_sendv.3: man/sd_journal_print.3
-man/sd_journal_set_data_threshold.3: man/sd_journal_get_data.3
-man/sd_journal_test_cursor.3: man/sd_journal_get_cursor.3
-man/sd_journal_wait.3: man/sd_journal_get_fd.3
 man/sd_machine_get_ifindices.3: man/sd_machine_get_class.3
 man/sd_notifyf.3: man/sd_notify.3
 man/sd_pid_notify.3: man/sd_notify.3
 man/sd_pid_notify_with_fds.3: man/sd_notify.3
 man/sd_pid_notifyf.3: man/sd_notify.3
-man/sleep.conf.d.5: man/systemd-sleep.conf.5
-man/system.conf.d.5: man/systemd-system.conf.5
-man/systemd-ask-password-console.path.8: man/systemd-ask-password-console.service.8
-man/systemd-ask-password-wall.path.8: man/systemd-ask-password-console.service.8
-man/systemd-ask-password-wall.service.8: man/systemd-ask-password-console.service.8
-man/systemd-bus-proxyd.socket.8: man/systemd-bus-proxyd.service.8
-man/systemd-fsck-root.service.8: man/systemd-fsck@.service.8
-man/systemd-fsck.8: man/systemd-fsck@.service.8
-man/systemd-hibernate-resume.8: man/systemd-hibernate-resume@.service.8
-man/systemd-hibernate.service.8: man/systemd-suspend.service.8
-man/systemd-hybrid-sleep.service.8: man/systemd-suspend.service.8
-man/systemd-initctl.8: man/systemd-initctl.service.8
-man/systemd-initctl.socket.8: man/systemd-initctl.service.8
-man/systemd-journald-dev-log.socket.8: man/systemd-journald.service.8
-man/systemd-journald.8: man/systemd-journald.service.8
-man/systemd-journald.socket.8: man/systemd-journald.service.8
-man/systemd-kexec.service.8: man/systemd-halt.service.8
-man/systemd-poweroff.service.8: man/systemd-halt.service.8
-man/systemd-reboot.service.8: man/systemd-halt.service.8
-man/systemd-remount-fs.8: man/systemd-remount-fs.service.8
-man/systemd-shutdown.8: man/systemd-halt.service.8
-man/systemd-sleep.8: man/systemd-suspend.service.8
-man/systemd-sysctl.8: man/systemd-sysctl.service.8
-man/systemd-sysusers.service.8: man/systemd-sysusers.8
-man/systemd-tmpfiles-clean.service.8: man/systemd-tmpfiles.8
-man/systemd-tmpfiles-clean.timer.8: man/systemd-tmpfiles.8
-man/systemd-tmpfiles-setup-dev.service.8: man/systemd-tmpfiles.8
-man/systemd-tmpfiles-setup.service.8: man/systemd-tmpfiles.8
-man/systemd-udevd-control.socket.8: man/systemd-udevd.service.8
-man/systemd-udevd-kernel.socket.8: man/systemd-udevd.service.8
-man/systemd-udevd.8: man/systemd-udevd.service.8
-man/systemd-update-done.8: man/systemd-update-done.service.8
-man/systemd-user.conf.5: man/systemd-system.conf.5
-man/udev_device_get_action.3: man/udev_device_get_syspath.3
-man/udev_device_get_devlinks_list_entry.3: man/udev_device_has_tag.3
-man/udev_device_get_devnode.3: man/udev_device_get_syspath.3
-man/udev_device_get_devnum.3: man/udev_device_get_syspath.3
-man/udev_device_get_devpath.3: man/udev_device_get_syspath.3
-man/udev_device_get_devtype.3: man/udev_device_get_syspath.3
-man/udev_device_get_driver.3: man/udev_device_get_syspath.3
-man/udev_device_get_is_initialized.3: man/udev_device_get_syspath.3
-man/udev_device_get_parent.3: man/udev_device_get_syspath.3
-man/udev_device_get_parent_with_subsystem_devtype.3: man/udev_device_get_syspath.3
-man/udev_device_get_properties_list_entry.3: man/udev_device_has_tag.3
-man/udev_device_get_property_value.3: man/udev_device_has_tag.3
-man/udev_device_get_subsystem.3: man/udev_device_get_syspath.3
-man/udev_device_get_sysattr_list_entry.3: man/udev_device_has_tag.3
-man/udev_device_get_sysattr_value.3: man/udev_device_has_tag.3
-man/udev_device_get_sysname.3: man/udev_device_get_syspath.3
-man/udev_device_get_sysnum.3: man/udev_device_get_syspath.3
-man/udev_device_get_tags_list_entry.3: man/udev_device_has_tag.3
-man/udev_device_get_udev.3: man/udev_device_get_syspath.3
-man/udev_device_new_from_device_id.3: man/udev_device_new_from_syspath.3
-man/udev_device_new_from_devnum.3: man/udev_device_new_from_syspath.3
-man/udev_device_new_from_environment.3: man/udev_device_new_from_syspath.3
-man/udev_device_new_from_subsystem_sysname.3: man/udev_device_new_from_syspath.3
-man/udev_device_ref.3: man/udev_device_new_from_syspath.3
-man/udev_device_set_sysattr_value.3: man/udev_device_has_tag.3
-man/udev_device_unref.3: man/udev_device_new_from_syspath.3
-man/udev_enumerate_add_match_is_initialized.3: man/udev_enumerate_add_match_subsystem.3
-man/udev_enumerate_add_match_parent.3: man/udev_enumerate_add_match_subsystem.3
-man/udev_enumerate_add_match_property.3: man/udev_enumerate_add_match_subsystem.3
-man/udev_enumerate_add_match_sysattr.3: man/udev_enumerate_add_match_subsystem.3
-man/udev_enumerate_add_match_sysname.3: man/udev_enumerate_add_match_subsystem.3
-man/udev_enumerate_add_match_tag.3: man/udev_enumerate_add_match_subsystem.3
-man/udev_enumerate_add_nomatch_subsystem.3: man/udev_enumerate_add_match_subsystem.3
-man/udev_enumerate_add_nomatch_sysattr.3: man/udev_enumerate_add_match_subsystem.3
-man/udev_enumerate_add_syspath.3: man/udev_enumerate_scan_devices.3
-man/udev_enumerate_get_list_entry.3: man/udev_enumerate_scan_devices.3
-man/udev_enumerate_get_udev.3: man/udev_enumerate_scan_devices.3
-man/udev_enumerate_ref.3: man/udev_enumerate_new.3
-man/udev_enumerate_scan_subsystems.3: man/udev_enumerate_scan_devices.3
-man/udev_enumerate_unref.3: man/udev_enumerate_new.3
-man/udev_list_entry_get_by_name.3: man/udev_list_entry.3
-man/udev_list_entry_get_name.3: man/udev_list_entry.3
-man/udev_list_entry_get_next.3: man/udev_list_entry.3
-man/udev_list_entry_get_value.3: man/udev_list_entry.3
-man/udev_monitor_enable_receiving.3: man/udev_monitor_receive_device.3
-man/udev_monitor_filter_add_match_subsystem_devtype.3: man/udev_monitor_filter_update.3
-man/udev_monitor_filter_add_match_tag.3: man/udev_monitor_filter_update.3
-man/udev_monitor_filter_remove.3: man/udev_monitor_filter_update.3
-man/udev_monitor_get_fd.3: man/udev_monitor_receive_device.3
-man/udev_monitor_get_udev.3: man/udev_monitor_receive_device.3
-man/udev_monitor_ref.3: man/udev_monitor_new_from_netlink.3
-man/udev_monitor_set_receive_buffer_size.3: man/udev_monitor_receive_device.3
-man/udev_monitor_unref.3: man/udev_monitor_new_from_netlink.3
-man/udev_ref.3: man/udev_new.3
-man/udev_unref.3: man/udev_new.3
-man/user.conf.d.5: man/systemd-system.conf.5
-man/SD_ALERT.html: man/sd-daemon.html
-       $(html-alias)
-
-man/SD_CRIT.html: man/sd-daemon.html
-       $(html-alias)
-
-man/SD_DEBUG.html: man/sd-daemon.html
-       $(html-alias)
-
-man/SD_EMERG.html: man/sd-daemon.html
-       $(html-alias)
-
-man/SD_ERR.html: man/sd-daemon.html
-       $(html-alias)
-
-man/SD_ID128_CONST_STR.html: man/sd-id128.html
-       $(html-alias)
-
-man/SD_ID128_FORMAT_STR.html: man/sd-id128.html
-       $(html-alias)
-
-man/SD_ID128_FORMAT_VAL.html: man/sd-id128.html
-       $(html-alias)
-
-man/SD_ID128_MAKE.html: man/sd-id128.html
-       $(html-alias)
-
-man/SD_INFO.html: man/sd-daemon.html
-       $(html-alias)
-
-man/SD_JOURNAL_APPEND.html: man/sd_journal_get_fd.html
-       $(html-alias)
-
-man/SD_JOURNAL_CURRENT_USER.html: man/sd_journal_open.html
-       $(html-alias)
-
-man/SD_JOURNAL_FOREACH.html: man/sd_journal_next.html
-       $(html-alias)
-
-man/SD_JOURNAL_FOREACH_BACKWARDS.html: man/sd_journal_next.html
-       $(html-alias)
-
-man/SD_JOURNAL_FOREACH_DATA.html: man/sd_journal_get_data.html
-       $(html-alias)
-
-man/SD_JOURNAL_FOREACH_UNIQUE.html: man/sd_journal_query_unique.html
-       $(html-alias)
-
-man/SD_JOURNAL_INVALIDATE.html: man/sd_journal_get_fd.html
-       $(html-alias)
-
-man/SD_JOURNAL_LOCAL_ONLY.html: man/sd_journal_open.html
-       $(html-alias)
-
-man/SD_JOURNAL_NOP.html: man/sd_journal_get_fd.html
-       $(html-alias)
-
-man/SD_JOURNAL_RUNTIME_ONLY.html: man/sd_journal_open.html
-       $(html-alias)
-
-man/SD_JOURNAL_SUPPRESS_LOCATION.html: man/sd_journal_print.html
-       $(html-alias)
-
-man/SD_JOURNAL_SYSTEM.html: man/sd_journal_open.html
-       $(html-alias)
-
-man/SD_LISTEN_FDS_START.html: man/sd_listen_fds.html
-       $(html-alias)
-
-man/SD_NOTICE.html: man/sd-daemon.html
-       $(html-alias)
-
-man/SD_WARNING.html: man/sd-daemon.html
-       $(html-alias)
-
-man/init.html: man/systemd.html
-       $(html-alias)
-
-man/journald.conf.d.html: man/journald.conf.html
-       $(html-alias)
-
-man/poweroff.html: man/halt.html
-       $(html-alias)
-
-man/reboot.html: man/halt.html
-       $(html-alias)
-
-man/sd_bus_creds_get_audit_login_uid.html: man/sd_bus_creds_get_pid.html
-       $(html-alias)
-
-man/sd_bus_creds_get_audit_session_id.html: man/sd_bus_creds_get_pid.html
-       $(html-alias)
-
-man/sd_bus_creds_get_cgroup.html: man/sd_bus_creds_get_pid.html
-       $(html-alias)
-
-man/sd_bus_creds_get_cmdline.html: man/sd_bus_creds_get_pid.html
-       $(html-alias)
-
-man/sd_bus_creds_get_comm.html: man/sd_bus_creds_get_pid.html
-       $(html-alias)
-
-man/sd_bus_creds_get_description.html: man/sd_bus_creds_get_pid.html
-       $(html-alias)
-
-man/sd_bus_creds_get_egid.html: man/sd_bus_creds_get_pid.html
-       $(html-alias)
-
-man/sd_bus_creds_get_euid.html: man/sd_bus_creds_get_pid.html
-       $(html-alias)
-
-man/sd_bus_creds_get_exe.html: man/sd_bus_creds_get_pid.html
-       $(html-alias)
-
-man/sd_bus_creds_get_fsgid.html: man/sd_bus_creds_get_pid.html
-       $(html-alias)
-
-man/sd_bus_creds_get_fsuid.html: man/sd_bus_creds_get_pid.html
-       $(html-alias)
-
-man/sd_bus_creds_get_gid.html: man/sd_bus_creds_get_pid.html
-       $(html-alias)
-
-man/sd_bus_creds_get_mask.html: man/sd_bus_creds_new_from_pid.html
-       $(html-alias)
-
-man/sd_bus_creds_get_owner_uid.html: man/sd_bus_creds_get_pid.html
-       $(html-alias)
-
-man/sd_bus_creds_get_ppid.html: man/sd_bus_creds_get_pid.html
-       $(html-alias)
-
-man/sd_bus_creds_get_selinux_context.html: man/sd_bus_creds_get_pid.html
-       $(html-alias)
-
-man/sd_bus_creds_get_session.html: man/sd_bus_creds_get_pid.html
-       $(html-alias)
-
-man/sd_bus_creds_get_sgid.html: man/sd_bus_creds_get_pid.html
-       $(html-alias)
-
-man/sd_bus_creds_get_slice.html: man/sd_bus_creds_get_pid.html
-       $(html-alias)
-
-man/sd_bus_creds_get_suid.html: man/sd_bus_creds_get_pid.html
-       $(html-alias)
-
-man/sd_bus_creds_get_supplementary_gids.html: man/sd_bus_creds_get_pid.html
-       $(html-alias)
-
-man/sd_bus_creds_get_tid.html: man/sd_bus_creds_get_pid.html
-       $(html-alias)
-
-man/sd_bus_creds_get_tid_comm.html: man/sd_bus_creds_get_pid.html
-       $(html-alias)
-
-man/sd_bus_creds_get_tty.html: man/sd_bus_creds_get_pid.html
-       $(html-alias)
-
-man/sd_bus_creds_get_uid.html: man/sd_bus_creds_get_pid.html
-       $(html-alias)
-
-man/sd_bus_creds_get_unique_name.html: man/sd_bus_creds_get_pid.html
-       $(html-alias)
-
-man/sd_bus_creds_get_unit.html: man/sd_bus_creds_get_pid.html
-       $(html-alias)
-
-man/sd_bus_creds_get_user_unit.html: man/sd_bus_creds_get_pid.html
-       $(html-alias)
-
-man/sd_bus_creds_get_well_known_names.html: man/sd_bus_creds_get_pid.html
-       $(html-alias)
-
-man/sd_bus_creds_has_bounding_cap.html: man/sd_bus_creds_get_pid.html
-       $(html-alias)
-
-man/sd_bus_creds_has_effective_cap.html: man/sd_bus_creds_get_pid.html
-       $(html-alias)
-
-man/sd_bus_creds_has_inheritable_cap.html: man/sd_bus_creds_get_pid.html
-       $(html-alias)
-
-man/sd_bus_creds_has_permitted_cap.html: man/sd_bus_creds_get_pid.html
-       $(html-alias)
-
-man/sd_bus_creds_ref.html: man/sd_bus_creds_new_from_pid.html
-       $(html-alias)
-
-man/sd_bus_creds_unref.html: man/sd_bus_creds_new_from_pid.html
-       $(html-alias)
-
-man/sd_bus_default_system.html: man/sd_bus_default.html
-       $(html-alias)
-
-man/sd_bus_default_user.html: man/sd_bus_default.html
-       $(html-alias)
-
-man/sd_bus_error_copy.html: man/sd_bus_error.html
-       $(html-alias)
-
-man/sd_bus_error_free.html: man/sd_bus_error.html
-       $(html-alias)
-
-man/sd_bus_error_get_errno.html: man/sd_bus_error.html
-       $(html-alias)
-
-man/sd_bus_error_has_name.html: man/sd_bus_error.html
-       $(html-alias)
-
-man/sd_bus_error_is_set.html: man/sd_bus_error.html
-       $(html-alias)
-
-man/sd_bus_error_set.html: man/sd_bus_error.html
-       $(html-alias)
-
-man/sd_bus_error_set_const.html: man/sd_bus_error.html
-       $(html-alias)
-
-man/sd_bus_error_set_errno.html: man/sd_bus_error.html
-       $(html-alias)
-
-man/sd_bus_error_set_errnof.html: man/sd_bus_error.html
-       $(html-alias)
-
-man/sd_bus_message_append_array_iovec.html: man/sd_bus_message_append_array.html
-       $(html-alias)
-
-man/sd_bus_message_append_array_memfd.html: man/sd_bus_message_append_array.html
-       $(html-alias)
-
-man/sd_bus_message_append_array_space.html: man/sd_bus_message_append_array.html
-       $(html-alias)
-
-man/sd_bus_message_append_string_iovec.html: man/sd_bus_message_append_string_memfd.html
-       $(html-alias)
-
-man/sd_bus_message_append_string_space.html: man/sd_bus_message_append_string_memfd.html
-       $(html-alias)
-
-man/sd_bus_message_get_realtime_usec.html: man/sd_bus_message_get_monotonic_usec.html
-       $(html-alias)
-
-man/sd_bus_message_get_reply_cookie.html: man/sd_bus_message_get_cookie.html
-       $(html-alias)
-
-man/sd_bus_message_get_seqnum.html: man/sd_bus_message_get_monotonic_usec.html
-       $(html-alias)
-
-man/sd_bus_negotiate_creds.html: man/sd_bus_negotiate_fds.html
-       $(html-alias)
-
-man/sd_bus_negotiate_timestamps.html: man/sd_bus_negotiate_fds.html
-       $(html-alias)
-
-man/sd_bus_open.html: man/sd_bus_default.html
-       $(html-alias)
-
-man/sd_bus_open_system.html: man/sd_bus_default.html
-       $(html-alias)
-
-man/sd_bus_open_system_machine.html: man/sd_bus_default.html
-       $(html-alias)
-
-man/sd_bus_open_system_remote.html: man/sd_bus_default.html
-       $(html-alias)
-
-man/sd_bus_open_user.html: man/sd_bus_default.html
-       $(html-alias)
-
-man/sd_bus_path_decode.html: man/sd_bus_path_encode.html
-       $(html-alias)
-
-man/sd_bus_ref.html: man/sd_bus_new.html
-       $(html-alias)
-
-man/sd_bus_release_name.html: man/sd_bus_request_name.html
-       $(html-alias)
-
-man/sd_bus_unref.html: man/sd_bus_new.html
-       $(html-alias)
-
-man/sd_event_add_exit.html: man/sd_event_add_defer.html
-       $(html-alias)
-
-man/sd_event_add_post.html: man/sd_event_add_defer.html
-       $(html-alias)
-
-man/sd_event_default.html: man/sd_event_new.html
-       $(html-alias)
-
-man/sd_event_dispatch.html: man/sd_event_wait.html
-       $(html-alias)
-
-man/sd_event_get_name.html: man/sd_event_set_name.html
-       $(html-alias)
-
-man/sd_event_loop.html: man/sd_event_run.html
-       $(html-alias)
-
-man/sd_event_prepare.html: man/sd_event_wait.html
-       $(html-alias)
-
-man/sd_event_ref.html: man/sd_event_new.html
-       $(html-alias)
-
-man/sd_event_source_get_child_pid.html: man/sd_event_add_child.html
-       $(html-alias)
-
-man/sd_event_source_get_signal.html: man/sd_event_add_signal.html
-       $(html-alias)
-
-man/sd_event_source_get_time.html: man/sd_event_add_time.html
-       $(html-alias)
-
-man/sd_event_source_get_time_accuracy.html: man/sd_event_add_time.html
-       $(html-alias)
-
-man/sd_event_source_get_time_clock.html: man/sd_event_add_time.html
-       $(html-alias)
-
-man/sd_event_source_set_time.html: man/sd_event_add_time.html
-       $(html-alias)
-
-man/sd_event_source_set_time_accuracy.html: man/sd_event_add_time.html
-       $(html-alias)
-
-man/sd_event_unref.html: man/sd_event_new.html
-       $(html-alias)
-
-man/sd_id128_equal.html: man/sd-id128.html
-       $(html-alias)
-
-man/sd_id128_from_string.html: man/sd_id128_to_string.html
-       $(html-alias)
-
-man/sd_id128_get_boot.html: man/sd_id128_get_machine.html
-       $(html-alias)
-
-man/sd_id128_t.html: man/sd-id128.html
-       $(html-alias)
-
-man/sd_is_mq.html: man/sd_is_fifo.html
-       $(html-alias)
-
-man/sd_is_socket.html: man/sd_is_fifo.html
-       $(html-alias)
-
-man/sd_is_socket_inet.html: man/sd_is_fifo.html
-       $(html-alias)
-
-man/sd_is_socket_unix.html: man/sd_is_fifo.html
-       $(html-alias)
-
-man/sd_is_special.html: man/sd_is_fifo.html
-       $(html-alias)
-
-man/sd_journal.html: man/sd_journal_open.html
-       $(html-alias)
-
-man/sd_journal_add_conjunction.html: man/sd_journal_add_match.html
-       $(html-alias)
-
-man/sd_journal_add_disjunction.html: man/sd_journal_add_match.html
-       $(html-alias)
-
-man/sd_journal_close.html: man/sd_journal_open.html
-       $(html-alias)
-
-man/sd_journal_enumerate_data.html: man/sd_journal_get_data.html
-       $(html-alias)
-
-man/sd_journal_enumerate_unique.html: man/sd_journal_query_unique.html
-       $(html-alias)
-
-man/sd_journal_flush_matches.html: man/sd_journal_add_match.html
-       $(html-alias)
-
-man/sd_journal_get_catalog_for_message_id.html: man/sd_journal_get_catalog.html
-       $(html-alias)
-
-man/sd_journal_get_cutoff_monotonic_usec.html: man/sd_journal_get_cutoff_realtime_usec.html
-       $(html-alias)
-
-man/sd_journal_get_data_threshold.html: man/sd_journal_get_data.html
-       $(html-alias)
-
-man/sd_journal_get_events.html: man/sd_journal_get_fd.html
-       $(html-alias)
-
-man/sd_journal_get_monotonic_usec.html: man/sd_journal_get_realtime_usec.html
-       $(html-alias)
-
-man/sd_journal_get_timeout.html: man/sd_journal_get_fd.html
-       $(html-alias)
-
-man/sd_journal_next_skip.html: man/sd_journal_next.html
-       $(html-alias)
-
-man/sd_journal_open_container.html: man/sd_journal_open.html
-       $(html-alias)
-
-man/sd_journal_open_directory.html: man/sd_journal_open.html
-       $(html-alias)
-
-man/sd_journal_open_files.html: man/sd_journal_open.html
-       $(html-alias)
-
-man/sd_journal_perror.html: man/sd_journal_print.html
-       $(html-alias)
-
-man/sd_journal_previous.html: man/sd_journal_next.html
-       $(html-alias)
-
-man/sd_journal_previous_skip.html: man/sd_journal_next.html
-       $(html-alias)
-
-man/sd_journal_printv.html: man/sd_journal_print.html
-       $(html-alias)
-
-man/sd_journal_process.html: man/sd_journal_get_fd.html
-       $(html-alias)
-
-man/sd_journal_reliable_fd.html: man/sd_journal_get_fd.html
-       $(html-alias)
-
-man/sd_journal_restart_data.html: man/sd_journal_get_data.html
-       $(html-alias)
-
-man/sd_journal_restart_unique.html: man/sd_journal_query_unique.html
-       $(html-alias)
-
-man/sd_journal_seek_cursor.html: man/sd_journal_seek_head.html
-       $(html-alias)
-
-man/sd_journal_seek_monotonic_usec.html: man/sd_journal_seek_head.html
-       $(html-alias)
-
-man/sd_journal_seek_realtime_usec.html: man/sd_journal_seek_head.html
-       $(html-alias)
-
-man/sd_journal_seek_tail.html: man/sd_journal_seek_head.html
-       $(html-alias)
-
-man/sd_journal_send.html: man/sd_journal_print.html
-       $(html-alias)
-
-man/sd_journal_sendv.html: man/sd_journal_print.html
-       $(html-alias)
-
-man/sd_journal_set_data_threshold.html: man/sd_journal_get_data.html
-       $(html-alias)
-
-man/sd_journal_test_cursor.html: man/sd_journal_get_cursor.html
-       $(html-alias)
-
-man/sd_journal_wait.html: man/sd_journal_get_fd.html
-       $(html-alias)
-
-man/sd_machine_get_ifindices.html: man/sd_machine_get_class.html
-       $(html-alias)
-
-man/sd_notifyf.html: man/sd_notify.html
-       $(html-alias)
-
-man/sd_pid_notify.html: man/sd_notify.html
-       $(html-alias)
-
-man/sd_pid_notify_with_fds.html: man/sd_notify.html
-       $(html-alias)
-
-man/sd_pid_notifyf.html: man/sd_notify.html
-       $(html-alias)
-
-man/sleep.conf.d.html: man/systemd-sleep.conf.html
-       $(html-alias)
-
-man/system.conf.d.html: man/systemd-system.conf.html
-       $(html-alias)
-
-man/systemd-ask-password-console.path.html: man/systemd-ask-password-console.service.html
-       $(html-alias)
-
-man/systemd-ask-password-wall.path.html: man/systemd-ask-password-console.service.html
-       $(html-alias)
-
-man/systemd-ask-password-wall.service.html: man/systemd-ask-password-console.service.html
-       $(html-alias)
-
-man/systemd-bus-proxyd.socket.html: man/systemd-bus-proxyd.service.html
-       $(html-alias)
-
-man/systemd-fsck-root.service.html: man/systemd-fsck@.service.html
-       $(html-alias)
-
-man/systemd-fsck.html: man/systemd-fsck@.service.html
-       $(html-alias)
-
-man/systemd-hibernate-resume.html: man/systemd-hibernate-resume@.service.html
-       $(html-alias)
-
-man/systemd-hibernate.service.html: man/systemd-suspend.service.html
-       $(html-alias)
-
-man/systemd-hybrid-sleep.service.html: man/systemd-suspend.service.html
-       $(html-alias)
-
-man/systemd-initctl.html: man/systemd-initctl.service.html
-       $(html-alias)
-
-man/systemd-initctl.socket.html: man/systemd-initctl.service.html
-       $(html-alias)
-
-man/systemd-journald-dev-log.socket.html: man/systemd-journald.service.html
-       $(html-alias)
-
-man/systemd-journald.html: man/systemd-journald.service.html
-       $(html-alias)
-
-man/systemd-journald.socket.html: man/systemd-journald.service.html
-       $(html-alias)
-
-man/systemd-kexec.service.html: man/systemd-halt.service.html
-       $(html-alias)
-
-man/systemd-poweroff.service.html: man/systemd-halt.service.html
-       $(html-alias)
-
-man/systemd-reboot.service.html: man/systemd-halt.service.html
-       $(html-alias)
-
-man/systemd-remount-fs.html: man/systemd-remount-fs.service.html
-       $(html-alias)
-
-man/systemd-shutdown.html: man/systemd-halt.service.html
-       $(html-alias)
-
-man/systemd-sleep.html: man/systemd-suspend.service.html
-       $(html-alias)
-
-man/systemd-sysctl.html: man/systemd-sysctl.service.html
-       $(html-alias)
-
-man/systemd-sysusers.service.html: man/systemd-sysusers.html
-       $(html-alias)
-
-man/systemd-tmpfiles-clean.service.html: man/systemd-tmpfiles.html
-       $(html-alias)
-
-man/systemd-tmpfiles-clean.timer.html: man/systemd-tmpfiles.html
-       $(html-alias)
-
-man/systemd-tmpfiles-setup-dev.service.html: man/systemd-tmpfiles.html
-       $(html-alias)
-
-man/systemd-tmpfiles-setup.service.html: man/systemd-tmpfiles.html
-       $(html-alias)
-
-man/systemd-udevd-control.socket.html: man/systemd-udevd.service.html
-       $(html-alias)
-
-man/systemd-udevd-kernel.socket.html: man/systemd-udevd.service.html
-       $(html-alias)
-
-man/systemd-udevd.html: man/systemd-udevd.service.html
-       $(html-alias)
-
-man/systemd-update-done.html: man/systemd-update-done.service.html
-       $(html-alias)
-
-man/systemd-user.conf.html: man/systemd-system.conf.html
-       $(html-alias)
-
-man/udev_device_get_action.html: man/udev_device_get_syspath.html
-       $(html-alias)
-
-man/udev_device_get_devlinks_list_entry.html: man/udev_device_has_tag.html
-       $(html-alias)
-
-man/udev_device_get_devnode.html: man/udev_device_get_syspath.html
-       $(html-alias)
-
-man/udev_device_get_devnum.html: man/udev_device_get_syspath.html
-       $(html-alias)
-
-man/udev_device_get_devpath.html: man/udev_device_get_syspath.html
-       $(html-alias)
-
-man/udev_device_get_devtype.html: man/udev_device_get_syspath.html
-       $(html-alias)
-
-man/udev_device_get_driver.html: man/udev_device_get_syspath.html
-       $(html-alias)
-
-man/udev_device_get_is_initialized.html: man/udev_device_get_syspath.html
-       $(html-alias)
-
-man/udev_device_get_parent.html: man/udev_device_get_syspath.html
-       $(html-alias)
-
-man/udev_device_get_parent_with_subsystem_devtype.html: man/udev_device_get_syspath.html
-       $(html-alias)
-
-man/udev_device_get_properties_list_entry.html: man/udev_device_has_tag.html
-       $(html-alias)
-
-man/udev_device_get_property_value.html: man/udev_device_has_tag.html
-       $(html-alias)
-
-man/udev_device_get_subsystem.html: man/udev_device_get_syspath.html
-       $(html-alias)
-
-man/udev_device_get_sysattr_list_entry.html: man/udev_device_has_tag.html
-       $(html-alias)
-
-man/udev_device_get_sysattr_value.html: man/udev_device_has_tag.html
-       $(html-alias)
-
-man/udev_device_get_sysname.html: man/udev_device_get_syspath.html
-       $(html-alias)
-
-man/udev_device_get_sysnum.html: man/udev_device_get_syspath.html
-       $(html-alias)
-
-man/udev_device_get_tags_list_entry.html: man/udev_device_has_tag.html
-       $(html-alias)
-
-man/udev_device_get_udev.html: man/udev_device_get_syspath.html
-       $(html-alias)
-
-man/udev_device_new_from_device_id.html: man/udev_device_new_from_syspath.html
-       $(html-alias)
-
-man/udev_device_new_from_devnum.html: man/udev_device_new_from_syspath.html
-       $(html-alias)
-
-man/udev_device_new_from_environment.html: man/udev_device_new_from_syspath.html
-       $(html-alias)
-
-man/udev_device_new_from_subsystem_sysname.html: man/udev_device_new_from_syspath.html
-       $(html-alias)
-
-man/udev_device_ref.html: man/udev_device_new_from_syspath.html
-       $(html-alias)
-
-man/udev_device_set_sysattr_value.html: man/udev_device_has_tag.html
-       $(html-alias)
-
-man/udev_device_unref.html: man/udev_device_new_from_syspath.html
-       $(html-alias)
-
-man/udev_enumerate_add_match_is_initialized.html: man/udev_enumerate_add_match_subsystem.html
-       $(html-alias)
-
-man/udev_enumerate_add_match_parent.html: man/udev_enumerate_add_match_subsystem.html
-       $(html-alias)
-
-man/udev_enumerate_add_match_property.html: man/udev_enumerate_add_match_subsystem.html
-       $(html-alias)
-
-man/udev_enumerate_add_match_sysattr.html: man/udev_enumerate_add_match_subsystem.html
-       $(html-alias)
-
-man/udev_enumerate_add_match_sysname.html: man/udev_enumerate_add_match_subsystem.html
-       $(html-alias)
-
-man/udev_enumerate_add_match_tag.html: man/udev_enumerate_add_match_subsystem.html
-       $(html-alias)
-
-man/udev_enumerate_add_nomatch_subsystem.html: man/udev_enumerate_add_match_subsystem.html
-       $(html-alias)
-
-man/udev_enumerate_add_nomatch_sysattr.html: man/udev_enumerate_add_match_subsystem.html
-       $(html-alias)
-
-man/udev_enumerate_add_syspath.html: man/udev_enumerate_scan_devices.html
-       $(html-alias)
-
-man/udev_enumerate_get_list_entry.html: man/udev_enumerate_scan_devices.html
-       $(html-alias)
-
-man/udev_enumerate_get_udev.html: man/udev_enumerate_scan_devices.html
-       $(html-alias)
-
-man/udev_enumerate_ref.html: man/udev_enumerate_new.html
-       $(html-alias)
-
-man/udev_enumerate_scan_subsystems.html: man/udev_enumerate_scan_devices.html
-       $(html-alias)
-
-man/udev_enumerate_unref.html: man/udev_enumerate_new.html
-       $(html-alias)
-
-man/udev_list_entry_get_by_name.html: man/udev_list_entry.html
-       $(html-alias)
-
-man/udev_list_entry_get_name.html: man/udev_list_entry.html
-       $(html-alias)
-
-man/udev_list_entry_get_next.html: man/udev_list_entry.html
-       $(html-alias)
-
-man/udev_list_entry_get_value.html: man/udev_list_entry.html
-       $(html-alias)
-
-man/udev_monitor_enable_receiving.html: man/udev_monitor_receive_device.html
-       $(html-alias)
-
-man/udev_monitor_filter_add_match_subsystem_devtype.html: man/udev_monitor_filter_update.html
-       $(html-alias)
-
-man/udev_monitor_filter_add_match_tag.html: man/udev_monitor_filter_update.html
-       $(html-alias)
-
-man/udev_monitor_filter_remove.html: man/udev_monitor_filter_update.html
-       $(html-alias)
-
-man/udev_monitor_get_fd.html: man/udev_monitor_receive_device.html
-       $(html-alias)
-
-man/udev_monitor_get_udev.html: man/udev_monitor_receive_device.html
-       $(html-alias)
-
-man/udev_monitor_ref.html: man/udev_monitor_new_from_netlink.html
-       $(html-alias)
-
-man/udev_monitor_set_receive_buffer_size.html: man/udev_monitor_receive_device.html
+man/sd_id128_from_string.html: man/sd_id128_to_string.html
        $(html-alias)
 
-man/udev_monitor_unref.html: man/udev_monitor_new_from_netlink.html
+man/sd_id128_get_boot.html: man/sd_id128_get_machine.html
        $(html-alias)
 
-man/udev_ref.html: man/udev_new.html
+man/sd_is_mq.html: man/sd_is_fifo.html
        $(html-alias)
 
-man/udev_unref.html: man/udev_new.html
+man/sd_is_socket.html: man/sd_is_fifo.html
        $(html-alias)
 
-man/user.conf.d.html: man/systemd-system.conf.html
+man/sd_is_socket_inet.html: man/sd_is_fifo.html
        $(html-alias)
 
-
-if ENABLE_BACKLIGHT
-MANPAGES += \
-       man/systemd-backlight@.service.8
-MANPAGES_ALIAS += \
-       man/systemd-backlight.8
-man/systemd-backlight.8: man/systemd-backlight@.service.8
-man/systemd-backlight.html: man/systemd-backlight@.service.html
+man/sd_is_socket_unix.html: man/sd_is_fifo.html
        $(html-alias)
 
-endif
-
-if ENABLE_BINFMT
-MANPAGES += \
-       man/binfmt.d.5 \
-       man/systemd-binfmt.service.8
-MANPAGES_ALIAS += \
-       man/systemd-binfmt.8
-man/systemd-binfmt.8: man/systemd-binfmt.service.8
-man/systemd-binfmt.html: man/systemd-binfmt.service.html
+man/sd_is_special.html: man/sd_is_fifo.html
        $(html-alias)
 
-endif
-
-if ENABLE_BOOTCHART
-MANPAGES += \
-       man/bootchart.conf.5 \
-       man/systemd-bootchart.1
-MANPAGES_ALIAS += \
-       man/bootchart.conf.d.5
-man/bootchart.conf.d.5: man/bootchart.conf.5
-man/bootchart.conf.d.html: man/bootchart.conf.html
+man/sd_machine_get_ifindices.html: man/sd_machine_get_class.html
        $(html-alias)
 
-endif
-
-if ENABLE_COREDUMP
-MANPAGES += \
-       man/coredump.conf.5 \
-       man/coredumpctl.1 \
-       man/systemd-coredump.8
-MANPAGES_ALIAS += \
-       man/coredump.conf.d.5
-man/coredump.conf.d.5: man/coredump.conf.5
-man/coredump.conf.d.html: man/coredump.conf.html
+man/sd_notifyf.html: man/sd_notify.html
        $(html-alias)
 
-endif
-
-if ENABLE_EFI
-MANPAGES += \
-       man/bootctl.1
-MANPAGES_ALIAS += \
-       #
-
-
-endif
-
-if ENABLE_FIRSTBOOT
-MANPAGES += \
-       man/systemd-firstboot.1
-MANPAGES_ALIAS += \
-       man/systemd-firstboot.service.1
-man/systemd-firstboot.service.1: man/systemd-firstboot.1
-man/systemd-firstboot.service.html: man/systemd-firstboot.html
+man/sd_pid_notify.html: man/sd_notify.html
        $(html-alias)
 
-endif
-
-if ENABLE_HOSTNAMED
-MANPAGES += \
-       man/hostnamectl.1 \
-       man/systemd-hostnamed.service.8
-MANPAGES_ALIAS += \
-       man/systemd-hostnamed.8
-man/systemd-hostnamed.8: man/systemd-hostnamed.service.8
-man/systemd-hostnamed.html: man/systemd-hostnamed.service.html
+man/sd_pid_notify_with_fds.html: man/sd_notify.html
        $(html-alias)
 
-endif
-
-if ENABLE_HWDB
-MANPAGES += \
-       man/hwdb.7 \
-       man/systemd-hwdb.8
-MANPAGES_ALIAS += \
-       #
-
-
-endif
-
-if ENABLE_LOCALED
-MANPAGES += \
-       man/localectl.1 \
-       man/systemd-localed.service.8
-MANPAGES_ALIAS += \
-       man/systemd-localed.8
-man/systemd-localed.8: man/systemd-localed.service.8
-man/systemd-localed.html: man/systemd-localed.service.html
+man/sd_pid_notifyf.html: man/sd_notify.html
        $(html-alias)
 
-endif
 
 if ENABLE_LOGIND
 MANPAGES += \
-       man/loginctl.1 \
-       man/logind.conf.5 \
-       man/systemd-logind.service.8
-MANPAGES_ALIAS += \
-       man/logind.conf.d.5 \
-       man/systemd-logind.8
-man/logind.conf.d.5: man/logind.conf.5
-man/systemd-logind.8: man/systemd-logind.service.8
-man/logind.conf.d.html: man/logind.conf.html
-       $(html-alias)
-
-man/systemd-logind.html: man/systemd-logind.service.html
-       $(html-alias)
-
-endif
-
-if ENABLE_MACHINED
-MANPAGES += \
-       man/machinectl.1 \
-       man/nss-mymachines.8 \
-       man/systemd-machined.service.8
-MANPAGES_ALIAS += \
-       man/libnss_mymachines.so.2.8 \
-       man/systemd-machined.8
-man/libnss_mymachines.so.2.8: man/nss-mymachines.8
-man/systemd-machined.8: man/systemd-machined.service.8
-man/libnss_mymachines.so.2.html: man/nss-mymachines.html
-       $(html-alias)
-
-man/systemd-machined.html: man/systemd-machined.service.html
-       $(html-alias)
-
-endif
-
-if ENABLE_NETWORKD
-MANPAGES += \
-       man/networkctl.1 \
-       man/systemd-networkd-wait-online.service.8 \
-       man/systemd-networkd.service.8 \
-       man/systemd.netdev.5 \
-       man/systemd.network.5
-MANPAGES_ALIAS += \
-       man/systemd-networkd-wait-online.8 \
-       man/systemd-networkd.8
-man/systemd-networkd-wait-online.8: man/systemd-networkd-wait-online.service.8
-man/systemd-networkd.8: man/systemd-networkd.service.8
-man/systemd-networkd-wait-online.html: man/systemd-networkd-wait-online.service.html
-       $(html-alias)
-
-man/systemd-networkd.html: man/systemd-networkd.service.html
-       $(html-alias)
-
-endif
-
-if ENABLE_QUOTACHECK
-MANPAGES += \
-       man/systemd-quotacheck.service.8
-MANPAGES_ALIAS += \
-       man/systemd-quotacheck.8
-man/systemd-quotacheck.8: man/systemd-quotacheck.service.8
-man/systemd-quotacheck.html: man/systemd-quotacheck.service.html
-       $(html-alias)
-
-endif
-
-if ENABLE_RANDOMSEED
-MANPAGES += \
-       man/systemd-random-seed.service.8
-MANPAGES_ALIAS += \
-       man/systemd-random-seed.8
-man/systemd-random-seed.8: man/systemd-random-seed.service.8
-man/systemd-random-seed.html: man/systemd-random-seed.service.html
-       $(html-alias)
-
-endif
-
-if ENABLE_RESOLVED
-MANPAGES += \
-       man/resolved.conf.5 \
-       man/systemd-resolved.service.8
-MANPAGES_ALIAS += \
-       man/resolved.conf.d.5 \
-       man/systemd-resolved.8
-man/resolved.conf.d.5: man/resolved.conf.5
-man/systemd-resolved.8: man/systemd-resolved.service.8
-man/resolved.conf.d.html: man/resolved.conf.html
-       $(html-alias)
-
-man/systemd-resolved.html: man/systemd-resolved.service.html
-       $(html-alias)
-
-endif
-
-if ENABLE_RFKILL
-MANPAGES += \
-       man/systemd-rfkill@.service.8
-MANPAGES_ALIAS += \
-       man/systemd-rfkill.8
-man/systemd-rfkill.8: man/systemd-rfkill@.service.8
-man/systemd-rfkill.html: man/systemd-rfkill@.service.html
-       $(html-alias)
-
-endif
-
-if ENABLE_SYSUSERS
-MANPAGES += \
-       man/sysusers.d.5
+       man/elogind.conf.5 \
+       man/loginctl.1
 MANPAGES_ALIAS += \
        #
 
 
 endif
 
-if ENABLE_TIMEDATED
-MANPAGES += \
-       man/systemd-timedated.service.8 \
-       man/timedatectl.1
-MANPAGES_ALIAS += \
-       man/systemd-timedated.8
-man/systemd-timedated.8: man/systemd-timedated.service.8
-man/systemd-timedated.html: man/systemd-timedated.service.html
-       $(html-alias)
-
-endif
-
-if ENABLE_TIMESYNCD
-MANPAGES += \
-       man/systemd-timesyncd.service.8 \
-       man/timesyncd.conf.5
-MANPAGES_ALIAS += \
-       man/systemd-timesyncd.8 \
-       man/timesyncd.conf.d.5
-man/systemd-timesyncd.8: man/systemd-timesyncd.service.8
-man/timesyncd.conf.d.5: man/timesyncd.conf.5
-man/systemd-timesyncd.html: man/systemd-timesyncd.service.html
-       $(html-alias)
-
-man/timesyncd.conf.d.html: man/timesyncd.conf.html
-       $(html-alias)
-
-endif
-
-if ENABLE_VCONSOLE
-MANPAGES += \
-       man/systemd-vconsole-setup.service.8 \
-       man/vconsole.conf.5
-MANPAGES_ALIAS += \
-       man/systemd-vconsole-setup.8
-man/systemd-vconsole-setup.8: man/systemd-vconsole-setup.service.8
-man/systemd-vconsole-setup.html: man/systemd-vconsole-setup.service.html
-       $(html-alias)
-
-endif
-
-if HAVE_KMOD
-MANPAGES += \
-       man/modules-load.d.5 \
-       man/systemd-modules-load.service.8
-MANPAGES_ALIAS += \
-       man/systemd-modules-load.8
-man/systemd-modules-load.8: man/systemd-modules-load.service.8
-man/systemd-modules-load.html: man/systemd-modules-load.service.html
-       $(html-alias)
-
-endif
-
-if HAVE_LIBCRYPTSETUP
-MANPAGES += \
-       man/crypttab.5 \
-       man/systemd-cryptsetup-generator.8 \
-       man/systemd-cryptsetup@.service.8
-MANPAGES_ALIAS += \
-       man/systemd-cryptsetup.8
-man/systemd-cryptsetup.8: man/systemd-cryptsetup@.service.8
-man/systemd-cryptsetup.html: man/systemd-cryptsetup@.service.html
-       $(html-alias)
-
-endif
-
-if HAVE_MICROHTTPD
-MANPAGES += \
-       man/journal-remote.conf.5 \
-       man/systemd-journal-gatewayd.service.8 \
-       man/systemd-journal-remote.8 \
-       man/systemd-journal-upload.8
-MANPAGES_ALIAS += \
-       man/journal-remote.conf.d.5 \
-       man/systemd-journal-gatewayd.8 \
-       man/systemd-journal-gatewayd.socket.8
-man/journal-remote.conf.d.5: man/journal-remote.conf.5
-man/systemd-journal-gatewayd.8: man/systemd-journal-gatewayd.service.8
-man/systemd-journal-gatewayd.socket.8: man/systemd-journal-gatewayd.service.8
-man/journal-remote.conf.d.html: man/journal-remote.conf.html
-       $(html-alias)
-
-man/systemd-journal-gatewayd.html: man/systemd-journal-gatewayd.service.html
-       $(html-alias)
-
-man/systemd-journal-gatewayd.socket.html: man/systemd-journal-gatewayd.service.html
-       $(html-alias)
-
-endif
-
-if HAVE_MYHOSTNAME
-MANPAGES += \
-       man/nss-myhostname.8
-MANPAGES_ALIAS += \
-       man/libnss_myhostname.so.2.8
-man/libnss_myhostname.so.2.8: man/nss-myhostname.8
-man/libnss_myhostname.so.2.html: man/nss-myhostname.html
-       $(html-alias)
-
-endif
-
 if HAVE_PAM
 MANPAGES += \
-       man/pam_systemd.8 \
-       man/sd-login.3 \
+       man/pam_elogind.8 \
        man/sd_get_seats.3 \
-       man/sd_login_monitor_new.3 \
-       man/sd_pid_get_session.3 \
        man/sd_seat_get_active.3 \
-       man/sd_session_is_active.3 \
-       man/sd_uid_get_state.3 \
-       man/systemd-user-sessions.service.8
+       man/sd_session_is_active.3
 MANPAGES_ALIAS += \
        man/sd_get_machine_names.3 \
        man/sd_get_sessions.3 \
        man/sd_get_uids.3 \
-       man/sd_login_monitor.3 \
-       man/sd_login_monitor_flush.3 \
-       man/sd_login_monitor_get_events.3 \
-       man/sd_login_monitor_get_fd.3 \
-       man/sd_login_monitor_get_timeout.3 \
-       man/sd_login_monitor_unref.3 \
-       man/sd_peer_get_machine_name.3 \
-       man/sd_peer_get_owner_uid.3 \
-       man/sd_peer_get_session.3 \
-       man/sd_peer_get_slice.3 \
-       man/sd_peer_get_unit.3 \
-       man/sd_peer_get_user_unit.3 \
-       man/sd_pid_get_machine_name.3 \
-       man/sd_pid_get_owner_uid.3 \
-       man/sd_pid_get_slice.3 \
-       man/sd_pid_get_unit.3 \
-       man/sd_pid_get_user_unit.3 \
        man/sd_seat_can_graphical.3 \
        man/sd_seat_can_multi_session.3 \
        man/sd_seat_can_tty.3 \
@@ -1762,32 +113,10 @@ MANPAGES_ALIAS += \
        man/sd_session_get_type.3 \
        man/sd_session_get_uid.3 \
        man/sd_session_get_vt.3 \
-       man/sd_session_is_remote.3 \
-       man/sd_uid_get_display.3 \
-       man/sd_uid_get_seats.3 \
-       man/sd_uid_get_sessions.3 \
-       man/sd_uid_is_on_seat.3 \
-       man/systemd-user-sessions.8
+       man/sd_session_is_remote.3
 man/sd_get_machine_names.3: man/sd_get_seats.3
 man/sd_get_sessions.3: man/sd_get_seats.3
 man/sd_get_uids.3: man/sd_get_seats.3
-man/sd_login_monitor.3: man/sd_login_monitor_new.3
-man/sd_login_monitor_flush.3: man/sd_login_monitor_new.3
-man/sd_login_monitor_get_events.3: man/sd_login_monitor_new.3
-man/sd_login_monitor_get_fd.3: man/sd_login_monitor_new.3
-man/sd_login_monitor_get_timeout.3: man/sd_login_monitor_new.3
-man/sd_login_monitor_unref.3: man/sd_login_monitor_new.3
-man/sd_peer_get_machine_name.3: man/sd_pid_get_session.3
-man/sd_peer_get_owner_uid.3: man/sd_pid_get_session.3
-man/sd_peer_get_session.3: man/sd_pid_get_session.3
-man/sd_peer_get_slice.3: man/sd_pid_get_session.3
-man/sd_peer_get_unit.3: man/sd_pid_get_session.3
-man/sd_peer_get_user_unit.3: man/sd_pid_get_session.3
-man/sd_pid_get_machine_name.3: man/sd_pid_get_session.3
-man/sd_pid_get_owner_uid.3: man/sd_pid_get_session.3
-man/sd_pid_get_slice.3: man/sd_pid_get_session.3
-man/sd_pid_get_unit.3: man/sd_pid_get_session.3
-man/sd_pid_get_user_unit.3: man/sd_pid_get_session.3
 man/sd_seat_can_graphical.3: man/sd_seat_get_active.3
 man/sd_seat_can_multi_session.3: man/sd_seat_get_active.3
 man/sd_seat_can_tty.3: man/sd_seat_get_active.3
@@ -1805,11 +134,6 @@ man/sd_session_get_type.3: man/sd_session_is_active.3
 man/sd_session_get_uid.3: man/sd_session_is_active.3
 man/sd_session_get_vt.3: man/sd_session_is_active.3
 man/sd_session_is_remote.3: man/sd_session_is_active.3
-man/sd_uid_get_display.3: man/sd_uid_get_state.3
-man/sd_uid_get_seats.3: man/sd_uid_get_state.3
-man/sd_uid_get_sessions.3: man/sd_uid_get_state.3
-man/sd_uid_is_on_seat.3: man/sd_uid_get_state.3
-man/systemd-user-sessions.8: man/systemd-user-sessions.service.8
 man/sd_get_machine_names.html: man/sd_get_seats.html
        $(html-alias)
 
@@ -1819,57 +143,6 @@ man/sd_get_sessions.html: man/sd_get_seats.html
 man/sd_get_uids.html: man/sd_get_seats.html
        $(html-alias)
 
-man/sd_login_monitor.html: man/sd_login_monitor_new.html
-       $(html-alias)
-
-man/sd_login_monitor_flush.html: man/sd_login_monitor_new.html
-       $(html-alias)
-
-man/sd_login_monitor_get_events.html: man/sd_login_monitor_new.html
-       $(html-alias)
-
-man/sd_login_monitor_get_fd.html: man/sd_login_monitor_new.html
-       $(html-alias)
-
-man/sd_login_monitor_get_timeout.html: man/sd_login_monitor_new.html
-       $(html-alias)
-
-man/sd_login_monitor_unref.html: man/sd_login_monitor_new.html
-       $(html-alias)
-
-man/sd_peer_get_machine_name.html: man/sd_pid_get_session.html
-       $(html-alias)
-
-man/sd_peer_get_owner_uid.html: man/sd_pid_get_session.html
-       $(html-alias)
-
-man/sd_peer_get_session.html: man/sd_pid_get_session.html
-       $(html-alias)
-
-man/sd_peer_get_slice.html: man/sd_pid_get_session.html
-       $(html-alias)
-
-man/sd_peer_get_unit.html: man/sd_pid_get_session.html
-       $(html-alias)
-
-man/sd_peer_get_user_unit.html: man/sd_pid_get_session.html
-       $(html-alias)
-
-man/sd_pid_get_machine_name.html: man/sd_pid_get_session.html
-       $(html-alias)
-
-man/sd_pid_get_owner_uid.html: man/sd_pid_get_session.html
-       $(html-alias)
-
-man/sd_pid_get_slice.html: man/sd_pid_get_session.html
-       $(html-alias)
-
-man/sd_pid_get_unit.html: man/sd_pid_get_session.html
-       $(html-alias)
-
-man/sd_pid_get_user_unit.html: man/sd_pid_get_session.html
-       $(html-alias)
-
 man/sd_seat_can_graphical.html: man/sd_seat_get_active.html
        $(html-alias)
 
@@ -1921,276 +194,26 @@ man/sd_session_get_vt.html: man/sd_session_is_active.html
 man/sd_session_is_remote.html: man/sd_session_is_active.html
        $(html-alias)
 
-man/sd_uid_get_display.html: man/sd_uid_get_state.html
-       $(html-alias)
-
-man/sd_uid_get_seats.html: man/sd_uid_get_state.html
-       $(html-alias)
-
-man/sd_uid_get_sessions.html: man/sd_uid_get_state.html
-       $(html-alias)
-
-man/sd_uid_is_on_seat.html: man/sd_uid_get_state.html
-       $(html-alias)
-
-man/systemd-user-sessions.html: man/systemd-user-sessions.service.html
-       $(html-alias)
-
-endif
-
-if HAVE_PYTHON
-MANPAGES += \
-       man/systemd.directives.7 \
-       man/systemd.index.7
-MANPAGES_ALIAS += \
-       #
-
-
-endif
-
-if HAVE_SYSV_COMPAT
-MANPAGES += \
-       man/systemd-sysv-generator.8
-MANPAGES_ALIAS += \
-       #
-
-
-endif
-
-if HAVE_UTMP
-MANPAGES += \
-       man/runlevel.8 \
-       man/systemd-update-utmp.service.8
-MANPAGES_ALIAS += \
-       man/systemd-update-utmp-runlevel.service.8 \
-       man/systemd-update-utmp.8
-man/systemd-update-utmp-runlevel.service.8: man/systemd-update-utmp.service.8
-man/systemd-update-utmp.8: man/systemd-update-utmp.service.8
-man/systemd-update-utmp-runlevel.service.html: man/systemd-update-utmp.service.html
-       $(html-alias)
-
-man/systemd-update-utmp.html: man/systemd-update-utmp.service.html
-       $(html-alias)
-
 endif
 
 # Really, do not edit this file.
 
 EXTRA_DIST += \
-       man/binfmt.d.xml \
-       man/bootchart.conf.xml \
-       man/bootctl.xml \
-       man/bootup.xml \
-       man/busctl.xml \
-       man/coredump.conf.xml \
-       man/coredumpctl.xml \
-       man/crypttab.xml \
-       man/daemon.xml \
-       man/file-hierarchy.xml \
-       man/halt.xml \
-       man/hostname.xml \
-       man/hostnamectl.xml \
-       man/hwdb.xml \
-       man/journal-remote.conf.xml \
-       man/journalctl.xml \
-       man/journald.conf.xml \
-       man/kernel-command-line.xml \
-       man/kernel-install.xml \
+       man/elogind.conf.xml \
        man/less-variables.xml \
-       man/libsystemd-pkgconfig.xml \
-       man/libudev.xml \
-       man/locale.conf.xml \
-       man/localectl.xml \
-       man/localtime.xml \
+       man/libelogind-pkgconfig.xml \
        man/loginctl.xml \
-       man/logind.conf.xml \
-       man/machine-id.xml \
-       man/machine-info.xml \
-       man/machinectl.xml \
-       man/modules-load.d.xml \
-       man/networkctl.xml \
-       man/nss-myhostname.xml \
-       man/nss-mymachines.xml \
-       man/os-release.xml \
-       man/pam_systemd.xml \
-       man/resolved.conf.xml \
-       man/runlevel.xml \
-       man/sd-daemon.xml \
-       man/sd-id128.xml \
-       man/sd-journal.xml \
-       man/sd-login.xml \
-       man/sd_booted.xml \
-       man/sd_bus_creds_get_pid.xml \
-       man/sd_bus_creds_new_from_pid.xml \
-       man/sd_bus_default.xml \
-       man/sd_bus_error.xml \
-       man/sd_bus_message_append.xml \
-       man/sd_bus_message_append_array.xml \
-       man/sd_bus_message_append_basic.xml \
-       man/sd_bus_message_append_string_memfd.xml \
-       man/sd_bus_message_append_strv.xml \
-       man/sd_bus_message_get_cookie.xml \
-       man/sd_bus_message_get_monotonic_usec.xml \
-       man/sd_bus_negotiate_fds.xml \
-       man/sd_bus_new.xml \
-       man/sd_bus_path_encode.xml \
-       man/sd_bus_request_name.xml \
-       man/sd_event_add_child.xml \
-       man/sd_event_add_defer.xml \
-       man/sd_event_add_signal.xml \
-       man/sd_event_add_time.xml \
-       man/sd_event_get_fd.xml \
-       man/sd_event_new.xml \
-       man/sd_event_run.xml \
-       man/sd_event_set_name.xml \
-       man/sd_event_wait.xml \
+       man/pam_elogind.xml \
        man/sd_get_seats.xml \
        man/sd_id128_get_machine.xml \
        man/sd_id128_randomize.xml \
        man/sd_id128_to_string.xml \
        man/sd_is_fifo.xml \
-       man/sd_journal_add_match.xml \
-       man/sd_journal_get_catalog.xml \
-       man/sd_journal_get_cursor.xml \
-       man/sd_journal_get_cutoff_realtime_usec.xml \
-       man/sd_journal_get_data.xml \
-       man/sd_journal_get_fd.xml \
-       man/sd_journal_get_realtime_usec.xml \
-       man/sd_journal_get_usage.xml \
-       man/sd_journal_next.xml \
-       man/sd_journal_open.xml \
-       man/sd_journal_print.xml \
-       man/sd_journal_query_unique.xml \
-       man/sd_journal_seek_head.xml \
-       man/sd_journal_stream_fd.xml \
-       man/sd_listen_fds.xml \
-       man/sd_login_monitor_new.xml \
        man/sd_machine_get_class.xml \
        man/sd_notify.xml \
-       man/sd_pid_get_session.xml \
        man/sd_seat_get_active.xml \
        man/sd_session_is_active.xml \
-       man/sd_uid_get_state.xml \
        man/sd_watchdog_enabled.xml \
-       man/shutdown.xml \
        man/standard-conf.xml \
        man/standard-options.xml \
-       man/sysctl.d.xml \
-       man/systemctl.xml \
-       man/systemd-activate.xml \
-       man/systemd-analyze.xml \
-       man/systemd-ask-password-console.service.xml \
-       man/systemd-ask-password.xml \
-       man/systemd-backlight@.service.xml \
-       man/systemd-binfmt.service.xml \
-       man/systemd-bootchart.xml \
-       man/systemd-bus-proxyd.service.xml \
-       man/systemd-bus-proxyd.xml \
-       man/systemd-cat.xml \
-       man/systemd-cgls.xml \
-       man/systemd-cgtop.xml \
-       man/systemd-coredump.xml \
-       man/systemd-cryptsetup-generator.xml \
-       man/systemd-cryptsetup@.service.xml \
-       man/systemd-debug-generator.xml \
-       man/systemd-delta.xml \
-       man/systemd-detect-virt.xml \
-       man/systemd-efi-boot-generator.xml \
-       man/systemd-escape.xml \
-       man/systemd-firstboot.xml \
-       man/systemd-fsck@.service.xml \
-       man/systemd-fstab-generator.xml \
-       man/systemd-getty-generator.xml \
-       man/systemd-gpt-auto-generator.xml \
-       man/systemd-halt.service.xml \
-       man/systemd-hibernate-resume-generator.xml \
-       man/systemd-hibernate-resume@.service.xml \
-       man/systemd-hostnamed.service.xml \
-       man/systemd-hwdb.xml \
-       man/systemd-inhibit.xml \
-       man/systemd-initctl.service.xml \
-       man/systemd-journal-gatewayd.service.xml \
-       man/systemd-journal-remote.xml \
-       man/systemd-journal-upload.xml \
-       man/systemd-journald.service.xml \
-       man/systemd-localed.service.xml \
-       man/systemd-logind.service.xml \
-       man/systemd-machine-id-commit.service.xml \
-       man/systemd-machine-id-commit.xml \
-       man/systemd-machine-id-setup.xml \
-       man/systemd-machined.service.xml \
-       man/systemd-modules-load.service.xml \
-       man/systemd-networkd-wait-online.service.xml \
-       man/systemd-networkd.service.xml \
-       man/systemd-notify.xml \
-       man/systemd-nspawn.xml \
-       man/systemd-path.xml \
-       man/systemd-quotacheck.service.xml \
-       man/systemd-random-seed.service.xml \
-       man/systemd-remount-fs.service.xml \
-       man/systemd-resolved.service.xml \
-       man/systemd-rfkill@.service.xml \
-       man/systemd-run.xml \
-       man/systemd-sleep.conf.xml \
-       man/systemd-socket-proxyd.xml \
-       man/systemd-suspend.service.xml \
-       man/systemd-sysctl.service.xml \
-       man/systemd-system-update-generator.xml \
-       man/systemd-system.conf.xml \
-       man/systemd-sysusers.xml \
-       man/systemd-sysv-generator.xml \
-       man/systemd-timedated.service.xml \
-       man/systemd-timesyncd.service.xml \
-       man/systemd-tmpfiles.xml \
-       man/systemd-tty-ask-password-agent.xml \
-       man/systemd-udevd.service.xml \
-       man/systemd-update-done.service.xml \
-       man/systemd-update-utmp.service.xml \
-       man/systemd-user-sessions.service.xml \
-       man/systemd-vconsole-setup.service.xml \
-       man/systemd.automount.xml \
-       man/systemd.device.xml \
-       man/systemd.exec.xml \
-       man/systemd.generator.xml \
-       man/systemd.journal-fields.xml \
-       man/systemd.kill.xml \
-       man/systemd.link.xml \
-       man/systemd.mount.xml \
-       man/systemd.netdev.xml \
-       man/systemd.network.xml \
-       man/systemd.path.xml \
-       man/systemd.preset.xml \
-       man/systemd.resource-control.xml \
-       man/systemd.scope.xml \
-       man/systemd.service.xml \
-       man/systemd.slice.xml \
-       man/systemd.snapshot.xml \
-       man/systemd.socket.xml \
-       man/systemd.special.xml \
-       man/systemd.swap.xml \
-       man/systemd.target.xml \
-       man/systemd.time.xml \
-       man/systemd.timer.xml \
-       man/systemd.unit.xml \
-       man/systemd.xml \
-       man/sysusers.d.xml \
-       man/telinit.xml \
-       man/timedatectl.xml \
-       man/timesyncd.conf.xml \
-       man/tmpfiles.d.xml \
-       man/udev.conf.xml \
-       man/udev.xml \
-       man/udev_device_get_syspath.xml \
-       man/udev_device_has_tag.xml \
-       man/udev_device_new_from_syspath.xml \
-       man/udev_enumerate_add_match_subsystem.xml \
-       man/udev_enumerate_new.xml \
-       man/udev_enumerate_scan_devices.xml \
-       man/udev_list_entry.xml \
-       man/udev_monitor_filter_update.xml \
-       man/udev_monitor_new_from_netlink.xml \
-       man/udev_monitor_receive_device.xml \
-       man/udev_new.xml \
-       man/udevadm.xml \
-       man/user-system-options.xml \
-       man/vconsole.conf.xml
+       man/user-system-options.xml
index 1cb1c20..639fd57 100644 (file)
@@ -38,9 +38,9 @@ SUBDIRS = . po
 # Keep the test-suite.log
 .PRECIOUS: $(TEST_SUITE_LOG) Makefile
 
-LIBELOGIND_CURRENT=8
-LIBELOGIND_REVISION=0
-LIBELOGIND_AGE=8
+LIBELOGIND_CURRENT=9
+LIBELOGIND_REVISION=3
+LIBELOGIND_AGE=9
 
 # Dirs of external packages
 dbuspolicydir=@dbuspolicydir@
@@ -241,6 +241,45 @@ noinst_DATA += \
 CLEANFILES += \
        docs/html/man
 
+if HAVE_PYTHON
+man/index.html: man/systemd.index.html
+       $(AM_V_LN)$(LN_S) -f systemd.index.html $@
+
+noinst_DATA += \
+       man/index.html
+
+CLEANFILES += \
+       man/index.html
+
+XML_GLOB = $(wildcard $(top_srcdir)/man/*.xml)
+NON_INDEX_XML_FILES = $(filter-out man/systemd.index.xml,$(XML_FILES))
+SOURCE_XML_FILES = ${patsubst %,$(top_srcdir)/%,$(filter-out man/systemd.directives.xml,$(NON_INDEX_XML_FILES))}
+
+# This target should only be run manually. It recreates Makefile-man.am
+# file in the source directory based on all man/*.xml files. Run it after
+# adding, removing, or changing the conditional in a man page.
+update-man-list: $(top_srcdir)/tools/make-man-rules.py $(XML_GLOB)
+       $(AM_V_GEN)$(PYTHON) $^ > $(top_srcdir)/Makefile-man.tmp
+       $(AM_V_at)mv $(top_srcdir)/Makefile-man.tmp $(top_srcdir)/Makefile-man.am
+       @echo "Makefile-man.am has been regenerated"
+
+man/systemd.index.xml: $(top_srcdir)/tools/make-man-index.py $(NON_INDEX_XML_FILES)
+       $(AM_V_at)$(MKDIR_P) $(dir $@)
+       $(AM_V_GEN)$(PYTHON) $< $@ $(filter-out $<,$^)
+
+man/systemd.directives.xml: $(top_srcdir)/tools/make-directive-index.py man/custom-entities.ent $(SOURCE_XML_FILES)
+       $(AM_V_at)$(MKDIR_P) $(dir $@)
+       $(AM_V_GEN)$(PYTHON) $< $@ $(SOURCE_XML_FILES)
+
+CLEANFILES += \
+       man/systemd.index.xml \
+       man/systemd.directives.xml
+
+EXTRA_DIST += \
+       tools/make-man-rules.py
+
+endif
+
 endif
 
 EXTRA_DIST += \
index c8a4aff..5da3365 100644 (file)
@@ -20,7 +20,7 @@
 AC_PREREQ([2.64])
 
 AC_INIT([elogind],
-        [221],
+        [222],
         [https://github.com/elogind/elogind/issues],
         [elogind],
         [https://github.com/elogind/elogind])
@@ -95,16 +95,7 @@ AS_IF([! ln --relative --help > /dev/null 2>&1], [AC_MSG_ERROR([*** ln doesn't s
 
 M4_DEFINES=
 
-# gtkdocize greps for '^GTK_DOC_CHECK', so it needs to be on its own line
-m4_ifdef([GTK_DOC_CHECK], [
-GTK_DOC_CHECK([1.18],[--flavour no-tmpl])],
-         [AM_CONDITIONAL([ENABLE_GTK_DOC], [false])
-          enable_gtk_doc=no])
-
-AS_IF([test "x$enable_gtk_doc" = "xyes" -a "x$XSLTPROC" = x], [
-        AC_MSG_ERROR([*** GTK doc requested but xsltproc not found])
-])
-
+AC_CHECK_TOOL(OBJCOPY, objcopy)
 AC_CHECK_TOOL(GPERF, gperf)
 if test -z "$GPERF" ; then
         AC_MSG_ERROR([*** gperf not found])
@@ -234,6 +225,54 @@ AC_CHECK_SIZEOF(rlim_t,,[
 ])
 
 # ------------------------------------------------------------------------------
+# we use python to build the man page index, and for systemd-python
+have_python=no
+AC_ARG_WITH([python],
+        [AS_HELP_STRING([--without-python], [Disable building the man page index and systemd-python (default: test)])])
+
+have_lxml=no
+AS_IF([test "x$with_python" != "xno"], [
+        AM_PATH_PYTHON(,, [:])
+        AS_IF([test "x$PYTHON" != "x:"], [
+                AC_MSG_CHECKING([for python lxml module])
+                AS_IF(["$PYTHON" -c 'import lxml' 2>/dev/null], [have_lxml=yes])
+                AC_MSG_RESULT([$have_lxml])
+                AS_IF([test "x$have_lxml" = "xyes"], [have_python=yes],
+                      [AC_MSG_WARN([*** python support requires python-lxml module installed])])
+        ])
+])
+AS_IF([test "$have_python" != "yes"], [
+      AS_IF([test "$with_python" = "yes"],
+            [AC_MSG_ERROR([*** python support requested but python support not found])])
+      AS_IF([test "$with_python" != "no"],
+            [AC_MSG_WARN([*** python support not found, some documentation cannot be built])])
+])
+
+AM_CONDITIONAL([HAVE_PYTHON], [test "x$have_python" = "xyes"])
+AS_IF([test "x$PYTHON_BINARY" = "x"],
+      [AS_IF([test "x$have_python" = "xyes"],
+             [PYTHON_BINARY="$(which "$PYTHON")"],
+             [PYTHON_BINARY=/usr/bin/python])])
+AC_ARG_VAR(PYTHON_BINARY, [Python binary used to launch installed scripts])
+
+AS_IF([test "x$have_python" != "xyes" -a "x$enable_python_devel" = "xyes"],
+      [AC_MSG_ERROR([*** python-devel support requires --with-python])])
+
+have_python_devel=no
+AC_ARG_ENABLE(python_devel, AS_HELP_STRING([--disable-python-devel], [Do not build python modules]))
+AS_IF([test "x$have_python" = "xyes" -a "x$enable_python_devel" != "xno"], [
+      PKG_CHECK_MODULES([PYTHON_DEVEL], [python-${PYTHON_VERSION}],
+            [have_python_devel=yes],
+            [PKG_CHECK_MODULES([PYTHON_DEVEL], [python],
+                  [have_python_devel=yes],
+                  [have_python_devel=no])])
+      AS_IF([test "x$have_python_devel" = xno -a "x$enable_python_devel" = xyes],
+            [AC_MSG_ERROR([*** python-devel support requested but libraries not found])])
+      AC_PATH_PROGS(SPHINX_BUILD, sphinx-build-${PYTHON_VERSION} sphinx-build)
+])
+AM_CONDITIONAL([HAVE_PYTHON_DEVEL], [test "$have_python_devel" = "yes"])
+
+# ------------------------------------------------------------------------------
 
 AC_CHECK_HEADERS([sys/capability.h], [], [AC_MSG_ERROR([*** POSIX caps headers not found])])
 AC_CHECK_HEADERS([linux/btrfs.h], [], [])
@@ -501,8 +540,14 @@ fi
 
 AC_ARG_WITH(smack-run-label,
 AS_HELP_STRING([--with-smack-run-label=STRING],
-        [run elogind --system with a specific SMACK label]),
-        [AC_DEFINE_UNQUOTED(SMACK_RUN_LABEL, ["$withval"], [Run with a smack label])],
+        [run elogind --system itself with a specific SMACK label]),
+        [AC_DEFINE_UNQUOTED(SMACK_RUN_LABEL, ["$withval"], [Run elogind itself with SMACK label])],
+        [])
+
+AC_ARG_WITH(smack-default-process-label,
+AS_HELP_STRING([--with-smack-default-process-label=STRING],
+        [default SMACK label for executed processes]),
+        [AC_DEFINE_UNQUOTED(SMACK_DEFAULT_PROCESS_LABEL, ["$withval"], [Default SMACK label for executed processes])],
         [])
 
 if test "x${have_smack}" = xyes ; then
@@ -512,6 +557,15 @@ fi
 AM_CONDITIONAL([HAVE_SMACK], [test "x$have_smack" = "xyes"])
 
 # ------------------------------------------------------------------------------
+have_logind=yes
+#AC_ARG_ENABLE(logind, AS_HELP_STRING([--disable-logind], [disable login daemon]))
+#if test "x$enable_logind" != "xno"; then
+#        have_logind=yes
+#fi
+AM_CONDITIONAL(ENABLE_LOGIND, [test "$have_logind" = "yes"])
+AS_IF([test "$have_logind" = "yes"], [ AC_DEFINE(HAVE_LOGIND, [1], [Logind support available]) ])
+
+# ------------------------------------------------------------------------------
 AC_ARG_WITH(system-uid-max,
         AS_HELP_STRING([--with-system-uid-max=UID]
                 [Maximum UID for system users]),
diff --git a/man/Makefile b/man/Makefile
new file mode 100644 (file)
index 0000000..9d07505
--- /dev/null
@@ -0,0 +1,28 @@
+#  This file is part of systemd.
+#
+#  Copyright 2010 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/>.
+
+# 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
index 99acc43..2771463 100644 (file)
@@ -1,22 +1,22 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 
 <!--
-  This file is part of systemd.
+  This file is part of elogind.
 
   Copyright 2011 Lennart Poettering
 
-  systemd is free software; you can redistribute it and/or modify it
+  elogind is free software; you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as published by
   the Free Software Foundation; either version 2.1 of the License, or
   (at your option) any later version.
 
-  systemd is distributed in the hope that it will be useful, but
+  elogind is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+  along with elogind; If not, see <http://www.gnu.org/licenses/>.
 -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
       <xsl:text>index.html</xsl:text>
     </xsl:attribute>
     <xsl:text>Index </xsl:text>
+  </a>·
+  <a>
+    <xsl:attribute name="href">
+      <xsl:text>elogind.directives.html</xsl:text>
+    </xsl:attribute>
+    <xsl:text>Directives </xsl:text>
+  </a>·
+  <a>
+    <xsl:attribute name="href">
+      <xsl:text>../python-elogind/index.html</xsl:text>
+    </xsl:attribute>
+    <xsl:text>Python </xsl:text>
   </a>
 
   <span style="float:right">
-    <xsl:text>elogind</xsl:text>
+    <xsl:text>elogind </xsl:text>
     <xsl:value-of select="$elogind.version"/>
   </span>
   <hr/>
index bb82f59..853e214 100644 (file)
@@ -1,22 +1,22 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 
 <!--
-  This file is part of systemd.
+  This file is part of elogind.
 
   Copyright 2013 Zbigniew Jędrzejewski-Szmek
 
-  systemd is free software; you can redistribute it and/or modify it
+  elogind is free software; you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as published by
   the Free Software Foundation; either version 2.1 of the License, or
   (at your option) any later version.
 
-  systemd is distributed in the hope that it will be useful, but
+  elogind is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+  along with elogind; If not, see <http://www.gnu.org/licenses/>.
 -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
index b6392a6..268e6d8 100644 (file)
@@ -3,25 +3,26 @@
   "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
-  This file is part of systemd.
+  This file is part of elogind.
 
   Copyright 2010 Lennart Poettering
 
-  systemd is free software; you can redistribute it and/or modify it
+  elogind is free software; you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as published by
   the Free Software Foundation; either version 2.1 of the License, or
   (at your option) any later version.
 
-  systemd is distributed in the hope that it will be useful, but
+  elogind is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+  along with elogind; If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<refentry id="elogind.conf" xmlns:xi="http://www.w3.org/2001/XInclude">
+<refentry id="elogind.conf" conditional='ENABLE_LOGIND'
+    xmlns:xi="http://www.w3.org/2001/XInclude">
   <refentryinfo>
     <title>elogind.conf</title>
     <productname>elogind</productname>
@@ -43,7 +44,6 @@
 
   <refnamediv>
     <refname>elogind.conf</refname>
-    <refname>elogind.conf.d</refname>
     <refpurpose>Login manager configuration files</refpurpose>
   </refnamediv>
 
@@ -56,6 +56,7 @@
 
     <para>These files configure various parameters of the elogind
     login manager,
+    <citerefentry><refentrytitle>elogind-logind.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.
     </para>
   </refsect1>
 
     <variablelist>
 
       <varlistentry>
+        <term><varname>NAutoVTs=</varname></term>
+
+        <listitem><para>Takes a positive integer. Configures how many
+        virtual terminals (VTs) to allocate by default that, when
+        switched to and are previously unused,
+        <literal>autovt</literal> services are automatically spawned
+        on. These services are instantiated from the template unit
+        <filename>autovt@.service</filename> for the respective VT TTY
+        name, for example, <filename>autovt@tty4.service</filename>.
+        By default, <filename>autovt@.service</filename> is linked to
+        <filename>getty@.service</filename>. In other words, login
+        prompts are started dynamically as the user switches to unused
+        virtual terminals. Hence, this parameter controls how many
+        login <literal>gettys</literal> are available on the VTs. If a
+        VT is already used by some other subsystem (for example, a
+        graphical login), this kind of activation will not be
+        attempted. Note that the VT configured in
+        <varname>ReserveVT=</varname> is always subject to this kind
+        of activation, even if it is not one of the VTs configured
+        with the <varname>NAutoVTs=</varname> directive. Defaults to
+        6. When set to 0, automatic spawning of
+        <literal>autovt</literal> services is
+        disabled.</para></listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><varname>ReserveVT=</varname></term>
+
+        <listitem><para>Takes a positive integer. Identifies one
+        virtual terminal that shall unconditionally be reserved for
+        <filename>autovt@.service</filename> activation (see above).
+        The VT selected with this option will be marked busy
+        unconditionally, so that no other subsystem will allocate it.
+        This functionality is useful to ensure that, regardless of how
+        many VTs are allocated by other subsystems, one login
+        <literal>getty</literal> is always available. Defaults to 6
+        (in other words, there will always be a
+        <literal>getty</literal> available on Alt-F6.). When set to 0,
+        VT reservation is disabled.</para></listitem>
+      </varlistentry>
+
+      <varlistentry>
         <term><varname>KillUserProcesses=</varname></term>
 
         <listitem><para>Takes a boolean argument. Configures whether
   <refsect1>
       <title>See Also</title>
       <para>
+        <citerefentry><refentrytitle>elogind</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+        <citerefentry><refentrytitle>elogind-logind.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
         <citerefentry><refentrytitle>loginctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+        <citerefentry><refentrytitle>elogind-system.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
       </para>
   </refsect1>
 
index 1c2d913..54a9a73 100644 (file)
@@ -3,25 +3,26 @@
   "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
-  This file is part of systemd.
+  This file is part of elogind.
 
   Copyright 2010 Lennart Poettering
 
-  systemd is free software; you can redistribute it and/or modify it
+  elogind is free software; you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as published by
   the Free Software Foundation; either version 2.1 of the License, or
   (at your option) any later version.
 
-  systemd is distributed in the hope that it will be useful, but
+  elogind is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+  along with elogind; If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<refentry id="loginctl" xmlns:xi="http://www.w3.org/2001/XInclude">
+<refentry id="loginctl" conditional='ENABLE_LOGIND'
+    xmlns:xi="http://www.w3.org/2001/XInclude">
 
   <refentryinfo>
     <title>loginctl</title>
     <title>Description</title>
 
     <para><command>loginctl</command> may be used to introspect and
-        control the state of the elogind login manager</para>
+    control the state of the
+    <citerefentry><refentrytitle>elogind</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+    login manager
+    <citerefentry><refentrytitle>elogind-logind.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>
   </refsect1>
 
   <refsect1>
   <refsect1>
     <title>See Also</title>
     <para>
+      <citerefentry><refentrytitle>elogind</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+      <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+      <citerefentry><refentrytitle>elogind-logind.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>elogind.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
     </para>
   </refsect1>
index 927ad1f..700f0cc 100644 (file)
@@ -3,22 +3,22 @@
   "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
-  This file is part of systemd.
+  This file is part of elogind.
 
   Copyright 2010 Lennart Poettering
 
-  systemd is free software; you can redistribute it and/or modify it
+  elogind is free software; you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as published by
   the Free Software Foundation; either version 2.1 of the License, or
   (at your option) any later version.
 
-  systemd is distributed in the hope that it will be useful, but
+  elogind is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+  along with elogind; If not, see <http://www.gnu.org/licenses/>.
 -->
 
 <refentry id="pam_elogind" conditional='HAVE_PAM'>
@@ -56,7 +56,7 @@
 
     <para><command>pam_elogind</command> registers user sessions with
     the elogind login manager
-    <citerefentry><refentrytitle>logind</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+    <citerefentry><refentrytitle>elogind-logind.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
     and hence the elogind control group hierarchy.</para>
 
     <para>On login, this module ensures the following:</para>
@@ -280,12 +280,16 @@ session    required     pam_elogind.so</programlisting>
     <title>See Also</title>
     <para>
       <citerefentry><refentrytitle>elogind</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+      <citerefentry><refentrytitle>elogind-logind.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>elogind.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>loginctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
       <citerefentry project='man-pages'><refentrytitle>pam.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
       <citerefentry project='man-pages'><refentrytitle>pam.d</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
       <citerefentry project='man-pages'><refentrytitle>pam</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
       <citerefentry project='man-pages'><refentrytitle>pam_loginuid</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+      <citerefentry><refentrytitle>elogind.scope</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+      <citerefentry><refentrytitle>elogind.slice</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+      <citerefentry><refentrytitle>elogind.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>
     </para>
   </refsect1>
 
diff --git a/man/sd-login.xml b/man/sd-login.xml
deleted file mode 100644 (file)
index 06ffc69..0000000
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version='1.0'?> <!--*-nxml-*-->
-<!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 2010 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/>.
--->
-
-<refentry id="sd-login" conditional='HAVE_PAM'
-  xmlns:xi="http://www.w3.org/2001/XInclude">
-
-  <refentryinfo>
-    <title>sd-login</title>
-    <productname>systemd</productname>
-
-    <authorgroup>
-      <author>
-        <contrib>Developer</contrib>
-        <firstname>Lennart</firstname>
-        <surname>Poettering</surname>
-        <email>lennart@poettering.net</email>
-      </author>
-    </authorgroup>
-  </refentryinfo>
-
-  <refmeta>
-    <refentrytitle>sd-login</refentrytitle>
-    <manvolnum>3</manvolnum>
-  </refmeta>
-
-  <refnamediv>
-    <refname>sd-login</refname>
-    <refpurpose>APIs for
-    tracking logins</refpurpose>
-  </refnamediv>
-
-  <refsynopsisdiv>
-    <funcsynopsis>
-      <funcsynopsisinfo>#include &lt;systemd/sd-login.h&gt;</funcsynopsisinfo>
-    </funcsynopsis>
-
-    <cmdsynopsis>
-      <command>pkg-config --cflags --libs libelogind</command>
-    </cmdsynopsis>
-  </refsynopsisdiv>
-
-  <refsect1>
-    <title>Description</title>
-
-    <para><filename>sd-login.h</filename> provides APIs to introspect
-    and monitor seat, login session and user status information on the
-    local system. </para>
-
-    <para>See <ulink
-    url="http://www.freedesktop.org/wiki/Software/systemd/multiseat">Multi-Seat
-    on Linux</ulink> for an introduction into multi-seat support on
-    Linux, the background for this set of APIs.</para>
-
-    <para>Note that these APIs only allow purely passive access and
-    monitoring of seats, sessions and users. To actively make changes
-    to the seat configuration, terminate login sessions, or switch
-    session on a seat you need to utilize the D-Bus API of
-    logind, instead.</para>
-
-    <para>These functions synchronously access data in
-    <filename>/proc</filename>, <filename>/sys/fs/cgroup</filename>
-    and <filename>/run</filename>. All of these are virtual file
-    systems, hence the runtime cost of the accesses is relatively
-    cheap.</para>
-
-    <para>It is possible (and often a very good choice) to mix calls
-    to the synchronous interface of <filename>sd-login.h</filename>
-    with the asynchronous D-Bus interface of logind. However,
-    if this is done you need to think a bit about possible races since
-    the stream of events from D-Bus and from
-    <filename>sd-login.h</filename> interfaces such as the login
-    monitor are asynchronous and not ordered against each
-    other.</para>
-
-    <para>If the functions return string arrays, these are generally
-    <constant>NULL</constant> terminated and need to be freed by the
-    caller with the libc
-    <citerefentry project='man-pages'><refentrytitle>free</refentrytitle><manvolnum>3</manvolnum></citerefentry>
-    call after use, including the strings referenced therein.
-    Similarly, individual strings returned need to be freed, as
-    well.</para>
-
-    <para>As a special exception, instead of an empty string array
-    <constant>NULL</constant> may be returned, which should be treated
-    equivalent to an empty string array.</para>
-
-    <para>See
-    <citerefentry><refentrytitle>sd_pid_get_session</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
-    <citerefentry><refentrytitle>sd_uid_get_state</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
-    <citerefentry><refentrytitle>sd_session_is_active</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
-    <citerefentry><refentrytitle>sd_seat_get_active</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
-    <citerefentry><refentrytitle>sd_get_seats</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
-    <citerefentry><refentrytitle>sd_login_monitor_new</refentrytitle><manvolnum>3</manvolnum></citerefentry>
-    for more information about the functions
-    implemented.</para>
-  </refsect1>
-
-  <xi:include href="libelogind-pkgconfig.xml" />
-
-  <refsect1>
-    <title>See Also</title>
-    <para>
-      <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>sd_pid_get_session</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>sd_uid_get_state</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>sd_session_is_active</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>sd_seat_get_active</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>sd_get_seats</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>sd_login_monitor_new</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>sd-daemon</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
-      <citerefentry project='die-net'><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
-    </para>
-  </refsect1>
-
-</refentry>
index c6b133e..5a456a5 100644 (file)
@@ -3,29 +3,29 @@
   "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
-  This file is part of systemd.
+  This file is part of elogind.
 
   Copyright 2010 Lennart Poettering
 
-  systemd is free software; you can redistribute it and/or modify it
+  elogind is free software; you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as published by
   the Free Software Foundation; either version 2.1 of the License, or
   (at your option) any later version.
 
-  systemd is distributed in the hope that it will be useful, but
+  elogind is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+  along with elogind; If not, see <http://www.gnu.org/licenses/>.
 -->
 
 <refentry id="sd_get_seats" conditional='HAVE_PAM'>
 
   <refentryinfo>
     <title>sd_get_seats</title>
-    <productname>systemd</productname>
+    <productname>elogind</productname>
 
     <authorgroup>
       <author>
@@ -52,7 +52,7 @@
 
   <refsynopsisdiv>
     <funcsynopsis>
-      <funcsynopsisinfo>#include &lt;systemd/sd-login.h&gt;</funcsynopsisinfo>
+      <funcsynopsisinfo>#include &lt;elogind/sd-login.h&gt;</funcsynopsisinfo>
 
       <funcprototype>
         <funcdef>int <function>sd_get_seats</function></funcdef>
     <title>See Also</title>
 
     <para>
-      <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+      <citerefentry><refentrytitle>elogind</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>sd-login</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>sd_session_get_seat</refentrytitle><manvolnum>3</manvolnum></citerefentry>
     </para>
diff --git a/man/sd_id128_get_machine.xml b/man/sd_id128_get_machine.xml
new file mode 100644 (file)
index 0000000..a3fcfb5
--- /dev/null
@@ -0,0 +1,129 @@
+<?xml version='1.0'?> <!--*-nxml-*-->
+<!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 elogind.
+
+  Copyright 2012 Lennart Poettering
+
+  elogind is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation; either version 2.1 of the License, or
+  (at your option) any later version.
+
+  elogind is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with elogind; If not, see <http://www.gnu.org/licenses/>.
+-->
+
+<refentry id="sd_id128_get_machine">
+
+  <refentryinfo>
+    <title>sd_id128_get_machine</title>
+    <productname>elogind</productname>
+
+    <authorgroup>
+      <author>
+        <contrib>Developer</contrib>
+        <firstname>Lennart</firstname>
+        <surname>Poettering</surname>
+        <email>lennart@poettering.net</email>
+      </author>
+    </authorgroup>
+  </refentryinfo>
+
+  <refmeta>
+    <refentrytitle>sd_id128_get_machine</refentrytitle>
+    <manvolnum>3</manvolnum>
+  </refmeta>
+
+  <refnamediv>
+    <refname>sd_id128_get_machine</refname>
+    <refname>sd_id128_get_boot</refname>
+    <refpurpose>Retrieve 128-bit IDs</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <funcsynopsis>
+      <funcsynopsisinfo>#include &lt;elogind/sd-id128.h&gt;</funcsynopsisinfo>
+
+      <funcprototype>
+        <funcdef>int <function>sd_id128_get_machine</function></funcdef>
+        <paramdef>sd_id128_t *<parameter>ret</parameter></paramdef>
+      </funcprototype>
+
+      <funcprototype>
+        <funcdef>int <function>sd_id128_get_boot</function></funcdef>
+        <paramdef>sd_id128_t *<parameter>ret</parameter></paramdef>
+      </funcprototype>
+
+    </funcsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1>
+    <title>Description</title>
+
+    <para><function>sd_id128_get_machine()</function> returns the
+    machine ID of the executing host. This reads and parses the
+    <citerefentry><refentrytitle>machine-id</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+    file. This function caches the machine ID internally to make
+    retrieving the machine ID a cheap operation.</para>
+
+    <para><function>sd_id128_get_boot()</function> returns the boot ID
+    of the executing kernel. This reads and parses the
+    <filename>/proc/sys/kernel/random/boot_id</filename> file exposed
+    by the kernel. It is randomly generated early at boot and is
+    unique for every running kernel instance. See
+    <citerefentry project='man-pages'><refentrytitle>random</refentrytitle><manvolnum>4</manvolnum></citerefentry>
+    for more information. This function also internally caches the
+    returned ID to make this call a cheap operation.</para>
+
+    <para>Note that <function>sd_id128_get_boot()</function> always
+    returns a UUID v4 compatible ID.
+    <function>sd_id128_get_machine()</function> will also return a
+    UUID v4-compatible ID on new installations but might not on older.
+    It is possible to convert the machine ID into a UUID v4-compatible
+    one. For more information, see
+    <citerefentry><refentrytitle>machine-id</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para>
+
+    <para>For more information about the <literal>sd_id128_t</literal>
+    type see
+    <citerefentry><refentrytitle>sd-id128</refentrytitle><manvolnum>3</manvolnum></citerefentry>.</para>
+  </refsect1>
+
+  <refsect1>
+    <title>Return Value</title>
+
+    <para>The two calls return 0 on success (in which case
+    <parameter>ret</parameter> is filled in), or a negative
+    errno-style error code.</para>
+  </refsect1>
+
+  <refsect1>
+    <title>Notes</title>
+
+    <para>The <function>sd_id128_get_machine()</function> and
+    <function>sd_id128_get_boot()</function> interfaces are available
+    as a shared library, which can be compiled and linked to with the
+    <literal>libelogind</literal> <citerefentry project='die-net'><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+    file.</para>
+  </refsect1>
+
+  <refsect1>
+    <title>See Also</title>
+
+    <para>
+      <citerefentry><refentrytitle>elogind</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+      <citerefentry><refentrytitle>sd-id128</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+      <citerefentry><refentrytitle>machine-id</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+      <citerefentry><refentrytitle>random</refentrytitle><manvolnum>4</manvolnum></citerefentry>,
+      <citerefentry><refentrytitle>sd_id128_randomize</refentrytitle><manvolnum>3</manvolnum></citerefentry>
+    </para>
+  </refsect1>
+
+</refentry>
diff --git a/man/sd_id128_randomize.xml b/man/sd_id128_randomize.xml
new file mode 100644 (file)
index 0000000..a5daae2
--- /dev/null
@@ -0,0 +1,114 @@
+<?xml version='1.0'?> <!--*-nxml-*-->
+<!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 elogind.
+
+  Copyright 2012 Lennart Poettering
+
+  elogind is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation; either version 2.1 of the License, or
+  (at your option) any later version.
+
+  elogind is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with elogind; If not, see <http://www.gnu.org/licenses/>.
+-->
+
+<refentry id="sd_id128_randomize">
+
+  <refentryinfo>
+    <title>sd_id128_randomize</title>
+    <productname>elogind</productname>
+
+    <authorgroup>
+      <author>
+        <contrib>Developer</contrib>
+        <firstname>Lennart</firstname>
+        <surname>Poettering</surname>
+        <email>lennart@poettering.net</email>
+      </author>
+    </authorgroup>
+  </refentryinfo>
+
+  <refmeta>
+    <refentrytitle>sd_id128_randomize</refentrytitle>
+    <manvolnum>3</manvolnum>
+  </refmeta>
+
+  <refnamediv>
+    <refname>sd_id128_randomize</refname>
+    <refpurpose>Generate 128-bit IDs</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <funcsynopsis>
+      <funcsynopsisinfo>#include &lt;elogind/sd-id128.h&gt;</funcsynopsisinfo>
+
+      <funcprototype>
+        <funcdef>int <function>sd_id128_randomize</function></funcdef>
+        <paramdef>sd_id128_t *<parameter>ret</parameter></paramdef>
+      </funcprototype>
+
+    </funcsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1>
+    <title>Description</title>
+
+    <para><function>sd_id128_randomize()</function> generates a new
+    randomized 128-bit ID and returns it in
+    <parameter>ret</parameter>. Every invocation returns a new
+    randomly generated ID. This uses the
+    <filename>/dev/urandom</filename> kernel random number
+    generator.</para>
+
+    <para>Note that <function>sd_id128_randomize()</function> always
+    returns a UUID v4-compatible ID.</para>
+
+    <para>For more information about the <literal>sd_id128_t</literal>
+    type, see
+    <citerefentry><refentrytitle>sd-id128</refentrytitle><manvolnum>3</manvolnum></citerefentry>.</para>
+
+    <para><citerefentry><refentrytitle>journalctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>'s
+    <option>--new-id</option> option may be used as a command line
+    front-end for <function>sd_id128_randomize()</function>.</para>
+  </refsect1>
+
+  <refsect1>
+    <title>Return Value</title>
+
+    <para>The call returns 0 on success (in which case
+    <parameter>ret</parameter> is filled in), or a negative
+    errno-style error code.</para>
+  </refsect1>
+
+  <refsect1>
+    <title>Notes</title>
+
+    <para>The <function>sd_id128_randomize()</function> interface is
+    available as a shared library, which can be compiled and linked to
+    with the
+    <literal>libelogind</literal> <citerefentry project='die-net'><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+    file.</para>
+  </refsect1>
+
+  <refsect1>
+    <title>See Also</title>
+
+    <para>
+      <citerefentry><refentrytitle>elogind</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+      <citerefentry><refentrytitle>sd-id128</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+      <citerefentry><refentrytitle>machine-id</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+      <citerefentry><refentrytitle>random</refentrytitle><manvolnum>4</manvolnum></citerefentry>,
+      <citerefentry><refentrytitle>sd_id128_get_machine</refentrytitle><manvolnum>3</manvolnum></citerefentry>
+    </para>
+  </refsect1>
+
+</refentry>
diff --git a/man/sd_id128_to_string.xml b/man/sd_id128_to_string.xml
new file mode 100644 (file)
index 0000000..afbf82c
--- /dev/null
@@ -0,0 +1,132 @@
+<?xml version='1.0'?> <!--*-nxml-*-->
+<!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 elogind.
+
+  Copyright 2012 Lennart Poettering
+
+  elogind is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation; either version 2.1 of the License, or
+  (at your option) any later version.
+
+  elogind is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with elogind; If not, see <http://www.gnu.org/licenses/>.
+-->
+
+<refentry id="sd_id128_to_string">
+
+  <refentryinfo>
+    <title>sd_id128_to_string</title>
+    <productname>elogind</productname>
+
+    <authorgroup>
+      <author>
+        <contrib>Developer</contrib>
+        <firstname>Lennart</firstname>
+        <surname>Poettering</surname>
+        <email>lennart@poettering.net</email>
+      </author>
+    </authorgroup>
+  </refentryinfo>
+
+  <refmeta>
+    <refentrytitle>sd_id128_to_string</refentrytitle>
+    <manvolnum>3</manvolnum>
+  </refmeta>
+
+  <refnamediv>
+    <refname>sd_id128_to_string</refname>
+    <refname>sd_id128_from_string</refname>
+    <refpurpose>Format or parse 128-bit IDs as strings</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <funcsynopsis>
+      <funcsynopsisinfo>#include &lt;elogind/sd-id128.h&gt;</funcsynopsisinfo>
+
+      <funcprototype>
+        <funcdef>char *<function>sd_id128_to_string</function></funcdef>
+        <paramdef>sd_id128_t <parameter>id</parameter>, char <parameter>s</parameter>[33]</paramdef>
+      </funcprototype>
+
+      <funcprototype>
+        <funcdef>int <function>sd_id128_from_string</function></funcdef>
+        <paramdef>const char *<parameter>s</parameter>, sd_id128_t *<parameter>ret</parameter></paramdef>
+      </funcprototype>
+
+    </funcsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1>
+    <title>Description</title>
+
+    <para><function>sd_id128_to_string()</function> formats a 128-bit
+    ID as a character string. It expects the ID and a string array
+    capable of storing 33 characters. The ID will be formatted as 32
+    lowercase hexadecimal digits and be terminated by a
+    <constant>NUL</constant> byte.</para>
+
+    <para><function>sd_id128_from_string()</function> implements the
+    reverse operation: it takes a 33 character string with 32
+    hexadecimal digits (either lowercase or uppercase, terminated by
+    <constant>NUL</constant>) and parses them back into a 128-bit ID
+    returned in <parameter>ret</parameter>. Alternatively, this call
+    can also parse a 37-character string with a 128-bit ID formatted
+    as RFC UUID.</para>
+
+    <para>For more information about the <literal>sd_id128_t</literal>
+    type see
+    <citerefentry><refentrytitle>sd-id128</refentrytitle><manvolnum>3</manvolnum></citerefentry>.
+    Note that these calls operate the same way on all architectures,
+    i.e. the results do not depend on endianness.</para>
+
+    <para>When formatting a 128-bit ID into a string, it is often
+    easier to use a format string for
+    <citerefentry project='man-pages'><refentrytitle>printf</refentrytitle><manvolnum>3</manvolnum></citerefentry>.
+    This is easily done using the
+    <function>SD_ID128_FORMAT_STR</function> and
+    <function>SD_ID128_FORMAT_VAL()</function> macros. For more
+    information see
+    <citerefentry><refentrytitle>sd-id128</refentrytitle><manvolnum>3</manvolnum></citerefentry>.</para>
+  </refsect1>
+
+  <refsect1>
+    <title>Return Value</title>
+
+    <para><function>sd_id128_to_string()</function> always succeeds
+    and returns a pointer to the string array passed in.
+    <function>sd_id128_from_string</function> returns 0 on success, in
+    which case <parameter>ret</parameter> is filled in, or a negative
+    errno-style error code.</para>
+  </refsect1>
+
+  <refsect1>
+    <title>Notes</title>
+
+    <para>The <function>sd_id128_to_string()</function> and
+    <function>sd_id128_from_string()</function> interfaces are
+    available as a shared library, which can be compiled and linked to
+    with the
+    <literal>libelogind</literal> <citerefentry project='die-net'><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+    file.</para>
+  </refsect1>
+
+  <refsect1>
+    <title>See Also</title>
+
+    <para>
+      <citerefentry><refentrytitle>elogind</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+      <citerefentry><refentrytitle>sd-id128</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+      <citerefentry project='man-pages'><refentrytitle>printf</refentrytitle><manvolnum>3</manvolnum></citerefentry>
+    </para>
+  </refsect1>
+
+</refentry>
index 627cb87..64f23cb 100644 (file)
@@ -3,22 +3,22 @@
   "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
-  This file is part of systemd.
+  This file is part of elogind.
 
   Copyright 2010 Lennart Poettering
 
-  systemd is free software; you can redistribute it and/or modify it
+  elogind is free software; you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as published by
   the Free Software Foundation; either version 2.1 of the License, or
   (at your option) any later version.
 
-  systemd is distributed in the hope that it will be useful, but
+  elogind is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+  along with elogind; If not, see <http://www.gnu.org/licenses/>.
 -->
 
 <refentry id="sd_is_fifo"
@@ -26,7 +26,7 @@
 
   <refentryinfo>
     <title>sd_is_fifo</title>
-    <productname>systemd</productname>
+    <productname>elogind</productname>
 
     <authorgroup>
       <author>
@@ -55,7 +55,7 @@
 
   <refsynopsisdiv>
     <funcsynopsis>
-      <funcsynopsisinfo>#include &lt;systemd/sd-daemon.h&gt;</funcsynopsisinfo>
+      <funcsynopsisinfo>#include &lt;elogind/sd-daemon.h&gt;</funcsynopsisinfo>
 
       <funcprototype>
         <funcdef>int <function>sd_is_fifo</function></funcdef>
   <refsect1>
     <title>Notes</title>
 
-    <xi:include href="libsystemd-pkgconfig.xml" xpointer="pkgconfig-text"/>
+    <xi:include href="libelogind-pkgconfig.xml" xpointer="pkgconfig-text"/>
 
     <para>Internally, these function use a combination of
     <filename>fstat()</filename> and
   <refsect1>
     <title>See Also</title>
     <para>
-      <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+      <citerefentry><refentrytitle>elogind</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>sd-daemon</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>sd_listen_fds</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>systemd.socket</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+      <citerefentry><refentrytitle>elogind.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+      <citerefentry><refentrytitle>elogind.socket</refentrytitle><manvolnum>5</manvolnum></citerefentry>
     </para>
   </refsect1>
 
diff --git a/man/sd_login_monitor_new.xml b/man/sd_login_monitor_new.xml
deleted file mode 100644 (file)
index 7319c06..0000000
+++ /dev/null
@@ -1,233 +0,0 @@
-<?xml version='1.0'?> <!--*-nxml-*-->
-<!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 2010 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/>.
--->
-
-<refentry id="sd_login_monitor_new" conditional='HAVE_PAM'>
-
-  <refentryinfo>
-    <title>sd_login_monitor_new</title>
-    <productname>systemd</productname>
-
-    <authorgroup>
-      <author>
-        <contrib>Developer</contrib>
-        <firstname>Lennart</firstname>
-        <surname>Poettering</surname>
-        <email>lennart@poettering.net</email>
-      </author>
-    </authorgroup>
-  </refentryinfo>
-
-  <refmeta>
-    <refentrytitle>sd_login_monitor_new</refentrytitle>
-    <manvolnum>3</manvolnum>
-  </refmeta>
-
-  <refnamediv>
-    <refname>sd_login_monitor_new</refname>
-    <refname>sd_login_monitor_unref</refname>
-    <refname>sd_login_monitor_flush</refname>
-    <refname>sd_login_monitor_get_fd</refname>
-    <refname>sd_login_monitor_get_events</refname>
-    <refname>sd_login_monitor_get_timeout</refname>
-    <refname>sd_login_monitor</refname>
-    <refpurpose>Monitor login sessions, seats, users and virtual machines/containers</refpurpose>
-  </refnamediv>
-
-  <refsynopsisdiv>
-    <funcsynopsis>
-      <funcsynopsisinfo>#include &lt;systemd/sd-login.h&gt;</funcsynopsisinfo>
-
-      <funcprototype>
-        <funcdef>int <function>sd_login_monitor_new</function></funcdef>
-        <paramdef>const char *<parameter>category</parameter></paramdef>
-        <paramdef>sd_login_monitor **<parameter>ret</parameter></paramdef>
-      </funcprototype>
-
-      <funcprototype>
-        <funcdef>sd_login_monitor *<function>sd_login_monitor_unref</function></funcdef>
-        <paramdef>sd_login_monitor *<parameter>m</parameter></paramdef>
-      </funcprototype>
-
-      <funcprototype>
-        <funcdef>int <function>sd_login_monitor_flush</function></funcdef>
-        <paramdef>sd_login_monitor *<parameter>m</parameter></paramdef>
-      </funcprototype>
-
-      <funcprototype>
-        <funcdef>int <function>sd_login_monitor_get_fd</function></funcdef>
-        <paramdef>sd_login_monitor *<parameter>m</parameter></paramdef>
-      </funcprototype>
-
-      <funcprototype>
-        <funcdef>int <function>sd_login_monitor_get_events</function></funcdef>
-        <paramdef>sd_login_monitor *<parameter>m</parameter></paramdef>
-      </funcprototype>
-
-      <funcprototype>
-        <funcdef>int <function>sd_login_monitor_get_timeout</function></funcdef>
-        <paramdef>sd_login_monitor *<parameter>m</parameter></paramdef>
-        <paramdef>uint64_t *<parameter>timeout_usec</parameter></paramdef>
-      </funcprototype>
-
-    </funcsynopsis>
-  </refsynopsisdiv>
-
-  <refsect1>
-    <title>Description</title>
-
-    <para><function>sd_login_monitor_new()</function> may be used to
-    monitor login sessions, users, seats, and virtual
-    machines/containers. Via a monitor object a file descriptor can be
-    integrated into an application defined event loop which is woken
-    up each time a user logs in, logs out or a seat is added or
-    removed, or a session, user, seat or virtual machine/container
-    changes state otherwise. The first parameter takes a string which
-    can be <literal>seat</literal> (to get only notifications about
-    seats being added, removed or changed), <literal>session</literal>
-    (to get only notifications about sessions being created or removed
-    or changed), <literal>uid</literal> (to get only notifications
-    when a user changes state in respect to logins) or
-    <literal>machine</literal> (to get only notifications when a
-    virtual machine or container is started or stopped). If
-    notifications shall be generated in all these conditions,
-    <constant>NULL</constant> may be passed. Note that in the future
-    additional categories may be defined. The second parameter returns
-    a monitor object and needs to be freed with the
-    <function>sd_login_monitor_unref()</function> call after
-    use.</para>
-
-    <para><function>sd_login_monitor_unref()</function> may be used to
-    destroy a monitor object. Note that this will invalidate any file
-    descriptor returned by
-    <function>sd_login_monitor_get_fd()</function>.</para>
-
-    <para><function>sd_login_monitor_flush()</function> may be used to
-    reset the wakeup state of the monitor object. Whenever an event
-    causes the monitor to wake up the event loop via the file
-    descriptor this function needs to be called to reset the wake-up
-    state. If this call is not invoked, the file descriptor will
-    immediately wake up the event loop again.</para>
-
-    <para><function>sd_login_monitor_get_fd()</function> may be used
-    to retrieve the file descriptor of the monitor object that may be
-    integrated in an application defined event loop, based around
-    <citerefentry><refentrytitle>poll</refentrytitle><manvolnum>2</manvolnum></citerefentry>
-    or a similar interface. The application should include the
-    returned file descriptor as wake-up source for the events mask
-    returned by <function>sd_login_monitor_get_events()</function>. It
-    should pass a timeout value as returned by
-    <function>sd_login_monitor_get_timeout()</function>. Whenever a
-    wake-up is triggered the file descriptor needs to be reset via
-    <function>sd_login_monitor_flush()</function>. An application
-    needs to reread the login state with a function like
-    <citerefentry><refentrytitle>sd_get_seats</refentrytitle><manvolnum>3</manvolnum></citerefentry>
-    or similar to determine what changed.</para>
-
-    <para><function>sd_login_monitor_get_events()</function> will
-    return the <function>poll()</function> mask to wait for. This
-    function will return a combination of <constant>POLLIN</constant>,
-    <constant>POLLOUT</constant> and similar to fill into the
-    <literal>.events</literal> field of <varname>struct
-    pollfd</varname>.</para>
-
-    <para><function>sd_login_monitor_get_timeout()</function> will
-    return a timeout value for usage in <function>poll()</function>.
-    This returns a value in microseconds since the epoch of
-    <constant>CLOCK_MONOTONIC</constant> for timing out
-    <function>poll()</function> in <varname>timeout_usec</varname>.
-    See
-    <citerefentry><refentrytitle>clock_gettime</refentrytitle><manvolnum>2</manvolnum></citerefentry>
-    for details about <constant>CLOCK_MONOTONIC</constant>. If there
-    is no timeout to wait for this will fill in <constant>(uint64_t)
-    -1</constant> instead. Note that <function>poll()</function> takes
-    a relative timeout in milliseconds rather than an absolute timeout
-    in microseconds. To convert the absolute 'us' timeout into
-    relative 'ms', use code like the following:</para>
-
-    <programlisting>uint64_t t;
-int msec;
-sd_login_monitor_get_timeout(m, &amp;t);
-if (t == (uint64_t) -1)
-  msec = -1;
-else {
-  struct timespec ts;
-  uint64_t n;
-  clock_getttime(CLOCK_MONOTONIC, &amp;ts);
-  n = (uint64_t) ts.tv_sec * 1000000 + ts.tv_nsec / 1000;
-  msec = t > n ? (int) ((t - n + 999) / 1000) : 0;
-}</programlisting>
-
-    <para>The code above does not do any error checking for brevity's
-    sake. The calculated <varname>msec</varname> integer can be passed
-    directly as <function>poll()</function>'s timeout
-    parameter.</para>
-  </refsect1>
-
-  <refsect1>
-    <title>Return Value</title>
-
-    <para>On success,
-    <function>sd_login_monitor_new()</function>,
-    <function>sd_login_monitor_flush()</function> and
-    <function>sd_login_monitor_get_timeout()</function>
-    return 0 or a positive integer. On success,
-    <function>sd_login_monitor_get_fd()</function> returns
-    a Unix file descriptor. On success,
-    <function>sd_login_monitor_get_events()</function>
-    returns a combination of <constant>POLLIN</constant>,
-    <constant>POLLOUT</constant> and suchlike. On failure,
-    these calls return a negative errno-style error
-    code.</para>
-
-    <para><function>sd_login_monitor_unref()</function>
-    always returns <constant>NULL</constant>.</para>
-  </refsect1>
-
-  <refsect1>
-    <title>Notes</title>
-
-    <para>The <function>sd_login_monitor_new()</function>,
-    <function>sd_login_monitor_unref()</function>,
-    <function>sd_login_monitor_flush()</function>,
-    <function>sd_login_monitor_get_fd()</function>,
-    <function>sd_login_monitor_get_events()</function> and
-    <function>sd_login_monitor_get_timeout()</function>
-    interfaces are available as a shared library, which can be
-    compiled and linked to with the
-    <constant>libelogind</constant> <citerefentry project='die-net'><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
-    file.</para>
-  </refsect1>
-
-  <refsect1>
-    <title>See Also</title>
-
-    <para>
-      <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>sd-login</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>sd_get_seats</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>poll</refentrytitle><manvolnum>2</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>clock_gettime</refentrytitle><manvolnum>2</manvolnum></citerefentry>
-    </para>
-  </refsect1>
-
-</refentry>
diff --git a/man/sd_machine_get_class.xml b/man/sd_machine_get_class.xml
new file mode 100644 (file)
index 0000000..1de9116
--- /dev/null
@@ -0,0 +1,123 @@
+<?xml version='1.0'?> <!--*-nxml-*-->
+<!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 elogind.
+
+  Copyright 2014 Lennart Poettering
+
+  elogind is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation; either version 2.1 of the License, or
+  (at your option) any later version.
+
+  elogind is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with elogind; If not, see <http://www.gnu.org/licenses/>.
+-->
+
+<refentry id="sd_machine_get_class">
+
+  <refentryinfo>
+    <title>sd_machine_get_class</title>
+    <productname>elogind</productname>
+
+    <authorgroup>
+      <author>
+        <contrib>Developer</contrib>
+        <firstname>Lennart</firstname>
+        <surname>Poettering</surname>
+        <email>lennart@poettering.net</email>
+      </author>
+    </authorgroup>
+  </refentryinfo>
+
+  <refmeta>
+    <refentrytitle>sd_machine_get_class</refentrytitle>
+    <manvolnum>3</manvolnum>
+  </refmeta>
+
+  <refnamediv>
+    <refname>sd_machine_get_class</refname>
+    <refname>sd_machine_get_ifindices</refname>
+    <refpurpose>Determine the class and network interface indices of a
+    locally running virtual machine or container.</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <funcsynopsis>
+      <funcsynopsisinfo>#include &lt;elogind/sd-login.h&gt;</funcsynopsisinfo>
+
+      <funcprototype>
+        <funcdef>int <function>sd_machine_get_class</function></funcdef>
+        <paramdef>const char* <parameter>machine</parameter></paramdef>
+        <paramdef>char *<parameter>class</parameter></paramdef>
+      </funcprototype>
+
+      <funcprototype>
+        <funcdef>int <function>sd_machine_get_ifindices</function></funcdef>
+        <paramdef>const char* <parameter>machine</parameter></paramdef>
+        <paramdef>int **<parameter>ifindices</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1>
+    <title>Description</title>
+
+    <para><function>sd_machine_get_class()</function> may be used to
+    determine the class of a locally running virtual machine or
+    container that is registered with
+    <citerefentry><refentrytitle>elogind-machined.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.
+    The string returned is either <literal>vm</literal> or
+    <literal>container</literal>. The returned string needs to be
+    freed with the libc <citerefentry
+    project='man-pages'><refentrytitle>free</refentrytitle><manvolnum>3</manvolnum></citerefentry>
+    call after use.</para>
+
+    <para><function>sd_machine_get_ifindices()</function> may be used
+    to determine the numeric indices of the network interfaces on the
+    host that are pointing towards the specified locally running
+    virtual machine or container that is registered with
+    <citerefentry><refentrytitle>elogind-machined.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.
+    The returned array needs to be freed with the libc <citerefentry
+    project='man-pages'><refentrytitle>free</refentrytitle><manvolnum>3</manvolnum></citerefentry>
+    call after use.</para>
+  </refsect1>
+
+  <refsect1>
+    <title>Return Value</title>
+
+    <para>On success, these calls return 0 or a positive integer. On
+    failure, these calls return a negative errno-style error
+    code.</para>
+  </refsect1>
+
+  <refsect1>
+    <title>Notes</title>
+
+    <para>The <function>sd_machine_get_class()</function> and
+    <function>sd_machine_get_ifindices()</function> interfaces are
+    available as a shared library, which can be compiled and linked to
+    with the
+    <constant>libelogind</constant> <citerefentry project='die-net'><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+    file.</para>
+  </refsect1>
+
+  <refsect1>
+    <title>See Also</title>
+
+    <para>
+      <citerefentry><refentrytitle>elogind</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+      <citerefentry><refentrytitle>sd-login</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+      <citerefentry><refentrytitle>elogind-machined.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+      <citerefentry><refentrytitle>sd_pid_get_machine_name</refentrytitle><manvolnum>3</manvolnum></citerefentry>
+    </para>
+  </refsect1>
+
+</refentry>
diff --git a/man/sd_notify.xml b/man/sd_notify.xml
new file mode 100644 (file)
index 0000000..41c3f3f
--- /dev/null
@@ -0,0 +1,376 @@
+<?xml version='1.0'?> <!--*-nxml-*-->
+<!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 elogind.
+
+  Copyright 2010 Lennart Poettering
+
+  elogind is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation; either version 2.1 of the License, or
+  (at your option) any later version.
+
+  elogind is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with elogind; If not, see <http://www.gnu.org/licenses/>.
+-->
+
+<refentry id="sd_notify"
+  xmlns:xi="http://www.w3.org/2001/XInclude">
+
+  <refentryinfo>
+    <title>sd_notify</title>
+    <productname>elogind</productname>
+
+    <authorgroup>
+      <author>
+        <contrib>Developer</contrib>
+        <firstname>Lennart</firstname>
+        <surname>Poettering</surname>
+        <email>lennart@poettering.net</email>
+      </author>
+    </authorgroup>
+  </refentryinfo>
+
+  <refmeta>
+    <refentrytitle>sd_notify</refentrytitle>
+    <manvolnum>3</manvolnum>
+  </refmeta>
+
+  <refnamediv>
+    <refname>sd_notify</refname>
+    <refname>sd_notifyf</refname>
+    <refname>sd_pid_notify</refname>
+    <refname>sd_pid_notifyf</refname>
+    <refname>sd_pid_notify_with_fds</refname>
+    <refpurpose>Notify service manager about start-up completion and other service status changes</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <funcsynopsis>
+      <funcsynopsisinfo>#include &lt;elogind/sd-daemon.h&gt;</funcsynopsisinfo>
+
+      <funcprototype>
+        <funcdef>int <function>sd_notify</function></funcdef>
+        <paramdef>int <parameter>unset_environment</parameter></paramdef>
+        <paramdef>const char *<parameter>state</parameter></paramdef>
+      </funcprototype>
+
+      <funcprototype>
+        <funcdef>int <function>sd_notifyf</function></funcdef>
+        <paramdef>int <parameter>unset_environment</parameter></paramdef>
+        <paramdef>const char *<parameter>format</parameter></paramdef>
+        <paramdef>...</paramdef>
+      </funcprototype>
+
+      <funcprototype>
+        <funcdef>int <function>sd_pid_notify</function></funcdef>
+        <paramdef>pid_t <parameter>pid</parameter></paramdef>
+        <paramdef>int <parameter>unset_environment</parameter></paramdef>
+        <paramdef>const char *<parameter>state</parameter></paramdef>
+      </funcprototype>
+
+      <funcprototype>
+        <funcdef>int <function>sd_pid_notifyf</function></funcdef>
+        <paramdef>pid_t <parameter>pid</parameter></paramdef>
+        <paramdef>int <parameter>unset_environment</parameter></paramdef>
+        <paramdef>const char *<parameter>format</parameter></paramdef>
+        <paramdef>...</paramdef>
+      </funcprototype>
+
+      <funcprototype>
+        <funcdef>int <function>sd_pid_notify_with_fds</function></funcdef>
+        <paramdef>pid_t <parameter>pid</parameter></paramdef>
+        <paramdef>int <parameter>unset_environment</parameter></paramdef>
+        <paramdef>const char *<parameter>state</parameter></paramdef>
+        <paramdef>const int *<parameter>fds</parameter></paramdef>
+        <paramdef>unsigned <parameter>n_fds</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1>
+    <title>Description</title>
+    <para><function>sd_notify()</function> may be called by a service
+    to notify the service manager about state changes. It can be used
+    to send arbitrary information, encoded in an
+    environment-block-like string. Most importantly it can be used for
+    start-up completion notification.</para>
+
+    <para>If the <parameter>unset_environment</parameter> parameter is
+    non-zero, <function>sd_notify()</function> will unset the
+    <varname>$NOTIFY_SOCKET</varname> environment variable before
+    returning (regardless of whether the function call itself
+    succeeded or not). Further calls to
+    <function>sd_notify()</function> will then fail, but the variable
+    is no longer inherited by child processes.</para>
+
+    <para>The <parameter>state</parameter> parameter should contain a
+    newline-separated list of variable assignments, similar in style
+    to an environment block. A trailing newline is implied if none is
+    specified. The string may contain any kind of variable
+    assignments, but the following shall be considered
+    well-known:</para>
+
+    <variablelist>
+      <varlistentry>
+        <term>READY=1</term>
+
+        <listitem><para>Tells the service manager that service startup
+        is finished. This is only used by elogind if the service
+        definition file has Type=notify set. Since there is little
+        value in signaling non-readiness, the only value services
+        should send is <literal>READY=1</literal> (i.e.
+        <literal>READY=0</literal> is not defined).</para></listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>RELOADING=1</term>
+
+        <listitem><para>Tells the service manager that the service is
+        reloading its configuration. This is useful to allow the
+        service manager to track the service's internal state, and
+        present it to the user. Note that a service that sends this
+        notification must also send a <literal>READY=1</literal>
+        notification when it completed reloading its
+        configuration.</para></listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>STOPPING=1</term>
+
+        <listitem><para>Tells the service manager that the service is
+        beginning its shutdown. This is useful to allow the service
+        manager to track the service's internal state, and present it
+        to the user.</para></listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>STATUS=...</term>
+
+        <listitem><para>Passes a single-line UTF-8 status string back
+        to the service manager that describes the service state. This
+        is free-form and can be used for various purposes: general
+        state feedback, fsck-like programs could pass completion
+        percentages and failing programs could pass a human readable
+        error message. Example: <literal>STATUS=Completed 66% of file
+        system check...</literal></para></listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>ERRNO=...</term>
+
+        <listitem><para>If a service fails, the errno-style error
+        code, formatted as string. Example: <literal>ERRNO=2</literal>
+        for ENOENT.</para></listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>BUSERROR=...</term>
+
+        <listitem><para>If a service fails, the D-Bus error-style
+        error code. Example:
+        <literal>BUSERROR=org.freedesktop.DBus.Error.TimedOut</literal></para></listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>MAINPID=...</term>
+
+        <listitem><para>The main process ID (PID) of the service, in
+        case the service manager did not fork off the process itself.
+        Example: <literal>MAINPID=4711</literal></para></listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>WATCHDOG=1</term>
+
+        <listitem><para>Tells the service manager to update the
+        watchdog timestamp. This is the keep-alive ping that services
+        need to issue in regular intervals if
+        <varname>WatchdogSec=</varname> is enabled for it. See
+        <citerefentry><refentrytitle>elogind.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+        for information how to enable this functionality and
+        <citerefentry><refentrytitle>sd_watchdog_enabled</refentrytitle><manvolnum>3</manvolnum></citerefentry>
+        for the details of how the service can check whether the
+        watchdog is enabled. </para></listitem>
+      </varlistentry>
+
+
+      <varlistentry>
+        <term>FDSTORE=1</term>
+
+        <listitem><para>Stores additional file descriptors in the
+        service manager. File descriptors sent this way will be
+        maintained per-service by the service manager and be passed
+        again using the usual file descriptor passing logic on the
+        next invocation of the service (see
+        <citerefentry><refentrytitle>sd_listen_fds</refentrytitle><manvolnum>3</manvolnum></citerefentry>).
+        This is useful for implementing service restart schemes where
+        services serialize their state to <filename>/run</filename>,
+        push their file descriptors to the system manager, and are
+        then restarted, retrieving their state again via socket
+        passing and <filename>/run</filename>. Note that the service
+        manager will accept messages for a service only if
+        <varname>FileDescriptorStoreMax=</varname> is set to non-zero
+        for it (defaults to zero). See
+        <citerefentry><refentrytitle>elogind.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+        for details. Multiple arrays of file descriptors may be sent
+        in separate messages, in which case the arrays are combined.
+        Note that the service manager removes duplicate file
+        descriptors before passing them to the service. Use
+        <function>sd_pid_notify_with_fds()</function> to send messages
+        with <literal>FDSTORE=1</literal>, see
+        below.</para></listitem>
+      </varlistentry>
+
+    </variablelist>
+
+    <para>It is recommended to prefix variable names that are not
+    listed above with <varname>X_</varname> to avoid namespace
+    clashes.</para>
+
+    <para>Note that elogind will accept status data sent from a
+    service only if the <varname>NotifyAccess=</varname> option is
+    correctly set in the service definition file. See
+    <citerefentry><refentrytitle>elogind.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+    for details.</para>
+
+    <para><function>sd_notifyf()</function> is similar to
+    <function>sd_notify()</function> but takes a
+    <function>printf()</function>-like format string plus
+    arguments.</para>
+
+    <para><function>sd_pid_notify()</function> and
+    <function>sd_pid_notifyf()</function> are similar to
+    <function>sd_notify()</function> and
+    <function>sd_notifyf()</function> but take a process ID (PID) to
+    use as originating PID for the message as first argument. This is
+    useful to send notification messages on behalf of other processes,
+    provided the appropriate privileges are available. If the PID
+    argument is specified as 0 the process ID of the calling process
+    is used, in which case the calls are fully equivalent to
+    <function>sd_notify()</function> and
+    <function>sd_notifyf()</function>.</para>
+
+    <para><function>sd_pid_notify_with_fds()</function> is similar to
+    <function>sd_pid_notify()</function> but takes an additional array
+    of file descriptors. These file descriptors are sent along the
+    notification message to the service manager. This is particularly
+    useful for sending <literal>FDSTORE=1</literal> messages, as
+    described above. The additional arguments are a pointer to the
+    file descriptor array plus the number of file descriptors in the
+    array. If the number of file descriptors is passed as 0, the call
+    is fully equivalent to <function>sd_pid_notify()</function>, i.e.
+    no file descriptors are passed. Note that sending file descriptors
+    to the service manager on messages that do not expect them (i.e.
+    without <literal>FDSTORE=1</literal>) they are immediately closed
+    on reception.</para>
+  </refsect1>
+
+  <refsect1>
+    <title>Return Value</title>
+
+    <para>On failure, these calls return a negative errno-style error
+    code. If <varname>$NOTIFY_SOCKET</varname> was not set and hence
+    no status data could be sent, 0 is returned. If the status was
+    sent, these functions return with a positive return value. In
+    order to support both, init systems that implement this scheme and
+    those which do not, it is generally recommended to ignore the
+    return value of this call.</para>
+  </refsect1>
+
+  <refsect1>
+    <title>Notes</title>
+
+    <xi:include href="libelogind-pkgconfig.xml" xpointer="pkgconfig-text"/>
+
+    <para>Internally, these functions send a single datagram with the
+    state string as payload to the <constant>AF_UNIX</constant> socket
+    referenced in the <varname>$NOTIFY_SOCKET</varname> environment
+    variable. If the first character of
+    <varname>$NOTIFY_SOCKET</varname> is <literal>@</literal>, the
+    string is understood as Linux abstract namespace socket. The
+    datagram is accompanied by the process credentials of the sending
+    service, using SCM_CREDENTIALS.</para>
+  </refsect1>
+
+  <refsect1>
+    <title>Environment</title>
+
+    <variablelist class='environment-variables'>
+      <varlistentry>
+        <term><varname>$NOTIFY_SOCKET</varname></term>
+
+        <listitem><para>Set by the service manager for supervised
+        processes for status and start-up completion notification.
+        This environment variable specifies the socket
+        <function>sd_notify()</function> talks to. See above for
+        details.</para></listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+
+  <refsect1>
+    <title>Examples</title>
+
+    <example>
+      <title>Start-up Notification</title>
+
+      <para>When a service finished starting up, it might issue the
+      following call to notify the service manager:</para>
+
+      <programlisting>sd_notify(0, "READY=1");</programlisting>
+    </example>
+
+    <example>
+      <title>Extended Start-up Notification</title>
+
+      <para>A service could send the following after completing
+      initialization:</para>
+
+      <programlisting>sd_notifyf(0, "READY=1\n"
+        "STATUS=Processing requests...\n"
+        "MAINPID=%lu",
+        (unsigned long) getpid());</programlisting>
+    </example>
+
+    <example>
+      <title>Error Cause Notification</title>
+
+      <para>A service could send the following shortly before exiting, on failure:</para>
+
+      <programlisting>sd_notifyf(0, "STATUS=Failed to start up: %s\n"
+        "ERRNO=%i",
+        strerror(errno),
+        errno);</programlisting>
+    </example>
+
+    <example>
+      <title>Store a File Descriptor in the Service Manager</title>
+
+      <para>To store an open file descriptor in the service manager,
+      in order to continue operation after a service restart without
+      losing state use <literal>FDSTORE=1</literal>:</para>
+
+      <programlisting>sd_pid_notify_with_fds(0, 0, "FDSTORE=1", &amp;fd, 1);</programlisting>
+    </example>
+  </refsect1>
+
+  <refsect1>
+    <title>See Also</title>
+    <para>
+      <citerefentry><refentrytitle>elogind</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+      <citerefentry><refentrytitle>sd-daemon</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+      <citerefentry><refentrytitle>daemon</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
+      <citerefentry><refentrytitle>elogind.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+      <citerefentry><refentrytitle>sd_watchdog_enabled</refentrytitle><manvolnum>3</manvolnum></citerefentry>
+    </para>
+  </refsect1>
+
+</refentry>
index e0002c2..793bbc8 100644 (file)
@@ -3,29 +3,29 @@
   "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
-  This file is part of systemd.
+  This file is part of elogind.
 
   Copyright 2010 Lennart Poettering
 
-  systemd is free software; you can redistribute it and/or modify it
+  elogind is free software; you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as published by
   the Free Software Foundation; either version 2.1 of the License, or
   (at your option) any later version.
 
-  systemd is distributed in the hope that it will be useful, but
+  elogind is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+  along with elogind; If not, see <http://www.gnu.org/licenses/>.
 -->
 
 <refentry id="sd_seat_get_active" conditional='HAVE_PAM'>
 
   <refentryinfo>
     <title>sd_seat_get_active</title>
-    <productname>systemd</productname>
+    <productname>elogind</productname>
 
     <authorgroup>
       <author>
@@ -53,7 +53,7 @@
 
   <refsynopsisdiv>
     <funcsynopsis>
-      <funcsynopsisinfo>#include &lt;systemd/sd-login.h&gt;</funcsynopsisinfo>
+      <funcsynopsisinfo>#include &lt;elogind/sd-login.h&gt;</funcsynopsisinfo>
 
       <funcprototype>
         <funcdef>int <function>sd_seat_get_active</function></funcdef>
     <title>See Also</title>
 
     <para>
-      <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+      <citerefentry><refentrytitle>elogind</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>sd-login</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>sd_session_get_seat</refentrytitle><manvolnum>3</manvolnum></citerefentry>
     </para>
index 069cbe0..55726f9 100644 (file)
@@ -3,29 +3,29 @@
   "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
-  This file is part of systemd.
+  This file is part of elogind.
 
   Copyright 2010 Lennart Poettering
 
-  systemd is free software; you can redistribute it and/or modify it
+  elogind is free software; you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as published by
   the Free Software Foundation; either version 2.1 of the License, or
   (at your option) any later version.
 
-  systemd is distributed in the hope that it will be useful, but
+  elogind is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+  along with elogind; If not, see <http://www.gnu.org/licenses/>.
 -->
 
 <refentry id="sd_session_is_active" conditional='HAVE_PAM'>
 
   <refentryinfo>
     <title>sd_session_is_active</title>
-    <productname>systemd</productname>
+    <productname>elogind</productname>
 
     <authorgroup>
       <author>
@@ -62,7 +62,7 @@
 
   <refsynopsisdiv>
     <funcsynopsis>
-      <funcsynopsisinfo>#include &lt;systemd/sd-login.h&gt;</funcsynopsisinfo>
+      <funcsynopsisinfo>#include &lt;elogind/sd-login.h&gt;</funcsynopsisinfo>
 
       <funcprototype>
         <funcdef>int <function>sd_session_is_active</function></funcdef>
     <title>See Also</title>
 
     <para>
-      <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+      <citerefentry><refentrytitle>elogind</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>sd-login</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>sd_pid_get_session</refentrytitle><manvolnum>3</manvolnum></citerefentry>
     </para>
diff --git a/man/sd_uid_get_state.xml b/man/sd_uid_get_state.xml
deleted file mode 100644 (file)
index 4218f73..0000000
+++ /dev/null
@@ -1,204 +0,0 @@
-<?xml version='1.0'?> <!--*-nxml-*-->
-<!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 2010 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/>.
--->
-
-<refentry id="sd_uid_get_state" conditional='HAVE_PAM'>
-
-  <refentryinfo>
-    <title>sd_uid_get_state</title>
-    <productname>systemd</productname>
-
-    <authorgroup>
-      <author>
-        <contrib>Developer</contrib>
-        <firstname>Lennart</firstname>
-        <surname>Poettering</surname>
-        <email>lennart@poettering.net</email>
-      </author>
-    </authorgroup>
-  </refentryinfo>
-
-  <refmeta>
-    <refentrytitle>sd_uid_get_state</refentrytitle>
-    <manvolnum>3</manvolnum>
-  </refmeta>
-
-  <refnamediv>
-    <refname>sd_uid_get_state</refname>
-    <refname>sd_uid_is_on_seat</refname>
-    <refname>sd_uid_get_sessions</refname>
-    <refname>sd_uid_get_seats</refname>
-    <refname>sd_uid_get_display</refname>
-    <refpurpose>Determine login state of a specific Unix user ID</refpurpose>
-  </refnamediv>
-
-  <refsynopsisdiv>
-    <funcsynopsis>
-      <funcsynopsisinfo>#include &lt;systemd/sd-login.h&gt;</funcsynopsisinfo>
-
-      <funcprototype>
-        <funcdef>int <function>sd_uid_get_state</function></funcdef>
-        <paramdef>uid_t <parameter>uid</parameter></paramdef>
-        <paramdef>char **<parameter>state</parameter></paramdef>
-      </funcprototype>
-
-      <funcprototype>
-        <funcdef>int <function>sd_uid_is_on_seat</function></funcdef>
-        <paramdef>uid_t <parameter>uid</parameter></paramdef>
-        <paramdef>int <parameter>require_active</parameter></paramdef>
-        <paramdef>const char *<parameter>seat</parameter></paramdef>
-      </funcprototype>
-
-      <funcprototype>
-        <funcdef>int <function>sd_uid_get_sessions</function></funcdef>
-        <paramdef>uid_t <parameter>uid</parameter></paramdef>
-        <paramdef>int <parameter>require_active</parameter></paramdef>
-        <paramdef>char ***<parameter>sessions</parameter></paramdef>
-      </funcprototype>
-
-      <funcprototype>
-        <funcdef>int <function>sd_uid_get_seats</function></funcdef>
-        <paramdef>uid_t <parameter>uid</parameter></paramdef>
-        <paramdef>int <parameter>require_active</parameter></paramdef>
-        <paramdef>char ***<parameter>seats</parameter></paramdef>
-      </funcprototype>
-
-      <funcprototype>
-        <funcdef>int <function>sd_uid_get_display</function></funcdef>
-        <paramdef>uid_t <parameter>uid</parameter></paramdef>
-        <paramdef>char **<parameter>session</parameter></paramdef>
-      </funcprototype>
-    </funcsynopsis>
-  </refsynopsisdiv>
-
-  <refsect1>
-    <title>Description</title>
-
-    <para><function>sd_uid_get_state()</function> may be used to
-    determine the login state of a specific Unix user identifier. The
-    following states are currently known: <literal>offline</literal>
-    (user not logged in at all), <literal>lingering</literal> (user
-    not logged in, but some user services running),
-    <literal>online</literal> (user logged in, but not active, i.e.
-    has no session in the foreground), <literal>active</literal> (user
-    logged in, and has at least one active session, i.e. one session
-    in the foreground), <literal>closing</literal> (user not logged
-    in, and not lingering, but some processes are still around). In
-    the future additional states might be defined, client code should
-    be written to be robust in regards to additional state strings
-    being returned. The returned string needs to be freed with the
-    libc
-    <citerefentry project='man-pages'><refentrytitle>free</refentrytitle><manvolnum>3</manvolnum></citerefentry>
-    call after use.</para>
-
-    <para><function>sd_uid_is_on_seat()</function> may be used to
-    determine whether a specific user is logged in or active on a
-    specific seat. Accepts a Unix user identifier and a seat
-    identifier string as parameters. The
-    <parameter>require_active</parameter> parameter is a boolean
-    value. If non-zero (true), this function will test if the user is
-    active (i.e. has a session that is in the foreground and accepting
-    user input) on the specified seat, otherwise (false) only if the
-    user is logged in (and possibly inactive) on the specified
-    seat.</para>
-
-    <para><function>sd_uid_get_sessions()</function> may be used to
-    determine the current sessions of the specified user. Accepts a
-    Unix user identifier as parameter. The
-    <parameter>require_active</parameter> parameter controls whether
-    the returned list shall consist of only those sessions where the
-    user is currently active (&gt; 0), where the user is currently
-    online but possibly inactive (= 0), or logged in at all but
-    possibly closing the session (&lt; 0). The call returns a
-    <constant>NULL</constant> terminated string array of session
-    identifiers in <parameter>sessions</parameter> which needs to be
-    freed by the caller with the libc
-    <citerefentry project='man-pages'><refentrytitle>free</refentrytitle><manvolnum>3</manvolnum></citerefentry>
-    call after use, including all the strings referenced. If the
-    string array parameter is passed as <constant>NULL</constant>, the
-    array will not be filled in, but the return code still indicates
-    the number of current sessions. Note that instead of an empty
-    array <constant>NULL</constant> may be returned and should be
-    considered equivalent to an empty array.</para>
-
-    <para>Similarly, <function>sd_uid_get_seats()</function> may be
-    used to determine the list of seats on which the user currently
-    has sessions. Similar semantics apply, however note that the user
-    may have multiple sessions on the same seat as well as sessions
-    with no attached seat and hence the number of entries in the
-    returned array may differ from the one returned by
-    <function>sd_uid_get_sessions()</function>.</para>
-
-    <para><function>sd_uid_get_display()</function> returns the name
-    of the "primary" session of a user. If the user has graphical
-    sessions, it will be the oldest graphical session. Otherwise, it
-    will be the oldest open session.</para>
-  </refsect1>
-
-  <refsect1>
-    <title>Return Value</title>
-
-    <para>On success, <function>sd_uid_get_state()</function> returns
-    0 or a positive integer. If the test succeeds,
-    <function>sd_uid_is_on_seat()</function> returns a positive
-    integer; if it fails, 0.
-    <function>sd_uid_get_sessions()</function> and
-    <function>sd_uid_get_seats()</function> return the number of
-    entries in the returned arrays.
-    <function>sd_uid_get_display()</function> returns a non-negative
-    code on success. On failure, these calls return a negative
-    errno-style error code.</para>
-  </refsect1>
-
-  <refsect1>
-    <title>Notes</title>
-
-    <para>Functions described here are available as a shared library,
-    and can be compiled and linked to using the
-    <constant>libelogind</constant> <citerefentry project='die-net'><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
-    entry.</para>
-  </refsect1>
-
-  <refsect1>
-    <title>History</title>
-
-    <para><function>sd_uid_get_state()</function>,
-    <function>sd_uid_is_on_seat()</function>,
-    <function>sd_uid_get_sessions()</function>, and
-    <function>sd_uid_get_seats()</function> functions were added in
-    systemd-31.</para>
-
-    <para><function>sd_uid_get_display()</function> was added in
-    systemd-213.</para>
-  </refsect1>
-
-  <refsect1>
-    <title>See Also</title>
-
-    <para>
-      <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>sd-login</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>sd_pid_get_owner_uid</refentrytitle><manvolnum>3</manvolnum></citerefentry>
-    </para>
-  </refsect1>
-
-</refentry>
diff --git a/man/sd_watchdog_enabled.xml b/man/sd_watchdog_enabled.xml
new file mode 100644 (file)
index 0000000..e588b04
--- /dev/null
@@ -0,0 +1,175 @@
+<?xml version='1.0'?> <!--*-nxml-*-->
+<!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 elogind.
+
+  Copyright 2013 Lennart Poettering
+
+  elogind is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation; either version 2.1 of the License, or
+  (at your option) any later version.
+
+  elogind is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with elogind; If not, see <http://www.gnu.org/licenses/>.
+-->
+
+<refentry id="sd_watchdog_enabled"
+  xmlns:xi="http://www.w3.org/2001/XInclude">
+
+  <refentryinfo>
+    <title>sd_watchdog_enabled</title>
+    <productname>elogind</productname>
+
+    <authorgroup>
+      <author>
+        <contrib>Developer</contrib>
+        <firstname>Lennart</firstname>
+        <surname>Poettering</surname>
+        <email>lennart@poettering.net</email>
+      </author>
+    </authorgroup>
+  </refentryinfo>
+
+  <refmeta>
+    <refentrytitle>sd_watchdog_enabled</refentrytitle>
+    <manvolnum>3</manvolnum>
+  </refmeta>
+
+  <refnamediv>
+    <refname>sd_watchdog_enabled</refname>
+    <refpurpose>Check whether the service manager expects watchdog keep-alive notifications from a service</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <funcsynopsis>
+      <funcsynopsisinfo>#include &lt;elogind/sd-daemon.h&gt;</funcsynopsisinfo>
+
+      <funcprototype>
+        <funcdef>int <function>sd_watchdog_enabled</function></funcdef>
+        <paramdef>int <parameter>unset_environment</parameter></paramdef>
+        <paramdef>uint64_t *<parameter>usec</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1>
+    <title>Description</title>
+    <para><function>sd_watchdog_enabled()</function> may be called by
+    a service to detect whether the service manager expects regular
+    keep-alive watchdog notification events from it, and the timeout
+    after which the manager will act on the service if it did not get
+    such a notification.</para>
+
+    <para>If the <varname>$WATCHDOG_USEC</varname> environment
+    variable is set, and the <varname>$WATCHDOG_PID</varname> variable
+    is unset or set to the PID of the current process, the service
+    manager expects notifications from this process. The manager will
+    usually terminate a service when it does not get a notification
+    message within the specified time after startup and after each
+    previous message. It is recommended that a daemon sends a
+    keep-alive notification message to the service manager every half
+    of the time returned here. Notification messages may be sent with
+    <citerefentry><refentrytitle>sd_notify</refentrytitle><manvolnum>3</manvolnum></citerefentry>
+    with a message string of <literal>WATCHDOG=1</literal>.</para>
+
+    <para>If the <parameter>unset_environment</parameter> parameter is
+    non-zero, <function>sd_watchdog_enabled()</function> will unset
+    the <varname>$WATCHDOG_USEC</varname> and
+    <varname>$WATCHDOG_PID</varname> environment variables before
+    returning (regardless of whether the function call itself
+    succeeded or not). Those variables are no longer inherited by
+    child processes. Further calls to
+    <function>sd_watchdog_enabled()</function> will also return with
+    zero.</para>
+
+    <para>If the <parameter>usec</parameter> parameter is non-NULL,
+    <function>sd_watchdog_enabled()</function> will write the timeout
+    in µs for the watchdog logic to it.</para>
+
+    <para>To enable service supervision with the watchdog logic, use
+    <varname>WatchdogSec=</varname> in service files. See
+    <citerefentry><refentrytitle>elogind.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+    for details.</para>
+  </refsect1>
+
+  <refsect1>
+    <title>Return Value</title>
+
+    <para>On failure, this call returns a negative errno-style error
+    code. If the service manager expects watchdog keep-alive
+    notification messages to be sent, &gt; 0 is returned, otherwise 0
+    is returned. Only if the return value is &gt; 0, the
+    <parameter>usec</parameter> parameter is valid after the
+    call.</para>
+  </refsect1>
+
+  <refsect1>
+    <title>Notes</title>
+
+    <xi:include href="libelogind-pkgconfig.xml" xpointer="pkgconfig-text"/>
+
+    <para>Internally, this functions parses the
+    <varname>$WATCHDOG_PID</varname> and
+    <varname>$WATCHDOG_USEC</varname> environment variable. The call
+    will ignore these variables if <varname>$WATCHDOG_PID</varname>
+    does not contain the PID of the current process, under the
+    assumption that in that case, the variables were set for a
+    different process further up the process tree.</para>
+  </refsect1>
+
+  <refsect1>
+    <title>Environment</title>
+
+    <variablelist class='environment-variables'>
+      <varlistentry>
+        <term><varname>$WATCHDOG_PID</varname></term>
+
+        <listitem><para>Set by the system manager for supervised
+        process for which watchdog support is enabled, and contains
+        the PID of that process. See above for
+        details.</para></listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><varname>$WATCHDOG_USEC</varname></term>
+
+        <listitem><para>Set by the system manager for supervised
+        process for which watchdog support is enabled, and contains
+        the watchdog timeout in µs See above for
+        details.</para></listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+
+  <refsect1>
+    <title>History</title>
+
+    <para>The watchdog functionality and the
+    <varname>$WATCHDOG_USEC</varname> variable were added in
+    elogind-41.</para>
+
+    <para><function>sd_watchdog_enabled()</function> function was
+    added in elogind-209. Since that version the
+    <varname>$WATCHDOG_PID</varname> variable is also set.</para>
+  </refsect1>
+
+  <refsect1>
+    <title>See Also</title>
+    <para>
+      <citerefentry><refentrytitle>elogind</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+      <citerefentry><refentrytitle>sd-daemon</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+      <citerefentry><refentrytitle>daemon</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
+      <citerefentry><refentrytitle>elogind.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+      <citerefentry><refentrytitle>sd_notify</refentrytitle><manvolnum>3</manvolnum></citerefentry>
+    </para>
+  </refsect1>
+
+</refentry>
diff --git a/src/basic/btrfs-util.h b/src/basic/btrfs-util.h
deleted file mode 100644 (file)
index 94ab1b5..0000000
+++ /dev/null
@@ -1,88 +0,0 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
-/***
-  This file is part of systemd.
-
-  Copyright 2014 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/>.
-***/
-
-#pragma once
-
-#include <stdbool.h>
-#include <sys/types.h>
-
-#include "time-util.h"
-
-typedef struct BtrfsSubvolInfo {
-        uint64_t subvol_id;
-        usec_t otime;
-
-        sd_id128_t uuid;
-        sd_id128_t parent_uuid;
-
-        bool read_only;
-} BtrfsSubvolInfo;
-
-typedef struct BtrfsQuotaInfo {
-        uint64_t referenced;
-        uint64_t exclusive;
-        uint64_t referenced_max;
-        uint64_t exclusive_max;
-} BtrfsQuotaInfo;
-
-typedef enum BtrfsSnapshotFlags {
-        BTRFS_SNAPSHOT_FALLBACK_COPY = 1,
-        BTRFS_SNAPSHOT_READ_ONLY = 2,
-        BTRFS_SNAPSHOT_RECURSIVE = 4,
-} BtrfsSnapshotFlags;
-
-int btrfs_is_filesystem(int fd);
-int btrfs_is_subvol(int fd);
-
-int btrfs_subvol_make(const char *path);
-int btrfs_subvol_make_label(const char *path);
-
-int btrfs_subvol_snapshot_fd(int old_fd, const char *new_path, BtrfsSnapshotFlags flags);
-int btrfs_subvol_snapshot(const char *old_path, const char *new_path, BtrfsSnapshotFlags flags);
-
-int btrfs_subvol_set_read_only_fd(int fd, bool b);
-int btrfs_subvol_set_read_only(const char *path, bool b);
-// UNNEEDED int btrfs_subvol_get_read_only_fd(int fd);
-int btrfs_subvol_get_id(int fd, const char *subvolume, uint64_t *ret);
-int btrfs_subvol_get_id_fd(int fd, uint64_t *ret);
-int btrfs_subvol_get_info_fd(int fd, BtrfsSubvolInfo *info);
-int btrfs_subvol_get_quota_fd(int fd, BtrfsQuotaInfo *quota);
-
-int btrfs_reflink(int infd, int outfd);
-// UNNEEDED int btrfs_clone_range(int infd, uint64_t in_offset, int ofd, uint64_t out_offset, uint64_t sz);
-
-int btrfs_get_block_device_fd(int fd, dev_t *dev);
-int btrfs_get_block_device(const char *path, dev_t *dev);
-
-int btrfs_defrag_fd(int fd);
-int btrfs_defrag(const char *p);
-
-int btrfs_quota_enable_fd(int fd, bool b);
-int btrfs_quota_enable(const char *path, bool b);
-
-int btrfs_quota_limit_fd(int fd, uint64_t referenced_max);
-int btrfs_quota_limit(const char *path, uint64_t referenced_max);
-
-int btrfs_resize_loopback_fd(int fd, uint64_t size, bool grow_only);
-int btrfs_resize_loopback(const char *path, uint64_t size, bool grow_only);
-
-int btrfs_subvol_remove(const char *path, bool recursive);
-int btrfs_subvol_remove_fd(int fd, const char *subvolume, bool recursive);
index 3945abd..f17a473 100644 (file)
@@ -4362,8 +4362,6 @@ int parse_proc_cmdline(int (*parse_item)(const char *key, const char *value)) {
         return 0;
 }
 
-/// UNNEEDED by elogind
-#if 0
 int get_proc_cmdline_key(const char *key, char **value) {
         _cleanup_free_ char *line = NULL, *ret = NULL;
         bool found = false;
@@ -4416,7 +4414,6 @@ int get_proc_cmdline_key(const char *key, char **value) {
         return found;
 
 }
-#endif // 0
 
 int container_get_leader(const char *machine, pid_t *pid) {
         _cleanup_free_ char *s = NULL, *class = NULL;
index bd7ec27..2a2c71f 100644 (file)
@@ -37,7 +37,7 @@
 #include "strv.h"
 #include "unit-name.h"
 #include "sysfs-show.h"
-#include "logs-show.h"
+// #include "logs-show.h"
 #include "cgroup-show.h"
 #include "cgroup-util.h"
 #include "spawn-polkit-agent.h"
index d408e70..3674105 100644 (file)
@@ -2021,8 +2021,6 @@ int bus_path_decode_unique(const char *path, const char *prefix, char **ret_send
         return 1;
 }
 
-/// UNNEEDED by elogind
-#if 0
 bool is_kdbus_wanted(void) {
         _cleanup_free_ char *value = NULL;
 #ifdef ENABLE_KDBUS
@@ -2056,4 +2054,3 @@ bool is_kdbus_available(void) {
 
         return ioctl(fd, KDBUS_CMD_BUS_MAKE, &cmd) >= 0;
 }
-#endif // 0
index da5874d..3b6374a 100644 (file)
@@ -197,5 +197,5 @@ DEFINE_TRIVIAL_CLEANUP_FUNC(BusWaitForJobs*, bus_wait_for_jobs_free);
 int bus_path_encode_unique(sd_bus *b, const char *prefix, const char *sender_id, const char *external_id, char **ret_path);
 int bus_path_decode_unique(const char *path, const char *prefix, char **ret_sender, char **ret_external);
 
-// UNNEEDED bool is_kdbus_wanted(void);
-// UNNEEDED bool is_kdbus_available(void);
+bool is_kdbus_wanted(void);
+bool is_kdbus_available(void);
index 8afe057..7c9c3f6 100644 (file)
@@ -23,7 +23,8 @@
 
 #include <stdbool.h>
 #include <sys/types.h>
-#include "logs-show.h"
+// #include "logs-show.h"
+#include "output-mode.h"
 
 int show_cgroup_by_path(const char *path, const char *prefix, unsigned columns, bool kernel_threads, OutputFlags flags);
 int show_cgroup(const char *controller, const char *path, const char *prefix, unsigned columns, bool kernel_threads, OutputFlags flags);
diff --git a/src/shared/logs-show.h b/src/shared/logs-show.h
deleted file mode 100644 (file)
index 569e1fa..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
-#pragma once
-
-/***
-  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/>.
-***/
-
-#include <stdbool.h>
-#include <sys/types.h>
-
-#include "sd-journal.h"
-
-#include "util.h"
-#include "output-mode.h"
-
-int output_journal(
-                FILE *f,
-                sd_journal *j,
-                OutputMode mode,
-                unsigned n_columns,
-                OutputFlags flags,
-                bool *ellipsized);
-
-int add_match_this_boot(sd_journal *j, const char *machine);
-
-int add_matches_for_unit(
-                sd_journal *j,
-                const char *unit);
-
-int add_matches_for_user_unit(
-                sd_journal *j,
-                const char *unit,
-                uid_t uid);
-
-int show_journal_by_unit(
-                FILE *f,
-                const char *unit,
-                OutputMode mode,
-                unsigned n_columns,
-                usec_t not_before,
-                unsigned how_many,
-                uid_t uid,
-                OutputFlags flags,
-                int journal_open_flags,
-                bool system_unit,
-                bool *ellipsized);
-
-void json_escape(
-                FILE *f,
-                const char* p,
-                size_t l,
-                OutputFlags flags);
-
-const char* output_mode_to_string(OutputMode m) _const_;
-OutputMode output_mode_from_string(const char *s) _pure_;
diff --git a/src/systemd/sd-dhcp6-lease.h b/src/systemd/sd-dhcp6-lease.h
deleted file mode 100644 (file)
index 716d767..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
-#ifndef foosddhcp6leasehfoo
-#define foosddhcp6leasehfoo
-
-/***
-  This file is part of systemd.
-
-  Copyright (C) 2014 Tom Gundersen
-  Copyright (C) 2014 Intel Corporation. All rights reserved.
-
-  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 <netinet/in.h>
-
-typedef struct sd_dhcp6_lease sd_dhcp6_lease;
-
-void sd_dhcp6_lease_reset_address_iter(sd_dhcp6_lease *lease);
-int sd_dhcp6_lease_get_address(sd_dhcp6_lease *lease,
-                               struct in6_addr *addr,
-                               uint32_t *lifetime_preferred,
-                               uint32_t *lifetime_valid);
-
-sd_dhcp6_lease *sd_dhcp6_lease_ref(sd_dhcp6_lease *lease);
-sd_dhcp6_lease *sd_dhcp6_lease_unref(sd_dhcp6_lease *lease);
-
-#endif
diff --git a/src/systemd/sd-journal.h b/src/systemd/sd-journal.h
deleted file mode 100644 (file)
index 00237a2..0000000
+++ /dev/null
@@ -1,159 +0,0 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
-#ifndef foosdjournalhfoo
-#define foosdjournalhfoo
-
-/***
-  This file is part of systemd.
-
-  Copyright 2011 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/>.
-***/
-
-#include <inttypes.h>
-#include <sys/types.h>
-#include <stdarg.h>
-#include <sys/uio.h>
-#include <syslog.h>
-
-#include "sd-id128.h"
-#include "_sd-common.h"
-
-/* Journal APIs. See sd-journal(3) for more information. */
-
-_SD_BEGIN_DECLARATIONS;
-
-/* Write to daemon */
-int sd_journal_print(int priority, const char *format, ...) _sd_printf_(2, 3);
-int sd_journal_printv(int priority, const char *format, va_list ap) _sd_printf_(2, 0);
-int sd_journal_send(const char *format, ...) _sd_printf_(1, 0) _sd_sentinel_;
-int sd_journal_sendv(const struct iovec *iov, int n);
-int sd_journal_perror(const char *message);
-
-/* Used by the macros below. You probably don't want to call this directly. */
-int sd_journal_print_with_location(int priority, const char *file, const char *line, const char *func, const char *format, ...) _sd_printf_(5, 6);
-int sd_journal_printv_with_location(int priority, const char *file, const char *line, const char *func, const char *format, va_list ap) _sd_printf_(5, 0);
-int sd_journal_send_with_location(const char *file, const char *line, const char *func, const char *format, ...) _sd_printf_(4, 0) _sd_sentinel_;
-int sd_journal_sendv_with_location(const char *file, const char *line, const char *func, const struct iovec *iov, int n);
-int sd_journal_perror_with_location(const char *file, const char *line, const char *func, const char *message);
-
-/* implicitly add code location to messages sent, if this is enabled */
-#ifndef SD_JOURNAL_SUPPRESS_LOCATION
-
-#define sd_journal_print(priority, ...) sd_journal_print_with_location(priority, "CODE_FILE=" __FILE__, "CODE_LINE=" _SD_STRINGIFY(__LINE__), __func__, __VA_ARGS__)
-#define sd_journal_printv(priority, format, ap) sd_journal_printv_with_location(priority, "CODE_FILE=" __FILE__, "CODE_LINE=" _SD_STRINGIFY(__LINE__), __func__, format, ap)
-#define sd_journal_send(...) sd_journal_send_with_location("CODE_FILE=" __FILE__, "CODE_LINE=" _SD_STRINGIFY(__LINE__), __func__, __VA_ARGS__)
-#define sd_journal_sendv(iovec, n) sd_journal_sendv_with_location("CODE_FILE=" __FILE__, "CODE_LINE=" _SD_STRINGIFY(__LINE__), __func__, iovec, n)
-#define sd_journal_perror(message) sd_journal_perror_with_location("CODE_FILE=" __FILE__, "CODE_LINE=" _SD_STRINGIFY(__LINE__), __func__, message)
-
-#endif
-
-int sd_journal_stream_fd(const char *identifier, int priority, int level_prefix);
-
-/* Browse journal stream */
-
-typedef struct sd_journal sd_journal;
-
-/* Open flags */
-enum {
-        SD_JOURNAL_LOCAL_ONLY = 1,
-        SD_JOURNAL_RUNTIME_ONLY = 2,
-        SD_JOURNAL_SYSTEM = 4,
-        SD_JOURNAL_CURRENT_USER = 8,
-
-        SD_JOURNAL_SYSTEM_ONLY = SD_JOURNAL_SYSTEM, /* deprecated name */
-};
-
-/* Wakeup event types */
-enum {
-        SD_JOURNAL_NOP,
-        SD_JOURNAL_APPEND,
-        SD_JOURNAL_INVALIDATE
-};
-
-int sd_journal_open(sd_journal **ret, int flags);
-int sd_journal_open_directory(sd_journal **ret, const char *path, int flags);
-int sd_journal_open_files(sd_journal **ret, const char **paths, int flags);
-int sd_journal_open_container(sd_journal **ret, const char *machine, int flags);
-void sd_journal_close(sd_journal *j);
-
-int sd_journal_previous(sd_journal *j);
-int sd_journal_next(sd_journal *j);
-
-int sd_journal_previous_skip(sd_journal *j, uint64_t skip);
-int sd_journal_next_skip(sd_journal *j, uint64_t skip);
-
-int sd_journal_get_realtime_usec(sd_journal *j, uint64_t *ret);
-int sd_journal_get_monotonic_usec(sd_journal *j, uint64_t *ret, sd_id128_t *ret_boot_id);
-
-int sd_journal_set_data_threshold(sd_journal *j, size_t sz);
-int sd_journal_get_data_threshold(sd_journal *j, size_t *sz);
-
-int sd_journal_get_data(sd_journal *j, const char *field, const void **data, size_t *l);
-int sd_journal_enumerate_data(sd_journal *j, const void **data, size_t *l);
-void sd_journal_restart_data(sd_journal *j);
-
-int sd_journal_add_match(sd_journal *j, const void *data, size_t size);
-int sd_journal_add_disjunction(sd_journal *j);
-int sd_journal_add_conjunction(sd_journal *j);
-void sd_journal_flush_matches(sd_journal *j);
-
-int sd_journal_seek_head(sd_journal *j);
-int sd_journal_seek_tail(sd_journal *j);
-int sd_journal_seek_monotonic_usec(sd_journal *j, sd_id128_t boot_id, uint64_t usec);
-int sd_journal_seek_realtime_usec(sd_journal *j, uint64_t usec);
-int sd_journal_seek_cursor(sd_journal *j, const char *cursor);
-
-int sd_journal_get_cursor(sd_journal *j, char **cursor);
-int sd_journal_test_cursor(sd_journal *j, const char *cursor);
-
-int sd_journal_get_cutoff_realtime_usec(sd_journal *j, uint64_t *from, uint64_t *to);
-int sd_journal_get_cutoff_monotonic_usec(sd_journal *j, const sd_id128_t boot_id, uint64_t *from, uint64_t *to);
-
-int sd_journal_get_usage(sd_journal *j, uint64_t *bytes);
-
-int sd_journal_query_unique(sd_journal *j, const char *field);
-int sd_journal_enumerate_unique(sd_journal *j, const void **data, size_t *l);
-void sd_journal_restart_unique(sd_journal *j);
-
-int sd_journal_get_fd(sd_journal *j);
-int sd_journal_get_events(sd_journal *j);
-int sd_journal_get_timeout(sd_journal *j, uint64_t *timeout_usec);
-int sd_journal_process(sd_journal *j);
-int sd_journal_wait(sd_journal *j, uint64_t timeout_usec);
-int sd_journal_reliable_fd(sd_journal *j);
-
-int sd_journal_get_catalog(sd_journal *j, char **text);
-int sd_journal_get_catalog_for_message_id(sd_id128_t id, char **text);
-
-/* the inverse condition avoids ambiguity of danling 'else' after the macro */
-#define SD_JOURNAL_FOREACH(j)                                           \
-        if (sd_journal_seek_head(j) < 0) { }                            \
-        else while (sd_journal_next(j) > 0)
-
-/* the inverse condition avoids ambiguity of danling 'else' after the macro */
-#define SD_JOURNAL_FOREACH_BACKWARDS(j)                                 \
-        if (sd_journal_seek_tail(j) < 0) { }                            \
-        else while (sd_journal_previous(j) > 0)
-
-#define SD_JOURNAL_FOREACH_DATA(j, data, l)                             \
-        for (sd_journal_restart_data(j); sd_journal_enumerate_data((j), &(data), &(l)) > 0; )
-
-#define SD_JOURNAL_FOREACH_UNIQUE(j, data, l)                           \
-        for (sd_journal_restart_unique(j); sd_journal_enumerate_unique((j), &(data), &(l)) > 0; )
-
-_SD_END_DECLARATIONS;
-
-#endif