Commit d3f09cf3 authored by Kay Sievers's avatar Kay Sievers

units: always enable random-seed, module-load, vconsole

parent fa70128d
...@@ -38,7 +38,7 @@ rootlibexecdir=$(rootdir)/lib/systemd ...@@ -38,7 +38,7 @@ rootlibexecdir=$(rootdir)/lib/systemd
systemunitdir=$(rootdir)/lib/systemd/system systemunitdir=$(rootdir)/lib/systemd/system
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-include $(top_builddir)/config.h \ -include $(top_builddir)/config.h \
-DSYSTEM_CONFIG_FILE=\"$(pkgsysconfdir)/system.conf\" \ -DSYSTEM_CONFIG_FILE=\"$(pkgsysconfdir)/system.conf\" \
-DSYSTEM_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/system\" \ -DSYSTEM_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/system\" \
-DSYSTEM_DATA_UNIT_PATH=\"$(systemunitdir)\" \ -DSYSTEM_DATA_UNIT_PATH=\"$(systemunitdir)\" \
...@@ -308,15 +308,15 @@ noinst_LTLIBRARIES = \ ...@@ -308,15 +308,15 @@ noinst_LTLIBRARIES = \
libsystemd-core.la libsystemd-core.la
libsystemd_basic_la_SOURCES = \ libsystemd_basic_la_SOURCES = \
src/util.c \ src/util.c \
src/label.c \ src/label.c \
src/hashmap.c \ src/hashmap.c \
src/set.c \ src/set.c \
src/strv.c \ src/strv.c \
src/conf-parser.c \ src/conf-parser.c \
src/socket-util.c \ src/socket-util.c \
src/log.c \ src/log.c \
src/ratelimit.c src/ratelimit.c
libsystemd_basic_la_CFLAGS = \ libsystemd_basic_la_CFLAGS = \
$(AM_CFLAGS) \ $(AM_CFLAGS) \
...@@ -327,27 +327,27 @@ libsystemd_basic_la_LIBADD = \ ...@@ -327,27 +327,27 @@ libsystemd_basic_la_LIBADD = \
libsystemd_core_la_SOURCES = \ libsystemd_core_la_SOURCES = \
src/unit.c \ src/unit.c \
src/job.c \ src/job.c \
src/manager.c \ src/manager.c \
src/path-lookup.c \ src/path-lookup.c \
src/load-fragment.c \ src/load-fragment.c \
src/service.c \ src/service.c \
src/automount.c \ src/automount.c \
src/mount.c \ src/mount.c \
src/swap.c \ src/swap.c \
src/device.c \ src/device.c \
src/target.c \ src/target.c \
src/snapshot.c \ src/snapshot.c \
src/socket.c \ src/socket.c \
src/timer.c \ src/timer.c \
src/path.c \ src/path.c \
src/load-dropin.c \ src/load-dropin.c \
src/execute.c \ src/execute.c \
src/exit-status.c \ src/exit-status.c \
src/dbus.c \ src/dbus.c \
src/dbus-manager.c \ src/dbus-manager.c \
src/dbus-unit.c \ src/dbus-unit.c \
src/dbus-job.c \ src/dbus-job.c \
src/dbus-service.c \ src/dbus-service.c \
src/dbus-socket.c \ src/dbus-socket.c \
src/dbus-timer.c \ src/dbus-timer.c \
...@@ -940,8 +940,10 @@ install-data-hook: ...@@ -940,8 +940,10 @@ install-data-hook:
rm -f systemd-update-utmp-runlevel.service && \ rm -f systemd-update-utmp-runlevel.service && \
$(LN_S) ../systemd-update-utmp-runlevel.service ) $(LN_S) ../systemd-update-utmp-runlevel.service )
( cd $(DESTDIR)$(systemunitdir)/shutdown.target.wants && \ ( cd $(DESTDIR)$(systemunitdir)/shutdown.target.wants && \
rm -f systemd-update-utmp-shutdown.service && \ rm -f systemd-update-utmp-shutdown.service \
$(LN_S) ../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) && \ ( cd $(DESTDIR)$(sessionunitdir) && \
rm -f shutdown.target sockets.target local-fs.target swap.target bluetooth.target printer.target && \ rm -f shutdown.target sockets.target local-fs.target swap.target bluetooth.target printer.target && \
$(LN_S) $(systemunitdir)/shutdown.target shutdown.target && \ $(LN_S) $(systemunitdir)/shutdown.target shutdown.target && \
...@@ -982,6 +984,9 @@ install-data-hook: ...@@ -982,6 +984,9 @@ install-data-hook:
proc-sys-fs-binfmt_misc.automount \ proc-sys-fs-binfmt_misc.automount \
sys-kernel-debug.automount \ sys-kernel-debug.automount \
sys-kernel-security.automount \ sys-kernel-security.automount \
systemd-vconsole-setup.service \
systemd-modules-load.service \
systemd-random-seed-load.service \
tmpwatch.timer \ tmpwatch.timer \
tmpwatch.service && \ tmpwatch.service && \
$(LN_S) ../dev-hugepages.automount dev-hugepages.automount && \ $(LN_S) ../dev-hugepages.automount dev-hugepages.automount && \
...@@ -989,6 +994,9 @@ install-data-hook: ...@@ -989,6 +994,9 @@ install-data-hook:
$(LN_S) ../proc-sys-fs-binfmt_misc.automount proc-sys-fs-binfmt_misc.automount && \ $(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-debug.automount sys-kernel-debug.automount && \
$(LN_S) ../sys-kernel-security.automount sys-kernel-security.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.timer && \
$(LN_S) ../tmpwatch.service ) $(LN_S) ../tmpwatch.service )
( cd $(DESTDIR)$(dbussessionservicedir) && \ ( cd $(DESTDIR)$(dbussessionservicedir) && \
......
...@@ -15,6 +15,3 @@ Before=shutdown.target ...@@ -15,6 +15,3 @@ Before=shutdown.target
Type=oneshot Type=oneshot
RemainAfterExit=yes RemainAfterExit=yes
ExecStart=@rootlibexecdir@/systemd-modules-load ExecStart=@rootlibexecdir@/systemd-modules-load
[Install]
WantedBy=sysinit.target
...@@ -15,6 +15,3 @@ Before=shutdown.target ...@@ -15,6 +15,3 @@ Before=shutdown.target
[Service] [Service]
Type=oneshot Type=oneshot
ExecStart=@rootlibexecdir@/systemd-random-seed load ExecStart=@rootlibexecdir@/systemd-random-seed load
[Install]
WantedBy=sysinit.target
...@@ -14,6 +14,3 @@ Conflicts=systemd-random-seed-load.service ...@@ -14,6 +14,3 @@ Conflicts=systemd-random-seed-load.service
[Service] [Service]
Type=oneshot Type=oneshot
ExecStart=@rootlibexecdir@/systemd-random-seed save ExecStart=@rootlibexecdir@/systemd-random-seed save
[Install]
WantedBy=shutdown.target
...@@ -15,6 +15,3 @@ Before=shutdown.target ...@@ -15,6 +15,3 @@ Before=shutdown.target
Type=oneshot Type=oneshot
RemainAfterExit=yes RemainAfterExit=yes
ExecStart=@rootlibexecdir@/systemd-vconsole-setup ExecStart=@rootlibexecdir@/systemd-vconsole-setup
[Install]
WantedBy=sysinit.target
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment