diff options
author | Lennart Poettering <lennart@poettering.net> | 2014-07-07 19:25:31 +0200 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2014-07-07 21:05:09 +0200 |
commit | e26807239bd65bc17535a53cd540f38600e7ef24 (patch) | |
tree | 3100aec0ebcf4743d138fcf4d6d03977b8a90817 /src/core/main.c | |
parent | 45035609fcfc3fe09324988c4929a3c147171c23 (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 'src/core/main.c')
-rw-r--r-- | src/core/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/main.c b/src/core/main.c index e1fc3f3718..a21a959be9 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -1648,11 +1648,11 @@ int main(int argc, char *argv[]) { m->initrd_timestamp = initrd_timestamp; m->security_start_timestamp = security_start_timestamp; m->security_finish_timestamp = security_finish_timestamp; - m->is_first_boot = empty_etc; manager_set_default_rlimits(m, arg_default_rlimit); manager_environment_add(m, NULL, arg_default_environment); manager_set_show_status(m, arg_show_status); + manager_set_first_boot(m, empty_etc); /* Remember whether we should queue the default job */ queue_default_job = !arg_serialization || arg_switched_root; |