ange/archinstall
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bump: 202510

Browse source
This commit is contained in:
ange 2025-10-03 10:10:06 +00:00
parent fa579eba0b
commit b0add9b2cd
Signed by: ange
GPG key ID: 9E0C4157BB7BEB1D
20 changed files with 75 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

17
modules/00-prechroot/10-disk.sh
View file

@ -11,29 +11,32 @@ root=/dev/disk/by-partlabel/root
if [ -n "$disk_passwd" ]; then
echo -n "$disk_passwd" | cryptsetup luksFormat "$root" -
cryptsetup open "$root" cryptroot - <<< "$disk_passwd"
root=/dev/mapper/cryptroot
cryptsetup open "$root" root - <<< "$disk_passwd"
root=/dev/mapper/root
fi
sleep 5 # wait /dev/disk/by-partlabel/
while ! [ -e "$root" ] || ! [ -e "$esp" ]; do
echo 'waiting for /dev/disk/by-partlabel/ to be populated' >&2
sleep 1
done
mkfs.vfat -F32 "$esp"
mkfs.ext4 -F "$root"
mount "$root" /mnt/
mount -m "$esp" /mnt/efi/
mkdir -p /mnt/etc/ /mnt/efi/EFI/Linux/
cat <<EOF > /mnt/etc/fstab
UUID=$(blkid "$root" -ovalue -sUUID) / ext4 rw,relatime 0 1
UUID=$(blkid "$esp" -ovalue -sUUID) /efi vfat rw,fmask=0077,dmask=0077,noauto 0 2
UUID=$(blkid "$esp" -ovalue -sUUID) /efi vfat rw,fmask=0077,dmask=0077 0 2
EOF
if [ -n "$swapfile" ]; then
dd if=/dev/zero of=/mnt/swapfile bs=1M count="$swapfile" status=progress
chmod 600 /mnt/swapfile
mkswap /mnt/swapfile
swapon /mnt/swapfile
echo "/swapfile none swap defaults 0 0" >> /mnt/etc/fstab
fi
cp -rfTv rootfs/ /mnt/
swapoff /mnt/swapfile

11
modules/00-prechroot/20-pkg.sh
View file

@ -2,17 +2,16 @@
#shellcheck disable=SC2154
case "$(lscpu)" in
*AMD*) echo amd-ucode >> pkglist.txt ;;
*Intel*) echo intel-ucode >> pkglist.txt ;;
*) ;;
*AMD*) printf '%s\n' amd-ucode >> pkglist.txt ;;
*Intel*) printf '%s\n' intel-ucode >> pkglist.txt ;;
esac
if [ -d /sys/class/power_supply/BAT0 ]; then
echo tlp >> pkglist.txt
printf '%s\n' tlp >> pkglist.txt
fi
echo "$shell" >> pkglist.txt
printf '%s\n' "$shell" >> pkglist.txt
pacstrap -C rootfs/etc/pacman.conf -K /mnt \
base linux{,-lts,-firmware} efibootmgr sbctl - < pkglist.txt
linux{,-lts,-firmware} efibootmgr sbctl pacman archlinux-keyring - < pkglist.txt
find /mnt/etc/ -name '*.pacnew' -delete