summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2010-09-21 21:25:44 +0200
committerKay Sievers <kay.sievers@vrfy.org>2010-09-21 21:25:44 +0200
commitd3f09cf39637de2441288b5e4c93eecbd1fb872d (patch)
treeca7d7e40f76be360dd96be66dfcd0197d3f5bd10
parentfa70128df1eb259cbf7244471ae9f03026e5b006 (diff)
units: always enable random-seed, module-load, vconsole
-rw-r--r--Makefile.am66
-rw-r--r--units/systemd-modules-load.service.in3
-rw-r--r--units/systemd-random-seed-load.service.in3
-rw-r--r--units/systemd-random-seed-save.service.in3
-rw-r--r--units/systemd-vconsole-setup.service.in3
5 files changed, 37 insertions, 41 deletions
diff --git a/Makefile.am b/Makefile.am
index f57482a15b..c2e903ad69 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,7 +38,7 @@ rootlibexecdir=$(rootdir)/lib/systemd
systemunitdir=$(rootdir)/lib/systemd/system
AM_CPPFLAGS = \
- -include $(top_builddir)/config.h \
+ -include $(top_builddir)/config.h \
-DSYSTEM_CONFIG_FILE=\"$(pkgsysconfdir)/system.conf\" \
-DSYSTEM_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/system\" \
-DSYSTEM_DATA_UNIT_PATH=\"$(systemunitdir)\" \
@@ -308,15 +308,15 @@ noinst_LTLIBRARIES = \
libsystemd-core.la
libsystemd_basic_la_SOURCES = \
- src/util.c \
+ src/util.c \
src/label.c \
- src/hashmap.c \
- src/set.c \
- src/strv.c \
- src/conf-parser.c \
- src/socket-util.c \
- src/log.c \
- src/ratelimit.c
+ src/hashmap.c \
+ src/set.c \
+ src/strv.c \
+ src/conf-parser.c \
+ src/socket-util.c \
+ src/log.c \
+ src/ratelimit.c
libsystemd_basic_la_CFLAGS = \
$(AM_CFLAGS) \
@@ -327,27 +327,27 @@ libsystemd_basic_la_LIBADD = \
libsystemd_core_la_SOURCES = \
src/unit.c \
- src/job.c \
- src/manager.c \
+ src/job.c \
+ src/manager.c \
src/path-lookup.c \
- src/load-fragment.c \
- src/service.c \
- src/automount.c \
- src/mount.c \
- src/swap.c \
- src/device.c \
- src/target.c \
- src/snapshot.c \
- src/socket.c \
- src/timer.c \
+ src/load-fragment.c \
+ src/service.c \
+ src/automount.c \
+ src/mount.c \
+ src/swap.c \
+ src/device.c \
+ src/target.c \
+ src/snapshot.c \
+ src/socket.c \
+ src/timer.c \
src/path.c \
- src/load-dropin.c \
- src/execute.c \
+ src/load-dropin.c \
+ src/execute.c \
src/exit-status.c \
- src/dbus.c \
- src/dbus-manager.c \
- src/dbus-unit.c \
- src/dbus-job.c \
+ src/dbus.c \
+ src/dbus-manager.c \
+ src/dbus-unit.c \
+ src/dbus-job.c \
src/dbus-service.c \
src/dbus-socket.c \
src/dbus-timer.c \
@@ -940,8 +940,10 @@ install-data-hook:
rm -f systemd-update-utmp-runlevel.service && \
$(LN_S) ../systemd-update-utmp-runlevel.service )
( cd $(DESTDIR)$(systemunitdir)/shutdown.target.wants && \
- rm -f systemd-update-utmp-shutdown.service && \
- $(LN_S) ../systemd-update-utmp-shutdown.service )
+ rm -f systemd-update-utmp-shutdown.service \
+ systemd-random-seed-save.service && \
+ $(LN_S) ../systemd-update-utmp-shutdown.service && \
+ $(LN_S) ../systemd-random-seed-save.service )
( 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 && \
@@ -982,6 +984,9 @@ install-data-hook:
proc-sys-fs-binfmt_misc.automount \
sys-kernel-debug.automount \
sys-kernel-security.automount \
+ systemd-vconsole-setup.service \
+ systemd-modules-load.service \
+ systemd-random-seed-load.service \
tmpwatch.timer \
tmpwatch.service && \
$(LN_S) ../dev-hugepages.automount dev-hugepages.automount && \
@@ -989,6 +994,9 @@ install-data-hook:
$(LN_S) ../proc-sys-fs-binfmt_misc.automount proc-sys-fs-binfmt_misc.automount && \
$(LN_S) ../sys-kernel-debug.automount sys-kernel-debug.automount && \
$(LN_S) ../sys-kernel-security.automount sys-kernel-security.automount && \
+ $(LN_S) ../systemd-vconsole-setup.service && \
+ $(LN_S) ../systemd-modules-load.service && \
+ $(LN_S) ../systemd-random-seed-load.service && \
$(LN_S) ../tmpwatch.timer && \
$(LN_S) ../tmpwatch.service )
( cd $(DESTDIR)$(dbussessionservicedir) && \
diff --git a/units/systemd-modules-load.service.in b/units/systemd-modules-load.service.in
index 7a94040fae..d6a5fa69a8 100644
--- a/units/systemd-modules-load.service.in
+++ b/units/systemd-modules-load.service.in
@@ -15,6 +15,3 @@ Before=shutdown.target
Type=oneshot
RemainAfterExit=yes
ExecStart=@rootlibexecdir@/systemd-modules-load
-
-[Install]
-WantedBy=sysinit.target
diff --git a/units/systemd-random-seed-load.service.in b/units/systemd-random-seed-load.service.in
index 965da06901..087f7b6800 100644
--- a/units/systemd-random-seed-load.service.in
+++ b/units/systemd-random-seed-load.service.in
@@ -15,6 +15,3 @@ Before=shutdown.target
[Service]
Type=oneshot
ExecStart=@rootlibexecdir@/systemd-random-seed load
-
-[Install]
-WantedBy=sysinit.target
diff --git a/units/systemd-random-seed-save.service.in b/units/systemd-random-seed-save.service.in
index 2021b079c7..7cfd2c0a4e 100644
--- a/units/systemd-random-seed-save.service.in
+++ b/units/systemd-random-seed-save.service.in
@@ -14,6 +14,3 @@ Conflicts=systemd-random-seed-load.service
[Service]
Type=oneshot
ExecStart=@rootlibexecdir@/systemd-random-seed save
-
-[Install]
-WantedBy=shutdown.target
diff --git a/units/systemd-vconsole-setup.service.in b/units/systemd-vconsole-setup.service.in
index c113be578e..66df594ea7 100644
--- a/units/systemd-vconsole-setup.service.in
+++ b/units/systemd-vconsole-setup.service.in
@@ -15,6 +15,3 @@ Before=shutdown.target
Type=oneshot
RemainAfterExit=yes
ExecStart=@rootlibexecdir@/systemd-vconsole-setup
-
-[Install]
-WantedBy=sysinit.target