X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fumount.c;h=2ae8f86ecd103cc98ff01dee344343a2f7a5c1f7;hp=c7f62081d204bc11d4f450d60cc89671dec70a82;hb=761163046260b42c0bed075c17d43e0e6c3dd3a4;hpb=12aad1d075a6cfa23920b977146e79d8154f2540 diff --git a/src/umount.c b/src/umount.c index c7f62081d..2ae8f86ec 100644 --- a/src/umount.c +++ b/src/umount.c @@ -105,7 +105,7 @@ static int mount_points_list_get(MountPoint **head) { goto finish; } - if (mount_point_is_api(p)) { + if (mount_point_is_api(p) || mount_point_ignore(p)) { free(p); continue; } @@ -223,7 +223,6 @@ static int loopback_list_get(MountPoint **head) { } first = udev_enumerate_get_list_entry(e); - udev_list_entry_foreach(item, first) { MountPoint *lb; struct udev_device *d; @@ -401,12 +400,13 @@ static int mount_points_list_umount(MountPoint **head, bool *changed) { assert(head); LIST_FOREACH_SAFE(mount_point, m, n, *head) { - if (streq(m->path, "/")) + if (streq(m->path, "/")) { + n_failed++; continue; + } /* Trying to umount. Forcing to umount if busy (only for NFS mounts) */ if (umount2(m->path, MNT_FORCE) == 0) { - if (changed) *changed = true;