umount: simplify code for deactivating loop devices

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 973d341ea39851e4f1f7db9930b2401a085cb051..e432dcbbe44149eb58ab834102721cf10d168f24 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,6 +35,7 @@ tmpfilesdir=$(sysconfdir)/tmpfiles.d
 # And these are the special ones for /
 rootdir=@rootdir@
 rootbindir=$(rootdir)/bin
+rootsbindir=$(rootdir)/sbin
 rootlibexecdir=$(rootdir)/lib/systemd
 systemunitdir=$(rootdir)/lib/systemd/system
 
@@ -50,9 +51,11 @@ AM_CPPFLAGS = \
        -DSESSION_DATA_UNIT_PATH=\"$(sessionunitdir)\" \
        -DCGROUP_AGENT_PATH=\"$(rootlibexecdir)/systemd-cgroups-agent\" \
        -DSYSTEMD_BINARY_PATH=\"$(rootbindir)/systemd\" \
+       -DSYSTEMD_SHUTDOWN_BINARY_PATH=\"$(rootlibexecdir)/systemd-shutdown\" \
        -DSYSTEMCTL_BINARY_PATH=\"$(rootbindir)/systemctl\" \
        -DRUNTIME_DIR=\"$(localstatedir)/run\" \
        -DRANDOM_SEED=\"$(localstatedir)/lib/random-seed\" \
+       -DKEXEC_BINARY_PATH=\"$(rootsbindir)/kexec\" \
        -I $(top_srcdir)/src
 
 if TARGET_GENTOO
@@ -61,11 +64,18 @@ AM_CPPFLAGS += \
        -DKBD_SETFONT=\"/usr/bin/setfont\" \
        -DDEFAULT_FONT=\"LatArCyrHeb-16\"
 else
+if TARGET_ARCH
+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
 
 rootbin_PROGRAMS = \
        systemd \
@@ -89,6 +99,7 @@ rootlibexec_PROGRAMS = \
        systemd-update-utmp \
        systemd-random-seed \
        systemd-shutdownd \
+       systemd-shutdown \
        systemd-modules-load \
        systemd-remount-api-vfs \
        systemd-kmsg-syslogd \
@@ -96,7 +107,8 @@ rootlibexec_PROGRAMS = \
        systemd-reply-password \
        systemd-readahead-collect \
        systemd-readahead-replay \
-       systemd-tmpfiles
+       systemd-tmpfiles \
+       systemd-user-sessions
 
 noinst_PROGRAMS = \
        test-engine \
@@ -181,11 +193,8 @@ dist_systemunit_DATA = \
        units/sys-kernel-security.automount \
        units/sys-kernel-security.mount \
        units/tmp.mount \
-       units/tmp.service \
        units/var-lock.mount \
-       units/var-lock.service \
        units/var-run.mount \
-       units/var-run.service \
        units/hwclock-load.service \
        units/hwclock-save.service \
        units/sysctl.service \
@@ -194,7 +203,8 @@ dist_systemunit_DATA = \
        units/bluetooth.target \
        units/smartcard.target \
        units/tmpwatch.service \
-       units/tmpwatch.timer
+       units/tmpwatch.timer \
+       units/systemd-readahead-done.timer
 
 nodist_systemunit_DATA = \
        units/sysinit.target \
@@ -216,6 +226,9 @@ nodist_systemunit_DATA = \
        units/systemd-random-seed-load.service \
        units/systemd-readahead-collect.service \
        units/systemd-readahead-replay.service \
+       units/systemd-readahead-done.service \
+       units/systemd-tmpfiles.service \
+       units/systemd-user-sessions.service \
        units/syslog.target
 
 dist_sessionunit_DATA = \
@@ -245,6 +258,9 @@ EXTRA_DIST = \
        units/systemd-random-seed-load.service.in \
        units/systemd-readahead-collect.service.in \
        units/systemd-readahead-replay.service.in \
+       units/systemd-readahead-done.service.in \
+       units/systemd-tmpfiles.service.in \
+       units/systemd-user-sessions.service.in \
        units/syslog.target.in \
        units/session/exit.service.in \
        systemd.pc.in
@@ -308,7 +324,9 @@ dist_doc_DATA = \
        LICENSE \
        DISTRO_PORTING \
        src/sd-daemon.h \
-       src/sd-daemon.c
+       src/sd-daemon.c \
+       src/sd-readahead.h \
+       src/sd-readahead.c
 
 pkgconfigdata_DATA = \
        systemd.pc
@@ -356,6 +374,7 @@ libsystemd_core_la_SOURCES = \
        src/path.c \
        src/load-dropin.c \
        src/execute.c \
+       src/utmp-wtmp.c \
        src/exit-status.c \
        src/dbus.c \
        src/dbus-manager.c \
@@ -383,7 +402,8 @@ libsystemd_core_la_SOURCES = \
        src/fdset.c \
        src/namespace.c \
        src/tcpwrap.c \
-       src/cgroup-util.c
+       src/cgroup-util.c \
+       src/condition.c
 
 libsystemd_core_la_CFLAGS = \
        $(AM_CFLAGS) \
@@ -417,13 +437,14 @@ EXTRA_DIST += \
        src/linux/fanotify.h \
        src/initreq.h \
        src/sd-daemon.h \
+       src/sd-readahead.h \
        src/special.h \
        src/dbus-common.h \
        src/bus-errors.h \
        src/cgroup-show.h \
