typedef struct MountPoint {
char *path;
dev_t devnum;
+ bool skip_ro;
LIST_FIELDS (struct MountPoint, mount_point);
} MountPoint;
for (i = 1;; i++) {
int k;
MountPoint *m;
+ char *root;
+ bool skip_ro;
path = p = NULL;
"%*s " /* (1) mount id */
"%*s " /* (2) parent id */
"%*s " /* (3) major:minor */
- "%*s " /* (4) root */
+ "%ms " /* (4) root */
"%ms " /* (5) mount point */
"%*s" /* (6) mount options */
"%*[^-]" /* (7) optional fields */
"%*s" /* (10) mount source */
"%*s" /* (11) mount options 2 */
"%*[^\n]", /* some rubbish at the end */
- &path)) != 1) {
+ &root,
+ &path)) != 2) {
if (k == EOF)
break;
continue;
}
+ /* If we encounter a bind mount, don't try to remount
+ * the source dir too early */
+ skip_ro = !streq(root, "/");
+ free(root);
+
p = cunescape(path);
free(path);
}
m->path = p;
+ m->skip_ro = skip_ro;
LIST_PREPEND(MountPoint, mount_point, *head, m);
}
int fd, r;
if ((fd = open(device, O_RDONLY|O_CLOEXEC)) < 0)
- return -errno;
+ return errno == ENOENT ? 0 : -errno;
r = ioctl(fd, LOOP_CLR_FD, 0);
close_nointr_nofail(fd);
LIST_FOREACH_SAFE(mount_point, m, n, *head) {
+ if (m->skip_ro) {
+ n_failed++;
+ continue;
+ }
+
/* Trying to remount read-only */
if (mount(NULL, m->path, NULL, MS_MGC_VAL|MS_REMOUNT|MS_RDONLY, NULL) == 0) {
if (changed)