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

Commit e3a3288d authored by Daniel Rosenberg's avatar Daniel Rosenberg
Browse files

resolve merge conflicts of 2857bd1e to nyc-dev 

Change-Id: I3dc666cd44deb3e8438c2a482328f79e7a67e81e
parents c2648132 2857bd1e

fs_mgr/fs_mgr.c

+12 −5
Original line number Diff line number Diff line
@@ -625,12 +625,19 @@ int fs_mgr_mount_all(struct fstab *fstab) 
                }

            }

            encryptable = FS_MGR_MNTALL_DEV_MIGHT_BE_ENCRYPTED;

        } else {

            if (fs_mgr_is_nofail(&fstab->recs[attempted_idx])) {

                ERROR("Ignoring failure to mount an un-encryptable or wiped partition on"

                       "%s at %s options: %s error: %s\n",

                       fstab->recs[attempted_idx].blk_device, fstab->recs[attempted_idx].mount_point,

                       fstab->recs[attempted_idx].fs_options, strerror(mount_errno));

            } else {

                ERROR("Failed to mount an un-encryptable or wiped partition on"

                       "%s at %s options: %s error: %s\n",

                       fstab->recs[attempted_idx].blk_device, fstab->recs[attempted_idx].mount_point,

                       fstab->recs[attempted_idx].fs_options, strerror(mount_errno));

                ++error_count;

            }

            continue;

        }

    }

fs_mgr/fs_mgr_fstab.c

+6 −0
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ static struct flag_list fs_mgr_flags[] = { 
    { "notrim",       MF_NOTRIM },

    { "formattable", MF_FORMATTABLE },

    { "slotselect",  MF_SLOTSELECT },

    { "nofail",      MF_NOFAIL },

    { "defaults",    0 },

    { 0,             0 },

};
@@ -502,3 +503,8 @@ int fs_mgr_is_slotselect(struct fstab_rec *fstab) 
{

    return fstab->fs_mgr_flags & MF_SLOTSELECT;

}



int fs_mgr_is_nofail(struct fstab_rec *fstab)

{

    return fstab->fs_mgr_flags & MF_NOFAIL;

}

fs_mgr/fs_mgr_priv.h

+1 −0
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ __BEGIN_DECLS 
#define MF_FORMATTABLE  0x4000

#define MF_SLOTSELECT   0x8000

#define MF_FORCEFDEORFBE 0x10000

#define MF_NOFAIL       0x40000



#define DM_BUF_SIZE 4096

fs_mgr/include/fs_mgr.h

+1 −0
Original line number Diff line number Diff line
@@ -106,6 +106,7 @@ int fs_mgr_is_convertible_to_fbe(const struct fstab_rec *fstab); 
int fs_mgr_is_noemulatedsd(const struct fstab_rec *fstab);

int fs_mgr_is_notrim(struct fstab_rec *fstab);

int fs_mgr_is_formattable(struct fstab_rec *fstab);

int fs_mgr_is_nofail(struct fstab_rec *fstab);

int fs_mgr_swapon_all(struct fstab *fstab);



int fs_mgr_do_format(struct fstab_rec *fstab);