From 6294534553f051ef4aea3c87523f53d715b5b0fa Mon Sep 17 00:00:00 2001 From: Ettore Di Giacinto Date: Tue, 11 Oct 2022 19:18:33 +0200 Subject: [PATCH] Consume default config from kairos --- packages/livecd/grub2/build.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/livecd/grub2/build.yaml b/packages/livecd/grub2/build.yaml index d52c397..1c4b38a 100644 --- a/packages/livecd/grub2/build.yaml +++ b/packages/livecd/grub2/build.yaml @@ -13,6 +13,7 @@ prelude: - grub2-mkimage -O i386-pc -o /usr/share/grub2/i386-pc/core.img -p /boot/grub2 -d /usr/share/grub2/i386-pc ext2 iso9660 linux echo configfile search_label search_fs_file search search_fs_uuid ls normal gzio png fat gettext font minicmd gfxterm gfxmenu all_video xfs btrfs lvm luks gcry_rijndael gcry_sha256 gcry_sha512 crypto cryptodisk test true loadenv part_gpt part_msdos biosdisk vga vbe chain boot - cat /usr/share/grub2/i386-pc/cdboot.img /usr/share/grub2/i386-pc/core.img > /usr/share/grub2/i386-pc/eltorito.img {{end}} +- git clone https://github.com/kairos-io/kairos && cd kairos && git checkout -b v"{{.Values.kairos_tag}}" steps: {{if eq .Values.name "grub2"}} @@ -28,7 +29,8 @@ steps: - mkdir -p /boot/grub2/i386-pc && cp -p /usr/share/grub2/i386-pc/* /boot/grub2/i386-pc/ - mkdir -p /boot/x86_64/loader - cp -p /usr/share/grub2/i386-pc/eltorito.img /usr/share/grub2/i386-pc/boot_hybrid.img /usr/share/syslinux/isolinux.bin /usr/share/syslinux/menu.c32 /usr/share/syslinux/chain.c32 /usr/share/syslinux/mboot.c32 /boot/x86_64/loader -- cp -p config/grub_live.cfg /boot/grub2/grub.cfg +- cp -p kairos/overlay/files-iso/boot/grub2/grub.cfg /boot/grub2/grub.cfg +#- cp -p config/grub_live.cfg /boot/grub2/grub.cfg {{end}} {{if eq .Values.name "grub2-efi-image"}} {{if .Values.arch }} @@ -49,4 +51,4 @@ steps: {{end}} - cp config/grub_live_efi.cfg /EFI/BOOT/grub.cfg {{end}} -{{ end }} \ No newline at end of file +{{ end }}