systemd \
systemctl \
systemd-notify \
- systemd-ask-password
+ systemd-ask-password \
+ systemd-tty-ask-password-agent
bin_PROGRAMS = \
systemd-cgls
if HAVE_GTK
bin_PROGRAMS += \
systemadm \
- systemd-ask-password-agent
+ systemd-gnome-ask-password-agent
endif
rootlibexec_PROGRAMS = \
units/smartcard.target \
units/systemd-readahead-done.timer \
units/systemd-tmpfiles-clean.timer \
- units/quotaon.service
+ units/quotaon.service \
+ units/systemd-ask-password-wall.path
nodist_systemunit_DATA = \
units/sysinit.target \
units/systemd-tmpfiles-setup.service \
units/systemd-tmpfiles-clean.service \
units/systemd-user-sessions.service \
+ units/systemd-ask-password-wall.service \
units/syslog.target \
units/halt.service \
units/poweroff.service \
units/systemd-tmpfiles-setup.service.in \
units/systemd-tmpfiles-clean.service.in \
units/systemd-user-sessions.service.in \
+ units/systemd-ask-password-wall.service.in \
units/syslog.target.in \
units/halt.service.in \
units/poweroff.service.in \
units/fedora/plymouth-halt.service
endif
-if TARGET_DEBIAN
+if TARGET_DEBIAN_OR_UBUNTU
dist_systemunit_DATA += \
- units/debian/fsck.target \
units/debian/umountfs.service \
units/debian/umountnfs.service \
units/debian/umountroot.service
endif
-if TARGET_SUSE
-dist_systemunit_DATA += \
- units/suse/fsck.target
-endif
-
if TARGET_GENTOO
dist_systemunit_DATA += \
units/gentoo/xdm.service
if TARGET_ARCH
dist_systemunit_DATA += \
- units/arch/sysinit.service \
units/arch/rc-local.service
endif
$(DBUSGLIB_LIBS) \
$(GTK_LIBS)
-systemd_ask_password_agent_SOURCES = \
- src/ask-password-agent.vala
+systemd_gnome_ask_password_agent_SOURCES = \
+ src/gnome-ask-password-agent.vala
-systemd_ask_password_agent_CFLAGS = \
+systemd_gnome_ask_password_agent_CFLAGS = \
$(AM_CFLAGS) \
$(DBUSGLIB_CFLAGS) \
$(GTK_CFLAGS) \
-Wno-shadow \
-Wno-format-nonliteral
-systemd_ask_password_agent_VALAFLAGS = \
+systemd_gnome_ask_password_agent_VALAFLAGS = \
--pkg=dbus-glib-1 \
--pkg=posix \
--pkg=gtk+-2.0 \
--pkg=libnotify \
-g
-systemd_ask_password_agent_LDADD = \
+systemd_gnome_ask_password_agent_LDADD = \
$(DBUSGLIB_LIBS) \
$(GTK_LIBS)
+systemd_tty_ask_password_agent_SOURCES = \
+ src/tty-ask-password-agent.c \
+ src/utmp-wtmp.c
+
+systemd_tty_ask_password_agent_LDADD = \
+ libsystemd-basic.la
+
pam_systemd_la_SOURCES = \
src/pam-module.c \
src/cgroup-util.c \
SED_PROCESS = \
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
$(SED) -e 's,@rootlibexecdir\@,$(rootlibexecdir),g' \
+ -e 's,@rootbindir\@,$(rootbindir),g' \
-e 's,@SPECIAL_SYSLOG_SERVICE\@,$(SPECIAL_SYSLOG_SERVICE),g' \
-e 's,@SYSTEMCTL\@,$(rootbindir)/systemctl,g' \
-e 's,@SYSTEMD_NOTIFY\@,$(rootbindir)/systemd-notify,g' \
$(LN_S) graphical.target default.target && \
$(LN_S) reboot.target ctrl-alt-del.target )
( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
- rm -f getty.target systemd-user-sessions.service && \
+ rm -f getty.target systemd-user-sessions.service systemd-ask-password-wall.path && \
$(LN_S) ../getty.target getty.target && \
- $(LN_S) ../systemd-user-sessions.service systemd-user-sessions.service )
+ $(LN_S) ../systemd-user-sessions.service systemd-user-sessions.service && \
+ $(LN_S) ../systemd-ask-password-wall.path systemd-ask-password-wall.path )
( cd $(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants && \
rm -f getty@tty1.service getty@tty2.service getty@tty3.service getty@tty4.service getty@tty5.service getty@tty6.service && \
$(LN_S) $(systemunitdir)/getty@.service getty@tty1.service && \
rm -f xdm.service && \
$(LN_S) $(systemunitdir)/xdm.service xdm.service )
endif
-if TARGET_DEBIAN
+if TARGET_DEBIAN_OR_UBUNTU
$(MKDIR_P) -m 0755 \
$(DESTDIR)$(systemunitdir)/umount.target.wants
( cd $(DESTDIR)$(systemunitdir)/umount.target.wants && \
rm -f runlevel5.target && \
$(LN_S) multi-user.target runlevel5.target )
endif
-if !TARGET_SUSE
-if !TARGET_DEBIAN
- ( cd $(DESTDIR)$(systemunitdir) && \
- rm -f fsck.target && \
- $(LN_S) sysinit.target fsck.target )
-endif
-endif
DISTCHECK_CONFIGURE_FLAGS = \
--with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \