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

Commit 561498e3 authored by Tom Cherry's avatar Tom Cherry Committed by Gerrit Code Review
Browse files

Merge changes Ibdecf0c9,I41bd92a7,I5669ed10 

* changes:
  fs_mgr: test parsing all mount and fs mgr options
  fs_mgr: convert parse_flags over to C++
  fs_mgr: store file_contents_mode and file_names_mode directly
parents 2d3ef2a2 eb6da459

fs_mgr/fs_mgr_fstab.cpp

+270 −333

File changed.

Preview size limit exceeded, changes collapsed.

fs_mgr/include_fstab/fstab/fstab.h

+6 −6
Original line number Diff line number Diff line
@@ -54,8 +54,8 @@ struct fstab_rec { 
    int max_comp_streams;

    off64_t zram_size;

    off64_t reserved_size;

    int file_contents_mode;

    int file_names_mode;

    char* file_contents_mode;

    char* file_names_mode;

    off64_t erase_blk_size;

    off64_t logical_blk_size;

    char* sysfs_path;
@@ -118,19 +118,19 @@ struct FstabEntry { 
    int max_comp_streams = 0;

    off64_t zram_size = 0;

    off64_t reserved_size = 0;

    int file_contents_mode = 0;

    int file_names_mode = 0;

    std::string file_contents_mode;

    std::string file_names_mode;

    off64_t erase_blk_size = 0;

    off64_t logical_blk_size = 0;

    std::string sysfs_path;

    std::string vbmeta_partition;

    std::string zram_loopback_path;

    uint64_t zram_loopback_size;

    uint64_t zram_loopback_size = 512 * 1024 * 1024;  // 512MB by default;

    std::string zram_backing_dev_path;



    // TODO: Remove this union once fstab_rec is deprecated. It only serves as a

    // convenient way to convert between fstab_rec::fs_mgr_flags and these bools.

    union {

    union FsMgrFlags {

        uint64_t val;

        struct {

            // bit 0

fs_mgr/tests/data/fstab.example

+4 −0
Original line number Diff line number Diff line
@@ -9,3 +9,7 @@ 
/dev/block/bootdevice/by-name/modem                 /vendor/firmware_mnt          vfat        ro,shortname=lower,uid=1000,gid=1000,dmask=227,fmask=337,context=u:object_r:firmware_file:s0   wait,slotselect

/devices/platform/soc/a600000.ssusb/a600000.dwc3*   auto               vfat        defaults                                              voldmanaged=usb:auto

/dev/block/zram0                                    none               swap        defaults                                              zramsize=1073741824,max_comp_streams=8

/dev/block/zram0                                    none2              swap        nodiratime,remount,bind                               zramsize=1073741824,max_comp_streams=8

/dev/block/zram0                                    none3              swap        unbindable,private,slave                              zramsize=1073741824,max_comp_streams=8

/dev/block/zram0                                    none4              swap        noexec,shared,rec                                     zramsize=1073741824,max_comp_streams=8

/dev/block/zram0                                    none5              swap        rw                                                    zramsize=1073741824,max_comp_streams=8

fs_mgr/tests/fs_mgr_test.cpp

+792 −1

File changed.

Preview size limit exceeded, changes collapsed.