[lxc-devel] [lxc-ci/master] images/opensuse: Use linux and initrd on aarch64

[monstermunchkin on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 303 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20200512/e9a68483/attachment.bin>
-------------- next part --------------
From 9072ca46a303fa62becbf3e7b34279b928c957b4 Mon Sep 17 00:00:00 2001
From: Thomas Hipp <thomas.hipp at canonical.com>
Date: Tue, 12 May 2020 15:01:28 +0200
Subject: [PATCH] images/opensuse: Use linux and initrd on aarch64

Use linux and initrd instead of linuxefi and initrdefi for aarch64 VMs.

Signed-off-by: Thomas Hipp <thomas.hipp at canonical.com>
---
 images/opensuse.yaml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/images/opensuse.yaml b/images/opensuse.yaml
index 221e68d..c4176ae 100644
--- a/images/opensuse.yaml
+++ b/images/opensuse.yaml
@@ -285,3 +285,16 @@ actions:
     sed -i "s#root=[^ ]*#root=/dev/sda2#g" /boot/grub2/grub.cfg
   types:
   - vm
+
+- trigger: post-files
+  action: |-
+    #!/bin/sh
+    set -eux
+
+    # linuxefi and initrdefi don't seem to exist for aarch64.
+    # Instead, we should use linux and initrd.
+    sed -i "s#linuxefi#linux#g;s#initrdefi#initrd#g" /boot/grub2/grub.cfg
+  types:
+  - vm
+  architectures:
+  - aarch64