chiark / gitweb /
~ianmdlvl / elogind.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
units: introduce plymouth-start and plymouth-kexec, and move a few things back from...
[elogind.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 9c76fc807a08ef7cbecc20f652893b3da5c6399e..683376b9208b76e76307f4fe8592adea227e31fb 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -53,9 +53,10 @@ AM_CPPFLAGS = \
        -DSYSTEMD_BINARY_PATH=\"$(rootbindir)/systemd\" \
        -DSYSTEMD_SHUTDOWN_BINARY_PATH=\"$(rootlibexecdir)/systemd-shutdown\" \
        -DSYSTEMCTL_BINARY_PATH=\"$(rootbindir)/systemctl\" \
+       -DSYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH=\"$(rootbindir)/systemd-tty-ask-password-agent\" \
        -DRUNTIME_DIR=\"$(localstatedir)/run\" \
        -DRANDOM_SEED=\"$(localstatedir)/lib/random-seed\" \
-       -DKEXEC_BINARY_PATH=\"$(rootsbindir)/kexec\" \
+       -DKEXEC_BINARY_PATH=\"/sbin/kexec\" \
        -I $(top_srcdir)/src
 
 if TARGET_GENTOO
@@ -210,7 +211,8 @@ dist_systemunit_DATA = \
        units/systemd-readahead-done.timer \
        units/systemd-tmpfiles-clean.timer \
        units/quotaon.service \
-       units/systemd-ask-password-wall.path
+       units/systemd-ask-password-wall.path \
+       units/systemd-ask-password-plymouth.path
 
 nodist_systemunit_DATA = \
        units/sysinit.target \
@@ -237,6 +239,7 @@ nodist_systemunit_DATA = \
        units/systemd-tmpfiles-clean.service \
        units/systemd-user-sessions.service \
        units/systemd-ask-password-wall.service \
+       units/systemd-ask-password-plymouth.service \
        units/syslog.target \
        units/halt.service \
        units/poweroff.service \
@@ -279,6 +282,7 @@ EXTRA_DIST = \
        units/systemd-tmpfiles-clean.service.in \
        units/systemd-user-sessions.service.in \
        units/systemd-ask-password-wall.service.in \
+       units/systemd-ask-password-plymouth.service.in \
        units/syslog.target.in \
        units/halt.service.in \
        units/poweroff.service.in \
@@ -295,10 +299,11 @@ dist_systemunit_DATA += \
        units/fedora/prefdm.service \
        units/fedora/rc-local.service \
        units/fedora/halt-local.service \
-       units/fedora/sysinit.service \
        units/fedora/single.service \
+       units/fedora/plymouth-start.service \
        units/fedora/plymouth-quit.service \
        units/fedora/plymouth-reboot.service \
+       units/fedora/plymouth-kexec.service \
        units/fedora/plymouth-poweroff.service \
        units/fedora/plymouth-halt.service
 endif
@@ -317,7 +322,6 @@ endif
 
 if TARGET_ARCH
 dist_systemunit_DATA += \
-       units/arch/sysinit.service \
        units/arch/rc-local.service
 endif
 
@@ -396,6 +400,7 @@ libsystemd_core_la_SOURCES = \
        src/cgroup.c \
        src/mount-setup.c \
        src/hostname-setup.c \
+       src/selinux-setup.c \
        src/loopback-setup.c \
        src/kmod-setup.c \
        src/locale-setup.c \
@@ -1032,6 +1037,7 @@ install-data-hook:
        $(MKDIR_P) -m 0755 \
                $(DESTDIR)$(systemunitdir) \
                $(DESTDIR)$(sessionunitdir) \
+               $(DESTDIR)$(systemunitdir)/sysinit.target.wants \
                $(DESTDIR)$(systemunitdir)/sockets.target.wants \
                $(DESTDIR)$(systemunitdir)/basic.target.wants \
                $(DESTDIR)$(systemunitdir)/shutdown.target.wants \
@@ -1042,11 +1048,11 @@ install-data-hook:
                $(DESTDIR)$(systemunitdir)/runlevel4.target.wants \
                $(DESTDIR)$(systemunitdir)/runlevel5.target.wants \
                $(DESTDIR)$(systemunitdir)/multi-user.target.wants \
+               $(DESTDIR)$(systemunitdir)/graphical.target.wants \
                $(DESTDIR)$(pkgsysconfdir)/system \
-               $(DESTDIR)$(pkgsysconfdir)/system/basic.target.wants \
+               $(DESTDIR)$(pkgsysconfdir)/system/sysinit.target.wants \
                $(DESTDIR)$(pkgsysconfdir)/system/local-fs.target.wants \
                $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants \
-               $(DESTDIR)$(pkgsysconfdir)/system/graphical.target.wants \
                $(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants \
                $(DESTDIR)$(pkgsysconfdir)/session \
                $(DESTDIR)$(sysconfdir)/xdg/systemd
@@ -1133,10 +1139,10 @@ install-data-hook:
        ( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \
                rm -f remote-fs.target && \
                $(LN_S) $(systemunitdir)/remote-fs.target remote-fs.target )
-       ( cd $(DESTDIR)$(pkgsysconfdir)/system/basic.target.wants && \
+       ( cd $(DESTDIR)$(pkgsysconfdir)/system/sysinit.target.wants && \
                rm -f hwclock-load.service && \
                $(LN_S) $(systemunitdir)/hwclock-load.service hwclock-load.service )
-       ( cd $(DESTDIR)$(systemunitdir)/basic.target.wants && \
+       ( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
                rm -f dev-hugepages.automount \
                        dev-mqueue.automount \
                        proc-sys-fs-binfmt_misc.automount \
@@ -1146,8 +1152,7 @@ install-data-hook:
                        systemd-modules-load.service \
                        systemd-random-seed-load.service \
                        systemd-tmpfiles-setup.service \
-                       sysctl.service \
-                       systemd-tmpfiles-clean.timer && \
+                       sysctl.service && \
                $(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 && \
@@ -1157,7 +1162,9 @@ 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) ../sysctl.service sysctl.service )
+       ( cd $(DESTDIR)$(systemunitdir)/basic.target.wants && \
+               rm -f systemd-tmpfiles-clean.timer && \
                $(LN_S) ../systemd-tmpfiles-clean.timer systemd-tmpfiles-clean.timer )
        ( cd $(DESTDIR)$(dbussessionservicedir) && \
                rm -f org.freedesktop.systemd1.service && \
@@ -1166,18 +1173,12 @@ if TARGET_FEDORA
        $(MKDIR_P) -m 0755 \
                $(DESTDIR)$(SYSTEM_SYSVINIT_PATH) \
                $(DESTDIR)$(systemunitdir)/reboot.target.wants \
+               $(DESTDIR)$(systemunitdir)/kexec.target.wants \
                $(DESTDIR)$(systemunitdir)/poweroff.target.wants \
                $(DESTDIR)$(systemunitdir)/halt.target.wants \
                $(DESTDIR)$(systemunitdir)/rescue.target.wants \
-               $(DESTDIR)$(systemunitdir)/multi-user.target.wants \
                $(DESTDIR)$(systemunitdir)/final.target.wants
-       ( cd $(DESTDIR)$(pkgsysconfdir)/system && \
-               rm -f display-manager.service && \
-               $(LN_S) $(systemunitdir)/prefdm.service display-manager.service )
-       ( cd $(DESTDIR)$(pkgsysconfdir)/system/graphical.target.wants && \
-               rm -f prefdm.service && \
-               $(LN_S) $(systemunitdir)/prefdm.service prefdm.service )
-       ( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \
+       ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
                rm -f rc-local.service && \
                $(LN_S) $(systemunitdir)/rc-local.service rc-local.service )
        ( cd $(DESTDIR)$(systemunitdir)/final.target.wants && \
@@ -1187,11 +1188,18 @@ if TARGET_FEDORA
                rm -f single.service && \
                $(LN_S) $(systemunitdir)/single.service single.service )
        ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
-               rm -f plymouth-quit.service && \
+               rm -f plymouth-quit.service  && \
                $(LN_S) ../plymouth-quit.service plymouth-quit.service )
+       ( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
+               rm -f plymouth-start.service systemd-ask-password-plymouth.path && \
+               $(LN_S) ../plymouth-start.service plymouth-start.service && \
+               $(LN_S) ../systemd-ask-password-plymouth.path systemd-ask-password-plymouth.path )
        ( cd $(DESTDIR)$(systemunitdir)/reboot.target.wants && \
                rm -f plymouth-reboot.service && \
                $(LN_S) ../plymouth-reboot.service plymouth-reboot.service )
+       ( cd $(DESTDIR)$(systemunitdir)/kexec.target.wants && \
+               rm -f plymouth-kexec.service && \
+               $(LN_S) ../plymouth-kexec.service plymouth-kexec.service )
        ( cd $(DESTDIR)$(systemunitdir)/poweroff.target.wants && \
                rm -f plymouth-poweroff.service && \
                $(LN_S) ../plymouth-poweroff.service plymouth-poweroff.service )
@@ -1199,18 +1207,19 @@ if TARGET_FEDORA
                rm -f plymouth-halt.service && \
                $(LN_S) ../plymouth-halt.service plymouth-halt.service )
        ( cd $(DESTDIR)$(systemunitdir) && \
-               rm -f local.service && \
-               $(LN_S) rc-local.service local.service )
-       ( cd $(DESTDIR)$(SYSTEM_SYSVINIT_PATH) && \
-               $(LN_S) halt reboot > /dev/null 2>&1 || true )
+               rm -f display-manager.service && \
+               $(LN_S) prefdm.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_GENTOO
-       ( cd $(DESTDIR)$(pkgsysconfdir)/system && \
+       ( 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)/xdm.service display-manager.service )
-       ( cd $(DESTDIR)$(pkgsysconfdir)/system/graphical.target.wants && \
-               rm -f xdm.service && \
-               $(LN_S) $(systemunitdir)/xdm.service xdm.service )
+               $(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
 endif
 if TARGET_DEBIAN_OR_UBUNTU
        $(MKDIR_P) -m 0755 \
@@ -1244,5 +1253,7 @@ git-tag:
 
 # Opt out from a few services on Fedora for now, as long as rc.sysinit does this job
 fedora: install
-       rm /lib/systemd/system/local-fs.target.wants/var-run.mount
-       rm /lib/systemd/system/local-fs.target.wants/var-lock.mount
+       rm $(DESTDIR)/lib/systemd/system/local-fs.target.wants/var-run.mount
+       rm $(DESTDIR)/lib/systemd/system/local-fs.target.wants/var-lock.mount
+       sed -i -e 's/^#MountAuto=yes$$/MountAuto=no/' \
+               -e 's/^#SwapAuto=yes$$/SwapAuto=no/' $(DESTDIR)/etc/systemd/system.conf
Unnamed repository; edit this file 'description' to name the repository.