-       src/utmp-wtmp.h \
        src/build.h \
        src/shutdownd.h \
+       src/umount.h \
        src/readahead-common.h
 
 MANPAGES = \
@@ -451,6 +472,7 @@ MANPAGES = \
        man/systemd.exec.5 \
        man/daemon.7 \
        man/sd-daemon.7 \
+       man/sd-readahead.7 \
        man/runlevel.8 \
        man/telinit.8 \
        man/halt.8 \
@@ -626,6 +648,19 @@ systemd_shutdownd_CFLAGS = \
 systemd_shutdownd_LDADD = \
        libsystemd-basic.la
 
+systemd_shutdown_SOURCES = \
+       src/mount-setup.c \
+       src/umount.c \
+       src/shutdown.c
+
+systemd_shutdown_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(UDEV_CFLAGS)
+
+systemd_shutdown_LDADD = \
+       libsystemd-basic.la \
+       $(UDEV_LIBS)
+
 systemd_modules_load_SOURCES = \
        src/modules-load.c
 
@@ -641,6 +676,16 @@ systemd_tmpfiles_SOURCES = \
 systemd_tmpfiles_CFLAGS = \
        $(AM_CFLAGS)
 
+systemd_user_sessions_LDADD = \
+       libsystemd-basic.la
+
+systemd_user_sessions_SOURCES = \
+       src/user-sessions.c \
+       src/cgroup-util.c
+
+systemd_user_sessions_CFLAGS = \
+       $(AM_CFLAGS)
+
 systemd_modules_load_LDADD = \
        libsystemd-basic.la
 
@@ -694,7 +739,8 @@ systemctl_SOURCES = \
        src/sd-daemon.c \
        src/cgroup-show.c \
        src/cgroup-util.c \
-       src/exit-status.c
+       src/exit-status.c \
+       src/unit-name.c
 
 systemctl_CFLAGS = \
        $(AM_CFLAGS) \
@@ -706,7 +752,8 @@ systemctl_LDADD = \
 
 systemd_notify_SOURCES = \
        src/notify.c \
-       src/sd-daemon.c
+       src/sd-daemon.c \
+       src/sd-readahead.c
 
 systemd_notify_LDADD = \
        libsystemd-basic.la
@@ -831,6 +878,7 @@ SED_PROCESS = \
        $(SED)  -e 's,@rootlibexecdir\@,$(rootlibexecdir),g' \
                -e 's,@SPECIAL_SYSLOG_SERVICE\@,$(SPECIAL_SYSLOG_SERVICE),g' \
                -e 's,@SYSTEMCTL\@,$(rootbindir)/systemctl,g' \
+               -e 's,@SYSTEMD_NOTIFY\@,$(rootbindir)/systemd-notify,g' \
                -e 's,@pkgsysconfdir\@,$(pkgsysconfdir),g' \
                -e 's,@pkgdatadir\@,$(pkgdatadir),g' \
                -e 's,@systemunitdir\@,$(systemunitdir),g' \
@@ -1001,15 +1049,11 @@ install-data-hook:
                rm -f systemd-remount-api-vfs.service \
                        remount-rootfs.service \
                        var-run.mount \
-                       var-run.service \
-                       var-lock.mount \
-                       var-lock.service && \
+                       var-lock.mount && \
                $(LN_S) ../systemd-remount-api-vfs.service systemd-remount-api-vfs.service && \
                $(LN_S) ../remount-rootfs.service remount-rootfs.service && \
                $(LN_S) ../var-run.mount var-run.mount && \
-               $(LN_S) ../var-run.service var-run.service && \
-               $(LN_S) ../var-lock.mount var-lock.mount && \
-               $(LN_S) ../var-lock.service var-lock.service )
+               $(LN_S) ../var-lock.mount var-lock.mount )
        ( cd $(DESTDIR)$(sessionunitdir) && \
                rm -f shutdown.target sockets.target local-fs.target swap.target bluetooth.target printer.target && \
                $(LN_S) $(systemunitdir)/shutdown.target shutdown.target && \
@@ -1032,8 +1076,9 @@ install-data-hook:
                $(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 && \
-               $(LN_S) ../getty.target getty.target )
+               rm -f getty.target systemd-user-sessions.service && \
+               $(LN_S) ../getty.target getty.target && \
+               $(LN_S) ../systemd-user-sessions.service systemd-user-sessions.service )
        ( 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 && \
@@ -1054,6 +1099,7 @@ install-data-hook:
                        systemd-vconsole-setup.service \
                        systemd-modules-load.service \
                        systemd-random-seed-load.service \
+                       systemd-tmpfiles.service \
                        sysctl.service \
                        tmpwatch.timer \
                        tmpwatch.service && \
@@ -1065,6 +1111,7 @@ install-data-hook:
                $(LN_S) ../systemd-vconsole-setup.service systemd-vconsole-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.service systemd-tmpfiles.service && \
                $(LN_S) ../sysctl.service sysctl.service && \
                $(LN_S) ../tmpwatch.timer tmpwatch.timer && \
                $(LN_S) ../tmpwatch.service tmpwatch.service )
@@ -1156,7 +1203,5 @@ 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.service
        rm /lib/systemd/system/local-fs.target.wants/var-run.mount
-       rm /lib/systemd/system/local-fs.target.wants/var-lock.service
        rm /lib/systemd/system/local-fs.target.wants/var-lock.mount