chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
udev: timeout - warn after a third of the timeout before killing
[elogind.git]
/
src
/
core
/
main.c
diff --git
a/src/core/main.c
b/src/core/main.c
index bd148b1b33642c444d13c25ff7cf7687fab2afca..64c2b3f3a143d4248522bb2339689d28e77d1474 100644
(file)
--- a/
src/core/main.c
+++ b/
src/core/main.c
@@
-1834,7
+1834,6
@@
finish:
if (reexecute) {
const char **args;
unsigned i, args_size;
if (reexecute) {
const char **args;
unsigned i, args_size;
- sigset_t ss;
/* Close and disarm the watchdog, so that the new
* instance can reinitialize it, but doesn't get
/* Close and disarm the watchdog, so that the new
* instance can reinitialize it, but doesn't get
@@
-1854,8
+1853,8
@@
finish:
* deserializing. */
broadcast_signal(SIGTERM, false, true);
* deserializing. */
broadcast_signal(SIGTERM, false, true);
- /* And switch root */
- r = switch_root(switch_root_dir);
+ /* And switch root
with MS_MOVE, because we remove the old directory afterwards and detach it.
*/
+ r = switch_root(switch_root_dir
, "/mnt", true, MS_MOVE
);
if (r < 0)
log_error("Failed to switch root, ignoring: %s", strerror(-r));
}
if (r < 0)
log_error("Failed to switch root, ignoring: %s", strerror(-r));
}
@@
-1918,12
+1917,10
@@
finish:
args[i++] = NULL;
assert(i <= args_size);
args[i++] = NULL;
assert(i <= args_size);
- /*
r
eenable any blocked signals, especially important
+ /*
R
eenable any blocked signals, especially important
* if we switch from initial ramdisk to init=... */
reset_all_signal_handlers();
* if we switch from initial ramdisk to init=... */
reset_all_signal_handlers();
-
- assert_se(sigemptyset(&ss) == 0);
- assert_se(sigprocmask(SIG_SETMASK, &ss, NULL) == 0);
+ reset_signal_mask();
if (switch_root_init) {
args[0] = switch_root_init;
if (switch_root_init) {
args[0] = switch_root_init;