summaryrefslogtreecommitdiff
path: root/include/vendor.sh
diff options
context:
space:
mode:
Diffstat (limited to 'include/vendor.sh')
-rw-r--r--include/vendor.sh11
1 files changed, 4 insertions, 7 deletions
diff --git a/include/vendor.sh b/include/vendor.sh
index d2f8ec26..7e3e99ae 100644
--- a/include/vendor.sh
+++ b/include/vendor.sh
@@ -157,8 +157,8 @@ extract_intel_me()
( fx_ find_me x_ find "$xbmkpwd/$appdir" -type f ) || :; :
set -u -e
- [ "$ME11bootguard" = "y" ] || x_ mv "$_metmp" "$_pre_dest"
- [ "$ME11bootguard" = "y" ] && apply_deguard_hack; :
+ [ "$ME11bootguard" != "y" ] && x_ mv "$_metmp" "$_pre_dest" && return 0
+ ( apply_deguard_hack ) || err "Error running deguard for $_dest"; :
}
find_me()
@@ -178,12 +178,9 @@ find_me()
apply_deguard_hack()
{
- (
- x_ cd src/deguard/
- x_ ./finalimage.py --delta "data/delta/$ME11delta" --version \
- "$ME11version" --pch "$ME11pch" --sku "$ME11sku" \
+ x_ cd src/deguard; x_ ./finalimage.py --delta "data/delta/$ME11delta" \
+ --version "$ME11version" --pch "$ME11pch" --sku "$ME11sku" \
--fake-fpfs data/fpfs/zero --input "$_metmp" --output "$_pre_dest"
- ) || err "Error running deguard for $_dest"; :
}
extract_archive()