chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Do not serialize environment, when switching root
[elogind.git]
/
src
/
core
/
main.c
diff --git
a/src/core/main.c
b/src/core/main.c
index 921476a042c7d9be0f0b82ee18042f84eb1cf074..789976108a7f16de8448581da9d38ef56310a16d 100644
(file)
--- a/
src/core/main.c
+++ b/
src/core/main.c
@@
-1088,7
+1088,7
@@
static int version(void) {
return 0;
}
return 0;
}
-static int prepare_reexecute(Manager *m, FILE **_f, FDSet **_fds, bool s
erialize_jobs
) {
+static int prepare_reexecute(Manager *m, FILE **_f, FDSet **_fds, bool s
witching_root
) {
FILE *f = NULL;
FDSet *fds = NULL;
int r;
FILE *f = NULL;
FDSet *fds = NULL;
int r;
@@
-1113,7
+1113,7
@@
static int prepare_reexecute(Manager *m, FILE **_f, FDSet **_fds, bool serialize
goto fail;
}
goto fail;
}
- r = manager_serialize(m, f, fds, s
erialize_jobs
);
+ r = manager_serialize(m, f, fds, s
witching_root
);
if (r < 0) {
log_error("Failed to serialize state: %s", strerror(-r));
goto fail;
if (r < 0) {
log_error("Failed to serialize state: %s", strerror(-r));
goto fail;
@@
-1780,7
+1780,7
@@
int main(int argc, char *argv[]) {
case MANAGER_REEXECUTE:
case MANAGER_REEXECUTE:
- if (prepare_reexecute(m, &serialization, &fds,
tru
e) < 0)
+ if (prepare_reexecute(m, &serialization, &fds,
fals
e) < 0)
goto finish;
reexecute = true;
goto finish;
reexecute = true;
@@
-1794,7
+1794,7
@@
int main(int argc, char *argv[]) {
m->switch_root = m->switch_root_init = NULL;
if (!switch_root_init)
m->switch_root = m->switch_root_init = NULL;
if (!switch_root_init)
- if (prepare_reexecute(m, &serialization, &fds,
fals
e) < 0)
+ if (prepare_reexecute(m, &serialization, &fds,
tru
e) < 0)
goto finish;
reexecute = true;
goto finish;
reexecute = true;