summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-07-07 19:25:31 +0200
committerLennart Poettering <lennart@poettering.net>2014-07-07 21:05:09 +0200
commite26807239bd65bc17535a53cd540f38600e7ef24 (patch)
tree3100aec0ebcf4743d138fcf4d6d03977b8a90817 /Makefile.am
parent45035609fcfc3fe09324988c4929a3c147171c23 (diff)
firstboot: get rid of firstboot generator again, introduce ConditionFirstBoot= instead
As Zbigniew pointed out a new ConditionFirstBoot= appears like the nicer way to hook in systemd-firstboot.service on first boots (those with /etc unpopulated), so let's do this, and get rid of the generator again.
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am11
1 files changed, 2 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am
index 321379ca5f..3ddbdf77d3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1894,15 +1894,8 @@ nodist_systemunit_DATA += \
EXTRA_DIST += \
units/systemd-firstboot.service.in
-systemgenerator_PROGRAMS += \
- systemd-firstboot-generator
-
-systemd_firstboot_generator_SOURCES = \
- src/firstboot/firstboot-generator.c
-
-systemd_firstboot_generator_LDADD = \
- libsystemd-label.la \
- libsystemd-shared.la
+SYSINIT_TARGET_WANTS += \
+ systemd-firstboot.service
endif