diff --git a/builder/build-iso.sh b/builder/build-iso.sh index 3d64fb3..05ad677 100755 --- a/builder/build-iso.sh +++ b/builder/build-iso.sh @@ -5,7 +5,7 @@ set -e # Note that these are packages installed to the Arch container used to build the ISO. pacman-key --init pacman --noconfirm -Sy archlinux-keyring -pacman --noconfirm -Sy archiso git sudo base-devel jq +pacman --noconfirm -Sy archiso git sudo base-devel jq grub # Setup build locations build_cache_dir="/var/cache" diff --git a/configs/profiledef.sh b/configs/profiledef.sh index 1785bbc..15105d9 100644 --- a/configs/profiledef.sh +++ b/configs/profiledef.sh @@ -2,15 +2,13 @@ # shellcheck disable=SC2034 iso_name="omarchy" -iso_label="ARCH_$(date --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y%m)" +iso_label="OMARCHY_$(date --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y%m)" iso_publisher="Omarchy " iso_application="Omarchy Installer" iso_version="$(date --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y.%m.%d)" install_dir="arch" buildmodes=('iso') -bootmodes=('bios.syslinux.mbr' 'bios.syslinux.eltorito' - 'uefi-ia32.systemd-boot.esp' 'uefi-x64.systemd-boot.esp' - 'uefi-ia32.systemd-boot.eltorito' 'uefi-x64.systemd-boot.eltorito') +bootmodes=('bios.syslinux.mbr' 'bios.syslinux.eltorito' 'uefi-x64.grub.esp' 'uefi-x64.grub.eltorito') arch="x86_64" pacman_conf="pacman.conf" airootfs_image_type="squashfs"