mirrors/libguestfs
1
0
Fork 0
mirror of https://github.com/libguestfs/libguestfs.git synced 2026-03-21 22:53:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

umount-all: Use /proc/mounts instead of output of 'mount' command.

Browse Source 
The particular issue is that ntfs-3g (or FUSE?) no longer appears
to update /etc/mtab, which meant that umount-all was not unmounting
these partitions.  But parsing /proc/mounts is simpler and more
robust in any case.
This commit is contained in:
Richard W.M. Jones
2011-03-22 11:15:21 +00:00
parent 1541f3a564
commit 4905604390
1 changed files with 25 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
daemon/mount.c
View File

@@ -298,50 +298,40 @@ compare_longest_first (const void *vp1, const void *vp2)
int
do_umount_all (void)
{
char *out, *err;
int i, r;
FILE *fp;
struct mntent *m;
char **mounts = NULL;
int size = 0, alloc = 0;
char *p, *p2, *p3, *pend;
char matching[5 + sysroot_len];
char *err;
int i, r;
r = command (&out, &err, "mount", NULL);
if (r == -1) {
reply_with_error ("mount: %s", err);
free (out);
free (err);
return -1;
/* NB: Eventually we should aim to parse /proc/self/mountinfo, but
* that requires custom parsing code.
*/
fp = setmntent ("/proc/mounts", "r");
if (fp == NULL) {
perror ("/proc/mounts");
exit (EXIT_FAILURE);
}
free (err);
/* Lines have the format:
* /dev/foo on /mountpoint type ...
*/
snprintf (matching, 5 + sysroot_len, " on %s", sysroot);
p = out;
while (p) {
pend = strchr (p, '\n');
if (pend) {
*pend = '\0';
pend++;
}
p2 = strstr (p, matching);
if (p2 != NULL) {
p2 += 4;
p3 = p2 + strcspn (p2, " ");
*p3 = '\0';
if (add_string (&mounts, &size, &alloc, p2) == -1) {
free (out);
while ((m = getmntent (fp)) != NULL) {
/* Allow a mount directory like "/sysroot". */
if (sysroot_len > 0 && STREQ (m->mnt_dir, sysroot)) {
if (add_string (&mounts, &size, &alloc, m->mnt_dir) == -1) {
endmntent (fp);
return -1;
}
}
/* Or allow a mount directory like "/sysroot/...". */
if (STRPREFIX (m->mnt_dir, sysroot) && m->mnt_dir[sysroot_len] == '/') {
if (add_string (&mounts, &size, &alloc, m->mnt_dir) == -1) {
endmntent (fp);
return -1;
}
}
p = pend;
}
free (out);
endmntent (fp);
qsort (mounts, size, sizeof (char *), compare_longest_first);