Merge ~alextu/pc-enablement/+git/oem-scripts:fix-debsum into ~oem-solutions-engineers/pc-enablement/+git/oem-scripts:master

[Alex Tu]

[Alex Tu (alextu)]

[pass] testing Dell image on http://10.102.135.50:8080/job/sanity-3-testflinger-dummy-98000-40003-staging
[keep the same result] testing HP image on http://10.102.135.50:8080/job/sanity-3-testflinger-dummy-98000-40003-staging/10/console

This 2 MPs is needed to fix checkbox debsum issue.

https://code.launchpad.net/~oem-solutions-engineers/pc-enablement/+git/oem-fix-misc-cnl-skip-oobe/+merge/413421
https://code.launchpad.net/~alextu/pc-enablement/+git/oem-scripts/+merge/413422

[Cyrus Lien (cyruslien)]

LGTM.

review: Approve

[OEM Taipei Bot (oem-taipei-bot)]

[autopkgtest]
autopkgtest-collect-credentials PASS
autopkgtest-oem-scripts-auto PASS
pkg-somerville-meta PASS
pkg-stella-meta PASS
pkg-sutton-meta PASS
bootstrap-meta PASS
bug-bind PASS
get-private-ppa PASS
jq-lp PASS
launchpad-api PASS
lp-bug PASS
oem-meta-packages FAIL non-zero exit status 1
pkg-list PASS
review-merge-proposal PASS
run-autopkgtest PASS
setup-apt-dir PASS
mir-bug SKIP exit status 77 and marked as skippable
git-url-insteadof-setting PASS
lp-dl-attm PASS
recovery-from-iso.sh PASS

https://oem-share.canonical.com/partners/lyoncore/share/artifacts/oem-scripts/oem-scripts-1.26-7eb19d9-in-linux-container-focal

diff --git a/recovery-from-iso.sh b/recovery-from-iso.sh
index 3b42656..2d1aa7d 100755
--- a/recovery-from-iso.sh
+++ b/recovery-from-iso.sh
@@ -14,6 +14,9 @@ GIT="git -C $temp_folder"
 
 clear_all() {
     rm -rf "$temp_folder"
+    # remove Ubiquity in the end to match factory and Stock Ubuntu image behavior.
+    # and it also workaround some debsum error from ubiquity.
+    ssh -o StrictHostKeyChecking=no "$user_on_target"@"$target_ip" sudo apt-get purge -y ubiquity
 }
 trap clear_all EXIT
 # shellcheck disable=SC2046