[lxc-devel] [lxc-ci/master] images: Add Debian VM support
monstermunchkin on Github
lxc-bot at linuxcontainers.org
Wed Feb 26 11:21:09 UTC 2020
A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 357 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20200226/a6cb3da3/attachment.bin>
-------------- next part --------------
From e7e2f40472c30e8b7f579529fcf16e0a5ee52b3a Mon Sep 17 00:00:00 2001
From: Thomas Hipp <thomas.hipp at canonical.com>
Date: Thu, 20 Feb 2020 10:53:29 +0100
Subject: [PATCH] images: Add Debian VM support
Signed-off-by: Thomas Hipp <thomas.hipp at canonical.com>
---
images/debian.yaml | 49 ++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 49 insertions(+)
diff --git a/images/debian.yaml b/images/debian.yaml
index ba57720..34663bf 100644
--- a/images/debian.yaml
+++ b/images/debian.yaml
@@ -847,6 +847,23 @@ files:
source /etc/network/interfaces.d/*.cfg
+ - path: /etc/default/grub.d/50-lxd.cfg
+ generator: dump
+ content: |-
+ # Set the recordfail timeout
+ GRUB_RECORDFAIL_TIMEOUT=0
+
+ # Do not wait on grub prompt
+ GRUB_TIMEOUT=0
+
+ # Set the default commandline
+ GRUB_CMDLINE_LINUX_DEFAULT="console=tty1 console=ttyS0"
+
+ # Set the grub console type
+ GRUB_TERMINAL=console
+ types:
+ - vm
+
- name: meta-data
generator: cloud-init
variants:
@@ -867,6 +884,15 @@ files:
variants:
- cloud
+ - name: lxd-agent
+ generator: lxd-agent
+ types:
+ - vm
+
+ - generator: fstab
+ types:
+ - vm
+
packages:
manager: apt
update: true
@@ -892,6 +918,15 @@ packages:
variants:
- cloud
+ - packages:
+ - grub-efi
+ - linux-image-amd64
+ - shim-signed
+ action: install
+ types:
+ - vm
+
+
repositories:
- name: sources.list
url: |-
@@ -922,5 +957,19 @@ actions:
# Cleanup temporary shadow paths
rm /etc/*-
+ - trigger: post-files
+ action: |-
+ #!/bin/sh
+ set -eux
+
+ update-grub
+ # This will create EFI/BOOT
+ grub-install --uefi-secure-boot --target=x86_64-efi --no-nvram --removable
+ # This will create EFI/debian
+ grub-install --uefi-secure-boot --target=x86_64-efi --no-nvram
+ update-grub
+ types:
+ - vm
+
mappings:
architecture_map: debian
More information about the lxc-devel
mailing list