root/z-arch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: Enable dynamic disk and partition selection, refine btrfs subvolume check, and correct chpasswd piping for user setup.

Browse source
This commit is contained in:
Zeev Diukman 2026-01-18 08:34:14 +02:00
parent 825e95765b
commit ca54f17189
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
z.sh
View file

@ -2,10 +2,10 @@
set -e set -e
selected_disk="/dev/vda" # Configuration variables (will be populated via user selection)
seed="/dev/vda1" seed_device=""
sprout="/dev/vda2" sprout_device=""
efi="/dev/vda3" efi_device=""
# 1. Select Disk # 1. Select Disk
echo "Available storage disks:" echo "Available storage disks:"
@ -31,6 +31,7 @@ get_partition() {
local prompt="$1" local prompt="$1"
local ps3_val="$2" local ps3_val="$2"
local var_name="$3" local var_name="$3"
local default_val="$4"
local parts=() local parts=()
while IFS= read -r line; do while IFS= read -r line; do
parts+=("$line") parts+=("$line")
@ -67,7 +68,7 @@ echo "EFI device: $efi_device"
echo "" echo ""
read -r -p "Confirm formatting and installation? (yes/no/skip): " response read -r -p "Confirm formatting and installation? (yes/no/skip): " response
if [[ "$response" != "yes" && "$response" != "y" && "$response" != "Y" ]]; then if [[ "$response" != "yes" && "$response" != "y" && "$response" != "Y" && "$response" != "skip" ]]; then
echo "Aborting." echo "Aborting."
exit 1 exit 1
fi fi
@ -86,7 +87,7 @@ fi
mount -o subvol=/ "$seed_device" /mnt mount -o subvol=/ "$seed_device" /mnt
# if subvolume @ exists remove and create new one # if subvolume @ exists remove and create new one
if btrfs subvolume show /mnt | grep -q "@"; then if btrfs subvolume list /mnt | grep -q "@$"; then
btrfs subvolume delete /mnt/@ btrfs subvolume delete /mnt/@
fi fi
btrfs su cr /mnt/@ btrfs su cr /mnt/@
@ -116,10 +117,10 @@ fi
pacstrap -K /mnt ${packages[@]} pacstrap -K /mnt ${packages[@]}
mount -m "$efi_device" /mnt/efi mount -m "$efi_device" /mnt/efi
genfstab -U /mnt > /mnt/etc/fstab genfstab -U /mnt > /mnt/etc/fstab
# set root password programmatically with "arch-chroot /mnt passwd" # set root and user passwords
arch-chroot /mnt echo "root:root" | chpasswd echo "root:root" | arch-chroot /mnt chpasswd
arch-chroot /mnt useradd -m -G wheel -s /usr/bin/bash zeev arch-chroot /mnt useradd -m -G wheel -s /usr/bin/bash zeev
arch-chroot /mnt echo "zeev:zeev" | chpasswd echo "zeev:zeev" | arch-chroot /mnt chpasswd
# arch-chroot /mnt grub-install --target=x86_64-efi --efi-directory=/efi --bootloader-id=GRUB # arch-chroot /mnt grub-install --target=x86_64-efi --efi-directory=/efi --bootloader-id=GRUB
# arch-chroot /mnt grub-mkconfig -o /boot/grub/grub.cfg # arch-chroot /mnt grub-mkconfig -o /boot/grub/grub.cfg
# arch-chroot /mnt systemctl enable NetworkManager # arch-chroot /mnt systemctl enable NetworkManager