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:oem-fix-misc-cnl-oem-image-helper_fish

[Alex Tu]

[Yuan-Chen Cheng (ycheng-twn)]

Change look good, however please share why this is needed.
This is not needed before, right?

review: Needs Fixing

[Alex Tu (alextu)]

So far, a lot of hacking for automation is based on dell-recovery with the foundation that /cdrom/debs be mounted during chroot scripts.

From the testing result of stella image, /cdrom/debs is not be as a local archive during all chroot scripts.

The easiest way to share those hacking for automation would be building up the foundation that /cdrom/debs be mounted during chroot scripts.

A quick testing with https://code.launchpad.net/~alextu/pc-enablement/+git/oem-scripts/+merge/402151 made a stella machine recovered with the hacking injected in recovery partition.

But so far, the part of skip oobe will stuck recovery process of Stella images which is something need to be fixed.

[Yuan-Chen Cheng (ycheng-twn)]

LGTM

review: Approve

diff --git a/scripts/chroot-scripts/fish/01-oem-image-helper-install.sh b/scripts/chroot-scripts/fish/01-oem-image-helper-install.sh
index f3d9bcd..b45ab37 100755
--- a/scripts/chroot-scripts/fish/01-oem-image-helper-install.sh
+++ b/scripts/chroot-scripts/fish/01-oem-image-helper-install.sh
@@ -1,3 +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