From 2b93b027d3a68b5d7ae26d0c2cd487eb5019d2a9 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 24 Apr 2012 16:42:42 +0200 Subject: remount: consolidate remount-api-vfs and remount-rootfs into one This has the advantage of removing a confusing warning by mount if the root directory is not listed in fstab. --- src/core/special.h | 2 +- src/core/swap.c | 4 +- src/remount-api-vfs/Makefile | 1 - src/remount-api-vfs/remount-api-vfs.c | 166 --------------------------------- src/remount-fs/Makefile | 1 + src/remount-fs/remount-fs.c | 168 ++++++++++++++++++++++++++++++++++ 6 files changed, 172 insertions(+), 170 deletions(-) delete mode 120000 src/remount-api-vfs/Makefile delete mode 100644 src/remount-api-vfs/remount-api-vfs.c create mode 120000 src/remount-fs/Makefile create mode 100644 src/remount-fs/remount-fs.c (limited to 'src') diff --git a/src/core/special.h b/src/core/special.h index f1ff1b94c0..2db4711c2e 100644 --- a/src/core/special.h +++ b/src/core/special.h @@ -65,7 +65,7 @@ #define SPECIAL_FSCK_SERVICE "fsck@.service" #define SPECIAL_QUOTACHECK_SERVICE "quotacheck.service" #define SPECIAL_QUOTAON_SERVICE "quotaon.service" -#define SPECIAL_REMOUNT_ROOTFS_SERVICE "remount-rootfs.service" +#define SPECIAL_REMOUNT_FS_SERVICE "systemd-remount-fs.service" /* Services systemd relies on */ #define SPECIAL_DBUS_SERVICE "dbus.service" diff --git a/src/core/swap.c b/src/core/swap.c index fea3f6887a..d2f949118b 100644 --- a/src/core/swap.c +++ b/src/core/swap.c @@ -211,9 +211,9 @@ static int swap_add_device_links(Swap *s) { UNIT(s)->manager->running_as == MANAGER_SYSTEM); else /* File based swap devices need to be ordered after - * remount-rootfs.service, since they might need a + * systemd-remount-fs.service, since they might need a * writable file system. */ - return unit_add_dependency_by_name(UNIT(s), UNIT_AFTER, SPECIAL_REMOUNT_ROOTFS_SERVICE, NULL, true); + return unit_add_dependency_by_name(UNIT(s), UNIT_AFTER, SPECIAL_REMOUNT_FS_SERVICE, NULL, true); } static int swap_add_default_dependencies(Swap *s) { diff --git a/src/remount-api-vfs/Makefile b/src/remount-api-vfs/Makefile deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/remount-api-vfs/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile \ No newline at end of file diff --git a/src/remount-api-vfs/remount-api-vfs.c b/src/remount-api-vfs/remount-api-vfs.c deleted file mode 100644 index 373ae25520..0000000000 --- a/src/remount-api-vfs/remount-api-vfs.c +++ /dev/null @@ -1,166 +0,0 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - -/*** - This file is part of systemd. - - Copyright 2010 Lennart Poettering - - systemd is free software; you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation; either version 2.1 of the License, or - (at your option) any later version. - - systemd is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with systemd; If not, see . -***/ - -#include -#include -#include -#include -#include -#include -#include - -#include "log.h" -#include "util.h" -#include "set.h" -#include "mount-setup.h" -#include "exit-status.h" - -/* Goes through /etc/fstab and remounts all API file systems, applying - * options that are in /etc/fstab that systemd might not have - * respected */ - -int main(int argc, char *argv[]) { - int ret = EXIT_FAILURE; - FILE *f = NULL; - struct mntent* me; - Hashmap *pids = NULL; - - if (argc > 1) { - log_error("This program takes no argument."); - return EXIT_FAILURE; - } - - log_set_target(LOG_TARGET_AUTO); - log_parse_environment(); - log_open(); - - umask(0022); - - f = setmntent("/etc/fstab", "r"); - if (!f) { - if (errno == ENOENT) { - ret = EXIT_SUCCESS; - goto finish; - } - - log_error("Failed to open /etc/fstab: %m"); - goto finish; - } - - pids = hashmap_new(trivial_hash_func, trivial_compare_func); - if (!pids) { - log_error("Failed to allocate set"); - goto finish; - } - - ret = EXIT_SUCCESS; - - while ((me = getmntent(f))) { - pid_t pid; - int k; - char *s; - - if (!mount_point_is_api(me->mnt_dir)) - continue; - - log_debug("Remounting %s", me->mnt_dir); - - pid = fork(); - if (pid < 0) { - log_error("Failed to fork: %m"); - ret = EXIT_FAILURE; - continue; - } - - if (pid == 0) { - const char *arguments[5]; - /* Child */ - - arguments[0] = "/bin/mount"; - arguments[1] = me->mnt_dir; - arguments[2] = "-o"; - arguments[3] = "remount"; - arguments[4] = NULL; - - execv("/bin/mount", (char **) arguments); - - log_error("Failed to execute /bin/mount: %m"); - _exit(EXIT_FAILURE); - } - - /* Parent */ - - s = strdup(me->mnt_dir); - if (!s) { - log_error("Out of memory."); - ret = EXIT_FAILURE; - continue; - } - - - k = hashmap_put(pids, UINT_TO_PTR(pid), s); - if (k < 0) { - log_error("Failed to add PID to set: %s", strerror(-k)); - ret = EXIT_FAILURE; - continue; - } - } - - while (!hashmap_isempty(pids)) { - siginfo_t si; - char *s; - - zero(si); - if (waitid(P_ALL, 0, &si, WEXITED) < 0) { - - if (errno == EINTR) - continue; - - log_error("waitid() failed: %m"); - ret = EXIT_FAILURE; - break; - } - - s = hashmap_remove(pids, UINT_TO_PTR(si.si_pid)); - if (s) { - if (!is_clean_exit(si.si_code, si.si_status)) { - if (si.si_code == CLD_EXITED) - log_error("/bin/mount for %s exited with exit status %i.", s, si.si_status); - else - log_error("/bin/mount for %s terminated by signal %s.", s, signal_to_string(si.si_status)); - - ret = EXIT_FAILURE; - } - - free(s); - } - } - -finish: - - if (pids) - hashmap_free_free(pids); - - if (f) - endmntent(f); - - return ret; -} diff --git a/src/remount-fs/Makefile b/src/remount-fs/Makefile new file mode 120000 index 0000000000..d0b0e8e008 --- /dev/null +++ b/src/remount-fs/Makefile @@ -0,0 +1 @@ +../Makefile \ No newline at end of file diff --git a/src/remount-fs/remount-fs.c b/src/remount-fs/remount-fs.c new file mode 100644 index 0000000000..35b71548a3 --- /dev/null +++ b/src/remount-fs/remount-fs.c @@ -0,0 +1,168 @@ +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ + +/*** + This file is part of systemd. + + Copyright 2010 Lennart Poettering + + systemd is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation; either version 2.1 of the License, or + (at your option) any later version. + + systemd is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with systemd; If not, see . +***/ + +#include +#include +#include +#include +#include +#include +#include + +#include "log.h" +#include "util.h" +#include "set.h" +#include "mount-setup.h" +#include "exit-status.h" + +/* Goes through /etc/fstab and remounts all API file systems, applying + * options that are in /etc/fstab that systemd might not have + * respected */ + +int main(int argc, char *argv[]) { + int ret = EXIT_FAILURE; + FILE *f = NULL; + struct mntent* me; + Hashmap *pids = NULL; + + if (argc > 1) { + log_error("This program takes no argument."); + return EXIT_FAILURE; + } + + log_set_target(LOG_TARGET_AUTO); + log_parse_environment(); + log_open(); + + umask(0022); + + f = setmntent("/etc/fstab", "r"); + if (!f) { + if (errno == ENOENT) { + ret = EXIT_SUCCESS; + goto finish; + } + + log_error("Failed to open /etc/fstab: %m"); + goto finish; + } + + pids = hashmap_new(trivial_hash_func, trivial_compare_func); + if (!pids) { + log_error("Failed to allocate set"); + goto finish; + } + + ret = EXIT_SUCCESS; + + while ((me = getmntent(f))) { + pid_t pid; + int k; + char *s; + + /* Remount the root fs and all API VFS */ + if (!mount_point_is_api(me->mnt_dir) && + !path_equal(me->mnt_dir, "/")) + continue; + + log_debug("Remounting %s", me->mnt_dir); + + pid = fork(); + if (pid < 0) { + log_error("Failed to fork: %m"); + ret = EXIT_FAILURE; + continue; + } + + if (pid == 0) { + const char *arguments[5]; + /* Child */ + + arguments[0] = "/bin/mount"; + arguments[1] = me->mnt_dir; + arguments[2] = "-o"; + arguments[3] = "remount"; + arguments[4] = NULL; + + execv("/bin/mount", (char **) arguments); + + log_error("Failed to execute /bin/mount: %m"); + _exit(EXIT_FAILURE); + } + + /* Parent */ + + s = strdup(me->mnt_dir); + if (!s) { + log_error("Out of memory."); + ret = EXIT_FAILURE; + continue; + } + + + k = hashmap_put(pids, UINT_TO_PTR(pid), s); + if (k < 0) { + log_error("Failed to add PID to set: %s", strerror(-k)); + ret = EXIT_FAILURE; + continue; + } + } + + while (!hashmap_isempty(pids)) { + siginfo_t si; + char *s; + + zero(si); + if (waitid(P_ALL, 0, &si, WEXITED) < 0) { + + if (errno == EINTR) + continue; + + log_error("waitid() failed: %m"); + ret = EXIT_FAILURE; + break; + } + + s = hashmap_remove(pids, UINT_TO_PTR(si.si_pid)); + if (s) { + if (!is_clean_exit(si.si_code, si.si_status)) { + if (si.si_code == CLD_EXITED) + log_error("/bin/mount for %s exited with exit status %i.", s, si.si_status); + else + log_error("/bin/mount for %s terminated by signal %s.", s, signal_to_string(si.si_status)); + + ret = EXIT_FAILURE; + } + + free(s); + } + } + +finish: + + if (pids) + hashmap_free_free(pids); + + if (f) + endmntent(f); + + return ret; +} -- cgit v1.2.3-54-g00ecf