umount: unescape path from /proc/self/mountinfo first, then check against api mount...

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index c06f1ecb5603552cd636880a522ce74c10619c34..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 \
@@ -216,6 +228,7 @@ nodist_systemunit_DATA = \
        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 = \
@@ -247,6 +260,7 @@ EXTRA_DIST = \
        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
@@ -360,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 \
@@ -387,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) \
@@ -426,9 +442,9 @@ EXTRA_DIST += \
        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 = \
@@ -632,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
 
@@ -647,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
 
@@ -700,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) \
@@ -1036,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 && \