[systemd-commits] 4 commits - .gitignore Makefile.am README src/shutdown.c src/umount.c src/umount.h src/util.h
Lennart Poettering
lennart at kemper.freedesktop.org
Thu Oct 7 10:24:27 PDT 2010
.gitignore | 1
Makefile.am | 17 ++
README | 2
src/shutdown.c | 345 +++++++++++++++++++++++++++++++++++++++++++++++
src/umount.c | 410 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
src/umount.h | 31 ++++
src/util.h | 1
7 files changed, 806 insertions(+), 1 deletion(-)
New commits:
commit b02b72cf0edccfc2ee2895062e61ccf4af17ff11
Author: Fabiano Fidencio <fidencio at profusion.mobi>
Date: Thu Oct 7 04:24:42 2010 -0700
README: Check for libudev-160, as in configure.ac
diff --git a/README b/README
index 430d091..12dc9fe 100644
--- a/README
+++ b/README
@@ -28,7 +28,7 @@ AUTHOR:
REQUIREMENTS:
Linux kernel >= 2.6.30 (with autofs4, devtmpfs, cgroups)
- libudev >= 151
+ libudev >= 160
libcgroup >= 0.35
vala >= 0.80
gtk+ >= 2.20
commit b1b2a107d15a370d40b200172837bdd82ff3c3b2
Author: Fabiano Fidencio <fidencio at profusion.mobi>
Date: Thu Oct 7 04:24:41 2010 -0700
shutdown: Adding binary to shutdown the system
This functions are working as follows:
- Send a SIGTERM to all processes that may be finished
- Send a SIGKILL to all processes that still live and may be finished
- Try to unmount all mount points
- Try to remount read-only all mount points that can't be umounted
- Umount all swap devices
- Umount and detach all loopback devices
- Call [poweroff|halt|reboot|kexec]
TODO:
- Umount device-mapper.
- Make log work. So far it is being useless as we do not parse
/etc/systemd/system.conf, kernel command line but just
environment, however we're executed by init and thus have no
useful variables. Forcing it to target=kmsg/console and
level=debug also does not produce any output, however writing to
/dev/console does work (hack used during debug).
diff --git a/Makefile.am b/Makefile.am
index 4b248c0..a79e94e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,6 +35,7 @@ tmpfilesdir=$(sysconfdir)/tmpfiles.d
# And these are the special ones for /
rootdir=@rootdir@
rootbindir=$(rootdir)/bin
+rootsbindir=$(rootdir)/sbin
rootlibexecdir=$(rootdir)/lib/systemd
systemunitdir=$(rootdir)/lib/systemd/system
@@ -50,9 +51,11 @@ AM_CPPFLAGS = \
-DSESSION_DATA_UNIT_PATH=\"$(sessionunitdir)\" \
-DCGROUP_AGENT_PATH=\"$(rootlibexecdir)/systemd-cgroups-agent\" \
-DSYSTEMD_BINARY_PATH=\"$(rootbindir)/systemd\" \
+ -DSYSTEMD_SHUTDOWN_BINARY_PATH=\"$(rootlibexecdir)/systemd-shutdown\" \
-DSYSTEMCTL_BINARY_PATH=\"$(rootbindir)/systemctl\" \
-DRUNTIME_DIR=\"$(localstatedir)/run\" \
-DRANDOM_SEED=\"$(localstatedir)/lib/random-seed\" \
+ -DKEXEC_BINARY_PATH=\"$(rootsbindir)/kexec\" \
-I $(top_srcdir)/src
if TARGET_GENTOO
@@ -96,6 +99,7 @@ rootlibexec_PROGRAMS = \
systemd-update-utmp \
systemd-random-seed \
systemd-shutdownd \
+ systemd-shutdown \
systemd-modules-load \
systemd-remount-api-vfs \
systemd-kmsg-syslogd \
@@ -639,6 +643,19 @@ systemd_shutdownd_CFLAGS = \
systemd_shutdownd_LDADD = \
libsystemd-basic.la
+systemd_shutdown_SOURCES = \
+ src/mount-setup.c \
+ src/umount.c \
+ src/shutdown.c
+
+systemd_shutdown_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(UDEV_CFLAGS)
+
+systemd_shutdown_LDADD = \
+ libsystemd-basic.la \
+ $(UDEV_LIBS)
+
systemd_modules_load_SOURCES = \
src/modules-load.c
diff --git a/src/shutdown.c b/src/shutdown.c
new file mode 100644
index 0000000..023648c
--- /dev/null
+++ b/src/shutdown.c
@@ -0,0 +1,345 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
+/***
+ This file is part of systemd.
+
+ Copyright 2010 ProFUSION embedded systems
+
+ systemd is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 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
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
+#include <sys/mman.h>
+#include <sys/types.h>
+#include <sys/reboot.h>
+#include <linux/reboot.h>
+#include <sys/wait.h>
+#include <dirent.h>
+#include <errno.h>
+#include <unistd.h>
+#include <signal.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "log.h"
+#include "umount.h"
+#include "util.h"
+
+#define TIMEOUT_USEC (5 * USEC_PER_SEC)
+#define FINALIZE_ATTEMPTS 50
+#define FINALIZE_CRITICAL_ATTEMPTS 10
+
+_noreturn_ static void freeze(void) {
+ for (;;)
+ pause();
+}
+
+static bool ignore_proc(pid_t pid) {
+ if (pid == 1)
+ return true;
+
+ /* TODO: add more ignore rules here: device-mapper, etc */
+
+ return false;
+}
+
+static bool is_kernel_thread(pid_t pid)
+{
+ char buf[PATH_MAX];
+ FILE *f;
+ char c;
+ size_t count;
+
+ snprintf(buf, sizeof(buf), "/proc/%lu/cmdline", (unsigned long)pid);
+ f = fopen(buf, "re");
+ if (!f)
+ return true; /* not really, but has the desired effect */
+
+ count = fread(&c, 1, 1, f);
+ fclose(f);
+ return count != 1;
+}
+
+static int killall(int sign) {
+ DIR *dir;
+ struct dirent *d;
+ unsigned int processes = 0;
+
+ if ((dir = opendir("/proc")) == NULL)
+ return -errno;
+
+ while ((d = readdir(dir))) {
+ pid_t pid;
+
+ if (parse_pid(d->d_name, &pid) < 0)
+ continue;
+
+ if (is_kernel_thread(pid))
+ continue;
+
+ if (ignore_proc(pid))
+ continue;
+
+ if (kill(pid, sign) == 0)
+ processes++;
+ else
+ log_warning("Could not kill %d: %m", pid);
+ }
+
+ closedir(dir);
+
+ return processes;
+}
+
+static int send_signal(int sign) {
+ sigset_t mask, oldmask;
+ usec_t until;
+ int processes;
+ struct timespec ts;
+
+ assert_se(sigemptyset(&mask) == 0);
+ assert_se(sigaddset(&mask, SIGCHLD) == 0);
+ if (sigprocmask(SIG_BLOCK, &mask, &oldmask) != 0)
+ return -errno;
+
+ if (kill(-1, SIGSTOP) < 0)
+ log_warning("Failed kill(-1, SIGSTOP): %m");
+
+ processes = killall(sign);
+
+ if (kill(-1, SIGCONT) < 0)
+ log_warning("Failed kill(-1, SIGCONT): %m");
+
+ if (processes <= 0)
+ goto finish;
+
+ until = now(CLOCK_MONOTONIC) + TIMEOUT_USEC;
+ for (;;) {
+ usec_t n = now(CLOCK_MONOTONIC);
+ for (;;) {
+ pid_t pid = waitpid(-1, NULL, WNOHANG);
+ if (pid == 0)
+ break;
+ else if (pid < 0 && errno == ECHILD) {
+ processes = 0;
+ goto finish;
+ }
+
+ if (--processes == 0)
+ goto finish;
+ }
+
+ if (n >= until)
+ goto finish;
+
+ timespec_store(&ts, until - n);
+ if (sigtimedwait(&mask, NULL, &ts) != SIGCHLD)
+ log_warning("Failed: sigtimedwait did not return SIGCHLD: %m");
+ }
+
+finish:
+ sigprocmask(SIG_SETMASK, &oldmask, NULL);
+
+ return processes;
+}
+
+static int rescue_send_signal(int sign) {
+ sigset_t mask, oldmask;
+ usec_t until;
+ struct timespec ts;
+ int r;
+
+ sigemptyset(&mask);
+ sigaddset(&mask, SIGCHLD);
+ if (sigprocmask(SIG_BLOCK, &mask, &oldmask) != 0)
+ return -errno;
+
+ if (kill(-1, SIGSTOP) < 0)
+ log_warning("Failed kill(-1, SIGSTOP): %m");
+
+ r = kill(-1, sign);
+ if (r < 0)
+ log_warning("Failed kill(-1, %d): %m", sign);
+
+ if (kill(-1, SIGCONT) < 0)
+ log_warning("Failed kill(-1, SIGCONT): %m");
+
+ if (r < 0)
+ goto finish;
+
+ until = now(CLOCK_MONOTONIC) + TIMEOUT_USEC;
+ for (;;) {
+ usec_t n = now(CLOCK_MONOTONIC);
+ for (;;) {
+ pid_t pid = waitpid(-1, NULL, WNOHANG);
+ if (pid == 0)
+ break;
+ else if (pid < 0 && errno == ECHILD)
+ goto finish;
+ }
+
+ if (n >= until)
+ goto finish;
+
+ timespec_store(&ts, until - n);
+ if (sigtimedwait(&mask, NULL, &ts) != SIGCHLD)
+ log_warning("Failed: sigtimedwait did not return SIGCHLD: %m");
+ }
+
+finish:
+ sigprocmask(SIG_SETMASK, &oldmask, NULL);
+
+ return r;
+}
+
+
+int main(int argc, char *argv[]) {
+ int cmd, r, retries;
+ bool need_umount = true, need_swapoff = true, need_loop_detach = true;
+
+ log_parse_environment();
+ log_set_target(LOG_TARGET_KMSG); /* syslog will die if not gone yet */
+ log_open();
+
+ if (getpid() != 1) {
+ log_error("Not executed by init (pid-1).");
+ r = -EPERM;
+ goto error;
+ }
+
+ if (argc != 2) {
+ log_error("Invalid number of arguments.");
+ r = -EINVAL;
+ goto error;
+ }
+
+ if (streq(argv[1], "reboot"))
+ cmd = RB_AUTOBOOT;
+ else if (streq(argv[1], "poweroff"))
+ cmd = RB_POWER_OFF;
+ else if (streq(argv[1], "halt"))
+ cmd = RB_HALT_SYSTEM;
+ else if (streq(argv[1], "kexec"))
+ cmd = LINUX_REBOOT_CMD_KEXEC;
+ else {
+ log_error("Unknown action '%s'.", argv[1]);
+ r = -EINVAL;
+ goto error;
+ }
+
+ /* lock us into memory */
+ if (mlockall(MCL_CURRENT|MCL_FUTURE) != 0)
+ log_warning("Cannot lock process memory: %m");
+
+ log_info("Sending SIGTERM to processes");
+ r = send_signal(SIGTERM);
+ if (r < 0)
+ log_warning("Cannot send SIGTERM to all process: %s", strerror(r));
+
+ log_info("Sending SIGKILL to processes");
+ r = send_signal(SIGKILL);
+ if (r < 0)
+ log_warning("Cannot send SIGKILL to all process: %s", strerror(r));
+
+
+ /* preventing that we won't block umounts */
+ if (chdir("/") != 0)
+ log_warning("Cannot chdir(\"/\"): %m. Unmounts likely to fail.");
+
+ /* umount all mountpoints, swaps, and loopback devices */
+ retries = FINALIZE_ATTEMPTS;
+ while (need_umount || need_swapoff || need_loop_detach) {
+ if (need_umount) {
+ log_info("Unmounting filesystems.");
+ r = umount_all();
+ if (r == 0)
+ need_umount = false;
+ else if (r > 0)
+ log_warning("Not all filesystems unmounted, %d left.", r);
+ else
+ log_error("Error unmounting filesystems: %s", strerror(-r));
+ }
+
+ if (need_swapoff) {
+ log_info("Disabling swaps.");
+ r = swapoff_all();
+ if (r == 0)
+ need_swapoff = false;
+ else if (r > 0)
+ log_warning("Not all swaps are off, %d left.", r);
+ else
+ log_error("Error turning off swaps: %s", strerror(-r));
+ }
+
+ if (need_loop_detach) {
+ log_info("Detaching loop devices.");
+ r = loopback_detach_all();
+ if (r == 0)
+ need_loop_detach = false;
+ else if (r > 0)
+ log_warning("Not all loop devices detached, %d left.", r);
+ else
+ log_error("Error detaching loop devices: %s", strerror(-r));
+
+ }
+
+ if (need_umount || need_swapoff || need_loop_detach) {
+ retries--;
+
+ if (retries <= FINALIZE_CRITICAL_ATTEMPTS) {
+ log_warning("Approaching critical level to finalize filesystem and devices, try to kill all processes.");
+ rescue_send_signal(SIGTERM);
+ rescue_send_signal(SIGKILL);
+ }
+
+ if (retries > 0)
+ log_info("Action still required, %d tries left", retries);
+ else {
+ log_error("Tried enough but still action required need_umount=%d, need_swapoff=%d, need_loop_detach=%d", need_umount, need_swapoff, need_loop_detach);
+ r = -EBUSY;
+ goto error;
+ }
+ }
+ }
+
+ sync();
+
+ if (cmd == LINUX_REBOOT_CMD_KEXEC) {
+ /* we cheat and exec kexec to avoid doing all its work */
+ pid_t pid = fork();
+ if (pid < 0) {
+ log_error("Could not fork: %m. Falling back to reboot.");
+ cmd = RB_AUTOBOOT;
+ } else if (pid > 0) {
+ waitpid(pid, NULL, 0);
+ log_warning("Failed %s -e -x -f. Falling back to reboot", KEXEC_BINARY_PATH);
+ cmd = RB_AUTOBOOT;
+ } else {
+ const char *args[5] = {KEXEC_BINARY_PATH, "-e", "-f", "-x", NULL};
+ execv(args[0], (char * const *) args);
+ return EXIT_FAILURE;
+ }
+ }
+
+ reboot(cmd);
+ r = errno;
+
+ error:
+ sync();
+ if (r < 0)
+ r = -r;
+ log_error("Critical error while doing system shutdown: %s", strerror(r));
+ freeze();
+ return 0;
+}
commit e3478379751fda30316204c68112b5a2b9ffd5a7
Author: Fabiano Fidencio <fidencio at profusion.mobi>
Date: Thu Oct 7 05:43:57 2010 -0700
umount: Adding unmount functions to be used in shutdown
This functions will:
- umount all mount points that aren't API
- remount read-only all mount points that can't be umounted
- umount all swap devices.
- detach all loopback devices
TODO:
- umount dms
Mountpoints are being read from /proc/self/mountinfo.
Swaps are being read from /proc/swaps.
Loop devices from /sys/class/block/loop*.
diff --git a/.gitignore b/.gitignore
index 9ba0758..2ba000c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+systemd-shutdown
systemd-tmpfiles
systemd-readahead-collect
systemd-readahead-replay
diff --git a/src/umount.c b/src/umount.c
new file mode 100644
index 0000000..4842d40
--- /dev/null
+++ b/src/umount.c
@@ -0,0 +1,410 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
+/***
+ This file is part of systemd.
+
+ Copyright 2010 ProFUSION embedded systems
+
+ systemd is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 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
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
+#include <errno.h>
+#include <fcntl.h>
+#include <string.h>
+#include <sys/mount.h>
+#include <sys/swap.h>
+#include <unistd.h>
+#include <linux/loop.h>
+#include <libudev.h>
+
+#include "list.h"
+#include "mount-setup.h"
+#include "umount.h"
+#include "util.h"
+
+typedef struct MountPoint {
+ char *path;
+ bool read_only;
+ LIST_FIELDS (struct MountPoint, mount_point);
+} MountPoint;
+
+static MountPoint *mount_point_alloc(char *path) {
+ MountPoint *mp;
+
+ if (!(mp = new(MountPoint, 1)))
+ return NULL;
+
+ mp->path = path;
+ mp->read_only = false;
+
+ return mp;
+}
+
+static void mount_point_remove_and_free(MountPoint *mount_point, MountPoint **mount_point_list_head) {
+ LIST_REMOVE(MountPoint, mount_point, *mount_point_list_head, mount_point);
+
+ free(mount_point->path);
+ free(mount_point);
+}
+
+static void mount_points_list_free(MountPoint **mount_point_list_head) {
+ while (*mount_point_list_head)
+ mount_point_remove_and_free(*mount_point_list_head, mount_point_list_head);
+}
+
+static int mount_points_list_get(MountPoint **mount_point_list_head) {
+ FILE *proc_self_mountinfo;
+ char *path, *p;
+ unsigned int i;
+ int r;
+
+ if (!(proc_self_mountinfo = fopen("/proc/self/mountinfo", "re")))
+ return -errno;
+
+ for (i = 1;; i++) {
+ int k;
+ MountPoint *mp;
+
+ path = p = NULL;
+
+ if ((k = fscanf(proc_self_mountinfo,
+ "%*s " /* (1) mount id */
+ "%*s " /* (2) parent id */
+ "%*s " /* (3) major:minor */
+ "%*s " /* (4) root */
+ "%ms " /* (5) mount point */
+ "%*s" /* (6) mount options */
+ "%*[^-]" /* (7) optional fields */
+ "- " /* (8) separator */
+ "%*s " /* (9) file system type */
+ "%*s" /* (10) mount source */
+ "%*s" /* (11) mount options 2 */
+ "%*[^\n]", /* some rubbish at the end */
+ &path)) != 1) {
+ if (k == EOF)
+ break;
+
+ log_warning("Failed to parse /proc/self/mountinfo:%u.", i);
+
+ free(path);
+ continue;
+ }
+
+ if (mount_point_is_api(path)) {
+ free(path);
+ continue;
+ }
+
+ if (!(p = cunescape(path))) {
+ r = -ENOMEM;
+ goto finish;
+ }
+
+ if (!(mp = mount_point_alloc(p))) {
+ r = -ENOMEM;
+ goto finish;
+ }
+ LIST_PREPEND(MountPoint, mount_point, *mount_point_list_head, mp);
+
+ free(path);
+ }
+
+ r = 0;
+
+finish:
+ fclose(proc_self_mountinfo);
+
+ free(path);
+
+ return r;
+}
+
+static int swap_list_get(MountPoint **swap_list_head) {
+ FILE *proc_swaps;
+ unsigned int i;
+ int r;
+
+ if (!(proc_swaps = fopen("/proc/swaps", "re")))
+ return -errno;
+
+ (void) fscanf(proc_swaps, "%*s %*s %*s %*s %*s\n");
+
+ for (i = 2;; i++) {
+ MountPoint *swap;
+ char *dev = NULL, *d;
+ int k;
+
+ if ((k = fscanf(proc_swaps,
+ "%ms " /* device/file */
+ "%*s " /* type of swap */
+ "%*s " /* swap size */
+ "%*s " /* used */
+ "%*s\n", /* priority */
+ &dev)) != 1) {
+
+ if (k == EOF)
+ break;
+
+ log_warning("Failed to parse /proc/swaps:%u.", i);
+
+ free(dev);
+ continue;
+ }
+
+ if (endswith(dev, "(deleted)")) {
+ free(dev);
+ continue;
+ }
+
+ d = cunescape(dev);
+ free(dev);
+
+ if (!d) {
+ r = -ENOMEM;
+ goto finish;
+ }
+
+ swap = mount_point_alloc(d);
+ if (!swap) {
+ free(d);
+ r = -ENOMEM;
+ goto finish;
+ }
+
+ LIST_PREPEND(MountPoint, mount_point, *swap_list_head, swap);
+ }
+
+ r = 0;
+
+finish:
+ fclose(proc_swaps);
+
+ return r;
+}
+
+static int loopback_list_get(MountPoint **loopback_list_head) {
+ int r;
+ struct udev *udev;
+ struct udev_enumerate *e = NULL;
+ struct udev_list_entry *item = NULL, *first = NULL;
+
+ if (!(udev = udev_new())) {
+ r = -ENOMEM;
+ goto finish;
+ }
+
+ if (!(e = udev_enumerate_new(udev))) {
+ r = -ENOMEM;
+ goto finish;
+ }
+
+ if (udev_enumerate_add_match_subsystem(e, "block") < 0) {
+ r = -EIO;
+ goto finish;
+ }
+
+ if (udev_enumerate_add_match_sysname(e, "loop*") < 0) {
+ r = -EIO;
+ goto finish;
+ }
+
+ if (udev_enumerate_scan_devices(e) < 0) {
+ r = -EIO;
+ goto finish;
+ }
+
+ first = udev_enumerate_get_list_entry(e);
+
+ udev_list_entry_foreach(item, first) {
+ MountPoint *lb;
+ char *loop;
+
+ loop = cunescape(udev_list_entry_get_name(item));
+ if (!loop) {
+ r = -ENOMEM;
+ goto finish;
+ }
+
+ lb = mount_point_alloc(loop);
+ if (!lb) {
+ free(loop);
+ r = -ENOMEM;
+ goto finish;
+ }
+
+ LIST_PREPEND(MountPoint, mount_point, *loopback_list_head, lb);
+ }
+
+ r = 0;
+
+finish:
+ if (e)
+ udev_enumerate_unref(e);
+
+ free(udev);
+ return r;
+}
+
+static int delete_loopback(const char *device) {
+ int fd, r;
+
+ if ((fd = open(device, O_RDONLY|O_CLOEXEC)) < 0) {
+ if (errno == ENOENT) {
+ log_debug("Loop device %s does not exist.", device);
+ errno = 0;
+ return 0;
+ }
+ return -errno;
+ }
+
+ ioctl(fd, LOOP_CLR_FD, 0);
+ r = errno;
+ close_nointr(fd);
+
+ if (r == ENXIO) /* not bound, so no error */
+ r = 0;
+ errno = r;
+ return -errno;
+}
+
+static int mount_points_list_umount(MountPoint **mount_point_list_head) {
+ MountPoint *mp, *mp_next;
+ int failed = 0;
+
+ LIST_FOREACH_SAFE(mount_point, mp, mp_next, *mount_point_list_head) {
+ if (streq(mp->path, "/"))
+ continue;
+
+ /* Trying to umount. Forcing to umount if busy (only for NFS mounts) */
+ if (umount2(mp->path, MNT_FORCE) == 0)
+ mount_point_remove_and_free(mp, mount_point_list_head);
+ else {
+ log_debug("Could not unmount %s: %m", mp->path);
+ failed++;
+ }
+ }
+
+ return failed;
+}
+
+static int mount_points_list_remount_read_only(MountPoint **mount_point_list_head) {
+ MountPoint *mp, *mp_next;
+ int failed = 0;
+
+ LIST_FOREACH_SAFE(mount_point, mp, mp_next, *mount_point_list_head) {
+ if (mp->read_only)
+ continue;
+
+ /* Trying to remount read-only */
+ if (mount(NULL, mp->path, NULL, MS_MGC_VAL|MS_REMOUNT|MS_RDONLY, NULL) == 0) {
+ mp->read_only = true;
+ mount_point_remove_and_free(mp, mount_point_list_head);
+ } else {
+ log_debug("Could not remount as read-only %s: %m", mp->path);
+ failed++;
+ }
+ }
+
+ return failed;
+}
+
+static int swap_points_list_off(MountPoint **swap_list_head) {
+ MountPoint *swap, *swap_next;
+ int failed = 0;
+
+ LIST_FOREACH_SAFE(mount_point, swap, swap_next, *swap_list_head) {
+ if (swapoff(swap->path) == 0)
+ mount_point_remove_and_free(swap, swap_list_head);
+ else {
+ log_debug("Could not swapoff %s: %m", swap->path);
+ failed++;
+ }
+ }
+
+ return failed;
+}
+
+static int loopback_points_list_detach(MountPoint **loopback_list_head) {
+ MountPoint *loopback, *loopback_next;
+ int failed = 0;
+
+ LIST_FOREACH_SAFE(mount_point, loopback, loopback_next, *loopback_list_head) {
+ if (delete_loopback(loopback->path) == 0)
+ mount_point_remove_and_free(loopback, loopback_list_head);
+ else {
+ log_debug("Could not delete loopback %s: %m", loopback->path);
+ failed++;
+ }
+ }
+
+ return failed;
+}
+
+int umount_all(void) {
+ int r;
+ LIST_HEAD(MountPoint, mp_list_head);
+
+ LIST_HEAD_INIT(MountPoint, mp_list_head);
+
+ r = mount_points_list_get(&mp_list_head);
+ if (r < 0)
+ goto end;
+
+ r = mount_points_list_umount(&mp_list_head);
+ if (r <= 0)
+ goto end;
+
+ r = mount_points_list_remount_read_only(&mp_list_head);
+
+ end:
+ mount_points_list_free(&mp_list_head);
+
+ return r;
+}
+
+int swapoff_all(void) {
+ int r;
+ LIST_HEAD(MountPoint, swap_list_head);
+
+ LIST_HEAD_INIT(MountPoint, swap_list_head);
+
+ r = swap_list_get(&swap_list_head);
+ if (r < 0)
+ goto end;
+
+ r = swap_points_list_off(&swap_list_head);
+
+ end:
+ mount_points_list_free(&swap_list_head);
+
+ return r;
+}
+
+int loopback_detach_all(void) {
+ int r;
+ LIST_HEAD(MountPoint, loopback_list_head);
+
+ LIST_HEAD_INIT(MountPoint, loopback_list_head);
+
+ r = loopback_list_get(&loopback_list_head);
+ if (r < 0)
+ goto end;
+
+ r = loopback_points_list_detach(&loopback_list_head);
+
+ end:
+ mount_points_list_free(&loopback_list_head);
+
+ return r;
+}
diff --git a/src/umount.h b/src/umount.h
new file mode 100644
index 0000000..aeccc00
--- /dev/null
+++ b/src/umount.h
@@ -0,0 +1,31 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
+#ifndef fooumounthfoo
+#define fooumounthfoo
+
+/***
+ This file is part of systemd.
+
+ Copyright 2010 ProFUSION embedded systems
+
+ systemd is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 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
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
+int umount_all(void);
+
+int swapoff_all(void);
+
+int loopback_detach_all(void);
+
+#endif
commit 3846aeeba29a31628ec7a8b34884916073585e06
Author: Fabiano Fidencio <fidencio at profusion.mobi>
Date: Thu Oct 7 04:24:39 2010 -0700
util: Adding a strneq, to represent (!strncmp(a, b, n))
As we have streq to repesent (strcmp(a, b) == 0),I'm adding
strneq to represent (strncmp(a, b, n) == 0), that will be used
in umount.c (at least).
diff --git a/src/util.h b/src/util.h
index f21aecf..618e7cf 100644
--- a/src/util.h
+++ b/src/util.h
@@ -82,6 +82,7 @@ usec_t timeval_load(const struct timeval *tv);
struct timeval *timeval_store(struct timeval *tv, usec_t u);
#define streq(a,b) (strcmp((a),(b)) == 0)
+#define strneq(a, b, n) (strncmp((a), (b), (n)) == 0)
bool streq_ptr(const char *a, const char *b);
More information about the systemd-commits
mailing list