Merge ~dannf/maas-images:i2c-arch-eval into maas-images:master

[dann frazier]

Tested by cut & pasting the cat > <<EOF sequence at a shell prompt and diff'ing the results:

$ diff -u /tmp/foo /tmp/bar
--- /tmp/foo 2018-12-14 12:20:28.587326091 -0700
+++ /tmp/bar 2018-12-14 12:20:53.507404464 -0700
@@ -5,7 +5,7 @@
 copy_modules_dir kernel/drivers/net/usb # LP: #1552378
 manual_add_modules bcache # LP: #1513176
 manual_add_modules hpilo # LP: #1761639
-case amd64 in
+case $(dpkg --print-architecture) in
     arm64)
         manual_add_modules i2c-thunderx # LP: #1702976
         ;;

[Scott Moser (smoser)]

it might be more straight forward to just quote the EOF

cat > file <<"EOF"
this stuff gets verbatum

EOF

[dann frazier (dannf)]

review: Needs Resubmitting

[Scott Moser (smoser)]

this looks fine to me. Thanks, Dan.

review: Approve

diff --git a/bin/kpack-from-image b/bin/kpack-from-image
index 356f6bc..f2652a3 100755
--- a/bin/kpack-from-image
+++ b/bin/kpack-from-image
@@ -183,7 +183,7 @@ kernel_from_mp() {
 config_addl_modules() {
     local root="${1:-/}" rel="$2" fname=""
     fname="${root%/}/etc/initramfs-tools/hooks/kpack_extra"
-    cat > "$fname" <<EOF
+    cat > "$fname" <<"EOF"
 #!/bin/sh
 . /usr/share/initramfs-tools/hook-functions