diff --git a/etc/archboot/presets/x86_64-offline b/etc/archboot/presets/x86_64-local similarity index 100% rename from etc/archboot/presets/x86_64-offline rename to etc/archboot/presets/x86_64-local diff --git a/etc/archboot/x86_64-offline.conf b/etc/archboot/x86_64-local.conf similarity index 94% rename from etc/archboot/x86_64-offline.conf rename to etc/archboot/x86_64-local.conf index 35661f631..9f4789bea 100644 --- a/etc/archboot/x86_64-offline.conf +++ b/etc/archboot/x86_64-local.conf @@ -12,7 +12,7 @@ FILES=() # Please change the hooks only if you know what you are doing. HOOKS=(udev keyboard archboot_base_common archboot_base_latest \ archboot_installer_common archboot_installer_latest archboot_kexec \ -archboot_licenses archboot_installer_offline) +archboot_licenses archboot_installer_local) # COMPRESSION # Use this to compress the initramfs image. By default, gzip compression diff --git a/usr/bin/archboot-setup.sh b/usr/bin/archboot-setup.sh index f8d8f3159..d5c73e108 100755 --- a/usr/bin/archboot-setup.sh +++ b/usr/bin/archboot-setup.sh @@ -1,8 +1,13 @@ #!/usr/bin/env bash # we rely on some output which is parsed in english! unset LANG +LOCAL_DB="/var/cache/pacman/pkg/archboot.db" ANSWER="/tmp/.setup" -TITLE="Arch Linux Installation --> https://wiki.archlinux.org/Archboot" +if [[ -e "${LOCAL_DB}" ]]; then + TITLE="Arch Linux Installation (Local mode) --> https://wiki.archlinux.org/Archboot" +else + TITLE="Arch Linux Installation (Online mode) --> https://wiki.archlinux.org/Archboot" +fi # use the first VT not dedicated to a running console # don't use /mnt because it's intended to mount other things there! # check first if bootet in archboot @@ -38,7 +43,6 @@ DLPROG="wget" # sources SYNC_URL="" MIRRORLIST="/etc/pacman.d/mirrorlist" -LOCAL_DB="/var/cache/pacman/pkg/archboot.db" unset PACKAGES # partitions diff --git a/usr/lib/initcpio/install/archboot_installer_offline b/usr/lib/initcpio/install/archboot_installer_local similarity index 92% rename from usr/lib/initcpio/install/archboot_installer_offline rename to usr/lib/initcpio/install/archboot_installer_local index 9d069c452..0f37e81bf 100644 --- a/usr/lib/initcpio/install/archboot_installer_offline +++ b/usr/lib/initcpio/install/archboot_installer_local @@ -17,6 +17,6 @@ help () { cat<