From 72626c5076f132b037bb78289c42e02d9745b972 Mon Sep 17 00:00:00 2001 From: Chih-Wei Huang Date: Fri, 11 May 2018 19:58:00 +0800 Subject: [PATCH] 1-install: always install system.img in read-write mode Originally we install the whole system directory to ext4 in read-write mode. However, oreo-x86 fails to boot since SELinux file contexts are not defined. To solve that, just install system.img in read-write mode no matter what the destination filesystem is. --- Android.mk | 1 - install/scripts/1-install | 13 +++---------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/Android.mk b/Android.mk index 9b4eea8..08ea889 100644 --- a/Android.mk +++ b/Android.mk @@ -42,7 +42,6 @@ initrd_bin := \ $(wildcard $(initrd_dir)/*/*) systemimg := $(PRODUCT_OUT)/system.$(if $(MKSQUASHFS),sfs,img) -$(if $(MKSQUASHFS),$(systemimg): | $(MKSQUASHFS)) TARGET_INITRD_OUT := $(PRODUCT_OUT)/initrd INITRD_RAMDISK := $(TARGET_INITRD_OUT).img diff --git a/install/scripts/1-install b/install/scripts/1-install index cd13b4a..0c62368 100644 --- a/install/scripts/1-install +++ b/install/scripts/1-install @@ -482,19 +482,12 @@ install_to() set_answer_if_auto 0 adialog --title " Question " --defaultno --yesno \ "\nDo you want to install /system directory as read-write?\n\nMaking /system be read-write is easier for debugging, but it needs more disk space and longer installation time." 10 61 - instal_rw=$? - - files="mnt/$SRC/kernel mnt/$SRC/initrd.img mnt/$SRC/$RAMDISK" - if [ $instal_rw -eq 0 ]; then - if [ "$fs" = "vfat" -o "$fs" = "fuseblk" ]; then - [ -e /sfs/system.img ] && sysimg="/sfs/system.img" || sysimg="mnt/$SRC/system.*" - else - sysimg="android/system" - fi + if [ $? -eq 0 -a -e /sfs/system.img ]; then + sysimg="/sfs/system.img" else sysimg="mnt/$SRC/system.*" fi - files="$files $sysimg" + files="mnt/$SRC/kernel mnt/$SRC/initrd.img mnt/$SRC/$RAMDISK $sysimg" size=0 for s in `du -sk $files | awk '{print $1}'`; do size=$(($size+$s)) -- 2.11.0