chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into journal
[elogind.git]
/
src
/
shutdown.c
diff --git
a/src/shutdown.c
b/src/shutdown.c
index c16871dde429268c2aa87f672af926130fe2c1ca..11213f9d595a288c57e3d803d3ed8d21ff16a115 100644
(file)
--- a/
src/shutdown.c
+++ b/
src/shutdown.c
@@
-41,6
+41,7
@@
#include "log.h"
#include "umount.h"
#include "util.h"
#include "log.h"
#include "umount.h"
#include "util.h"
+#include "virt.h"
#define TIMEOUT_USEC (5 * USEC_PER_SEC)
#define FINALIZE_ATTEMPTS 50
#define TIMEOUT_USEC (5 * USEC_PER_SEC)
#define FINALIZE_ATTEMPTS 50
@@
-276,7
+277,10
@@
static int pivot_to_new_root(void) {
log_error("Failed to open /dev/console: %m");
else {
make_stdio(fd);
log_error("Failed to open /dev/console: %m");
else {
make_stdio(fd);
- close_nointr_nofail(fd);
+
+ /* Initialize the controlling terminal */
+ setsid();
+ ioctl(STDIN_FILENO, TIOCSCTTY, NULL);
}
return 0;
}
return 0;
@@
-292,6
+296,8
@@
int main(int argc, char *argv[]) {
log_set_target(LOG_TARGET_CONSOLE); /* syslog will die if not gone yet */
log_open();
log_set_target(LOG_TARGET_CONSOLE); /* syslog will die if not gone yet */
log_open();
+ umask(0022);
+
if (getpid() != 1) {
log_error("Not executed by init (pid 1).");
r = -EPERM;
if (getpid() != 1) {
log_error("Not executed by init (pid 1).");
r = -EPERM;
@@
-381,9
+387,12
@@
int main(int argc, char *argv[]) {
log_error("Failed to detach DM devices: %s", strerror(-r));
}
log_error("Failed to detach DM devices: %s", strerror(-r));
}
- if (!need_umount && !need_swapoff && !need_loop_detach && !need_dm_detach)
+ if (!need_umount && !need_swapoff && !need_loop_detach && !need_dm_detach) {
+ if (retries > 0)
+ log_info("All filesystems, swaps, loop devices, DM devices detached.");
/* Yay, done */
break;
/* Yay, done */
break;
+ }
/* If in this iteration we didn't manage to
* unmount/deactivate anything, we either kill more
/* If in this iteration we didn't manage to
* unmount/deactivate anything, we either kill more