chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
util: don't pass invalid fd to fdopendir() on error to avoid corruption of errno
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index ab8146d0852ccd6dc910bd8c66e4affd8526c3cf..fa704ae8b4311f98893c868a98e98ed987aaba2b 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-30,9
+30,9
@@
bashcompletiondir=$(sysconfdir)/bash_completion.d
# Our own, non-special dirs
pkgsysconfdir=$(sysconfdir)/systemd
# Our own, non-special dirs
pkgsysconfdir=$(sysconfdir)/systemd
-sessionunitdir=$(pkgdatadir)/session
+userunitdir=$(pkgdatadir)/user
tmpfilesdir=$(sysconfdir)/tmpfiles.d
tmpfilesdir=$(sysconfdir)/tmpfiles.d
-
sessiongeneratordir=$(pkglibexecdir)/session
-generators
+
usergeneratordir=$(pkglibexecdir)/user
-generators
# And these are the special ones for /
rootdir=@rootdir@
# And these are the special ones for /
rootdir=@rootdir@
@@
-49,9
+49,9
@@
AM_CPPFLAGS = \
-DSYSTEM_DATA_UNIT_PATH=\"$(systemunitdir)\" \
-DSYSTEM_SYSVINIT_PATH=\"$(SYSTEM_SYSVINIT_PATH)\" \
-DSYSTEM_SYSVRCND_PATH=\"$(SYSTEM_SYSVRCND_PATH)\" \
-DSYSTEM_DATA_UNIT_PATH=\"$(systemunitdir)\" \
-DSYSTEM_SYSVINIT_PATH=\"$(SYSTEM_SYSVINIT_PATH)\" \
-DSYSTEM_SYSVRCND_PATH=\"$(SYSTEM_SYSVRCND_PATH)\" \
- -D
SESSION_CONFIG_FILE=\"$(pkgsysconfdir)/session
.conf\" \
- -D
SESSION_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/session
\" \
- -D
SESSION_DATA_UNIT_PATH=\"$(session
unitdir)\" \
+ -D
USER_CONFIG_FILE=\"$(pkgsysconfdir)/user
.conf\" \
+ -D
USER_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/user
\" \
+ -D
USER_DATA_UNIT_PATH=\"$(user
unitdir)\" \
-DSYSTEMD_CGROUP_AGENT_PATH=\"$(rootlibexecdir)/systemd-cgroups-agent\" \
-DSYSTEMD_BINARY_PATH=\"$(rootbindir)/systemd\" \
-DSYSTEMD_SHUTDOWN_BINARY_PATH=\"$(rootlibexecdir)/systemd-shutdown\" \
-DSYSTEMD_CGROUP_AGENT_PATH=\"$(rootlibexecdir)/systemd-cgroups-agent\" \
-DSYSTEMD_BINARY_PATH=\"$(rootbindir)/systemd\" \
-DSYSTEMD_SHUTDOWN_BINARY_PATH=\"$(rootlibexecdir)/systemd-shutdown\" \
@@
-61,7
+61,7
@@
AM_CPPFLAGS = \
-DRANDOM_SEED=\"$(localstatedir)/lib/random-seed\" \
-DSYSTEMD_CRYPTSETUP_PATH=\"$(rootlibexecdir)/systemd-cryptsetup\" \
-DSYSTEM_GENERATOR_PATH=\"$(systemgeneratordir)\" \
-DRANDOM_SEED=\"$(localstatedir)/lib/random-seed\" \
-DSYSTEMD_CRYPTSETUP_PATH=\"$(rootlibexecdir)/systemd-cryptsetup\" \
-DSYSTEM_GENERATOR_PATH=\"$(systemgeneratordir)\" \
- -D
SESSION_GENERATOR_PATH=\"$(session
generatordir)\" \
+ -D
USER_GENERATOR_PATH=\"$(user
generatordir)\" \
-I $(top_srcdir)/src
if TARGET_GENTOO
-I $(top_srcdir)/src
if TARGET_GENTOO
@@
-76,12
+76,19
@@
AM_CPPFLAGS += \
-DKBD_SETFONT=\"/usr/bin/setfont\" \
-DDEFAULT_FONT=\"LatArCyrHeb-16\"
else
-DKBD_SETFONT=\"/usr/bin/setfont\" \
-DDEFAULT_FONT=\"LatArCyrHeb-16\"
else
+if TARGET_FRUGALWARE
+AM_CPPFLAGS += \
+ -DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
+ -DKBD_SETFONT=\"/usr/bin/setfont\" \
+ -DDEFAULT_FONT=\"LatArCyrHeb-16\"
+else
AM_CPPFLAGS += \
-DKBD_LOADKEYS=\"/bin/loadkeys\" \
-DKBD_SETFONT=\"/bin/setfont\" \
-DDEFAULT_FONT=\"latarcyrheb-sun16\"
endif
endif
AM_CPPFLAGS += \
-DKBD_LOADKEYS=\"/bin/loadkeys\" \
-DKBD_SETFONT=\"/bin/setfont\" \
-DDEFAULT_FONT=\"latarcyrheb-sun16\"
endif
endif
+endif
rootbin_PROGRAMS = \
systemd \
rootbin_PROGRAMS = \
systemd \
@@
-118,12
+125,17
@@
rootlibexec_PROGRAMS = \
systemd-user-sessions \
systemd-fsck \
systemd-quotacheck \
systemd-user-sessions \
systemd-fsck \
systemd-quotacheck \
- systemd-cryptsetup \
systemd-timestamp \
systemd-timestamp \
- systemd-ac-power
+ systemd-ac-power \
+ systemd-sysctl
+
+if HAVE_LIBCRYPTSETUP
+rootlibexec_PROGRAMS += \
+ systemd-cryptsetup
systemgenerator_PROGRAMS = \
systemd-cryptsetup-generator
systemgenerator_PROGRAMS = \
systemd-cryptsetup-generator
+endif
noinst_PROGRAMS = \
test-engine \
noinst_PROGRAMS = \
test-engine \
@@
-133,7
+145,8
@@
noinst_PROGRAMS = \
test-hostname \
test-daemon \
test-cgroup \
test-hostname \
test-daemon \
test-cgroup \
- test-env-replace
+ test-env-replace \
+ test-strv
if HAVE_PAM
pamlib_LTLIBRARIES = \
if HAVE_PAM
pamlib_LTLIBRARIES = \
@@
-183,6
+196,7
@@
dist_systemunit_DATA = \
units/halt.target \
units/kexec.target \
units/local-fs.target \
units/halt.target \
units/kexec.target \
units/local-fs.target \
+ units/cryptsetup.target \
units/network.target \
units/nss-lookup.target \
units/mail-transfer-agent.target \
units/network.target \
units/nss-lookup.target \
units/mail-transfer-agent.target \
@@
-213,12
+227,10
@@
dist_systemunit_DATA = \
units/sys-kernel-debug.mount \
units/sys-kernel-security.automount \
units/sys-kernel-security.mount \
units/sys-kernel-debug.mount \
units/sys-kernel-security.automount \
units/sys-kernel-security.mount \
- units/tmp.mount \
units/var-lock.mount \
units/var-run.mount \
units/hwclock-load.service \
units/hwclock-save.service \
units/var-lock.mount \
units/var-run.mount \
units/hwclock-load.service \
units/hwclock-save.service \
- units/sysctl.service \
units/remount-rootfs.service \
units/printer.target \
units/bluetooth.target \
units/remount-rootfs.service \
units/printer.target \
units/bluetooth.target \
@@
-227,7
+239,8
@@
dist_systemunit_DATA = \
units/systemd-tmpfiles-clean.timer \
units/quotaon.service \
units/systemd-ask-password-wall.path \
units/systemd-tmpfiles-clean.timer \
units/quotaon.service \
units/systemd-ask-password-wall.path \
- units/systemd-ask-password-plymouth.path
+ units/systemd-ask-password-plymouth.path \
+ units/systemd-ask-password-console.path
nodist_systemunit_DATA = \
units/getty@.service \
nodist_systemunit_DATA = \
units/getty@.service \
@@
-254,6
+267,8
@@
nodist_systemunit_DATA = \
units/systemd-user-sessions.service \
units/systemd-ask-password-wall.service \
units/systemd-ask-password-plymouth.service \
units/systemd-user-sessions.service \
units/systemd-ask-password-wall.service \
units/systemd-ask-password-plymouth.service \
+ units/systemd-ask-password-console.service \
+ units/systemd-sysctl.service \
units/syslog.target \
units/halt.service \
units/poweroff.service \
units/syslog.target \
units/halt.service \
units/poweroff.service \
@@
-264,13
+279,13
@@
nodist_systemunit_DATA = \
units/quotacheck.service \
units/rescue.service
units/quotacheck.service \
units/rescue.service
-dist_
session
unit_DATA = \
- units/
session
/default.target \
- units/
session
/exit.target
+dist_
user
unit_DATA = \
+ units/
user
/default.target \
+ units/
user
/exit.target
-nodist_
session
unit_DATA = \
- units/
session
/remote-fs.target \
- units/
session
/exit.service
+nodist_
user
unit_DATA = \
+ units/
user
/remote-fs.target \
+ units/
user
/exit.service
EXTRA_DIST = \
units/getty@.service.m4 \
EXTRA_DIST = \
units/getty@.service.m4 \
@@
-298,16
+313,19
@@
EXTRA_DIST = \
units/systemd-user-sessions.service.in \
units/systemd-ask-password-wall.service.in \
units/systemd-ask-password-plymouth.service.in \
units/systemd-user-sessions.service.in \
units/systemd-ask-password-wall.service.in \
units/systemd-ask-password-plymouth.service.in \
+ units/systemd-ask-password-console.service.in \
+ units/systemd-sysctl.service.in \
units/syslog.target.in \
units/halt.service.in \
units/poweroff.service.in \
units/reboot.service.in \
units/kexec.service.in \
units/syslog.target.in \
units/halt.service.in \
units/poweroff.service.in \
units/reboot.service.in \
units/kexec.service.in \
- units/
session
/exit.service.in \
+ units/
user
/exit.service.in \
units/fsck@.service.in \
units/fsck-root.service.in \
units/quotacheck.service.in \
units/fsck@.service.in \
units/fsck-root.service.in \
units/quotacheck.service.in \
- systemd.pc.in
+ systemd.pc.in \
+ introspect.awk
if TARGET_FEDORA
dist_systemunit_DATA += \
if TARGET_FEDORA
dist_systemunit_DATA += \
@@
-323,17
+341,6
@@
dist_systemunit_DATA += \
units/fedora/plymouth-halt.service
endif
units/fedora/plymouth-halt.service
endif
-if TARGET_DEBIAN_OR_UBUNTU
-dist_systemunit_DATA += \
- units/debian/umountfs.service \
- units/debian/umountnfs.service \
- units/debian/umountroot.service
-endif
-
-if TARGET_GENTOO
-dist_systemunit_DATA += \
- units/gentoo/xdm.service
-endif
if TARGET_ARCH
dist_systemunit_DATA += \
if TARGET_ARCH
dist_systemunit_DATA += \
@@
-357,7
+364,8
@@
dist_polkitpolicy_DATA = \
noinst_LTLIBRARIES = \
libsystemd-basic.la \
noinst_LTLIBRARIES = \
libsystemd-basic.la \
- libsystemd-core.la
+ libsystemd-core.la \
+ libsystemd-daemon.la
libsystemd_basic_la_SOURCES = \
src/util.c \
libsystemd_basic_la_SOURCES = \
src/util.c \
@@
-443,6
+451,9
@@
libsystemd_core_la_LIBADD = \
$(PAM_LIBS) \
$(AUDIT_LIBS)
$(PAM_LIBS) \
$(AUDIT_LIBS)
+libsystemd_daemon_la_SOURCES = \
+ src/sd-daemon.c
+
# This is needed because automake is buggy in how it generates the
# rules for C programs, but not Vala programs. We therefore can't
# list the .h files as dependencies if we want make dist to work.
# This is needed because automake is buggy in how it generates the
# rules for C programs, but not Vala programs. We therefore can't
# list the .h files as dependencies if we want make dist to work.
@@
-450,6
+461,7
@@
libsystemd_core_la_LIBADD = \
EXTRA_DIST += \
${libsystemd_basic_la_SOURCES:.c=.h} \
${libsystemd_core_la_SOURCES:.c=.h} \
EXTRA_DIST += \
${libsystemd_basic_la_SOURCES:.c=.h} \
${libsystemd_core_la_SOURCES:.c=.h} \
+ ${libsystemd_daemon_la_SOURCES:.c=.h} \
src/macro.h \
src/ioprio.h \
src/missing.h \
src/macro.h \
src/ioprio.h \
src/missing.h \
@@
-458,7
+470,6
@@
EXTRA_DIST += \
src/linux/auto_dev-ioctl.h \
src/linux/fanotify.h \
src/initreq.h \
src/linux/auto_dev-ioctl.h \
src/linux/fanotify.h \
src/initreq.h \
- src/sd-daemon.h \
src/sd-readahead.h \
src/special.h \
src/dbus-common.h \
src/sd-readahead.h \
src/special.h \
src/dbus-common.h \
@@
-467,7
+478,8
@@
EXTRA_DIST += \
src/build.h \
src/shutdownd.h \
src/umount.h \
src/build.h \
src/shutdownd.h \
src/umount.h \
- src/readahead-common.h
+ src/readahead-common.h \
+ src/ask-password-api.h
MANPAGES = \
man/systemd.1 \
MANPAGES = \
man/systemd.1 \
@@
-501,7
+513,12
@@
MANPAGES = \
man/shutdown.8 \
man/pam_systemd.8 \
man/systemd.conf.5 \
man/shutdown.8 \
man/pam_systemd.8 \
man/systemd.conf.5 \
- man/tmpfiles.d.5
+ man/tmpfiles.d.5 \
+ man/hostname.5 \
+ man/vconsole.conf.5 \
+ man/locale.conf.5 \
+ man/os-release.5 \
+ man/modules-load.d.5
MANPAGES_ALIAS = \
man/reboot.8 \
MANPAGES_ALIAS = \
man/reboot.8 \
@@
-589,11
+606,11
@@
test_hostname_LDADD = \
libsystemd-basic.la
test_daemon_SOURCES = \
libsystemd-basic.la
test_daemon_SOURCES = \
- src/test-daemon.c \
- src/sd-daemon.c
+ src/test-daemon.c
test_daemon_LDADD = \
test_daemon_LDADD = \
- libsystemd-basic.la
+ libsystemd-basic.la \
+ libsystemd-daemon.la
test_cgroup_SOURCES = \
src/test-cgroup.c \
test_cgroup_SOURCES = \
src/test-cgroup.c \
@@
-614,18
+631,26
@@
test_env_replace_CFLAGS = \
test_env_replace_LDADD = \
libsystemd-basic.la
test_env_replace_LDADD = \
libsystemd-basic.la
+test_strv_SOURCES = \
+ src/test-strv.c
+
+test_strv_CFLAGS = \
+ $(AM_CFLAGS)
+
+test_strv_LDADD = \
+ libsystemd-basic.la
+
systemd_logger_SOURCES = \
src/logger.c \
systemd_logger_SOURCES = \
src/logger.c \
- src/sd-daemon.c \
src/tcpwrap.c
systemd_logger_LDADD = \
libsystemd-basic.la \
src/tcpwrap.c
systemd_logger_LDADD = \
libsystemd-basic.la \
+ libsystemd-daemon.la \
$(LIBWRAP_LIBS)
systemd_initctl_SOURCES = \
src/initctl.c \
$(LIBWRAP_LIBS)
systemd_initctl_SOURCES = \
src/initctl.c \
- src/sd-daemon.c \
src/dbus-common.c
systemd_initctl_CFLAGS = \
src/dbus-common.c
systemd_initctl_CFLAGS = \
@@
-634,6
+659,7
@@
systemd_initctl_CFLAGS = \
systemd_initctl_LDADD = \
libsystemd-basic.la \
systemd_initctl_LDADD = \
libsystemd-basic.la \
+ libsystemd-daemon.la \
$(DBUS_LIBS)
systemd_update_utmp_SOURCES = \
$(DBUS_LIBS)
systemd_update_utmp_SOURCES = \
@@
-662,14
+688,14
@@
systemd_random_seed_LDADD = \
systemd_shutdownd_SOURCES = \
src/utmp-wtmp.c \
systemd_shutdownd_SOURCES = \
src/utmp-wtmp.c \
- src/sd-daemon.c \
src/shutdownd.c
systemd_shutdownd_CFLAGS = \
$(AM_CFLAGS)
systemd_shutdownd_LDADD = \
src/shutdownd.c
systemd_shutdownd_CFLAGS = \
$(AM_CFLAGS)
systemd_shutdownd_LDADD = \
- libsystemd-basic.la
+ libsystemd-basic.la \
+ libsystemd-daemon.la
systemd_shutdown_SOURCES = \
src/mount-setup.c \
systemd_shutdown_SOURCES = \
src/mount-setup.c \
@@
-702,6
+728,15
@@
systemd_tmpfiles_CFLAGS = \
systemd_tmpfiles_LDADD = \
libsystemd-basic.la
systemd_tmpfiles_LDADD = \
libsystemd-basic.la
+systemd_sysctl_SOURCES = \
+ src/sysctl.c
+
+systemd_sysctl_CFLAGS = \
+ $(AM_CFLAGS)
+
+systemd_sysctl_LDADD = \
+ libsystemd-basic.la
+
systemd_fsck_SOURCES = \
src/fsck.c \
src/dbus-common.c
systemd_fsck_SOURCES = \
src/fsck.c \
src/dbus-common.c
@@
-746,12
+781,17
@@
systemd_ac_power_LDADD = \
$(UDEV_LIBS)
systemd_cryptsetup_SOURCES = \
$(UDEV_LIBS)
systemd_cryptsetup_SOURCES = \
- src/cryptsetup.c
+ src/cryptsetup.c \
+ src/ask-password-api.c
systemd_cryptsetup_CFLAGS = \
systemd_cryptsetup_CFLAGS = \
+ $(LIBCRYPTSETUP_CFLAGS) \
+ $(UDEV_CFLAGS) \
$(AM_CFLAGS)
systemd_cryptsetup_LDADD = \
$(AM_CFLAGS)
systemd_cryptsetup_LDADD = \
+ $(LIBCRYPTSETUP_LIBS) \
+ $(UDEV_LIBS) \
libsystemd-basic.la
systemd_cryptsetup_generator_SOURCES = \
libsystemd-basic.la
systemd_cryptsetup_generator_SOURCES = \
@@
-807,21
+847,20
@@
systemd_cgroups_agent_LDADD = \
systemd_kmsg_syslogd_SOURCES = \
src/kmsg-syslogd.c \
systemd_kmsg_syslogd_SOURCES = \
src/kmsg-syslogd.c \
- src/sd-daemon.c \
src/fdset.c
systemd_kmsg_syslogd_CFLAGS = \
$(AM_CFLAGS)
systemd_kmsg_syslogd_LDADD = \
src/fdset.c
systemd_kmsg_syslogd_CFLAGS = \
$(AM_CFLAGS)
systemd_kmsg_syslogd_LDADD = \
- libsystemd-basic.la
+ libsystemd-basic.la \
+ libsystemd-daemon.la
systemctl_SOURCES = \
src/systemctl.c \
src/utmp-wtmp.c \
src/dbus-common.c \
src/path-lookup.c \
systemctl_SOURCES = \
src/systemctl.c \
src/utmp-wtmp.c \
src/dbus-common.c \
src/path-lookup.c \
- src/sd-daemon.c \
src/cgroup-show.c \
src/cgroup-util.c \
src/exit-status.c \
src/cgroup-show.c \
src/cgroup-util.c \
src/exit-status.c \
@@
-833,18
+872,20
@@
systemctl_CFLAGS = \
systemctl_LDADD = \
libsystemd-basic.la \
systemctl_LDADD = \
libsystemd-basic.la \
+ libsystemd-daemon.la \
$(DBUS_LIBS)
systemd_notify_SOURCES = \
src/notify.c \
$(DBUS_LIBS)
systemd_notify_SOURCES = \
src/notify.c \
- src/sd-daemon.c \
src/sd-readahead.c
systemd_notify_LDADD = \
src/sd-readahead.c
systemd_notify_LDADD = \
- libsystemd-basic.la
+ libsystemd-basic.la \
+ libsystemd-daemon.la
systemd_ask_password_SOURCES = \
systemd_ask_password_SOURCES = \
- src/ask-password.c
+ src/ask-password.c \
+ src/ask-password-api.c
systemd_ask_password_LDADD = \
libsystemd-basic.la
systemd_ask_password_LDADD = \
libsystemd-basic.la
@@
-857,7
+898,6
@@
systemd_reply_password_LDADD = \
systemd_readahead_collect_SOURCES = \
src/readahead-collect.c \
systemd_readahead_collect_SOURCES = \
src/readahead-collect.c \
- src/sd-daemon.c \
src/readahead-common.c
systemd_readahead_collect_CFLAGS = \
src/readahead-common.c
systemd_readahead_collect_CFLAGS = \
@@
-865,11
+905,11
@@
systemd_readahead_collect_CFLAGS = \
systemd_readahead_collect_LDADD = \
libsystemd-basic.la \
systemd_readahead_collect_LDADD = \
libsystemd-basic.la \
+ libsystemd-daemon.la \
$(UDEV_LIBS)
systemd_readahead_replay_SOURCES = \
src/readahead-replay.c \
$(UDEV_LIBS)
systemd_readahead_replay_SOURCES = \
src/readahead-replay.c \
- src/sd-daemon.c \
src/readahead-common.c
systemd_readahead_replay_CFLAGS = \
src/readahead-common.c
systemd_readahead_replay_CFLAGS = \
@@
-877,6
+917,7
@@
systemd_readahead_replay_CFLAGS = \
systemd_readahead_replay_LDADD = \
libsystemd-basic.la \
systemd_readahead_replay_LDADD = \
libsystemd-basic.la \
+ libsystemd-daemon.la \
$(UDEV_LIBS)
systemd_cgls_SOURCES = \
$(UDEV_LIBS)
systemd_cgls_SOURCES = \
@@
-919,6
+960,7
@@
systemd_gnome_ask_password_agent_SOURCES = \
systemd_gnome_ask_password_agent_CFLAGS = \
$(AM_CFLAGS) \
$(DBUSGLIB_CFLAGS) \
systemd_gnome_ask_password_agent_CFLAGS = \
$(AM_CFLAGS) \
$(DBUSGLIB_CFLAGS) \
+ $(LIBNOTIFY_CFLAGS) \
$(GTK_CFLAGS) \
-Wno-unused-variable \
-Wno-unused-function \
$(GTK_CFLAGS) \
-Wno-unused-variable \
-Wno-unused-function \
@@
-931,15
+973,22
@@
systemd_gnome_ask_password_agent_VALAFLAGS = \
--pkg=gtk+-2.0 \
--pkg=linux \
--pkg=gio-unix-2.0 \
--pkg=gtk+-2.0 \
--pkg=linux \
--pkg=gio-unix-2.0 \
- --pkg=libnotify \
+ --pkg=libnotify
+if LIBNOTIFY07
+systemd_gnome_ask_password_agent_VALAFLAGS += \
+ -D LIBNOTIFY07
+endif
+systemd_gnome_ask_password_agent_VALAFLAGS += \
-g
systemd_gnome_ask_password_agent_LDADD = \
$(DBUSGLIB_LIBS) \
-g
systemd_gnome_ask_password_agent_LDADD = \
$(DBUSGLIB_LIBS) \
+ $(LIBNOTIFY_LIBS) \
$(GTK_LIBS)
systemd_tty_ask_password_agent_SOURCES = \
src/tty-ask-password-agent.c \
$(GTK_LIBS)
systemd_tty_ask_password_agent_SOURCES = \
src/tty-ask-password-agent.c \
+ src/ask-password-api.c \
src/utmp-wtmp.c
systemd_tty_ask_password_agent_LDADD = \
src/utmp-wtmp.c
systemd_tty_ask_password_agent_LDADD = \
@@
-947,8
+996,7
@@
systemd_tty_ask_password_agent_LDADD = \
pam_systemd_la_SOURCES = \
src/pam-module.c \
pam_systemd_la_SOURCES = \
src/pam-module.c \
- src/cgroup-util.c \
- src/sd-daemon.c
+ src/cgroup-util.c
pam_systemd_la_CFLAGS = \
$(AM_CFLAGS)
pam_systemd_la_CFLAGS = \
$(AM_CFLAGS)
@@
-963,6
+1011,7
@@
pam_systemd_la_LDFLAGS = \
pam_systemd_la_LIBADD = \
libsystemd-basic.la \
pam_systemd_la_LIBADD = \
libsystemd-basic.la \
+ libsystemd-daemon.la \
$(PAM_LIBS)
SED_PROCESS = \
$(PAM_LIBS)
SED_PROCESS = \
@@
-994,19
+1043,19
@@
M4_PROCESS_SYSTEM = \
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
$(M4) -P $(M4_DISTRO_FLAG) -DFOR_SYSTEM=1 < $< > $@ || rm $@
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
$(M4) -P $(M4_DISTRO_FLAG) -DFOR_SYSTEM=1 < $< > $@ || rm $@
-M4_PROCESS_
SESSION
= \
+M4_PROCESS_
USER
= \
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
- $(M4) -P $(M4_DISTRO_FLAG) -DFOR_
SESSION
=1 < $< > $@ || rm $@
+ $(M4) -P $(M4_DISTRO_FLAG) -DFOR_
USER
=1 < $< > $@ || rm $@
units/%: units/%.m4 Makefile
$(M4_PROCESS_SYSTEM)
units/%: units/%.m4 Makefile
$(M4_PROCESS_SYSTEM)
-units/
session
/%: units/%.m4 Makefile
- $(M4_PROCESS_
SESSION
)
+units/
user
/%: units/%.m4 Makefile
+ $(M4_PROCESS_
USER
)
CLEANFILES = \
$(nodist_systemunit_DATA) \
CLEANFILES = \
$(nodist_systemunit_DATA) \
- $(nodist_
session
unit_DATA) \
+ $(nodist_
user
unit_DATA) \
$(nodist_man_MANS) \
${XML_IN_FILES:.xml.in=.html} \
$(pkgconfigdata_DATA)
$(nodist_man_MANS) \
${XML_IN_FILES:.xml.in=.html} \
$(pkgconfigdata_DATA)
@@
-1082,8
+1131,12
@@
CLEANFILES += \
${XML_IN_FILES:.xml.in=.html.in}
endif
${XML_IN_FILES:.xml.in=.html.in}
endif
+DBUS_PREPROCESS = $(CPP) -P $(DBUS_CFLAGS) -imacros dbus/dbus-protocol.h
+
org.freedesktop.systemd1.%.xml: systemd
org.freedesktop.systemd1.%.xml: systemd
- $(AM_V_GEN)SYSTEMD_SKIP_API_MOUNTS=1 ./systemd --introspect=${@:.xml=} > $@
+ $(AM_V_GEN)$(OBJCOPY) -O binary -j introspect.$* $< $@.tmp && \
+ $(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \
+ $(DBUS_PREPROCESS) -o $@ - && rm $@.tmp
CLEANFILES += \
$(dbusinterface_DATA)
CLEANFILES += \
$(dbusinterface_DATA)
@@
-1091,7
+1144,7
@@
CLEANFILES += \
install-data-hook:
$(MKDIR_P) -m 0755 \
$(DESTDIR)$(systemunitdir) \
install-data-hook:
$(MKDIR_P) -m 0755 \
$(DESTDIR)$(systemunitdir) \
- $(DESTDIR)$(
session
unitdir) \
+ $(DESTDIR)$(
user
unitdir) \
$(DESTDIR)$(systemunitdir)/sysinit.target.wants \
$(DESTDIR)$(systemunitdir)/sockets.target.wants \
$(DESTDIR)$(systemunitdir)/basic.target.wants \
$(DESTDIR)$(systemunitdir)/sysinit.target.wants \
$(DESTDIR)$(systemunitdir)/sockets.target.wants \
$(DESTDIR)$(systemunitdir)/basic.target.wants \
@@
-1109,11
+1162,11
@@
install-data-hook:
$(DESTDIR)$(pkgsysconfdir)/system/local-fs.target.wants \
$(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants \
$(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants \
$(DESTDIR)$(pkgsysconfdir)/system/local-fs.target.wants \
$(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants \
$(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants \
- $(DESTDIR)$(pkgsysconfdir)/
session
\
+ $(DESTDIR)$(pkgsysconfdir)/
user
\
$(DESTDIR)$(sysconfdir)/xdg/systemd
( cd $(DESTDIR)$(sysconfdir)/xdg/systemd/ && \
$(DESTDIR)$(sysconfdir)/xdg/systemd
( cd $(DESTDIR)$(sysconfdir)/xdg/systemd/ && \
- rm -f
session
&& \
- $(LN_S) $(pkgsysconfdir)/
session session
)
+ rm -f
user
&& \
+ $(LN_S) $(pkgsysconfdir)/
user user
)
( cd $(DESTDIR)$(systemunitdir)/sockets.target.wants && \
rm -f systemd-initctl.socket systemd-logger.socket systemd-shutdownd.socket syslog.socket && \
$(LN_S) ../systemd-logger.socket systemd-logger.socket && \
( cd $(DESTDIR)$(systemunitdir)/sockets.target.wants && \
rm -f systemd-initctl.socket systemd-logger.socket systemd-shutdownd.socket syslog.socket && \
$(LN_S) ../systemd-logger.socket systemd-logger.socket && \
@@
-1147,13
+1200,15
@@
install-data-hook:
fsck-root.service \
remount-rootfs.service \
var-run.mount \
fsck-root.service \
remount-rootfs.service \
var-run.mount \
- var-lock.mount && \
+ var-lock.mount \
+ cryptsetup.target && \
$(LN_S) ../systemd-remount-api-vfs.service systemd-remount-api-vfs.service && \
$(LN_S) ../fsck-root.service fsck-root.service && \
$(LN_S) ../remount-rootfs.service remount-rootfs.service && \
$(LN_S) ../var-run.mount var-run.mount && \
$(LN_S) ../systemd-remount-api-vfs.service systemd-remount-api-vfs.service && \
$(LN_S) ../fsck-root.service fsck-root.service && \
$(LN_S) ../remount-rootfs.service remount-rootfs.service && \
$(LN_S) ../var-run.mount var-run.mount && \
- $(LN_S) ../var-lock.mount var-lock.mount )
- ( cd $(DESTDIR)$(sessionunitdir) && \
+ $(LN_S) ../var-lock.mount var-lock.mount && \
+ $(LN_S) ../cryptsetup.target )
+ ( cd $(DESTDIR)$(userunitdir) && \
rm -f shutdown.target sockets.target local-fs.target swap.target bluetooth.target printer.target && \
$(LN_S) $(systemunitdir)/shutdown.target shutdown.target && \
$(LN_S) $(systemunitdir)/sockets.target sockets.target && \
rm -f shutdown.target sockets.target local-fs.target swap.target bluetooth.target printer.target && \
$(LN_S) $(systemunitdir)/shutdown.target shutdown.target && \
$(LN_S) $(systemunitdir)/sockets.target sockets.target && \
@@
-1207,7
+1262,8
@@
install-data-hook:
systemd-modules-load.service \
systemd-random-seed-load.service \
systemd-tmpfiles-setup.service \
systemd-modules-load.service \
systemd-random-seed-load.service \
systemd-tmpfiles-setup.service \
- sysctl.service && \
+ systemd-sysctl.service \
+ systemd-ask-password-console.path && \
$(LN_S) ../dev-hugepages.automount dev-hugepages.automount && \
$(LN_S) ../dev-mqueue.automount dev-mqueue.automount && \
$(LN_S) ../proc-sys-fs-binfmt_misc.automount proc-sys-fs-binfmt_misc.automount && \
$(LN_S) ../dev-hugepages.automount dev-hugepages.automount && \
$(LN_S) ../dev-mqueue.automount dev-mqueue.automount && \
$(LN_S) ../proc-sys-fs-binfmt_misc.automount proc-sys-fs-binfmt_misc.automount && \
@@
-1217,7
+1273,8
@@
install-data-hook:
$(LN_S) ../systemd-modules-load.service systemd-modules-load.service && \
$(LN_S) ../systemd-random-seed-load.service systemd-random-seed-load.service && \
$(LN_S) ../systemd-tmpfiles-setup.service systemd-tmpfiles-setup.service && \
$(LN_S) ../systemd-modules-load.service systemd-modules-load.service && \
$(LN_S) ../systemd-random-seed-load.service systemd-random-seed-load.service && \
$(LN_S) ../systemd-tmpfiles-setup.service systemd-tmpfiles-setup.service && \
- $(LN_S) ../sysctl.service sysctl.service )
+ $(LN_S) ../systemd-sysctl.service systemd-sysctl.service && \
+ $(LN_S) ../systemd-ask-password-console.path systemd-ask-password-console.path )
( cd $(DESTDIR)$(systemunitdir)/basic.target.wants && \
rm -f systemd-tmpfiles-clean.timer && \
$(LN_S) ../systemd-tmpfiles-clean.timer systemd-tmpfiles-clean.timer )
( cd $(DESTDIR)$(systemunitdir)/basic.target.wants && \
rm -f systemd-tmpfiles-clean.timer && \
$(LN_S) ../systemd-tmpfiles-clean.timer systemd-tmpfiles-clean.timer )
@@
-1239,10
+1296,9
@@
if TARGET_FEDORA
rm -f halt-local.service && \
$(LN_S) $(systemunitdir)/halt-local.service halt-local.service )
( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
rm -f halt-local.service && \
$(LN_S) $(systemunitdir)/halt-local.service halt-local.service )
( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
- rm -f plymouth-start.service
systemd-ask-password-plymouth.path
plymouth-read-write.service && \
+ rm -f plymouth-start.service plymouth-read-write.service && \
$(LN_S) ../plymouth-start.service plymouth-start.service && \
$(LN_S) ../plymouth-start.service plymouth-start.service && \
- $(LN_S) ../plymouth-read-write.service plymouth-read-write.service && \
- $(LN_S) ../systemd-ask-password-plymouth.path systemd-ask-password-plymouth.path )
+ $(LN_S) ../plymouth-read-write.service plymouth-read-write.service )
( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
rm -f plymouth-quit.service && \
$(LN_S) ../plymouth-quit.service plymouth-quit.service )
( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
rm -f plymouth-quit.service && \
$(LN_S) ../plymouth-quit.service plymouth-quit.service )
@@
-1265,22
+1321,7
@@
if TARGET_FEDORA
rm -f display-manager.service && \
$(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
endif
rm -f display-manager.service && \
$(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
endif
-if TARGET_GENTOO
- ( cd $(DESTDIR)$(systemunitdir) && \
- rm -f display-manager.service && \
- $(LN_S) xdm.service display-manager.service )
- ( cd $(DESTDIR)$(systemunitdir)/graphical.target.wants && \
- rm -f display-manager.service && \
- $(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
-endif
if TARGET_DEBIAN_OR_UBUNTU
if TARGET_DEBIAN_OR_UBUNTU
- $(MKDIR_P) -m 0755 \
- $(DESTDIR)$(systemunitdir)/umount.target.wants
- ( cd $(DESTDIR)$(systemunitdir)/umount.target.wants && \
- rm -f umountfs.service umountnfs.service umountroot.service && \
- $(LN_S) ../umountfs.service umountfs.service && \
- $(LN_S) ../umountnfs.service umountnfs.service && \
- $(LN_S) ../umountroot.service umountroot.service )
( cd $(DESTDIR)$(systemunitdir) && \
rm -f runlevel5.target && \
$(LN_S) multi-user.target runlevel5.target )
( cd $(DESTDIR)$(systemunitdir) && \
rm -f runlevel5.target && \
$(LN_S) multi-user.target runlevel5.target )
@@
-1302,8
+1343,3
@@
upload: all distcheck
git-tag:
git tag "v$(VERSION)" -m "systemd $(VERSION)"
git-tag:
git tag "v$(VERSION)" -m "systemd $(VERSION)"
-
-# Opt out from a few services on Fedora for now, as long as rc.sysinit does this job
-fedora: install
- rm $(DESTDIR)/lib/systemd/system/local-fs.target.wants/var-run.mount
- rm $(DESTDIR)/lib/systemd/system/local-fs.target.wants/var-lock.mount