[systemd-commits] 6 commits - src/missing.h src/shutdown.c src/umount.c
Lennart Poettering
lennart at kemper.freedesktop.org
Mon Jul 11 13:58:44 PDT 2011
src/missing.h | 4 ++
src/shutdown.c | 99 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
src/umount.c | 17 ++++++++-
3 files changed, 117 insertions(+), 3 deletions(-)
New commits:
commit 89d471d55eadce53c5ad97e50dfaa0063c227d7e
Author: Lennart Poettering <lennart at poettering.net>
Date: Mon Jul 11 22:56:45 2011 +0200
shutdown: coding style fixes
diff --git a/src/shutdown.c b/src/shutdown.c
index 528b30b..c16871d 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();
commit 7e2bb92dcae6ee785ff7462aadc8c369fd93715b
Merge: 2fb1aed... 7cb1094...
Author: Lennart Poettering <lennart at poettering.net>
Date: Mon Jul 11 22:39:57 2011 +0200
Merge remote-tracking branch 'harald/master'
commit 7cb1094acefff2a89dc842d84eb94a8afcac67fd
Author: Harald Hoyer <harald at redhat.com>
Date: Thu May 5 12:29:44 2011 +0200
shutdown: pivot_root to a tmpfs directory to properly umount root
check for /run/initramfs/shutdown
mount bind all needed dirs to /run/initramfs
pivot_root to /run/initramfs
execute /run/initramfs/shutdown
diff --git a/src/missing.h b/src/missing.h
index 23ab39e..a443900 100644
--- a/src/missing.h
+++ b/src/missing.h
@@ -172,4 +172,8 @@ struct btrfs_ioctl_vol_args {
#define MS_MOVE 8192
#endif
+#ifndef MS_PRIVATE
+#define MS_PRIVATE (1 << 18)
+#endif
+
#endif
diff --git a/src/shutdown.c b/src/shutdown.c
index a2f3b53..528b30b 100644
--- a/src/shutdown.c
+++ b/src/shutdown.c
@@ -24,6 +24,11 @@
#include <sys/reboot.h>
#include <linux/reboot.h>
#include <sys/wait.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/mount.h>
+#include <sys/syscall.h>
+#include <fcntl.h>
#include <dirent.h>
#include <errno.h>
#include <unistd.h>
@@ -32,12 +37,14 @@
#include <stdlib.h>
#include <string.h>
+#include "missing.h"
#include "log.h"
#include "umount.h"
#include "util.h"
#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)
@@ -192,6 +199,90 @@ 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;
+ }
+ free((char *) msg);
+ }
+
+ 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;
+}
+
+static bool pivot_to_new_root(void) {
+ int fd;
+ int r = 0;
+ chdir("/run/initramfs");
+
+ /*
+ In case some evil process made "/" MS_SHARED
+ 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;
+ }
+
+ r = pivot_root(".", "oldroot");
+ if (r!=0) {
+ log_error("pivot failed: %m");
+ /* only chroot, if pivot root succeded */
+ return false;
+ }
+ 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;
+}
+
int main(int argc, char *argv[]) {
int cmd, r;
unsigned retries;
@@ -330,6 +421,17 @@ int main(int argc, char *argv[]) {
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);
+ log_error("Failed to execute shutdown binary: %m");
+ }
+ }
+
if (cmd == LINUX_REBOOT_CMD_KEXEC) {
/* We cheat and exec kexec to avoid doing all its work */
pid_t pid = fork();
commit 31657718f5b7c39037f7b013c449100b9cf2dc21
Author: Harald Hoyer <harald at redhat.com>
Date: Fri May 27 10:59:45 2011 +0200
umount: log failed umounts only once at the end
diff --git a/src/umount.c b/src/umount.c
index 20db612..67be42e 100644
--- a/src/umount.c
+++ b/src/umount.c
@@ -403,7 +403,7 @@ static int delete_dm(dev_t devnum) {
return r >= 0 ? 0 : -errno;
}
-static int mount_points_list_umount(MountPoint **head, bool *changed) {
+static int mount_points_list_umount(MountPoint **head, bool *changed, bool log_error) {
MountPoint *m, *n;
int n_failed = 0;
@@ -422,7 +422,7 @@ static int mount_points_list_umount(MountPoint **head, bool *changed) {
*changed = true;
mount_point_free(head, m);
- } else {
+ } else if (log_error) {
log_warning("Could not unmount %s: %m", m->path);
n_failed++;
}
@@ -565,10 +565,12 @@ int umount_all(bool *changed) {
/* retry umount, until nothing can be umounted anymore */
do {
umount_changed = false;
- r = mount_points_list_umount(&mp_list_head, &umount_changed);
+ r = mount_points_list_umount(&mp_list_head, &umount_changed, false);
if (umount_changed)
*changed = true;
} while(umount_changed);
+ /* umount one more time with logging enabled */
+ r = mount_points_list_umount(&mp_list_head, &umount_changed, true);
if (r <= 0)
goto end;
commit 6f7f51f793e5f2a5d42e05e3f1e3101f49d37299
Author: Harald Hoyer <harald at redhat.com>
Date: Thu May 5 12:26:31 2011 +0200
umount: umount, until all umounts failed
diff --git a/src/umount.c b/src/umount.c
index 290e6ca..20db612 100644
--- a/src/umount.c
+++ b/src/umount.c
@@ -552,6 +552,8 @@ static int dm_points_list_detach(MountPoint **head, bool *changed) {
int umount_all(bool *changed) {
int r;
+ bool umount_changed;
+
LIST_HEAD(MountPoint, mp_list_head);
LIST_HEAD_INIT(MountPoint, mp_list_head);
@@ -560,7 +562,13 @@ int umount_all(bool *changed) {
if (r < 0)
goto end;
- r = mount_points_list_umount(&mp_list_head, changed);
+ /* retry umount, until nothing can be umounted anymore */
+ do {
+ umount_changed = false;
+ r = mount_points_list_umount(&mp_list_head, &umount_changed);
+ if (umount_changed)
+ *changed = true;
+ } while(umount_changed);
if (r <= 0)
goto end;
commit 0415a104366b93418fcedb076a962c632d9dd2ab
Author: Harald Hoyer <harald at redhat.com>
Date: Fri May 20 16:26:00 2011 +0200
umount: log_info about what we unmounted
diff --git a/src/umount.c b/src/umount.c
index 95efa82..290e6ca 100644
--- a/src/umount.c
+++ b/src/umount.c
@@ -417,6 +417,7 @@ static int mount_points_list_umount(MountPoint **head, bool *changed) {
/* Trying to umount. Forcing to umount if busy (only for NFS mounts) */
if (umount2(m->path, MNT_FORCE) == 0) {
+ log_info("Unmounted %s.", m->path);
if (changed)
*changed = true;
More information about the systemd-commits
mailing list