@@ -123,18 +123,16 @@ echo -e "$build_text: ${INPUT##*/} ($partition) ➠ ($CONVER)...\n"
123123# patch fstab
124124if [ " $AVBIMG " == 1 ]; then
125125rm -fr $INPUT /bin/install-recovery.sh $INPUT /etc/init/vendor_flash_recovery.rc $INPUT /recovery-from-boot.p $INPUT /verity_key
126- listfab=" $( find " $INPUT " / * ramdisk -type f -name " fstab. *" 2> /dev/null) "
126+ listfab=" $( find " $INPUT " -type f -name " fstab*" 2> /dev/null) "
127127for fstab in $listfab ; do
128128 if [ -f " $fstab " ]; then
129129 if [ " $2 " == 1 ]; then
130130 if [[ -n $( cat " $fstab " | grep -v " avb_keys=/avb/q-gsi.avbpubkey:/avb/r-gsi.avbpubkey:/avb/s-gsi.avbpubkey" | grep -i " avb" ) ]]; then
131- sed -i " s/avb,//g; s/,avb=vbmeta //g; s/,avb=.*system //g; s/,avb=.*vendor //g; s/,avb=.*vbmeta //g; s/,avb_keys.*key //g; s/,avb//g; s/,,/,/g" " $fstab "
131+ sed -i " s/avb,//g; s/,avb=.*system //g; s/,avb=.*vendor //g; s/,avb=.*vbmeta //g; s/,avb_keys.*key //g; s/,avb=vbmeta //g; s/,avb//g; s/,,/,/g" " $fstab "
132132 echo " Deleted avb in fstab: ${fstab##*/ } "
133133 fi
134- if [[ -n $( cat " $fstab " | egrep -i " fileencryption|keydirectory" ) ]]; then
135- sed -i ' s/fileencryption=[^,]*,//' " $fstab "
136- sed -i ' s/keydirectory=[^,]*,//' " $fstab "
137- sed -i ' s/metadata_encryption=[^,]*,//' " $fstab "
134+ if [[ -n $( cat " $fstab " | egrep -i " fileencryption|keydirectory|metadata_encryption" ) ]]; then
135+ sed -i -e ' s/fileencryption=[^,]*,//' -e ' s/keydirectory=[^,]*,//' -e ' s/metadata_encryption=[^,]*,//' " $fstab "
138136 echo " Decrypted data: ${fstab##*/ } "
139137 fi
140138 fi
0 commit comments