kmod: automatically load a few kernel modules we need for normal operation before...

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 3589b735b0a6cb55d917e0f7624b13b227e6b589..194e3737d7e0f41f637d4d9bf4987e5367aa735f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -102,6 +102,9 @@ systemunit_DATA = \
        units/systemd-logger.service \
        units/syslog.target
 
+dist_sessionunit_DATA = \
+       units/session/default.target
+
 sessionunit_DATA = \
        units/session/remote-fs.target
 
@@ -129,6 +132,15 @@ dist_systemunit_DATA += \
        units/fedora/sysinit.service
 endif
 
+if TARGET_GENTOO
+dist_systemunit_DATA += \
+       units/gentoo/halt.service \
+       units/gentoo/killall.service \
+       units/gentoo/poweroff.service \
+       units/gentoo/reboot.service \
+       units/gentoo/xdm.service
+endif
+
 # This is needed because automake is buggy in how it generates the
 # rules for C programs, but not Vala programs.  We therefore can't
 # list the .h files as dependencies if we want make dist to work.
@@ -176,6 +188,7 @@ COMMON_SOURCES = \
        src/mount-setup.c \
        src/hostname-setup.c \
        src/loopback-setup.c \
+       src/kmod-setup.c \
        src/utmp-wtmp.c \
        src/specifier.c \
        src/unit-name.c \
@@ -416,7 +429,6 @@ install-data-hook:
                $(DESTDIR)$(systemunitdir)/basic.target.wants \
                $(DESTDIR)$(pkgsysconfdir)/system \
                $(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants \
-               $(DESTDIR)$(pkgsysconfdir)/system/local-fs.target.wants \
                $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants \
                $(DESTDIR)$(pkgsysconfdir)/system/graphical.target.wants \
                $(DESTDIR)$(pkgsysconfdir)/session \
@@ -462,9 +474,6 @@ install-data-hook:
        ( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \
                rm -f getty.target && \
                $(LN_S) $(systemunitdir)/getty.target getty.target )
-       ( cd $(DESTDIR)$(pkgsysconfdir)/system/local-fs.target.wants && \
-               rm -f var-run.mount && \
-               $(LN_S) $(systemunitdir)/var-run.mount var-run.mount )
        ( cd $(DESTDIR)$(systemunitdir)/basic.target.wants && \
                rm -f dev-hugepages.automount dev-mqueue.automount proc-sys-fs-binfmt_misc.automount sys-kernel-debug.automount && \
                $(LN_S) ../dev-hugepages.automount dev-hugepages.automount && \
@@ -481,6 +490,8 @@ if TARGET_FEDORA
        ( cd $(DESTDIR)$(systemunitdir) && \
                rm -f local.service && \
                $(LN_S) rc-local.service local.service )
+       ( cd $(DESTDIR)/etc/init.d && \
+               $(LN_S) halt reboot > /dev/null 2>&1 || true )
 endif
 
 DISTCHECK_CONFIGURE_FLAGS = \