From ac51e094923adf577c22d1dd5f8a0230b790a3bc Mon Sep 17 00:00:00 2001 From: Jeffy Chen Date: Fri, 19 Aug 2022 10:52:27 +0800 Subject: [PATCH] post-build.sh: Fixup basic partitions in /etc/fstab Change-Id: I84d226c799611e01c9ae974492f15d622c509abd Signed-off-by: Jeffy Chen --- common/post-build.sh | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/common/post-build.sh b/common/post-build.sh index 965b1ce..fd980c2 100755 --- a/common/post-build.sh +++ b/common/post-build.sh @@ -23,7 +23,20 @@ function fixup_root() ${TARGET_DIR}/etc/fstab } -partition_arg() { +function fixup_basic() +{ + echo "Fixing up basic partition: $@" + + FS_TYPE="$1" + MOUNT_POINT="$2" + MOUNT_OPTS="${3:-defaults}" + + sed -i "/[[:space:]]$FS_TYPE[[:space:]]/d" ${TARGET_DIR}/etc/fstab + echo -e "${FS_TYPE}\t${MOUNT_POINT}\t${FS_TYPE}\t${MOUNT_OPTS}\t0 0" >> \ + ${TARGET_DIR}/etc/fstab +} + +function partition_arg() { PART="$1" I="$2" DEFAULT="$3" @@ -68,13 +81,12 @@ function fixup_fstab() ;; esac - sed -i "/[[:space:]]debugfs[[:space:]]/d" ${TARGET_DIR}/etc/fstab - echo -e "debugfs\t/sys/kernel/debug\tdebugfs\tdefaults\t0 0" >> \ - ${TARGET_DIR}/etc/fstab - - sed -i "/[[:space:]]pstore[[:space:]]/d" ${TARGET_DIR}/etc/fstab - echo -e "pstore\t/sys/fs/pstore\tpstore\tdefaults\t0 0" >> \ - ${TARGET_DIR}/etc/fstab + fixup_basic proc /proc + fixup_basic devpts /dev/pts mode=0620,ptmxmode=0666,gid=5 + fixup_basic tmpfs /dev/shm nosuid,nodev,noexec + fixup_basic sysfs /sys + fixup_basic debugfs /sys/kernel/debug + fixup_basic pstore /sys/fs/pstore if echo $TARGET_DIR | grep -qE "_recovery/target/*$"; then fixup_part "/dev/sda1:/mnt/udisk:auto:defaults::"