The following pull request was submitted through Github.
It can be accessed and reviewed at: https://github.com/lxc/lxc-ci/pull/123

This e-mail was sent by the LXC bot, direct replies will not reach the author
unless they happen to be subscribed to this list.

=== Description (from pull-request) ===
On ARM machines, the preset file is named linux-<arch>.preset instead of
linux.preset.

Signed-off-by: Thomas Hipp <thomas.h...@canonical.com>
From 1be3ba8c37f3d9d56996f81a2c941d81cc650da4 Mon Sep 17 00:00:00 2001
From: Thomas Hipp <thomas.h...@canonical.com>
Date: Wed, 4 Mar 2020 09:02:34 +0100
Subject: [PATCH] images/archlinux: Choose correct linux*.preset file

On ARM machines, the preset file is named linux-<arch>.preset instead of
linux.preset.

Signed-off-by: Thomas Hipp <thomas.h...@canonical.com>
---
 images/archlinux.yaml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/images/archlinux.yaml b/images/archlinux.yaml
index 6ed62e2..9c3cfe8 100644
--- a/images/archlinux.yaml
+++ b/images/archlinux.yaml
@@ -626,7 +626,12 @@ actions:
 
       # Rebuild initrd
       sed -i 's#^MODULES=.*#MODULES=(virtio_pci virtio_scsi virtio_console)#' 
/etc/mkinitcpio.conf
-      mkinitcpio -p linux
+
+      if [ "${TARGET}" = "x86_64" ]; then
+        mkinitcpio -p linux
+      else
+        mkinitcpio -p linux-$(uname -m)
+      fi
     types:
       - vm
 mappings:
_______________________________________________
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel

Reply via email to