util: place a couple of _likely_ around cache TLS vars

[elogind.git] / src / shutdown.c

diff --git a/src/shutdown.c b/src/shutdown.c
index c16871dde429268c2aa87f672af926130fe2c1ca..52bad21971f810ebceeee85ef2ac908d0c83e640 100644 (file)
--- a/src/shutdown.c
+++ b/src/shutdown.c
@@ -276,7 +276,10 @@ static int pivot_to_new_root(void) {
                 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;
@@ -381,9 +384,12 @@ int main(int argc, char *argv[]) {
                                 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;
+                }
 
                 /* If in this iteration we didn't manage to
                  * unmount/deactivate anything, we either kill more