From 5eeaade7a40a8b769c34ed5643d89c1a1025ee8d Mon Sep 17 00:00:00 2001 From: Randall Huang Date: Thu, 6 Jan 2022 16:49:38 +0800 Subject: [PATCH] storage: remove convert_to_f2fs.sh No longer need this script. Bug: 207031989 Test: boot to home, make sure all f2fs partitions are mounted Signed-off-by: Randall Huang Change-Id: I882084fb3a7cf1771e146d7d950ee4a5106792fe --- conf/init.gs201.rc | 12 ------- convert_to_f2fs.sh | 81 ---------------------------------------------- device.mk | 4 --- 3 files changed, 97 deletions(-) delete mode 100644 convert_to_f2fs.sh diff --git a/conf/init.gs201.rc b/conf/init.gs201.rc index 8b3068cb..6d03ed8d 100644 --- a/conf/init.gs201.rc +++ b/conf/init.gs201.rc @@ -14,18 +14,6 @@ service vendor.charger /system/bin/charger file /proc/last_kmsg r on early-init - # Convert /dev/block/by-name/persist to f2fs - exec -- /vendor/bin/convert_to_f2fs.sh /dev/block/by-name/persist false - - # Format /efs to f2fs, if it's ext4 - exec -- /vendor/bin/convert_to_f2fs.sh /dev/block/by-name/efs true - - # Format /efs_backup to f2fs, if it's ext4 - exec -- /vendor/bin/convert_to_f2fs.sh /dev/block/by-name/efs_backup true - - # Format /modem_userdata to f2fs, if it's ext4 - exec -- /vendor/bin/convert_to_f2fs.sh /dev/block/by-name/modem_userdata true - mount_all /vendor/etc/fstab.persist --early on init diff --git a/convert_to_f2fs.sh b/convert_to_f2fs.sh deleted file mode 100644 index 806964c3..00000000 --- a/convert_to_f2fs.sh +++ /dev/null @@ -1,81 +0,0 @@ -#!/bin/sh - -BLK=$1 -FORMAT_ONLY=$2 -MNT_OLD="/mnt/convert_old" -MNT_NEW="/mnt/convert_new" - -function log() { - if [ ! -z "$1" ]; then - echo "partition_convert: $1" > /dev/kmsg - fi -} - -function check_success() { - if [ $? -ne 0 ]; then - log "Failed: $1" - exit -1 - fi - log "Success: $1" -} - -F2FS_MAGIC=$(xxd $BLK -s 0x400 -l 4 -p) -if [ "$F2FS_MAGIC" = "1020f5f2" ]; then - log "$BLK is already f2fs - skipping" - exit 0 -fi - -EXT4_MAGIC=$(xxd $BLK -s 0x438 -l 2 -p) -if [ "$EXT4_MAGIC" != "53ef" ]; then - log "Unknown filesystem $EXT4_MAGIC" - exit -1 -fi - -if [ $FORMAT_ONLY == "true" ]; then - make_f2fs $BLK 2>&1 > /dev/null - check_success "make_f2fs $BLK" - sync - check_success "sync" - exit 0 -fi - -mkdir -p $MNT_OLD -check_success "mkdir $MNT_OLD" - -mkdir -p $MNT_NEW -check_success "mkdir $MNT_NEW" - -mount -t ext4 $BLK $MNT_OLD -check_success "mount $MNT_OLD as ext4" - -mount -t tmpfs tmpfs $MNT_NEW -check_success "mount $MNT_NEW as tmpfs" - -cp -rp $MNT_OLD/* $MNT_NEW/ -check_success "copy $MNT_OLD to $MNT_NEW" - -umount $MNT_OLD -check_success "umount $MNT_OLD" - -make_f2fs $BLK 2>&1 > /dev/null -check_success "make_f2fs $BLK" - -mount -t f2fs $BLK $MNT_OLD -check_success "mount $MNT_OLD as f2fs" - -cp -rp $MNT_NEW/* $MNT_OLD/ -check_success "copy $MNT_NEW to $MNT_OLD" - -sync -check_success "sync" - -umount $MNT_OLD -check_success "umount $MNT_OLD" -umount $MNT_NEW -check_success "umount $MNT_NEW" - -rmdir $MNT_OLD -check_success "rmdir $MNT_OLD" - -rmdir $MNT_NEW -check_success "rmdir $MNT_NEW" diff --git a/device.mk b/device.mk index 9c16da9e..36b1c8db 100644 --- a/device.mk +++ b/device.mk @@ -294,10 +294,6 @@ PRODUCT_PACKAGES += \ tune2fs.vendor_ramdisk \ resize2fs.vendor_ramdisk -# Filesystem: convert /dev/block/by-name/persist to f2fs -PRODUCT_COPY_FILES += \ - device/google/gs201/convert_to_f2fs.sh:$(TARGET_COPY_OUT_VENDOR)/bin/convert_to_f2fs.sh \ - # Userdata Checkpointing OTA GC PRODUCT_PACKAGES += \ checkpoint_gc