The following pull request was submitted through Github.
It can be accessed and reviewed at: https://github.com/lxc/lxc-ci/pull/117
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) ===
Signed-off-by: Thomas Hipp <thomas.h...@canonical.com>
From a8770ab4e8cb4733d60b0a83cfa88b76a89b88b0 Mon Sep 17 00:00:00 2001
From: Thomas Hipp <thomas.h...@canonical.com>
Date: Tue, 3 Mar 2020 15:12:00 +0100
Subject: [PATCH] images/fedora: Fix grub.cfg
Signed-off-by: Thomas Hipp <thomas.h...@canonical.com>
---
images/fedora.yaml | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/images/fedora.yaml b/images/fedora.yaml
index 40e2cdf..9c6ab68 100644
--- a/images/fedora.yaml
+++ b/images/fedora.yaml
@@ -242,8 +242,12 @@ actions:
#!/bin/sh
set -eux
- grub2-mkconfig -o $(readlink -f /etc/grub2-efi.cfg)
- sed -i "s#root=[^ ]*#root=/dev/sda2#g" /etc/grub2-efi.cfg
+ # Remove the "Container Image" string as this is going to be am VM
+ sed -i 's/[ ]*(Container Image)//;/^VARIANT/d' /etc/os-release
+
+ target="$(readlink -f /etc/grub2-efi.cfg)"
+ grub2-mkconfig -o "${target}"
+ sed -i "s#root=[^ ]*#root=/dev/sda2#g" "${target}"
# Regenerate initramfs
kver=$(ls /boot/initramfs-*.img | sed -r 's#.*initramfs-(.+)\.img#\1#')
@@ -253,8 +257,5 @@ actions:
for f in $(find /etc/systemd/system -type l); do
[[ "$(readlink ${f})" == /dev/null ]] && rm "${f}"
done
-
- # Remove the "Container Image" string as this is going to be am VM
- sed -i 's/[ ]*(Container Image)//;/^VARIANT/d' /etc/os-release
types:
- vm
_______________________________________________
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel
