Merge ~alextu/pc-enablement/+git/oem-fix-misc-cnl-oem-image-helper:steps-to-support-ubuntu-recovery-injection into ~oem-solutions-engineers/pc-enablement/+git/oem-fix-misc-cnl-oem-image-helper:master

[Alex Tu]

Unmerged commits

ee686e4... by Alex Tu on 2021-05-03

prepare local archive for /cdrom/debs for ubuntu-recovery

ce6eb88... by Alex Tu on 2021-05-03

Merge tag 'oem-fix-misc-cnl-oem-image-helper_fish9' into HEAD

e4a15ea... by Alex Tu on 2021-03-15

remove image-helper in the end of os-post

249cf2f... by Alex Tu on 2021-03-15

change file mode

73f097a... by Alex Tu on 2021-01-14

move the clean of image-helper to os-post so that scripts can use it in os-post

3b71f2e... by Alex Tu on 2019-12-06

update deb

179584f... by Alex Tu on 2019-12-05

bump version for oem-image-helper

9b2540f... by Alex Tu on 2019-07-15

repack with re-named package

598458a... by Alex Tu on 2019-07-15

update debs

d1bb091... by Alex Tu on 2018-12-06

oem-image-helper fish

diff --git a/debs/oem-fix-misc-cnl-oem-image-helper_0.3.5_all.deb b/debs/oem-fix-misc-cnl-oem-image-helper_0.3.5_all.deb
new file mode 100644
index 0000000..81591ad
Binary files /dev/null and b/debs/oem-fix-misc-cnl-oem-image-helper_0.3.5_all.deb differ
diff --git a/prepackage.dell b/prepackage.dell
new file mode 100644
index 0000000..6c4b0b6
--- /dev/null
+++ b/prepackage.dell
@@ -0,0 +1,3 @@
+fccfbc49092bc895201ce93c90e32769  ./debs/oem-fix-misc-cnl-oem-image-helper_0.3.5~test1_all.deb
+c818e31927a143cec5443001ecf94da4  ./scripts/chroot-scripts/fish/01-oem-image-helper-install.sh
+85510dc5d5d28e522f344d9941955a46  ./scripts/chroot-scripts/fish/99-oem-image-helper-remove.sh
diff --git a/scripts/chroot-scripts/fish/01-oem-image-helper-install.sh b/scripts/chroot-scripts/fish/01-oem-image-helper-install.sh
new file mode 100755
index 0000000..b45ab37
--- /dev/null
+++ b/scripts/chroot-scripts/fish/01-oem-image-helper-install.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+set -x
+# if /cdrom/debs not in local archives, then prepare it(for ubuntu-recovery).
+if [ -z "$(apt-cache search oem-fix-misc-cnl-oem-image-helper)" ]; then
+    mkdir /tmp/cdrom_debs
+    apt-ftparchive packages /cdrom/debs > /tmp/cdrom_debs/Packages
+    echo 'deb [ trusted=yes ] file:/. /tmp/cdrom_debs/' >> /etc/apt/sources.list.d/$(basename $0)_$$.list
+    sudo apt-get update
+fi
+
+apt-get install -y oem-fix-misc-cnl-oem-image-helper --allow-unauthenticated
diff --git a/scripts/chroot-scripts/os-post/99-oem-image-helper-remove.sh b/scripts/chroot-scripts/os-post/99-oem-image-helper-remove.sh
new file mode 100755
index 0000000..10174a9
--- /dev/null
+++ b/scripts/chroot-scripts/os-post/99-oem-image-helper-remove.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+apt-get purge -y oem-fix-misc-cnl-oem-image-helper