diff --git a/builder/online.sh b/builder/online.sh index 7ddd132..5765d5e 100755 --- a/builder/online.sh +++ b/builder/online.sh @@ -1,5 +1,4 @@ #!/bin/bash - set -e # Note that these are packages installed to the Arch container used to build the ISO. @@ -21,16 +20,14 @@ wget -qO "$cache_dir/airootfs/root/installer" https://raw.githubusercontent.com/ # Configure sudoers for passwordless installation # This allows the installer to run without password prompts -mkdir -p "$cache_dir/airootfs/etc/sudoers.d" -cp /builder/configs/sudo-less-installation "$cache_dir/airootfs/etc/sudoers.d/99-omarchy-installer" +# mkdir -p "$cache_dir/airootfs/etc/sudoers.d" +# cp /builder/configs/sudo-less-installation "$cache_dir/airootfs/etc/sudoers.d/99-omarchy-installer" -# We add in our auto-start applications -# First we'll check for an active internet connection -# Then we'll start the omarchy installer +# Ensure the Omarchy installer launches automatically on boot cp /builder/cmds/autostart.sh "$cache_dir/airootfs/root/.automated_script.sh" -# We patch permissions, grub and efi loaders to our liking: -(cd $cache_dir/ && git apply /builder/patches/permissions-online.patch) +# We patch permissions, grub and efi loaders to our liking +(cd $cache_dir/ && git apply /builder/patches/profiledef.patch) (cd $cache_dir/ && git apply /builder/patches/grub-autoboot.patch) (cd $cache_dir/ && git apply /builder/patches/efi-autoboot.patch) diff --git a/builder/patches/permissions-online.patch b/builder/patches/permissions-online.patch deleted file mode 100644 index e46c36c..0000000 --- a/builder/patches/permissions-online.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/profiledef.sh -+++ b/profiledef.sh -@@ -22,6 +22,5 @@ file_permissions=( - ["/root/.automated_script.sh"]="0:0:755" - ["/root/.gnupg"]="0:0:700" - ["/usr/local/bin/choose-mirror"]="0:0:755" -- ["/usr/local/bin/Installation_guide"]="0:0:755" -- ["/usr/local/bin/livecd-sound"]="0:0:755" -+ ["/root/installer"]="0:0:755" - ) diff --git a/builder/patches/profiledef.patch b/builder/patches/profiledef.patch new file mode 100644 index 0000000..529731c --- /dev/null +++ b/builder/patches/profiledef.patch @@ -0,0 +1,25 @@ +--- a/profiledef.sh ++++ b/profiledef.sh +@@ -1,10 +1,10 @@ + #!/usr/bin/env bash + # shellcheck disable=SC2034 + +-iso_name="archlinux" ++iso_name="omarchy" + iso_label="ARCH_$(date --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y%m)" +-iso_publisher="Arch Linux " +-iso_application="Arch Linux Live/Rescue DVD" ++iso_publisher="Omarchy " ++iso_application="Omarchy Installer" + iso_version="$(date --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y.%m.%d)" + install_dir="arch" + buildmodes=('iso') +@@ -22,6 +22,5 @@ file_permissions=( + ["/root/.automated_script.sh"]="0:0:755" + ["/root/.gnupg"]="0:0:700" + ["/usr/local/bin/choose-mirror"]="0:0:755" +- ["/usr/local/bin/Installation_guide"]="0:0:755" +- ["/usr/local/bin/livecd-sound"]="0:0:755" ++ ["/root/installer"]="0:0:755" + ) +