installer: add no-encryption option and auto LUKS backup key
Both arch-autoinstall.sh and archbaseos-guided-install.sh now ask whether to enable disk encryption. If skipped, btrfs is formatted directly on the root partition with an appropriate plain GRUB cmdline (root=UUID=... rootflags=subvol=@). When encryption is chosen, a 64-byte random key is generated, enrolled as a second LUKS keyslot, and written to /_LUKS_BACKUP_KEY inside the new system (mode 400, root-owned, inside the encrypted container). Also fixes: duplicate 'encrypt' hook in original mkinitcpio HOOKS strings, missing KERNEL export into arch-autoinstall chroot heredoc. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>main
parent
19b31859f6
commit
e25dd231cb
|
|
@ -1,11 +1,18 @@
|
||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
|
# arch-autoinstall.sh — automated Arch Linux base installer
|
||||||
|
#
|
||||||
|
# If /answerfile.json exists (e.g. embedded in the ISO via build.sh --preconf),
|
||||||
|
# all prompts are answered from it. Missing fields fall back to interactive prompts.
|
||||||
|
#
|
||||||
|
# Answerfile fields: drive, kernel, hostname, username, encrypt, fido2_root,
|
||||||
|
# fido2_user, run_tui (password always prompted interactively)
|
||||||
|
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
|
||||||
############################################
|
############################################
|
||||||
# LOGGING
|
# LOGGING
|
||||||
############################################
|
############################################
|
||||||
LOGFILE="$HOME/arch-autoinstall.log"
|
LOGFILE="$HOME/arch-autoinstall.log"
|
||||||
|
|
||||||
{
|
{
|
||||||
echo
|
echo
|
||||||
echo "############################################"
|
echo "############################################"
|
||||||
|
|
@ -13,16 +20,53 @@ LOGFILE="$HOME/arch-autoinstall.log"
|
||||||
echo "############################################"
|
echo "############################################"
|
||||||
echo
|
echo
|
||||||
} >> "$LOGFILE"
|
} >> "$LOGFILE"
|
||||||
|
|
||||||
exec > >(tee -a "$LOGFILE") 2>&1
|
exec > >(tee -a "$LOGFILE") 2>&1
|
||||||
|
|
||||||
|
############################################
|
||||||
|
# ANSWERFILE
|
||||||
|
############################################
|
||||||
|
ANSWERFILE="${ANSWERFILE:-/answerfile.json}"
|
||||||
|
AF_MODE=false
|
||||||
|
[[ -f "$ANSWERFILE" ]] && AF_MODE=true
|
||||||
|
|
||||||
|
af_get() {
|
||||||
|
# af_get <jq-filter> [default]
|
||||||
|
local val
|
||||||
|
val=$(jq -r "${1} // empty" "$ANSWERFILE" 2>/dev/null || true)
|
||||||
|
if [[ -z "$val" ]]; then printf '%s' "${2:-}"; else printf '%s' "$val"; fi
|
||||||
|
}
|
||||||
|
|
||||||
|
af_bool() {
|
||||||
|
# Returns YES or NO from a JSON boolean field
|
||||||
|
local val; val=$(jq -r "${1} // false" "$ANSWERFILE" 2>/dev/null || true)
|
||||||
|
[[ "$val" == "true" ]] && echo "YES" || echo "NO"
|
||||||
|
}
|
||||||
|
|
||||||
|
get_mac_suffix() {
|
||||||
|
local mac
|
||||||
|
mac=$(ip link show 2>/dev/null \
|
||||||
|
| awk '/^[0-9]+: [^l][^o]/{iface=1} iface && /link\/ether/{print $2; iface=0; exit}')
|
||||||
|
printf '%s' "${mac//:/}"
|
||||||
|
}
|
||||||
|
|
||||||
|
if $AF_MODE; then
|
||||||
|
echo "Answerfile detected: $ANSWERFILE"
|
||||||
|
# Ensure jq is available
|
||||||
|
command -v jq &>/dev/null || pacman -Sy --noconfirm jq
|
||||||
|
fi
|
||||||
|
|
||||||
############################################
|
############################################
|
||||||
# SAFETY WARNING
|
# SAFETY WARNING
|
||||||
############################################
|
############################################
|
||||||
echo "WARNING: This will ERASE ALL DATA on the selected drive!"
|
if $AF_MODE; then
|
||||||
read -rp "Type 'YES' to continue: " confirm
|
echo "WARNING: Automated install — all data on $(af_get '.drive' '/dev/?') will be ERASED."
|
||||||
[[ "$confirm" == "YES" ]] || { echo "Aborted."; exit 1; }
|
echo "Proceeding in 5 seconds... (Ctrl-C to abort)"
|
||||||
|
sleep 5
|
||||||
|
else
|
||||||
|
echo "WARNING: This will ERASE ALL DATA on the selected drive!"
|
||||||
|
read -rp "Type 'YES' to continue: " confirm
|
||||||
|
[[ "$confirm" == "YES" ]] || { echo "Aborted."; exit 1; }
|
||||||
|
fi
|
||||||
|
|
||||||
############################################
|
############################################
|
||||||
# REQUIRED PACKAGES FOR INSTALL ENVIRONMENT
|
# REQUIRED PACKAGES FOR INSTALL ENVIRONMENT
|
||||||
|
|
@ -30,10 +74,57 @@ read -rp "Type 'YES' to continue: " confirm
|
||||||
pacman -Sy --noconfirm parted cryptsetup libfido2 pam-u2f
|
pacman -Sy --noconfirm parted cryptsetup libfido2 pam-u2f
|
||||||
|
|
||||||
############################################
|
############################################
|
||||||
# DISK SELECTION
|
# DRIVE SELECTION
|
||||||
############################################
|
############################################
|
||||||
lsblk
|
lsblk
|
||||||
read -rp "Enter target drive (e.g., /dev/sda): " DRIVE
|
if $AF_MODE && [[ -n "$(af_get '.drive')" ]]; then
|
||||||
|
DRIVE=$(af_get '.drive')
|
||||||
|
echo "Drive (from answerfile): $DRIVE"
|
||||||
|
else
|
||||||
|
read -rp "Enter target drive (e.g., /dev/sda): " DRIVE
|
||||||
|
fi
|
||||||
|
|
||||||
|
############################################
|
||||||
|
# USER INPUT
|
||||||
|
############################################
|
||||||
|
if $AF_MODE; then
|
||||||
|
KERNEL=$(af_get '.kernel' 'linux')
|
||||||
|
RAW_HOSTNAME=$(af_get '.hostname' '')
|
||||||
|
if [[ -n "$RAW_HOSTNAME" ]]; then
|
||||||
|
HOSTNAME="${RAW_HOSTNAME}-$(get_mac_suffix)"
|
||||||
|
else
|
||||||
|
HOSTNAME="arch"
|
||||||
|
fi
|
||||||
|
USERNAME=$(af_get '.username' '')
|
||||||
|
ENCRYPT_DISK=$(af_bool '.encrypt')
|
||||||
|
FIDO_ROOT=$(af_bool '.fido2_root')
|
||||||
|
FIDO_USER=$(af_bool '.fido2_user')
|
||||||
|
RUN_TUI=$(af_bool '.run_tui')
|
||||||
|
echo "Kernel: $KERNEL"
|
||||||
|
echo "Hostname: $HOSTNAME"
|
||||||
|
echo "Username: $USERNAME"
|
||||||
|
echo "Encrypt: $ENCRYPT_DISK / FIDO2 root: $FIDO_ROOT / FIDO2 user: $FIDO_USER"
|
||||||
|
else
|
||||||
|
read -rp "Enter kernel package (e.g., linux, linux-lts): " KERNEL
|
||||||
|
read -rp "Enter hostname: " HOSTNAME
|
||||||
|
read -rp "Enter username: " USERNAME
|
||||||
|
read -rp "Enable disk encryption? (YES/NO): " ENCRYPT_DISK
|
||||||
|
FIDO_ROOT="NO"
|
||||||
|
if [[ "$ENCRYPT_DISK" == "YES" ]]; then
|
||||||
|
read -rp "Enable FIDO2 unlocking for root partition? (YES/NO): " FIDO_ROOT
|
||||||
|
fi
|
||||||
|
read -rp "Enable FIDO2 authentication for user login? (YES/NO): " FIDO_USER
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Password always prompted — never stored in answerfile
|
||||||
|
read -rsp "Enter password for $USERNAME: " USERPASS; echo
|
||||||
|
[[ -z "$USERPASS" ]] && { echo "Error: password cannot be empty."; exit 1; }
|
||||||
|
|
||||||
|
if ! $AF_MODE; then
|
||||||
|
read -rp "Run dotfiles TUI setup inside chroot now? [YES/no]: " _RUN_TUI_IN
|
||||||
|
_RUN_TUI_IN="${_RUN_TUI_IN:-YES}"
|
||||||
|
[[ "${_RUN_TUI_IN^^}" == "YES" ]] && RUN_TUI="YES" || RUN_TUI="NO"
|
||||||
|
fi
|
||||||
|
|
||||||
############################################
|
############################################
|
||||||
# RAM / PARTITION SIZING
|
# RAM / PARTITION SIZING
|
||||||
|
|
@ -44,7 +135,6 @@ SWAP_SIZE="${RAM_GB}GiB"
|
||||||
|
|
||||||
DISK_SIZE=$(lsblk -b -dn -o SIZE "$DRIVE")
|
DISK_SIZE=$(lsblk -b -dn -o SIZE "$DRIVE")
|
||||||
DISK_GIB=$((DISK_SIZE / 1024 / 1024 / 1024))
|
DISK_GIB=$((DISK_SIZE / 1024 / 1024 / 1024))
|
||||||
|
|
||||||
ROOT_GIB=$((DISK_GIB - RAM_GB - 15))
|
ROOT_GIB=$((DISK_GIB - RAM_GB - 15))
|
||||||
|
|
||||||
echo "Partition plan:"
|
echo "Partition plan:"
|
||||||
|
|
@ -73,44 +163,74 @@ mkswap "$SWAP_PART"
|
||||||
swapon "$SWAP_PART"
|
swapon "$SWAP_PART"
|
||||||
|
|
||||||
############################################
|
############################################
|
||||||
# ASK ABOUT FIDO2 LUKS ENROLLMENT
|
# ENCRYPTION (OPTIONAL)
|
||||||
############################################
|
############################################
|
||||||
read -rp "Enable FIDO2 unlocking for root partition? (YES/NO): " FIDO_ROOT
|
LUKS_BACKUP_KEY="" # path to key file, set only when encryption is active
|
||||||
|
|
||||||
############################################
|
if [[ "$ENCRYPT_DISK" == "YES" ]]; then
|
||||||
# LUKS ENCRYPT ROOT
|
echo "Encrypting root partition..."
|
||||||
############################################
|
cryptsetup -v luksFormat "$ROOT_PART"
|
||||||
echo "Encrypting root partition..."
|
cryptsetup open "$ROOT_PART" cryptroot
|
||||||
cryptsetup -v luksFormat "$ROOT_PART"
|
|
||||||
cryptsetup open "$ROOT_PART" cryptroot
|
|
||||||
|
|
||||||
############################################
|
# ── Auto-generate backup LUKS key ──────────────────────────────────────────
|
||||||
# OPTIONAL FIDO2 ENROLLMENT
|
# A random key is enrolled as a second LUKS slot so recovery is possible
|
||||||
############################################
|
# without the primary passphrase. It is written to /_LUKS_BACKUP_KEY in the
|
||||||
if [[ "$FIDO_ROOT" == "YES" ]]; then
|
# new system (inside the encrypted container) where only root can read it.
|
||||||
|
LUKS_BACKUP_KEY=$(mktemp /tmp/luks-backup-key.XXXXXX)
|
||||||
|
dd if=/dev/urandom bs=64 count=1 2>/dev/null | base64 -w0 > "$LUKS_BACKUP_KEY"
|
||||||
|
echo "Enrolling auto-generated backup LUKS key..."
|
||||||
|
cryptsetup luksAddKey "$ROOT_PART" "$LUKS_BACKUP_KEY"
|
||||||
|
|
||||||
|
# ── Optional FIDO2 enrollment ─────────────────────────────────────────────
|
||||||
|
if [[ "$FIDO_ROOT" == "YES" ]]; then
|
||||||
echo "Insert FIDO2 key for LUKS and touch when prompted..."
|
echo "Insert FIDO2 key for LUKS and touch when prompted..."
|
||||||
systemd-cryptenroll "$ROOT_PART" --fido2-device=auto --fido2-with-client-pin=no
|
systemd-cryptenroll "$ROOT_PART" --fido2-device=auto --fido2-with-client-pin=no
|
||||||
|
fi
|
||||||
|
|
||||||
|
############################################
|
||||||
|
# BTRFS ON ENCRYPTED ROOT
|
||||||
|
############################################
|
||||||
|
mkfs.btrfs /dev/mapper/cryptroot
|
||||||
|
mount /dev/mapper/cryptroot /mnt
|
||||||
|
btrfs subvolume create /mnt/@
|
||||||
|
btrfs subvolume create /mnt/@home
|
||||||
|
umount /mnt
|
||||||
|
|
||||||
|
mount -o subvol=@ /dev/mapper/cryptroot /mnt
|
||||||
|
mkdir -p /mnt/home
|
||||||
|
mount -o subvol=@home /dev/mapper/cryptroot /mnt/home
|
||||||
|
|
||||||
|
else
|
||||||
|
echo "Skipping encryption — formatting root directly."
|
||||||
|
|
||||||
|
############################################
|
||||||
|
# BTRFS ON UNENCRYPTED ROOT
|
||||||
|
############################################
|
||||||
|
mkfs.btrfs "$ROOT_PART"
|
||||||
|
mount "$ROOT_PART" /mnt
|
||||||
|
btrfs subvolume create /mnt/@
|
||||||
|
btrfs subvolume create /mnt/@home
|
||||||
|
umount /mnt
|
||||||
|
|
||||||
|
mount -o subvol=@ "$ROOT_PART" /mnt
|
||||||
|
mkdir -p /mnt/home
|
||||||
|
mount -o subvol=@home "$ROOT_PART" /mnt/home
|
||||||
fi
|
fi
|
||||||
|
|
||||||
############################################
|
mkdir -p /mnt/boot
|
||||||
# BTRFS SUBVOLUMES
|
|
||||||
############################################
|
|
||||||
mkfs.btrfs /dev/mapper/cryptroot
|
|
||||||
mount /dev/mapper/cryptroot /mnt
|
|
||||||
btrfs subvolume create /mnt/@
|
|
||||||
btrfs subvolume create /mnt/@home
|
|
||||||
umount /mnt
|
|
||||||
|
|
||||||
mount -o subvol=@ /dev/mapper/cryptroot /mnt
|
|
||||||
mkdir /mnt/home
|
|
||||||
mount -o subvol=@home /dev/mapper/cryptroot /mnt/home
|
|
||||||
mkdir /mnt/boot
|
|
||||||
mount "$BOOT_PART" /mnt/boot
|
mount "$BOOT_PART" /mnt/boot
|
||||||
|
|
||||||
|
# Place backup key inside the new system (only accessible when disk is unlocked)
|
||||||
|
if [[ -n "$LUKS_BACKUP_KEY" ]]; then
|
||||||
|
install -m 400 "$LUKS_BACKUP_KEY" /mnt/_LUKS_BACKUP_KEY
|
||||||
|
rm -f "$LUKS_BACKUP_KEY"
|
||||||
|
echo "Backup LUKS key written to /_LUKS_BACKUP_KEY in new system."
|
||||||
|
fi
|
||||||
|
|
||||||
############################################
|
############################################
|
||||||
# GPU DETECTION
|
# GPU DETECTION
|
||||||
############################################
|
############################################
|
||||||
GPU_INFO=$(lspci | grep -E "VGA|3D")
|
GPU_INFO=$(lspci | grep -E "VGA|3D" || true)
|
||||||
GPU_PKGS=""
|
GPU_PKGS=""
|
||||||
if echo "$GPU_INFO" | grep -qi "NVIDIA"; then
|
if echo "$GPU_INFO" | grep -qi "NVIDIA"; then
|
||||||
GPU_PKGS="nvidia nvidia-utils"
|
GPU_PKGS="nvidia nvidia-utils"
|
||||||
|
|
@ -119,39 +239,36 @@ elif echo "$GPU_INFO" | grep -qi "AMD"; then
|
||||||
elif echo "$GPU_INFO" | grep -qi "Intel"; then
|
elif echo "$GPU_INFO" | grep -qi "Intel"; then
|
||||||
GPU_PKGS="xf86-video-intel"
|
GPU_PKGS="xf86-video-intel"
|
||||||
fi
|
fi
|
||||||
|
echo "Detected GPU: ${GPU_INFO:-none}"
|
||||||
echo "Detected GPU: $GPU_INFO"
|
|
||||||
|
|
||||||
############################################
|
|
||||||
# USER INPUT
|
|
||||||
############################################
|
|
||||||
read -rp "Enter kernel package (e.g., linux, linux-lts): " KERNEL
|
|
||||||
read -rp "Enter hostname: " HOSTNAME
|
|
||||||
read -rp "Enter username: " USERNAME
|
|
||||||
read -rsp "Enter password for $USERNAME: " USERPASS
|
|
||||||
echo
|
|
||||||
read -rp "Enable FIDO2 authentication for user login? (YES/NO): " FIDO_USER
|
|
||||||
|
|
||||||
############################################
|
############################################
|
||||||
# BASE INSTALL
|
# BASE INSTALL
|
||||||
############################################
|
############################################
|
||||||
|
# shellcheck disable=SC2086
|
||||||
pacstrap -K /mnt base base-devel "$KERNEL" linux-firmware vim bash zsh git less btop fastfetch \
|
pacstrap -K /mnt base base-devel "$KERNEL" linux-firmware vim bash zsh git less btop fastfetch \
|
||||||
networkmanager grub cryptsetup libfido2 pam-u2f efibootmgr sudo btrfs-progs lvm2 $GPU_PKGS
|
networkmanager grub cryptsetup libfido2 pam-u2f efibootmgr sudo btrfs-progs lvm2 jq $GPU_PKGS
|
||||||
|
|
||||||
############################################
|
############################################
|
||||||
# FSTAB
|
# FSTAB
|
||||||
############################################
|
############################################
|
||||||
genfstab -U /mnt >> /mnt/etc/fstab
|
genfstab -U /mnt >> /mnt/etc/fstab
|
||||||
|
|
||||||
|
############################################
|
||||||
|
# COPY ANSWERFILE INTO NEW SYSTEM
|
||||||
|
############################################
|
||||||
|
if $AF_MODE; then
|
||||||
|
install -m 644 "$ANSWERFILE" /mnt/answerfile.json
|
||||||
|
fi
|
||||||
|
|
||||||
############################################
|
############################################
|
||||||
# PASS VARIABLES INTO CHROOT
|
# PASS VARIABLES INTO CHROOT
|
||||||
############################################
|
############################################
|
||||||
export HOSTNAME USERNAME USERPASS ROOT_PART FIDO_ROOT FIDO_USER
|
export HOSTNAME USERNAME USERPASS ROOT_PART KERNEL FIDO_ROOT FIDO_USER ENCRYPT_DISK
|
||||||
|
|
||||||
############################################
|
############################################
|
||||||
# CHROOT CONFIGURATION
|
# CHROOT CONFIGURATION
|
||||||
############################################
|
############################################
|
||||||
arch-chroot /mnt /bin/bash <<'EOF'
|
arch-chroot /mnt /bin/bash <<'CHROOT_EOF'
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
|
||||||
# Locale
|
# Locale
|
||||||
|
|
@ -175,10 +292,12 @@ echo "%wheel ALL=(ALL:ALL) ALL" >> /etc/sudoers
|
||||||
###################################################
|
###################################################
|
||||||
# INITRAMFS CONFIG
|
# INITRAMFS CONFIG
|
||||||
###################################################
|
###################################################
|
||||||
if [[ "$FIDO_ROOT" == "YES" ]]; then
|
if [[ "$ENCRYPT_DISK" == "YES" && "$FIDO_ROOT" == "YES" ]]; then
|
||||||
sed -i 's/^HOOKS=.*/HOOKS=(base btrfs udev systemd microcode kms autodetect modconf consolefont block sd-encrypt encrypt lvm2 filesystems keyboard keymap fsck)/' /etc/mkinitcpio.conf
|
sed -i 's/^HOOKS=.*/HOOKS=(base udev systemd autodetect microcode modconf kms consolefont block sd-encrypt lvm2 btrfs filesystems keyboard keymap fsck)/' /etc/mkinitcpio.conf
|
||||||
|
elif [[ "$ENCRYPT_DISK" == "YES" ]]; then
|
||||||
|
sed -i 's/^HOOKS=.*/HOOKS=(base udev autodetect microcode modconf kms consolefont block encrypt lvm2 btrfs filesystems keyboard keymap fsck)/' /etc/mkinitcpio.conf
|
||||||
else
|
else
|
||||||
sed -i 's/^HOOKS=.*/HOOKS=(base btrfs udev systemd microcode kms autodetect modconf consolefont block encrypt encrypt lvm2 filesystems keyboard keymap fsck)/' /etc/mkinitcpio.conf
|
sed -i 's/^HOOKS=.*/HOOKS=(base udev autodetect microcode modconf kms consolefont block btrfs filesystems keyboard fsck)/' /etc/mkinitcpio.conf
|
||||||
fi
|
fi
|
||||||
|
|
||||||
mkinitcpio -p "$KERNEL"
|
mkinitcpio -p "$KERNEL"
|
||||||
|
|
@ -187,49 +306,46 @@ mkinitcpio -p "$KERNEL"
|
||||||
# GRUB CONFIG
|
# GRUB CONFIG
|
||||||
###################################################
|
###################################################
|
||||||
UUID=$(blkid -s UUID -o value "$ROOT_PART")
|
UUID=$(blkid -s UUID -o value "$ROOT_PART")
|
||||||
|
if [[ "$ENCRYPT_DISK" == "YES" ]]; then
|
||||||
if [[ "$FIDO_ROOT" == "YES" ]]; then
|
if [[ "$FIDO_ROOT" == "YES" ]]; then
|
||||||
KERNEL_CMD="rd.luks.name=${UUID}=cryptroot root=/dev/mapper/cryptroot"
|
KERNEL_CMD="rd.luks.name=${UUID}=cryptroot root=/dev/mapper/cryptroot"
|
||||||
else
|
else
|
||||||
KERNEL_CMD="cryptdevice=UUID=${UUID}:cryptroot root=/dev/mapper/cryptroot"
|
KERNEL_CMD="cryptdevice=UUID=${UUID}:cryptroot root=/dev/mapper/cryptroot"
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
KERNEL_CMD="root=UUID=${UUID} rootflags=subvol=@"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
sed -i "s|^GRUB_CMDLINE_LINUX=.*|GRUB_CMDLINE_LINUX=\"$KERNEL_CMD\"|" /etc/default/grub
|
sed -i "s|^GRUB_CMDLINE_LINUX=.*|GRUB_CMDLINE_LINUX=\"$KERNEL_CMD\"|" /etc/default/grub
|
||||||
|
|
||||||
grub-install --target=x86_64-efi --efi-directory=/boot --bootloader-id=M-Archy-GRUB-CuIn
|
grub-install --target=x86_64-efi --efi-directory=/boot --bootloader-id=M-Archy-GRUB
|
||||||
grub-mkconfig -o /boot/grub/grub.cfg
|
grub-mkconfig -o /boot/grub/grub.cfg
|
||||||
|
|
||||||
###################################################
|
###################################################
|
||||||
# USER FIDO2 LOGIN
|
# USER FIDO2 LOGIN
|
||||||
###################################################
|
###################################################
|
||||||
if [[ "$FIDO_USER" == "YES" ]]; then
|
if [[ "$FIDO_USER" == "YES" ]]; then
|
||||||
mkdir -p /home/$USERNAME/.config/Yubico
|
mkdir -p "/home/$USERNAME/.config/Yubico"
|
||||||
echo "Insert FIDO2 key for user login and touch when prompted..."
|
echo "Insert FIDO2 key for user login and touch when prompted..."
|
||||||
sudo -u "$USERNAME" pamu2fcfg -u "$USERNAME" > /home/$USERNAME/.config/Yubico/u2f_keys
|
sudo -u "$USERNAME" pamu2fcfg -u "$USERNAME" > "/home/$USERNAME/.config/Yubico/u2f_keys"
|
||||||
chown "$USERNAME":"$USERNAME" /home/$USERNAME/.config/Yubico/u2f_keys
|
chown "$USERNAME":"$USERNAME" "/home/$USERNAME/.config/Yubico/u2f_keys"
|
||||||
|
|
||||||
echo "auth required pam_u2f.so" >> /etc/pam.d/system-local-login
|
echo "auth required pam_u2f.so" >> /etc/pam.d/system-local-login
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
###################################################
|
###################################################
|
||||||
# CLONE DOTFILES FOR POST-INSTALL SETUP
|
# CLONE DOTFILES
|
||||||
###################################################
|
###################################################
|
||||||
echo "Cloning dotfiles..."
|
echo "Cloning dotfiles..."
|
||||||
git clone https://git.abdelbaki.eu/The_miro/Dotfiles.git /home/$USERNAME/Dotfiles \
|
git clone https://git.abdelbaki.eu/The_miro/Dotfiles.git "/home/$USERNAME/Dotfiles" \
|
||||||
&& chown -R $USERNAME:$USERNAME /home/$USERNAME/Dotfiles \
|
&& chown -R "$USERNAME":"$USERNAME" "/home/$USERNAME/Dotfiles" \
|
||||||
|| echo "Warning: dotfiles clone failed — clone manually after first boot."
|
|| echo "Warning: dotfiles clone failed — clone manually after first boot."
|
||||||
|
|
||||||
EOF
|
CHROOT_EOF
|
||||||
|
|
||||||
############################################
|
############################################
|
||||||
# DOTFILES SETUP (in-chroot, optional)
|
# DOTFILES TUI SETUP (in-chroot, optional)
|
||||||
############################################
|
############################################
|
||||||
echo
|
if [[ "${RUN_TUI^^}" == "YES" ]]; then
|
||||||
read -rp "Run dotfiles TUI setup inside chroot now? [YES/no]: " _RUN_TUI
|
|
||||||
_RUN_TUI="${_RUN_TUI:-YES}"
|
|
||||||
|
|
||||||
if [[ "${_RUN_TUI^^}" == "YES" ]]; then
|
|
||||||
echo "${USERNAME} ALL=(ALL) NOPASSWD: ALL" \
|
echo "${USERNAME} ALL=(ALL) NOPASSWD: ALL" \
|
||||||
| arch-chroot /mnt tee /etc/sudoers.d/99-setup-nopasswd > /dev/null
|
| arch-chroot /mnt tee /etc/sudoers.d/99-setup-nopasswd > /dev/null
|
||||||
|
|
||||||
|
|
@ -241,8 +357,13 @@ if [[ "${_RUN_TUI^^}" == "YES" ]]; then
|
||||||
arch-chroot /mnt rm -f /etc/sudoers.d/99-setup-nopasswd
|
arch-chroot /mnt rm -f /etc/sudoers.d/99-setup-nopasswd
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Remove answerfile from new system after setup is complete (contains sensitive paths/config)
|
||||||
|
if $AF_MODE && [[ -f /mnt/answerfile.json ]]; then
|
||||||
|
rm -f /mnt/answerfile.json
|
||||||
|
fi
|
||||||
|
|
||||||
############################################
|
############################################
|
||||||
# SUMMARY OUTPUT (NEW)
|
# SUMMARY
|
||||||
############################################
|
############################################
|
||||||
echo
|
echo
|
||||||
echo "############################################"
|
echo "############################################"
|
||||||
|
|
@ -256,28 +377,27 @@ echo
|
||||||
echo "Hostname: $HOSTNAME"
|
echo "Hostname: $HOSTNAME"
|
||||||
echo "Username: $USERNAME"
|
echo "Username: $USERNAME"
|
||||||
echo "Kernel: $KERNEL"
|
echo "Kernel: $KERNEL"
|
||||||
echo "GPU detected: $GPU_INFO"
|
echo "GPU detected: ${GPU_INFO:-none}"
|
||||||
echo
|
echo
|
||||||
|
echo "Disk encryption: $ENCRYPT_DISK"
|
||||||
echo "FIDO2 root unlock: $FIDO_ROOT"
|
echo "FIDO2 root unlock: $FIDO_ROOT"
|
||||||
echo "FIDO2 user login: $FIDO_USER"
|
echo "FIDO2 user login: $FIDO_USER"
|
||||||
|
[[ "$ENCRYPT_DISK" == "YES" ]] && echo "LUKS backup key: /_LUKS_BACKUP_KEY (in new system)"
|
||||||
echo
|
echo
|
||||||
echo "Boot size: $BOOT_SIZE"
|
echo "Boot size: $BOOT_SIZE"
|
||||||
echo "Root size: ${ROOT_GIB}GiB"
|
echo "Root size: ${ROOT_GIB}GiB"
|
||||||
echo "Swap size: $SWAP_SIZE"
|
echo "Swap size: $SWAP_SIZE"
|
||||||
echo
|
echo
|
||||||
echo "Log file saved to: $LOGFILE"
|
echo "Log file: $LOGFILE"
|
||||||
echo "############################################"
|
echo "############################################"
|
||||||
echo
|
echo
|
||||||
|
|
||||||
cp $LOGFILE /mnt/boot/
|
cp "$LOGFILE" /mnt/boot/ 2>/dev/null || true
|
||||||
|
|
||||||
############################################
|
echo "Installation complete! Unmount and reboot:"
|
||||||
# DONE
|
echo " umount -R /mnt && reboot"
|
||||||
############################################
|
if [[ "${RUN_TUI^^}" != "YES" ]]; then
|
||||||
echo "Installation complete! You can now unmount and reboot."
|
echo
|
||||||
echo
|
|
||||||
if [[ "${_RUN_TUI^^}" != "YES" ]]; then
|
|
||||||
echo "After first boot, login as $USERNAME and run:"
|
echo "After first boot, login as $USERNAME and run:"
|
||||||
echo " ~/Dotfiles/setup/tui-install.sh"
|
echo " ~/Dotfiles/setup/tui-install.sh"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,9 @@
|
||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
|
# archbaseos-guided-install.sh — guided (dialog-based) Arch Linux base installer
|
||||||
|
#
|
||||||
|
# If /answerfile.json exists (e.g. embedded via build.sh --preconf), all prompts
|
||||||
|
# are answered from it. Missing fields fall back to interactive prompts.
|
||||||
|
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
|
||||||
############################################
|
############################################
|
||||||
|
|
@ -22,18 +27,55 @@ pause() {
|
||||||
read -rp "Press ENTER to continue..."
|
read -rp "Press ENTER to continue..."
|
||||||
}
|
}
|
||||||
|
|
||||||
|
############################################
|
||||||
|
# ANSWERFILE
|
||||||
|
############################################
|
||||||
|
ANSWERFILE="${ANSWERFILE:-/answerfile.json}"
|
||||||
|
AF_MODE=false
|
||||||
|
[[ -f "$ANSWERFILE" ]] && AF_MODE=true
|
||||||
|
|
||||||
|
af_get() {
|
||||||
|
local val
|
||||||
|
val=$(jq -r "${1} // empty" "$ANSWERFILE" 2>/dev/null || true)
|
||||||
|
if [[ -z "$val" ]]; then printf '%s' "${2:-}"; else printf '%s' "$val"; fi
|
||||||
|
}
|
||||||
|
|
||||||
|
af_bool() {
|
||||||
|
local val; val=$(jq -r "${1} // false" "$ANSWERFILE" 2>/dev/null || true)
|
||||||
|
[[ "$val" == "true" ]] && echo "YES" || echo "NO"
|
||||||
|
}
|
||||||
|
|
||||||
|
get_mac_suffix() {
|
||||||
|
local mac
|
||||||
|
mac=$(ip link show 2>/dev/null \
|
||||||
|
| awk '/^[0-9]+: [^l][^o]/{iface=1} iface && /link\/ether/{print $2; iface=0; exit}')
|
||||||
|
printf '%s' "${mac//:/}"
|
||||||
|
}
|
||||||
|
|
||||||
|
if $AF_MODE; then
|
||||||
|
echo "== Arch Linux Guided Installer (answerfile mode) =="
|
||||||
|
command -v jq &>/dev/null || pacman -Sy --noconfirm jq
|
||||||
|
else
|
||||||
|
echo "== Arch Linux FIDO2-Ready Installer =="
|
||||||
|
fi
|
||||||
|
|
||||||
############################################
|
############################################
|
||||||
# Begin
|
# Begin
|
||||||
############################################
|
############################################
|
||||||
|
|
||||||
echo "== Arch Linux FIDO2-Ready Installer =="
|
|
||||||
|
|
||||||
lsblk
|
lsblk
|
||||||
DRIVE=$(ask "Enter install drive (e.g., /dev/sda)")
|
|
||||||
confirm "$DRIVE" || exit 1
|
if $AF_MODE && [[ -n "$(af_get '.drive')" ]]; then
|
||||||
|
DRIVE=$(af_get '.drive')
|
||||||
|
echo "Drive (from answerfile): $DRIVE"
|
||||||
|
echo "WARNING: All data on $DRIVE will be erased. Proceeding in 5 seconds..."
|
||||||
|
sleep 5
|
||||||
|
else
|
||||||
|
DRIVE=$(ask "Enter install drive (e.g., /dev/sda)")
|
||||||
|
confirm "$DRIVE" || exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
# Required packages
|
# Required packages
|
||||||
pacman -Syd --noconfirm parted cryptsetup libfido2 pam-u2f systemd-ukify
|
pacman -Syd --noconfirm parted cryptsetup libfido2 pam-u2f systemd-ukify jq
|
||||||
|
|
||||||
############################################
|
############################################
|
||||||
# Partitioning
|
# Partitioning
|
||||||
|
|
@ -68,53 +110,101 @@ mkswap "$SWAP_PART"
|
||||||
swapon "$SWAP_PART"
|
swapon "$SWAP_PART"
|
||||||
|
|
||||||
############################################
|
############################################
|
||||||
# Encryption
|
# User input
|
||||||
############################################
|
############################################
|
||||||
|
if $AF_MODE; then
|
||||||
|
KERNEL=$(af_get '.kernel' 'linux')
|
||||||
|
RAW_HOSTNAME=$(af_get '.hostname' '')
|
||||||
|
if [[ -n "$RAW_HOSTNAME" ]]; then
|
||||||
|
HOSTNAME="${RAW_HOSTNAME}-$(get_mac_suffix)"
|
||||||
|
else
|
||||||
|
HOSTNAME="arch"
|
||||||
|
fi
|
||||||
|
USERNAME=$(af_get '.username' '')
|
||||||
|
ENCRYPT_DISK=$(af_bool '.encrypt')
|
||||||
|
ENABLE_FIDO_ROOT=$(af_bool '.fido2_root')
|
||||||
|
ENABLE_FIDO_USER=$(af_bool '.fido2_user')
|
||||||
|
RUN_TUI=$(af_bool '.run_tui')
|
||||||
|
echo "Kernel: $KERNEL / Hostname: $HOSTNAME / Username: $USERNAME"
|
||||||
|
echo "Encrypt: $ENCRYPT_DISK / FIDO2 root: $ENABLE_FIDO_ROOT / FIDO2 user: $ENABLE_FIDO_USER"
|
||||||
|
else
|
||||||
|
KERNEL=$(ask "Kernel (linux, linux-lts, linux-zen)")
|
||||||
|
HOSTNAME=$(ask "Hostname")
|
||||||
|
USERNAME=$(ask "Username")
|
||||||
|
read -rp "Enable disk encryption? (YES/NO): " ENCRYPT_DISK
|
||||||
|
ENABLE_FIDO_ROOT="NO"
|
||||||
|
if [[ "$ENCRYPT_DISK" == "YES" ]]; then
|
||||||
|
read -rp "Enable FIDO2 for unlocking root? (YES/NO): " ENABLE_FIDO_ROOT
|
||||||
|
fi
|
||||||
|
read -rp "Enable FIDO2 for user login? (YES/NO): " ENABLE_FIDO_USER
|
||||||
|
fi
|
||||||
|
|
||||||
echo
|
read -rsp "Password for $USERNAME: " USERPASS; echo
|
||||||
read -rp "Enable FIDO2 for unlocking root? (YES/NO): " ENABLE_FIDO_ROOT
|
[[ -z "$USERPASS" ]] && { echo "Error: password cannot be empty."; exit 1; }
|
||||||
|
|
||||||
echo "Formatting LUKS2 root..."
|
############################################
|
||||||
cryptsetup luksFormat "$ROOT_PART" --type luks2
|
# Encryption (optional)
|
||||||
cryptsetup open "$ROOT_PART" cryptroot
|
############################################
|
||||||
|
LUKS_BACKUP_KEY=""
|
||||||
|
|
||||||
if [[ $ENABLE_FIDO_ROOT == "YES" ]]; then
|
if [[ "$ENCRYPT_DISK" == "YES" ]]; then
|
||||||
|
echo "Formatting LUKS2 root..."
|
||||||
|
cryptsetup luksFormat "$ROOT_PART" --type luks2
|
||||||
|
cryptsetup open "$ROOT_PART" cryptroot
|
||||||
|
|
||||||
|
# ── Auto-generate backup LUKS key ─────────────────────────────────────────
|
||||||
|
LUKS_BACKUP_KEY=$(mktemp /tmp/luks-backup-key.XXXXXX)
|
||||||
|
dd if=/dev/urandom bs=64 count=1 2>/dev/null | base64 -w0 > "$LUKS_BACKUP_KEY"
|
||||||
|
echo "Enrolling auto-generated backup LUKS key..."
|
||||||
|
cryptsetup luksAddKey "$ROOT_PART" "$LUKS_BACKUP_KEY"
|
||||||
|
|
||||||
|
if [[ "$ENABLE_FIDO_ROOT" == "YES" ]]; then
|
||||||
echo "Enroll FIDO2 key for LUKS2"
|
echo "Enroll FIDO2 key for LUKS2"
|
||||||
pause
|
pause
|
||||||
systemd-cryptenroll "$ROOT_PART" --fido2-device=auto --fido2-with-client-pin=no
|
systemd-cryptenroll "$ROOT_PART" --fido2-device=auto --fido2-with-client-pin=no
|
||||||
|
fi
|
||||||
|
|
||||||
|
mkfs.btrfs /dev/mapper/cryptroot
|
||||||
|
mount /dev/mapper/cryptroot /mnt
|
||||||
|
btrfs subvolume create /mnt/@
|
||||||
|
btrfs subvolume create /mnt/@home
|
||||||
|
umount /mnt
|
||||||
|
|
||||||
|
mount -o subvol=@ /dev/mapper/cryptroot /mnt
|
||||||
|
mkdir -p /mnt/home
|
||||||
|
mount -o subvol=@home /dev/mapper/cryptroot /mnt/home
|
||||||
|
|
||||||
|
else
|
||||||
|
echo "Skipping encryption — formatting root directly."
|
||||||
|
|
||||||
|
mkfs.btrfs "$ROOT_PART"
|
||||||
|
mount "$ROOT_PART" /mnt
|
||||||
|
btrfs subvolume create /mnt/@
|
||||||
|
btrfs subvolume create /mnt/@home
|
||||||
|
umount /mnt
|
||||||
|
|
||||||
|
mount -o subvol=@ "$ROOT_PART" /mnt
|
||||||
|
mkdir -p /mnt/home
|
||||||
|
mount -o subvol=@home "$ROOT_PART" /mnt/home
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Add fallback password
|
|
||||||
echo "Adding fallback LUKS password (recommended)"
|
|
||||||
cryptsetup luksAddKey "$ROOT_PART"
|
|
||||||
|
|
||||||
############################################
|
|
||||||
# Filesystem
|
|
||||||
############################################
|
|
||||||
|
|
||||||
mkfs.btrfs /dev/mapper/cryptroot
|
|
||||||
|
|
||||||
mount /dev/mapper/cryptroot /mnt
|
|
||||||
btrfs subvolume create /mnt/@
|
|
||||||
btrfs subvolume create /mnt/@home
|
|
||||||
umount /mnt
|
|
||||||
|
|
||||||
mount -o subvol=@ /dev/mapper/cryptroot /mnt
|
|
||||||
mkdir -p /mnt/home
|
|
||||||
mount -o subvol=@home /dev/mapper/cryptroot /mnt/home
|
|
||||||
|
|
||||||
mkdir -p /mnt/boot
|
mkdir -p /mnt/boot
|
||||||
mount "$EFI_PART" /mnt/boot
|
mount "$EFI_PART" /mnt/boot
|
||||||
|
|
||||||
|
# Place backup key inside the new system (readable only by root, inside LUKS container)
|
||||||
|
if [[ -n "$LUKS_BACKUP_KEY" ]]; then
|
||||||
|
install -m 400 "$LUKS_BACKUP_KEY" /mnt/_LUKS_BACKUP_KEY
|
||||||
|
rm -f "$LUKS_BACKUP_KEY"
|
||||||
|
echo "Backup LUKS key written to /_LUKS_BACKUP_KEY in new system."
|
||||||
|
fi
|
||||||
|
|
||||||
############################################
|
############################################
|
||||||
# Base System Install
|
# Base System Install
|
||||||
############################################
|
############################################
|
||||||
|
GPU_INFO=$(lspci | grep -E "VGA|3D" || true)
|
||||||
GPU_INFO=$(lspci | grep -E "VGA|3D")
|
|
||||||
GPU_PKGS=""
|
GPU_PKGS=""
|
||||||
|
|
||||||
if echo "$GPU_INFO" | grep -qi nvidia; then
|
if echo "$GPU_INFO" | grep -qi nvidia; then
|
||||||
#GPU_PKGS="nvidia nvidia-utils"
|
|
||||||
GPU_PKGS="nvidia-open"
|
GPU_PKGS="nvidia-open"
|
||||||
elif echo "$GPU_INFO" | grep -qi amd; then
|
elif echo "$GPU_INFO" | grep -qi amd; then
|
||||||
GPU_PKGS="xf86-video-amdgpu"
|
GPU_PKGS="xf86-video-amdgpu"
|
||||||
|
|
@ -122,34 +212,35 @@ elif echo "$GPU_INFO" | grep -qi intel; then
|
||||||
GPU_PKGS="xf86-video-intel"
|
GPU_PKGS="xf86-video-intel"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
KERNEL=$(ask "Kernel (linux, linux-lts, linux-zen)")
|
# shellcheck disable=SC2086
|
||||||
HOSTNAME=$(ask "Hostname")
|
|
||||||
USERNAME=$(ask "Username")
|
|
||||||
read -rsp "Password for $USERNAME: " USERPASS; echo
|
|
||||||
|
|
||||||
read -rp "Enable FIDO2 for user login? (YES/NO): " ENABLE_FIDO_USER
|
|
||||||
|
|
||||||
pacstrap /mnt \
|
pacstrap /mnt \
|
||||||
base base-devel "$KERNEL" linux-firmware vim zsh git networkmanager grub efibootmgr \
|
base base-devel "$KERNEL" linux-firmware vim zsh git networkmanager grub efibootmgr \
|
||||||
btrfs-progs cryptsetup libfido2 pam-u2f sudo less "$GPU_PKGS"
|
btrfs-progs cryptsetup libfido2 pam-u2f sudo less jq $GPU_PKGS
|
||||||
|
|
||||||
genfstab -U /mnt >> /mnt/etc/fstab
|
genfstab -U /mnt >> /mnt/etc/fstab
|
||||||
|
|
||||||
|
############################################
|
||||||
|
# COPY ANSWERFILE INTO NEW SYSTEM
|
||||||
|
############################################
|
||||||
|
if $AF_MODE; then
|
||||||
|
install -m 644 "$ANSWERFILE" /mnt/answerfile.json
|
||||||
|
fi
|
||||||
|
|
||||||
############################################
|
############################################
|
||||||
# CHROOT Configuration
|
# CHROOT Configuration
|
||||||
############################################
|
############################################
|
||||||
|
|
||||||
ROOT_UUID=$(blkid -s UUID -o value "$ROOT_PART")
|
ROOT_UUID=$(blkid -s UUID -o value "$ROOT_PART")
|
||||||
|
|
||||||
|
|
||||||
arch-chroot /mnt /usr/bin/env \
|
arch-chroot /mnt /usr/bin/env \
|
||||||
HOSTNAME="$HOSTNAME" \
|
HOSTNAME="$HOSTNAME" \
|
||||||
USERNAME="$USERNAME" \
|
USERNAME="$USERNAME" \
|
||||||
USERPASS="$USERPASS" \
|
USERPASS="$USERPASS" \
|
||||||
|
ENCRYPT_DISK="$ENCRYPT_DISK" \
|
||||||
ENABLE_FIDO_ROOT="$ENABLE_FIDO_ROOT" \
|
ENABLE_FIDO_ROOT="$ENABLE_FIDO_ROOT" \
|
||||||
ENABLE_FIDO_USER="$ENABLE_FIDO_USER" \
|
ENABLE_FIDO_USER="$ENABLE_FIDO_USER" \
|
||||||
ROOT_UUID="$ROOT_UUID" \
|
ROOT_UUID="$ROOT_UUID" \
|
||||||
/bin/bash <<'EOF'
|
ROOT_PART="$ROOT_PART" \
|
||||||
|
/bin/bash <<'CHROOT_EOF'
|
||||||
|
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
|
||||||
|
|
@ -176,19 +267,26 @@ chown -R "$USERNAME:$USERNAME" "/home/$USERNAME"
|
||||||
|
|
||||||
echo "%wheel ALL=(ALL) ALL" >> /etc/sudoers
|
echo "%wheel ALL=(ALL) ALL" >> /etc/sudoers
|
||||||
|
|
||||||
# Initramfs + GRUB for FIDO2
|
# Initramfs
|
||||||
if [[ "$ENABLE_FIDO_ROOT" == "YES" ]]; then
|
if [[ "$ENCRYPT_DISK" == "YES" && "$ENABLE_FIDO_ROOT" == "YES" ]]; then
|
||||||
sed -i 's/^HOOKS=.*/HOOKS=(base systemd autodetect modconf block sd-encrypt filesystems keyboard fsck)/' /etc/mkinitcpio.conf
|
sed -i 's/^HOOKS=.*/HOOKS=(base udev systemd autodetect microcode modconf kms consolefont block sd-encrypt lvm2 btrfs filesystems keyboard keymap fsck)/' /etc/mkinitcpio.conf
|
||||||
|
elif [[ "$ENCRYPT_DISK" == "YES" ]]; then
|
||||||
|
sed -i 's/^HOOKS=.*/HOOKS=(base udev autodetect microcode modconf kms consolefont block encrypt lvm2 btrfs filesystems keyboard keymap fsck)/' /etc/mkinitcpio.conf
|
||||||
else
|
else
|
||||||
sed -i 's/^HOOKS=.*/HOOKS=(base udev autodetect modconf block encrypt filesystems keyboard fsck)/' /etc/mkinitcpio.conf
|
sed -i 's/^HOOKS=.*/HOOKS=(base udev autodetect microcode modconf kms consolefont block btrfs filesystems keyboard fsck)/' /etc/mkinitcpio.conf
|
||||||
fi
|
fi
|
||||||
|
|
||||||
mkinitcpio -P
|
mkinitcpio -P
|
||||||
|
|
||||||
if [[ "$ENABLE_FIDO_ROOT" == "YES" ]]; then
|
# GRUB
|
||||||
|
if [[ "$ENCRYPT_DISK" == "YES" ]]; then
|
||||||
|
if [[ "$ENABLE_FIDO_ROOT" == "YES" ]]; then
|
||||||
GRUB_CMDLINE="rd.luks.name=$ROOT_UUID=cryptroot rd.luks.options=fido2-device=auto root=/dev/mapper/cryptroot"
|
GRUB_CMDLINE="rd.luks.name=$ROOT_UUID=cryptroot rd.luks.options=fido2-device=auto root=/dev/mapper/cryptroot"
|
||||||
else
|
else
|
||||||
GRUB_CMDLINE="cryptdevice=UUID=$ROOT_UUID:cryptroot root=/dev/mapper/cryptroot"
|
GRUB_CMDLINE="cryptdevice=UUID=$ROOT_UUID:cryptroot root=/dev/mapper/cryptroot"
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
GRUB_CMDLINE="root=UUID=${ROOT_UUID} rootflags=subvol=@"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
sed -i "s|^GRUB_CMDLINE_LINUX=.*|GRUB_CMDLINE_LINUX=\"$GRUB_CMDLINE\"|" /etc/default/grub
|
sed -i "s|^GRUB_CMDLINE_LINUX=.*|GRUB_CMDLINE_LINUX=\"$GRUB_CMDLINE\"|" /etc/default/grub
|
||||||
|
|
@ -199,23 +297,26 @@ grub-mkconfig -o /boot/grub/grub.cfg
|
||||||
# User login FIDO2
|
# User login FIDO2
|
||||||
if [[ "$ENABLE_FIDO_USER" == "YES" ]]; then
|
if [[ "$ENABLE_FIDO_USER" == "YES" ]]; then
|
||||||
echo "Enrolling FIDO2 for user login"
|
echo "Enrolling FIDO2 for user login"
|
||||||
mkdir -p /home/$USERNAME/.config/Yubico
|
mkdir -p "/home/$USERNAME/.config/Yubico"
|
||||||
chown $USERNAME:$USERNAME /home/$USERNAME/.config/Yubico
|
chown "$USERNAME:$USERNAME" "/home/$USERNAME/.config/Yubico"
|
||||||
sudo -u "$USERNAME" bash -c "pamu2fcfg >> /home/$USERNAME/.config/Yubico/u2f_keys"
|
sudo -u "$USERNAME" bash -c "pamu2fcfg >> /home/$USERNAME/.config/Yubico/u2f_keys"
|
||||||
echo "auth required pam_u2f.so" >> /etc/pam.d/system-auth
|
echo "auth required pam_u2f.so" >> /etc/pam.d/system-auth
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
CHROOT_EOF
|
||||||
EOF
|
|
||||||
|
|
||||||
############################################
|
############################################
|
||||||
# DOTFILES SETUP (in-chroot, optional)
|
# DOTFILES SETUP (in-chroot, optional)
|
||||||
############################################
|
############################################
|
||||||
echo
|
if $AF_MODE; then
|
||||||
read -rp "Run dotfiles TUI setup inside chroot now? [YES/no]: " _RUN_TUI
|
_DO_TUI="${RUN_TUI}"
|
||||||
_RUN_TUI="${_RUN_TUI:-YES}"
|
else
|
||||||
|
read -rp "Run dotfiles TUI setup inside chroot now? [YES/no]: " _TUI_IN
|
||||||
|
_TUI_IN="${_TUI_IN:-YES}"
|
||||||
|
[[ "${_TUI_IN^^}" == "YES" ]] && _DO_TUI="YES" || _DO_TUI="NO"
|
||||||
|
fi
|
||||||
|
|
||||||
if [[ "${_RUN_TUI^^}" == "YES" ]]; then
|
if [[ "${_DO_TUI^^}" == "YES" ]]; then
|
||||||
echo "${USERNAME} ALL=(ALL) NOPASSWD: ALL" \
|
echo "${USERNAME} ALL=(ALL) NOPASSWD: ALL" \
|
||||||
| arch-chroot /mnt tee /etc/sudoers.d/99-setup-nopasswd > /dev/null
|
| arch-chroot /mnt tee /etc/sudoers.d/99-setup-nopasswd > /dev/null
|
||||||
|
|
||||||
|
|
@ -227,10 +328,20 @@ if [[ "${_RUN_TUI^^}" == "YES" ]]; then
|
||||||
arch-chroot /mnt rm -f /etc/sudoers.d/99-setup-nopasswd
|
arch-chroot /mnt rm -f /etc/sudoers.d/99-setup-nopasswd
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Remove answerfile from new system after setup completes
|
||||||
|
if $AF_MODE && [[ -f /mnt/answerfile.json ]]; then
|
||||||
|
rm -f /mnt/answerfile.json
|
||||||
|
fi
|
||||||
|
|
||||||
echo "Installation complete!"
|
echo "Installation complete!"
|
||||||
echo " umount -R /mnt && reboot"
|
echo " umount -R /mnt && reboot"
|
||||||
if [[ "${_RUN_TUI^^}" != "YES" ]]; then
|
if [[ "${_DO_TUI^^}" != "YES" ]]; then
|
||||||
echo
|
echo
|
||||||
echo "After first boot, login as ${USERNAME} and run:"
|
echo "After first boot, login as ${USERNAME} and run:"
|
||||||
echo " ~/Dotfiles/setup/tui-install.sh"
|
echo " ~/Dotfiles/setup/tui-install.sh"
|
||||||
fi
|
fi
|
||||||
|
if [[ "$ENCRYPT_DISK" == "YES" ]]; then
|
||||||
|
echo
|
||||||
|
echo "LUKS backup key stored at /_LUKS_BACKUP_KEY in the new system."
|
||||||
|
echo "Keep this file secure — it can unlock the root partition."
|
||||||
|
fi
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue