Merge 9ab9471aa6
into d54d0fff39
This commit is contained in:
commit
e6bbd1a832
|
@ -7445,9 +7445,14 @@ unshare_unmount_path(int op, char *path, int flags, boolean_t is_manual)
|
||||||
}
|
}
|
||||||
(void) fprintf(stderr, gettext("warning: %s not in"
|
(void) fprintf(stderr, gettext("warning: %s not in"
|
||||||
"/proc/self/mounts\n"), path);
|
"/proc/self/mounts\n"), path);
|
||||||
if ((ret = umount2(path, flags)) != 0)
|
if ((ret = umount2(path, flags)) != 0) {
|
||||||
(void) fprintf(stderr, gettext("%s: %s\n"), path,
|
(void) fprintf(stderr, gettext("%s: %s\n"), path,
|
||||||
strerror(errno));
|
strerror(errno));
|
||||||
|
if (ret == EPERM && geteuid() != 0) {
|
||||||
|
(void) fprintf(stderr, gettext("filesystems "
|
||||||
|
"may only be unmounted by root\n"));
|
||||||
|
}
|
||||||
|
}
|
||||||
return (ret != 0);
|
return (ret != 0);
|
||||||
}
|
}
|
||||||
path_inode = statbuf.st_ino;
|
path_inode = statbuf.st_ino;
|
||||||
|
|
Loading…
Reference in New Issue