*/
int
-do_mount_vfs (const char *options, const char *vfstype,
- const char *device, const char *mountpoint)
+do_mount_vfs (char *options, char *vfstype,
+ char *device, char *mountpoint)
{
int len, r, is_root;
char *mp;
char *error;
+ IS_DEVICE (device, -1);
+
is_root = strcmp (mountpoint, "/") == 0;
if (!root_mounted && !is_root) {
}
int
-do_mount (const char *device, const char *mountpoint)
+do_mount (char *device, char *mountpoint)
{
return do_mount_vfs ("sync,noatime", NULL, device, mountpoint);
}
int
-do_mount_ro (const char *device, const char *mountpoint)
+do_mount_ro (char *device, char *mountpoint)
{
return do_mount_vfs ("ro", NULL, device, mountpoint);
}
int
-do_mount_options (const char *options, const char *device,
- const char *mountpoint)
+do_mount_options (char *options, char *device,
+ char *mountpoint)
{
return do_mount_vfs (options, NULL, device, mountpoint);
}
* is kept updated.
*/
int
-do_umount (const char *pathordevice)
+do_umount (char *pathordevice)
{
int len, freeit = 0, r;
char *buf;
char *err;
- if (strncmp (pathordevice, "/dev/", 5) == 0)
- buf = (char *) pathordevice;
- else {
+ if (strncmp (pathordevice, "/dev/", 5) == 0) {
+ buf = pathordevice;
+ IS_DEVICE (buf, -1);
+ } else {
len = strlen (pathordevice) + 9;
freeit = 1;
buf = malloc (len);
return ret;
}
-/* Only unmount stuff under /sysroot */
+/* Unmount everything mounted under /sysroot.
+ *
+ * We have to unmount in the correct order, so we sort the paths by
+ * longest first to ensure that child paths are unmounted by parent
+ * paths.
+ *
+ * This call is more important than it appears at first, because it
+ * is widely used by both test and production code in order to
+ * get back to a known state (nothing mounted, everything synchronized).
+ */
+static int
+compare_longest_first (const void *vp1, const void *vp2)
+{
+ char * const *p1 = (char * const *) vp1;
+ char * const *p2 = (char * const *) vp2;
+ int n1 = strlen (*p1);
+ int n2 = strlen (*p2);
+ return n2 - n1;
+}
+
int
do_umount_all (void)
{
- char **mounts;
+ char *out, *err;
int i, r;
- char *err;
+ char **mounts = NULL;
+ int size = 0, alloc = 0;
+ char *p, *p2, *p3, *pend;
- mounts = do_mounts ();
- if (mounts == NULL) /* do_mounts has already replied */
+ r = command (&out, &err, "mount", NULL);
+ if (r == -1) {
+ reply_with_error ("mount: %s", err);
+ free (out);
+ free (err);
return -1;
+ }
+
+ free (err);
+
+ p = out;
+ while (p) {
+ pend = strchr (p, '\n');
+ if (pend) {
+ *pend = '\0';
+ pend++;
+ }
- for (i = 0; mounts[i] != NULL; ++i) {
+ /* Lines have the format:
+ * /dev/foo on /mountpoint type ...
+ */
+ p2 = strstr (p, " on /sysroot");
+ if (p2 != NULL) {
+ p2 += 4;
+ p3 = p2 + strcspn (p2, " ");
+ *p3 = '\0';
+ if (add_string (&mounts, &size, &alloc, p2) == -1) {
+ free (out);
+ return -1;
+ }
+ }
+
+ p = pend;
+ }
+ free (out);
+
+ qsort (mounts, size, sizeof (char *), compare_longest_first);
+
+ /* Unmount them. */
+ for (i = 0; i < size; ++i) {
r = command (NULL, &err, "umount", mounts[i], NULL);
if (r == -1) {
reply_with_error ("umount: %s: %s", mounts[i], err);
free (err);
- free_strings (mounts);
+ free_stringslen (mounts, size);
return -1;
}
free (err);
}
- free_strings (mounts);
+ free_stringslen (mounts, size);
+
+ /* We've unmounted root now, so ... */
+ root_mounted = 0;
+
return 0;
}