From dda63f7ce1fdddc181d767c16be7145357b3aab4 Mon Sep 17 00:00:00 2001 From: Peter Surda Date: Wed, 3 Mar 2021 12:30:15 +0100 Subject: [PATCH] fix: syslinux install order --- maas-images.inc | 2 +- syslinux.inc | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/maas-images.inc b/maas-images.inc index 8f56165..e3c6eba 100644 --- a/maas-images.inc +++ b/maas-images.inc @@ -37,7 +37,7 @@ function file_url() { local release_version="$1" local filename="$2" - local baseurl="https://images.maas.io/ephemeral-v3/stable/" + local baseurl="https://images.maas.io/ephemeral-v3/stable" if [ ! -f "$streams" ]; then return 1 diff --git a/syslinux.inc b/syslinux.inc index 2bc0719..a62f4c9 100644 --- a/syslinux.inc +++ b/syslinux.inc @@ -46,15 +46,8 @@ function install_syslinux() apt -yq install syslinux syslinux-common syslinux-efi - sleep 5 - dev_from_partnum "$drive" 1 - syslinux "$partition" - sync - sleep 5 dd bs=440 count=1 conv=notrunc \ if=/usr/lib/syslinux/mbr/gptmbr.bin of="$drive" - sync - sleep 5 mount_efi "$drive" @@ -71,6 +64,9 @@ function install_syslinux() cp syslinux/syslx64.cfg "$mnt"/EFI/BOOT umount_efi + + dev_from_partnum "$drive" 1 + syslinux "$partition" } # vim: set ft=sh: