StrixOS/vendor_strix
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

lineage: env: fixup recovery fstab path

Browse Source 
Change-Id: I36860bdee4f9d3c186ca643becb37ad20213628c
This commit is contained in:
Alessandro Astone
2019-09-06 13:07:03 +02:00
committed by Michael Bestas
parent da2c7502a3
commit f8f4877abb
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
build/envsetup.sh
View File

@@ -358,7 +358,7 @@ function githubremote()
function installboot()
{
if [ ! -e "$OUT/recovery/root/etc/recovery.fstab" ];
if [ ! -e "$OUT/recovery/root/system/etc/recovery.fstab" ];
then
echo "No recovery.fstab found. Build recovery first."
return 1
@@ -368,12 +368,12 @@ function installboot()
echo "No boot.img found. Run make bootimage first."
return 1
fi
PARTITION=`grep "^\/boot" $OUT/recovery/root/etc/recovery.fstab | awk {'print $3'}`
PARTITION=`grep "^\/boot" $OUT/recovery/root/system/etc/recovery.fstab | awk {'print $3'}`
if [ -z "$PARTITION" ];
then
# Try for RECOVERY_FSTAB_VERSION = 2
PARTITION=`grep "[[:space:]]\/boot[[:space:]]" $OUT/recovery/root/etc/recovery.fstab | awk {'print $1'}`
PARTITION_TYPE=`grep "[[:space:]]\/boot[[:space:]]" $OUT/recovery/root/etc/recovery.fstab | awk {'print $3'}`
PARTITION=`grep "[[:space:]]\/boot[[:space:]]" $OUT/recovery/root/system/etc/recovery.fstab | awk {'print $1'}`
PARTITION_TYPE=`grep "[[:space:]]\/boot[[:space:]]" $OUT/recovery/root/system/etc/recovery.fstab | awk {'print $3'}`
if [ -z "$PARTITION" ];
then
echo "Unable to determine boot partition."
@@ -407,7 +407,7 @@ function installboot()
function installrecovery()
{
if [ ! -e "$OUT/recovery/root/etc/recovery.fstab" ];
if [ ! -e "$OUT/recovery/root/system/etc/recovery.fstab" ];
then
echo "No recovery.fstab found. Build recovery first."
return 1
@@ -417,12 +417,12 @@ function installrecovery()
echo "No recovery.img found. Run make recoveryimage first."
return 1
fi
PARTITION=`grep "^\/recovery" $OUT/recovery/root/etc/recovery.fstab | awk {'print $3'}`
PARTITION=`grep "^\/recovery" $OUT/recovery/root/system/etc/recovery.fstab | awk {'print $3'}`
if [ -z "$PARTITION" ];
then
# Try for RECOVERY_FSTAB_VERSION = 2
PARTITION=`grep "[[:space:]]\/recovery[[:space:]]" $OUT/recovery/root/etc/recovery.fstab | awk {'print $1'}`
PARTITION_TYPE=`grep "[[:space:]]\/recovery[[:space:]]" $OUT/recovery/root/etc/recovery.fstab | awk {'print $3'}`
PARTITION=`grep "[[:space:]]\/recovery[[:space:]]" $OUT/recovery/root/system/etc/recovery.fstab | awk {'print $1'}`
PARTITION_TYPE=`grep "[[:space:]]\/recovery[[:space:]]" $OUT/recovery/root/system/etc/recovery.fstab | awk {'print $3'}`
if [ -z "$PARTITION" ];
then
echo "Unable to determine recovery partition."