chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
test-socket-util: silence warnings
[elogind.git]
/
src
/
core
/
manager.c
diff --git
a/src/core/manager.c
b/src/core/manager.c
index 9d078c0af759161a1a44f55fdc589593cff99a8f..e7a3a2a193179f01def2633ebfd9edfc75039905 100644
(file)
--- a/
src/core/manager.c
+++ b/
src/core/manager.c
@@
-2477,7
+2477,7
@@
void manager_check_finished(Manager *m) {
m->confirm_spawn = false;
/* This is no longer the first boot */
m->confirm_spawn = false;
/* This is no longer the first boot */
- m
->is_first_boot = false
;
+ m
anager_set_first_boot(m, false)
;
if (dual_timestamp_is_set(&m->finish_timestamp))
return;
if (dual_timestamp_is_set(&m->finish_timestamp))
return;
@@
-2542,7
+2542,8
@@
void manager_check_finished(Manager *m) {
}
SET_FOREACH(u, m->startup_units, i)
}
SET_FOREACH(u, m->startup_units, i)
- cgroup_context_apply(unit_get_cgroup_context(u), unit_get_cgroup_mask(u), u->cgroup_path, manager_state(m));
+ if (u->cgroup_path)
+ cgroup_context_apply(unit_get_cgroup_context(u), unit_get_cgroup_mask(u), u->cgroup_path, manager_state(m));
bus_manager_send_finished(m, firmware_usec, loader_usec, kernel_usec, initrd_usec, userspace_usec, total_usec);
bus_manager_send_finished(m, firmware_usec, loader_usec, kernel_usec, initrd_usec, userspace_usec, total_usec);
@@
-2631,7
+2632,6
@@
void manager_run_generators(Manager *m) {
_cleanup_closedir_ DIR *d = NULL;
const char *generator_path;
const char *argv[5];
_cleanup_closedir_ DIR *d = NULL;
const char *generator_path;
const char *argv[5];
- const char *env[2];
int r;
assert(m);
int r;
assert(m);
@@
-2665,14
+2665,8
@@
void manager_run_generators(Manager *m) {
argv[3] = m->generator_unit_path_late;
argv[4] = NULL;
argv[3] = m->generator_unit_path_late;
argv[4] = NULL;
- if (m->is_first_boot) {
- env[0] = (char*) "SYSTEMD_FIRST_BOOT=1";
- env[1] = NULL;
- } else
- env[0] = NULL;
-
RUN_WITH_UMASK(0022)
RUN_WITH_UMASK(0022)
- execute_directory(generator_path, d, DEFAULT_TIMEOUT_USEC, (char**) argv
, (char**) env
);
+ execute_directory(generator_path, d, DEFAULT_TIMEOUT_USEC, (char**) argv);
finish:
trim_generator_dir(m, &m->generator_unit_path);
finish:
trim_generator_dir(m, &m->generator_unit_path);
@@
-2816,6
+2810,20
@@
static bool manager_get_show_status(Manager *m) {
return plymouth_running();
}
return plymouth_running();
}
+void manager_set_first_boot(Manager *m, bool b) {
+ assert(m);
+
+ if (m->running_as != SYSTEMD_SYSTEM)
+ return;
+
+ m->first_boot = b;
+
+ if (m->first_boot)
+ touch("/run/systemd/first-boot");
+ else
+ unlink("/run/systemd/first-boot");
+}
+
void manager_status_printf(Manager *m, bool ephemeral, const char *status, const char *format, ...) {
va_list ap;
void manager_status_printf(Manager *m, bool ephemeral, const char *status, const char *format, ...) {
va_list ap;