autoinstall logging - vars
parent
992dcbafaf
commit
110e55ee11
|
|
@ -6,7 +6,6 @@ set -euo pipefail
|
||||||
############################################
|
############################################
|
||||||
LOGFILE="$HOME/arch-autoinstall.log"
|
LOGFILE="$HOME/arch-autoinstall.log"
|
||||||
|
|
||||||
# Timestamped header
|
|
||||||
{
|
{
|
||||||
echo
|
echo
|
||||||
echo "############################################"
|
echo "############################################"
|
||||||
|
|
@ -15,9 +14,9 @@ LOGFILE="$HOME/arch-autoinstall.log"
|
||||||
echo
|
echo
|
||||||
} >> "$LOGFILE"
|
} >> "$LOGFILE"
|
||||||
|
|
||||||
# Redirect ALL output (stdout & stderr) to both screen AND log
|
|
||||||
exec > >(tee -a "$LOGFILE") 2>&1
|
exec > >(tee -a "$LOGFILE") 2>&1
|
||||||
|
|
||||||
|
|
||||||
############################################
|
############################################
|
||||||
# SAFETY WARNING
|
# SAFETY WARNING
|
||||||
############################################
|
############################################
|
||||||
|
|
@ -43,7 +42,6 @@ RAM_GB=$(free --giga | awk '/^Mem:/ {print $2}')
|
||||||
BOOT_SIZE=15GiB
|
BOOT_SIZE=15GiB
|
||||||
SWAP_SIZE="${RAM_GB}GiB"
|
SWAP_SIZE="${RAM_GB}GiB"
|
||||||
|
|
||||||
# Exact disk size in 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))
|
||||||
|
|
||||||
|
|
@ -175,7 +173,7 @@ echo "$USERNAME:$USERPASS" | chpasswd
|
||||||
echo "%wheel ALL=(ALL:ALL) ALL" >> /etc/sudoers
|
echo "%wheel ALL=(ALL:ALL) ALL" >> /etc/sudoers
|
||||||
|
|
||||||
###################################################
|
###################################################
|
||||||
# INITRAMFS CONFIG FOR SYSTEMD-CRYPTENROLL + FIDO2
|
# INITRAMFS CONFIG
|
||||||
###################################################
|
###################################################
|
||||||
if [[ "$FIDO_ROOT" == "YES" ]]; then
|
if [[ "$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 systemd autodetect modconf block sd-encrypt filesystems keyboard fsck)/' /etc/mkinitcpio.conf
|
||||||
|
|
@ -186,7 +184,7 @@ fi
|
||||||
mkinitcpio -P
|
mkinitcpio -P
|
||||||
|
|
||||||
###################################################
|
###################################################
|
||||||
# GRUB CONFIG — systemd-based cryptsetup
|
# GRUB CONFIG
|
||||||
###################################################
|
###################################################
|
||||||
UUID=$(blkid -s UUID -o value "$ROOT_PART")
|
UUID=$(blkid -s UUID -o value "$ROOT_PART")
|
||||||
|
|
||||||
|
|
@ -202,7 +200,7 @@ grub-install --target=x86_64-efi --efi-directory=/boot --bootloader-id=GRUB
|
||||||
grub-mkconfig -o /boot/grub/grub.cfg
|
grub-mkconfig -o /boot/grub/grub.cfg
|
||||||
|
|
||||||
###################################################
|
###################################################
|
||||||
# USER FIDO2 LOGIN (pam-u2f)
|
# 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
|
||||||
|
|
@ -215,9 +213,36 @@ fi
|
||||||
|
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
|
############################################
|
||||||
|
# SUMMARY OUTPUT (NEW)
|
||||||
|
############################################
|
||||||
|
echo
|
||||||
|
echo "############################################"
|
||||||
|
echo " INSTALL SUMMARY"
|
||||||
|
echo "############################################"
|
||||||
|
echo "Drive: $DRIVE"
|
||||||
|
echo "Boot partition: $BOOT_PART"
|
||||||
|
echo "Root partition: $ROOT_PART"
|
||||||
|
echo "Swap partition: $SWAP_PART"
|
||||||
|
echo
|
||||||
|
echo "Hostname: $HOSTNAME"
|
||||||
|
echo "Username: $USERNAME"
|
||||||
|
echo "Kernel: $KERNEL"
|
||||||
|
echo "GPU detected: $GPU_INFO"
|
||||||
|
echo
|
||||||
|
echo "FIDO2 root unlock: $FIDO_ROOT"
|
||||||
|
echo "FIDO2 user login: $FIDO_USER"
|
||||||
|
echo
|
||||||
|
echo "Boot size: $BOOT_SIZE"
|
||||||
|
echo "Root size: ${ROOT_GIB}GiB"
|
||||||
|
echo "Swap size: $SWAP_SIZE"
|
||||||
|
echo
|
||||||
|
echo "Log file saved to: $LOGFILE"
|
||||||
|
echo "############################################"
|
||||||
|
echo
|
||||||
|
|
||||||
############################################
|
############################################
|
||||||
# DONE
|
# DONE
|
||||||
############################################
|
############################################
|
||||||
echo "Installation complete! You can now unmount and reboot."
|
echo "Installation complete! You can now unmount and reboot."
|
||||||
echo "Log saved to: $LOGFILE"
|
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue