X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=d7a279c152297ce7586961d5a5026ec3d602e8a2;hp=3389f436dfc73ac12e551b542bb8befb9e7ff188;hb=28cdc98ae8d128646eda4e1512b1f392d9dbb9d0;hpb=d8b4dbe6d7b1dcef739927d37b2e763860b85233

diff --git a/Makefile.am b/Makefile.am
index 3389f436d..d7a279c15 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,9 +30,9 @@ bashcompletiondir=$(sysconfdir)/bash_completion.d
 
 # Our own, non-special dirs
 pkgsysconfdir=$(sysconfdir)/systemd
-sessionunitdir=$(pkgdatadir)/session
+userunitdir=$(pkgdatadir)/user
 tmpfilesdir=$(sysconfdir)/tmpfiles.d
-sessiongeneratordir=$(pkglibexecdir)/session-generators
+usergeneratordir=$(pkglibexecdir)/user-generators
 
 # 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)\" \
-	-DSESSION_CONFIG_FILE=\"$(pkgsysconfdir)/session.conf\" \
-	-DSESSION_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/session\" \
-	-DSESSION_DATA_UNIT_PATH=\"$(sessionunitdir)\" \
+	-DUSER_CONFIG_FILE=\"$(pkgsysconfdir)/user.conf\" \
+	-DUSER_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/user\" \
+	-DUSER_DATA_UNIT_PATH=\"$(userunitdir)\" \
 	-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)\" \
-	-DSESSION_GENERATOR_PATH=\"$(sessiongeneratordir)\" \
+	-DUSER_GENERATOR_PATH=\"$(usergeneratordir)\" \
 	-I $(top_srcdir)/src
 
 if TARGET_GENTOO
@@ -119,7 +119,8 @@ rootlibexec_PROGRAMS = \
 	systemd-fsck \
 	systemd-quotacheck \
 	systemd-timestamp \
-	systemd-ac-power
+	systemd-ac-power \
+	systemd-sysctl
 
 if HAVE_LIBCRYPTSETUP
 rootlibexec_PROGRAMS += \
@@ -188,6 +189,7 @@ dist_systemunit_DATA = \
 	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 \
@@ -222,7 +224,6 @@ dist_systemunit_DATA = \
 	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 \
@@ -231,7 +232,8 @@ dist_systemunit_DATA = \
 	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 \
@@ -258,6 +260,8 @@ nodist_systemunit_DATA = \
 	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 \
@@ -268,13 +272,13 @@ nodist_systemunit_DATA = \
 	units/quotacheck.service \
 	units/rescue.service
 
-dist_sessionunit_DATA = \
-	units/session/default.target \
-	units/session/exit.target
+dist_userunit_DATA = \
+	units/user/default.target \
+	units/user/exit.target
 
-nodist_sessionunit_DATA = \
-	units/session/remote-fs.target \
-	units/session/exit.service
+nodist_userunit_DATA = \
+	units/user/remote-fs.target \
+	units/user/exit.service
 
 EXTRA_DIST = \
 	units/getty@.service.m4 \
@@ -302,16 +306,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-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/session/exit.service.in \
+	units/user/exit.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 += \
@@ -499,7 +506,12 @@ MANPAGES = \
 	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 \
@@ -709,6 +721,15 @@ systemd_tmpfiles_CFLAGS = \
 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
@@ -758,10 +779,12 @@ systemd_cryptsetup_SOURCES = \
 
 systemd_cryptsetup_CFLAGS = \
 	$(LIBCRYPTSETUP_CFLAGS) \
+	$(UDEV_CFLAGS) \
 	$(AM_CFLAGS)
 
 systemd_cryptsetup_LDADD = \
 	$(LIBCRYPTSETUP_LIBS) \
+	$(UDEV_LIBS) \
 	libsystemd-basic.la
 
 systemd_cryptsetup_generator_SOURCES = \
@@ -1008,19 +1031,19 @@ M4_PROCESS_SYSTEM = \
 	$(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 $@) && \
-	$(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/session/%: units/%.m4 Makefile
-	$(M4_PROCESS_SESSION)
+units/user/%: units/%.m4 Makefile
+	$(M4_PROCESS_USER)
 
 CLEANFILES = \
 	$(nodist_systemunit_DATA) \
-	$(nodist_sessionunit_DATA) \
+	$(nodist_userunit_DATA) \
 	$(nodist_man_MANS) \
 	${XML_IN_FILES:.xml.in=.html} \
 	$(pkgconfigdata_DATA)
@@ -1096,8 +1119,12 @@ CLEANFILES += \
 	${XML_IN_FILES:.xml.in=.html.in}
 endif
 
+DBUS_PREPROCESS = $(CPP) -P $(DBUS_CFLAGS) -imacros dbus/dbus-protocol.h
+
 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)
@@ -1105,7 +1132,7 @@ CLEANFILES += \
 install-data-hook:
 	$(MKDIR_P) -m 0755 \
 		$(DESTDIR)$(systemunitdir) \
-		$(DESTDIR)$(sessionunitdir) \
+		$(DESTDIR)$(userunitdir) \
 		$(DESTDIR)$(systemunitdir)/sysinit.target.wants \
 		$(DESTDIR)$(systemunitdir)/sockets.target.wants \
 		$(DESTDIR)$(systemunitdir)/basic.target.wants \
@@ -1123,11 +1150,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)/session \
+		$(DESTDIR)$(pkgsysconfdir)/user \
 		$(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 && \
@@ -1161,13 +1188,15 @@ install-data-hook:
 			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) ../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 && \
@@ -1221,7 +1250,8 @@ install-data-hook:
 			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 && \
@@ -1231,7 +1261,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) ../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 )
@@ -1253,10 +1284,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 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-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 )
@@ -1309,8 +1339,3 @@ upload: all distcheck
 
 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