aboutsummaryrefslogtreecommitdiff
path: root/custom
diff options
context:
space:
mode:
authorCraig Jennings <c@cjennings.net>2026-01-25 11:37:06 -0600
committerCraig Jennings <c@cjennings.net>2026-01-25 11:37:06 -0600
commit239536ce0722c2da81760a223e5bd526fcc67184 (patch)
treeccf313126ed339f4d3f971f70976dca20b221886 /custom
parent746102d097bd4f2099cd79180613351e797ec9c5 (diff)
downloadarchangel-239536ce0722c2da81760a223e5bd526fcc67184.tar.gz
archangel-239536ce0722c2da81760a223e5bd526fcc67184.zip
refactor: remove archsetup references, make installer standalone
- Remove copy_archsetup function and calls from ZFS/Btrfs paths - Update SSH hardening messages to generic advice - Change sanoid references to tips without archsetup dependency - Improve filesystem dialog descriptions
Diffstat (limited to 'custom')
-rwxr-xr-xcustom/archangel23
-rw-r--r--custom/lib/common.sh4
2 files changed, 7 insertions, 20 deletions
diff --git a/custom/archangel b/custom/archangel
index d0c52db..9076ac2 100755
--- a/custom/archangel
+++ b/custom/archangel
@@ -684,7 +684,7 @@ get_ssh_config() {
step "SSH Configuration"
echo ""
info "SSH enables remote access after installation."
- info "Recommended for headless servers. Harden with archsetup later."
+ info "Recommended for headless servers. Harden after install (key auth, fail2ban)."
echo ""
prompt "Enable SSH with root login? [Y/n]:"
read -p "> " ssh_choice
@@ -695,7 +695,7 @@ get_ssh_config() {
else
ENABLE_SSH="yes"
info "SSH will be enabled with root password login."
- warn "Remember to harden SSH (key auth, fail2ban) with archsetup!"
+ warn "Remember to harden SSH after install (key auth, fail2ban)!"
fi
}
@@ -1088,7 +1088,7 @@ configure_ssh() {
arch-chroot /mnt systemctl enable sshd
info "SSH enabled with root password login."
- warn "Run archsetup to harden SSH (key auth, fail2ban)."
+ warn "Harden SSH after install (key auth, fail2ban)."
else
info "SSH not enabled. Enable manually if needed."
fi
@@ -1343,18 +1343,7 @@ configure_zfs_tools() {
chmod +x /mnt/usr/local/bin/zfsrollback
info "ZFS management scripts installed: zfssnapshot, zfsrollback"
- info "Note: Install sanoid via archsetup for automated snapshot retention."
-}
-
-copy_archsetup() {
- step "Installing archsetup Launcher"
-
- cat > /mnt/usr/local/bin/archsetup << 'EOF'
-#!/bin/bash
-curl -fsSL https://cjennings.net/archsetup | bash
-EOF
- chmod +x /mnt/usr/local/bin/archsetup
- info "archsetup launcher installed to /usr/local/bin/archsetup"
+ info "Tip: Install sanoid for automated snapshot retention."
}
sync_efi_partitions() {
@@ -1486,7 +1475,7 @@ print_summary() {
echo " - Boot from any snapshot (Ctrl+D at boot menu)"
echo " - Genesis snapshot: pristine post-install state"
echo " - Pre-pacman snapshots for safe upgrades"
- echo " - Sanoid/syncoid configured by archsetup"
+ echo " - Install sanoid/syncoid for automated retention"
echo ""
echo "Boot Menu Keys (at ZFSBootMenu):"
echo " Enter - Boot selected environment"
@@ -1584,7 +1573,6 @@ install_zfs() {
configure_zfs_services
configure_pacman_hook
configure_zfs_tools
- copy_archsetup
sync_efi_partitions
create_genesis_snapshot
cleanup
@@ -1680,7 +1668,6 @@ install_btrfs() {
configure_snapper
configure_btrfs_services
configure_btrfs_pacman_hook
- copy_archsetup
# Genesis snapshot
create_btrfs_genesis_snapshot
diff --git a/custom/lib/common.sh b/custom/lib/common.sh
index c271aec..3af5707 100644
--- a/custom/lib/common.sh
+++ b/custom/lib/common.sh
@@ -110,8 +110,8 @@ select_filesystem() {
step "Select Filesystem"
local options=(
- "ZFS - Native encryption, best data integrity (recommended)"
- "Btrfs - Native Linux, GRUB snapshot boot"
+ "ZFS - Built-in encryption, best data integrity (recommended)"
+ "Btrfs - Copy-on-write, LUKS encryption, GRUB snapshot boot"
)
local selected