[lxc-devel] [lxc-ci/master] images/archlinux: Exclude fallback initramfs

[monstermunchkin on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 543 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20200304/731b048c/attachment.bin>
-------------- next part --------------
From a5e6bee4b02640abeeaefc276a5b2a8baaabbbbb Mon Sep 17 00:00:00 2001
From: Thomas Hipp <thomas.hipp at canonical.com>
Date: Wed, 4 Mar 2020 11:53:15 +0100
Subject: [PATCH] images/archlinux: Exclude fallback initramfs

This excludes the fallback initramfs. It's usually not needed and
currently causes some issues when building it.

Also, use `mkinicpio -P` which simply considers all preset files.

Signed-off-by: Thomas Hipp <thomas.hipp at canonical.com>
---
 images/archlinux.yaml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/images/archlinux.yaml b/images/archlinux.yaml
index 9c3cfe8..fe058fb 100644
--- a/images/archlinux.yaml
+++ b/images/archlinux.yaml
@@ -627,12 +627,10 @@ actions:
       # Rebuild initrd
       sed -i 's#^MODULES=.*#MODULES=(virtio_pci virtio_scsi virtio_console)#' /etc/mkinitcpio.conf
 
-      if [ "${TARGET}" = "x86_64" ]; then
-        mkinitcpio -p linux
-      else
-        mkinitcpio -p linux-$(uname -m)
-      fi
+      sed -i 's#^PRESETS=.*#PRESETS=(default)#' /etc/mkinitcpio.d/*.preset
+      mkinitcpio -P
     types:
       - vm
+
 mappings:
   architecture_map: archlinux