1 files changed, 70 insertions, 73 deletions

diff --git a/src/shutdown.c b/src/shutdown.c
index 528b30b98f..c16871dde4 100644
--- a/src/shutdown.c
+++ b/src/shutdown.c
@@ -44,7 +44,6 @@
 
 #define TIMEOUT_USEC (5 * USEC_PER_SEC)
 #define FINALIZE_ATTEMPTS 50
-#define pivot_root(new_root,put_old) syscall(SYS_pivot_root,new_root,put_old)
 
 static bool ignore_proc(pid_t pid) {
         if (pid == 1)
@@ -199,57 +198,58 @@ finish:
         sigprocmask(SIG_SETMASK, &oldmask, NULL);
 }
 
-static bool prepare_new_root(void) {
-        int r = false;
-        const char *dirs[] = { "/run/initramfs/oldroot",
-                               "/run/initramfs/proc",
-                               "/run/initramfs/sys",
-                               "/run/initramfs/dev",
-                               "/run/initramfs/run",
-                               NULL };
-        const char **dir;
-        const char *msg;
-
-        msg = "Failed to mount bind /run/initramfs on /run/initramfs";
-        if (mount("/run/initramfs", "/run/initramfs", NULL, MS_BIND, NULL) != 0)
-                goto out;
-
-        msg="Failed to make /run/initramfs private mount %m:";
-        if (mount(NULL, "/run/initramfs", NULL, MS_PRIVATE, NULL) != 0)
-                goto out;
-
-        for (dir = &dirs[0]; *dir != NULL; dir++) {
-                asprintf((char **) &msg, "mkdir %s: %%m", *dir);
-                if (mkdir(*dir, 0755) != 0) {
-                        if (errno != EEXIST)
-                                goto out;
+static int prepare_new_root(void) {
+        static const char dirs[] =
+                "/run/initramfs/oldroot\0"
+                "/run/initramfs/proc\0"
+                "/run/initramfs/sys\0"
+                "/run/initramfs/dev\0"
+                "/run/initramfs/run\0";
+
+        const char *dir;
+
+        if (mount("/run/initramfs", "/run/initramfs", NULL, MS_BIND, NULL) < 0) {
+                log_error("Failed to mount bind /run/initramfs on /run/initramfs: %m");
+                return -errno;
+        }
+
+        if (mount(NULL, "/run/initramfs", NULL, MS_PRIVATE, NULL) < 0) {
+                log_error("Failed to make /run/initramfs private mount: %m");
+                return -errno;
+        }
+
+        NULSTR_FOREACH(dir, dirs)
+                if (mkdir_p(dir, 0755) < 0 && errno != EEXIST) {
+                        log_error("Failed to mkdir %s: %m", dir);
+                        return -errno;
                 }
-                free((char *) msg);
+
+        if (mount("/sys", "/run/initramfs/sys", NULL, MS_BIND, NULL) < 0) {
+                log_error("Failed to mount bind /sys on /run/initramfs/sys: %m");
+                return -errno;
+        }
+
+        if (mount("/proc", "/run/initramfs/proc", NULL, MS_BIND, NULL) < 0) {
+                log_error("Failed to mount bind /proc on /run/initramfs/proc: %m");
+                return -errno;
+        }
+
+        if (mount("/dev", "/run/initramfs/dev", NULL, MS_BIND, NULL) < 0) {
+                log_error("Failed to mount bind /dev on /run/initramfs/dev: %m");
+                return -errno;
         }
 
-        msg = "Failed to mount bind /sys on /run/initramfs/sys";
-        if (mount("/sys", "/run/initramfs/sys", NULL, MS_BIND, NULL) != 0)
-                goto out;
-        msg = "Failed to mount bind /proc on /run/initramfs/proc";
-        if (mount("/proc", "/run/initramfs/proc", NULL, MS_BIND, NULL) != 0)
-                goto out;
-        msg = "Failed to mount bind /dev on /run/initramfs/dev";
-        if (mount("/dev", "/run/initramfs/dev", NULL, MS_BIND, NULL) != 0)
-                goto out;
-        msg = "Failed to mount bind /run on /run/initramfs/run";
-        if (mount("/run", "/run/initramfs/run", NULL, MS_BIND, NULL) != 0)
-                goto out;
-
-        r = true;
- out:
-        if (!r)
-                log_error("%s: %m", msg);
-        return r;
+        if (mount("/run", "/run/initramfs/run", NULL, MS_BIND, NULL) < 0) {
+                log_error("Failed to mount bind /run on /run/initramfs/run: %m");
+                return -errno;
+        }
+
+        return 0;
 }
 
-static bool pivot_to_new_root(void) {
+static int pivot_to_new_root(void) {
         int fd;
-        int r = 0;
+
         chdir("/run/initramfs");
 
         /*
@@ -257,30 +257,29 @@ static bool pivot_to_new_root(void) {
           It works for pivot_root, but the ref count for the root device
           is not decreasing :-/
         */
-        if (mount(NULL, "/", NULL, MS_PRIVATE, NULL) != 0) {
-                log_error("Failed to make \"/\" private mount %m: ");
-                return false;
+        if (mount(NULL, "/", NULL, MS_PRIVATE, NULL) < 0) {
+                log_error("Failed to make \"/\" private mount %m");
+                return -errno;
         }
 
-        r = pivot_root(".", "oldroot");
-        if (r!=0) {
+        if (pivot_root(".", "oldroot") < 0) {
                 log_error("pivot failed: %m");
-                /* only chroot, if pivot root succeded */
-                return false;
+                /* only chroot if pivot root succeded */
+                return -errno;
         }
+
         chroot(".");
-        log_info("pivot rooted");
-
-        fd = open("dev/console", O_RDONLY);
-        dup2(fd, STDIN_FILENO);
-        close_nointr_nofail(fd);
-        fd = open("dev/console", O_WRONLY);
-        dup2(fd, STDOUT_FILENO);
-        close_nointr_nofail(fd);
-        fd = open("dev/console", O_WRONLY);
-        dup2(fd, STDERR_FILENO);
-        close_nointr_nofail(fd);
-        return true;
+        log_info("Successfully changed into root pivot.");
+
+        fd = open("/dev/console", O_RDWR);
+        if (fd < 0)
+                log_error("Failed to open /dev/console: %m");
+        else {
+                make_stdio(fd);
+                close_nointr_nofail(fd);
+        }
+
+        return 0;
 }
 
 int main(int argc, char *argv[]) {
@@ -419,19 +418,17 @@ int main(int argc, char *argv[]) {
                 exit(0);
         }
 
-        sync();
-
         if (access("/run/initramfs/shutdown", X_OK) == 0) {
-                char *new_argv[3];
-                new_argv[0] = strdup(argv[0]);
-                new_argv[1] = strdup(argv[1]);
-                new_argv[2] = NULL;
-                if (prepare_new_root() && pivot_to_new_root()) {
-                        execv("/shutdown", new_argv);
+
+                if (prepare_new_root() >= 0 &&
+                    pivot_to_new_root() >= 0) {
+                        execv("/shutdown", argv);
                         log_error("Failed to execute shutdown binary: %m");
                 }
         }
 
+        sync();
+
         if (cmd == LINUX_REBOOT_CMD_KEXEC) {
                 /* We cheat and exec kexec to avoid doing all its work */
                 pid_t pid = fork();