diff --git a/device_w7.mk b/device_w7.mk index c52905d..8f73db9 100644 --- a/device_w7.mk +++ b/device_w7.mk @@ -98,7 +98,6 @@ PRODUCT_COPY_FILES += \ # Ramdisk PRODUCT_COPY_FILES += \ device/lge/w7/rootdir/fstab.w7:root/fstab.w7 \ - device/lge/w7/rootdir/fstab_f2fs.w7:root/fstab_f2fs.w7 \ device/lge/w7/rootdir/init.class_main.sh:root/init.class_main.sh \ device/lge/w7/rootdir/init.lge.early.rc:root/init.lge.early.rc \ device/lge/w7/rootdir/init.lge.rc:root/init.lge.rc \ @@ -119,9 +118,7 @@ PRODUCT_COPY_FILES += \ device/lge/w7/rootdir/init.zetaw.syspart_fixup.sh:root/init.zetaw.syspart_fixup.sh \ device/lge/w7/rootdir/init.zetaw.usb.rc:root/init.zetaw.usb.rc \ device/lge/w7/rootdir/init.zetaw.usb.sh:root/init.zetaw.usb.sh \ - device/lge/w7/rootdir/ueventd.w7.rc:root/ueventd.w7.rc \ - device/lge/w7/rootdir/sbin/bbx:root/sbin/bbx \ - device/lge/w7/rootdir/fscheck.sh:root/fscheck.sh + device/lge/w7/rootdir/ueventd.w7.rc:root/ueventd.w7.rc # TWRP PRODUCT_COPY_FILES += \ diff --git a/rootdir/fscheck.sh b/rootdir/fscheck.sh deleted file mode 100644 index 29a3779..0000000 --- a/rootdir/fscheck.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/sbin/bbx sh - -FSTYPE=`/sbin/bbx blkid /dev/block/mmcblk0p34 | /sbin/bbx cut -d ' ' -f3 | /sbin/bbx cut -d '"' -f2` - -if [ "$FSTYPE" == "ext4" ] -then - /sbin/bbx rm /fstab_f2fs.w7 -else - /sbin/bbx cp -f /fstab_f2fs.w7 /etc/recovery.fstab - /sbin/bbx mv -f /fstab_f2fs.w7 /fstab.w7 -fi diff --git a/rootdir/fstab.w7 b/rootdir/fstab.w7 index 68fa871..4268dfc 100644 --- a/rootdir/fstab.w7 +++ b/rootdir/fstab.w7 @@ -9,8 +9,10 @@ /devices/msm_sdcc.2/mmc_host auto vfat defaults voldmanaged=sdcard1:auto,noemulatedsd /dev/block/platform/msm_sdcc.1/by-name/system /system ext4 ro,barrier=1 wait,check /dev/block/platform/msm_sdcc.1/by-name/userdata /data ext4 noatime,nosuid,nodev,barrier=1,noauto_da_alloc,discard,data=ordered,errors=continue wait,check,encryptable=/dev/block/platform/msm_sdcc.1/by-name/encrypt +/dev/block/platform/msm_sdcc.1/by-name/userdata /data f2fs rw,discard,nosuid,nodev,noatime,nodiratime,inline_xattr,errors=recover wait,nonremovable,encryptable=footer,length=-16384 /dev/block/platform/msm_sdcc.1/by-name/persist /persist ext4 nosuid,nodev,barrier=1,data=ordered,nodelalloc wait,check /dev/block/platform/msm_sdcc.1/by-name/cache /cache ext4 noatime,nosuid,nodev,barrier=1,data=ordered wait,check +/dev/block/platform/msm_sdcc.1/by-name/cache /cache f2fs rw,discard,nosuid,nodev,noatime,nodiratime,inline_xattr,errors=recover wait,nonremovable,length=-16384 /dev/block/platform/msm_sdcc.1/by-name/drm /persist-lg ext4 nosuid,nodev,barrier=1,data=ordered wait,check /dev/block/platform/msm_sdcc.1/by-name/mpt /mpt ext4 nosuid,nodev,barrier=1,data=ordered wait,check /dev/block/platform/msm_sdcc.1/by-name/sns /sns ext4 nosuid,nodev,barrier=1,data=ordered wait,check diff --git a/rootdir/fstab_f2fs.w7 b/rootdir/fstab_f2fs.w7 deleted file mode 100644 index c6e3103..0000000 --- a/rootdir/fstab_f2fs.w7 +++ /dev/null @@ -1,19 +0,0 @@ -# Android fstab file. -# The filesystem that contains the filesystem checker binary (typically /system) cannot -# specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK - -#TODO: Add 'check' as fs_mgr_flags with data partition. -# Currently we dont have e2fsck compiled. So fs check would failed. -# -# -/devices/msm_sdcc.2/mmc_host auto vfat defaults voldmanaged=sdcard1:auto,noemulatedsd -/dev/block/platform/msm_sdcc.1/by-name/system /system ext4 ro,barrier=1 wait,check -/dev/block/platform/msm_sdcc.1/by-name/userdata /data f2fs rw,discard,nosuid,nodev,noatime,nodiratime,inline_xattr,errors=recover wait,nonremovable,encryptable=footer,length=-16384 -/dev/block/platform/msm_sdcc.1/by-name/persist /persist ext4 nosuid,nodev,barrier=1,data=ordered,nodelalloc wait,check -/dev/block/platform/msm_sdcc.1/by-name/cache /cache f2fs rw,discard,nosuid,nodev,noatime,nodiratime,inline_xattr,errors=recover wait,nonremovable,length=-16384 -/dev/block/platform/msm_sdcc.1/by-name/drm /persist-lg ext4 nosuid,nodev,barrier=1,data=ordered wait,check -/dev/block/platform/msm_sdcc.1/by-name/mpt /mpt ext4 nosuid,nodev,barrier=1,data=ordered wait,check -/dev/block/platform/msm_sdcc.1/by-name/sns /sns ext4 nosuid,nodev,barrier=1,data=ordered wait,check -/dev/block/platform/msm_sdcc.1/by-name/boot /boot emmc defaults defaults -/dev/block/platform/msm_sdcc.1/by-name/recovery /recovery emmc defaults defaults -/dev/block/platform/msm_sdcc.1/by-name/misc /misc emmc defaults defaults diff --git a/rootdir/init.w7.rc b/rootdir/init.w7.rc index 9127300..b70123a 100755 --- a/rootdir/init.w7.rc +++ b/rootdir/init.w7.rc @@ -8,10 +8,6 @@ on early-init on init - chmod 755 /sbin/bbx - chmod 755 /fscheck.sh - exec /fscheck.sh - # CM: We use our own ril-daemon service definition, see mmi-ril-daemon stop ril-daemon diff --git a/rootdir/sbin/bbx b/rootdir/sbin/bbx deleted file mode 100755 index ab9e099..0000000 Binary files a/rootdir/sbin/bbx and /dev/null differ