Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 13d62278 authored by Daniel Rosenberg's avatar Daniel Rosenberg Committed by Gerrit Code Review
Browse files

Merge "Skip mounting /, just mark block device as ro if needed."

parents 81fd50c3 31a4fafc

fs_mgr/fs_mgr.c

+8 −0
Original line number Diff line number Diff line
@@ -524,6 +524,14 @@ int fs_mgr_mount_all(struct fstab *fstab) 
            continue;

        }



        /* Skip mounting the root partition, as it will already have been mounted */

        if (!strcmp(fstab->recs[i].mount_point, "/")) {

            if ((fstab->recs[i].fs_mgr_flags & MS_RDONLY) != 0) {

                fs_mgr_set_blk_ro(fstab->recs[i].blk_device);

            }

            continue;

        }



        /* Translate LABEL= file system labels into block devices */

        if (!strcmp(fstab->recs[i].fs_type, "ext2") ||

            !strcmp(fstab->recs[i].fs_type, "ext3") ||