Compare commits

..

2 Commits

Author SHA1 Message Date
99ba1b6f2f testing 2022-11-29 01:17:13 -05:00
77bd3bd259 testing 2022-11-29 01:03:18 -05:00
2 changed files with 34 additions and 43 deletions

View File

@ -45,7 +45,7 @@ build {
} }
provisioner "shell" { provisioner "shell" {
inline = ["sudo /tmp/debianzfs.sh -ip changeme -P letmeinzfs! /dev/vda debianzfs"] inline = ["sudo /tmp/debianzfs.sh -p changeme -P letmeinzfs! /dev/vda debianzfs"]
} }
} }

View File

@ -7,14 +7,7 @@
### Functions ### ### Functions ###
################# #################
function usage () { function usage () {
echo "Usage: $(basename "$0") [-ghimpPr] <DISK> [HOSTNAME]" echo "Usage: ./$(basename "$0") [-mpPr] <DISK> <HOSTNAME>"
echo -e "\t-g\n\t\tMirror GRUB after the installation. Requires: -m"
echo -e "\n\t-h\n\t\tThe help menu, i.e., the menu you're seeing now."
echo -e "\n\t-i\n\t\tIgnore the check for the /dev/disk/by-id/* format."
echo -e "\n\t-m <MIRROR>\n\t\tSet the MIRROR disk for a ZFS mirror installation."
echo -e "\n\t-p <PASSWORD>\n\t\tSet the password for root. Caution: saves to file temporarily."
echo -e "\n\t-P <PASSWWORD>\n\t\tSet the password for encrypting the root zpool."
echo -e "\n\t-r <ZFSROOT>\n\t\tSet the path for the new ZFS chroot. Defaults to /mnt"
} }
function disk_check () { function disk_check () {
@ -122,20 +115,27 @@ function part_path () {
exit 0 exit 0
} }
function mirror_grub () { function part_by_uuid () {
umount /boot/efi OUTPUT=$(
dd if="$1" of="$2" blkid -s UUID | grep -e "^${1}.*${2}: UUID=" | \
efibootmgr -c -g -d "$2" -p 2 \ awk '{ print substr($2, 7, length($2)-7) }'
-L "debian-${3}" -l '\EFI\debian\grubx64.efi' )
mount /boot/efi
}
function disk_byid_check () { if [ -z "$OUTPUT" ]; then
BYID="/dev/disk/by-id/" echo "ERROR: No disk by-uuid label found for: ${1}, partition ${2}"
if [ ! "${1:0:${#BYID}}" == "$BYID" ]; then
echo "ERROR: DISK needs to be ${BYID}* format"
exit 1 exit 1
fi fi
echo "/dev/disk/by-uuid/$OUTPUT"
}
function mirror_grub () {
DISK1_PART2="$(part_by_uuid "$1" 2)"
DISK2_PART2="$(part_by_uuid "$2" 2)"
umount /boot/efi
dd if="$DISK1_PART2" of="$DISK2_PART2"
efibootmgr -c -g -d "$DISK2" -p 2 \
-L "debian-${3}" -l '\EFI\debian\grubx64.efi'
mount /boot/efi
} }
################ ################
@ -146,10 +146,9 @@ export DEBIAN_FRONTEND=noninteractive
CODENAME="bullseye" CODENAME="bullseye"
# Options # Options
while getopts ':ghim:p:P:r:' OPTION; do while getopts ':gm:p:P:r:' OPTION; do
case "$OPTION" in case "$OPTION" in
g) GRUB_MIRROR="true";; g) GRUB_MIRROR="true";;
i) IGNORE_BYID="true";;
m) MIRROR="$OPTARG";; m) MIRROR="$OPTARG";;
p) ROOTPW="$OPTARG";; p) ROOTPW="$OPTARG";;
P) RPOOLPW="$OPTARG";; P) RPOOLPW="$OPTARG";;
@ -174,8 +173,6 @@ if [ "$GRUB_MIRROR" == "true" ]; then
[Yy]*) [Yy]*)
disk_check "$DISK" disk_check "$DISK"
disk_check "$MIRROR" disk_check "$MIRROR"
[ -z "$IGNORE_BYID" ] && disk_byid_check "$DISK"
[ -z "$IGNORE_BYID" ] && disk_byid_check "$MIRROR"
mirror_grub "$DISK" "$MIRROR" 2 mirror_grub "$DISK" "$MIRROR" 2
exit 0;; exit 0;;
?) ?)
@ -226,11 +223,9 @@ fi
# Are the DISK pathes empty devices? i.e., no filesystem signatures # Are the DISK pathes empty devices? i.e., no filesystem signatures
disk_check "$DISK" disk_check "$DISK"
disk_status "$DISK" disk_status "$DISK"
[ -z "$IGNORE_BYID" ] && disk_byid_check "$DISK"
if [ -n "$MIRROR" ]; then if [ -n "$MIRROR" ]; then
disk_check "$MIRROR" disk_check "$MIRROR"
disk_status "$MIRROR" disk_status "$MIRROR"
[ -z "$IGNORE_BYID" ] && disk_byid_check "$MIRROR"
fi fi
############################################### ###############################################
@ -265,27 +260,21 @@ swapoff --all
# 3. Partition your disk(s) # 3. Partition your disk(s)
# UEFI booting + boot pool + ZFS native encryption # UEFI booting + boot pool + ZFS native encryption
disk_format "$DISK" disk_format "$DISK"
[ -n "$MIRROR" ] && disk_format "$MIRROR"
sleep 5
# Check for partitions 3 and 4
disk_check "$DISK-part3"
disk_check "$DISK-part4"
if [ -n "$MIRROR" ]; then if [ -n "$MIRROR" ]; then
disk_check "$MIRROR-part3" disk_format "$MIRROR"
disk_check "$MIRROR-part4"
fi fi
sleep 5
# 4. Create the boot pool # 4. Create the boot pool
# 5. Create the root pool # 5. Create the root pool
if [ -z "$MIRROR" ]; then if [ -z "$MIRROR" ]; then
create_boot_pool "$ZFSROOT" "$DISK-part3" create_boot_pool "$ZFSROOT" "$(part_path "$DISK" 3)"
create_root_pool "$ZFSROOT" "$DISK-part4" "$RPOOLPW" create_root_pool "$ZFSROOT" "$(part_path "$DISK" 4)" "$RPOOLPW"
else else
create_boot_pool "$ZFSROOT" \ create_boot_pool "$ZFSROOT" \
"mirror ${DISK}-part3 $MIRROR-part3" "mirror $(part_path "$DISK" 3) $(part_path "$MIRROR" 3)"
create_root_pool "$ZFSROOT" \ create_root_pool "$ZFSROOT" \
"mirror ${DISK}-part4 $MIRROR-part4" "$RPOOLPW" "mirror $(part_path "$DISK" 4) $(part_path "$MIRROR" 4)" "$RPOOLPW"
fi fi
################################### ###################################
@ -375,7 +364,7 @@ EOF
# 4. Bind the virtual filesystems from the LiveCD environment to the new system and chroot into it # 4. Bind the virtual filesystems from the LiveCD environment to the new system and chroot into it
# Copy DISK/MIRROR vars under ZFSROOT # Copy DISK/MIRROR vars under ZFSROOT
echo -e "DISK=\"$DISK\"\nROOTPW=\"${ROOTPW}\"" > "$ZFSROOT/var/tmp/zfsenv" echo -e "DISK=\"$(part_path "$DISK" 2)\"\nROOTPW=\"${ROOTPW}\"" > "$ZFSROOT/var/tmp/zfsenv"
# Copy self and GRUB mirror helper script into chroot # Copy self and GRUB mirror helper script into chroot
if [ -n "$MIRROR" ]; then if [ -n "$MIRROR" ]; then
@ -386,8 +375,8 @@ if [ -n "$MIRROR" ]; then
#!/bin/bash #!/bin/bash
# Post-install GRUB mirror helper script # Post-install GRUB mirror helper script
/usr/local/bin/debianzfs \ /usr/local/bin/debianzfs \
-gm $MIRROR-part2 \ -gm "$MIRROR_PART2_BYUUID" \
$DISK-part2) "$DISK_PART2_BYUUID"
GRUBMIRROR GRUBMIRROR
fi fi
@ -400,6 +389,8 @@ mount --make-private --rbind /sys /mnt/sys
cat << CHROOT | chroot /mnt bash --login cat << CHROOT | chroot /mnt bash --login
# Setup # Setup
export DEBIAN_FRONTEND=noninteractive export DEBIAN_FRONTEND=noninteractive
export LC_CTYPE=en_US.UTF-8
export LC_ALL=en_US.UTF-8
set -ex set -ex
. /var/tmp/zfsenv . /var/tmp/zfsenv
rm -f /var/tmp/zfsenv rm -f /var/tmp/zfsenv
@ -423,9 +414,9 @@ echo REMAKE_INITRD=yes > /etc/dkms/zfs.conf
# Install GRUB for UEFI booting # Install GRUB for UEFI booting
apt-get install -y dosfstools apt-get install -y dosfstools
mkdosfs -F 32 -s 1 -n EFI "\${DISK}-part2" mkdosfs -F 32 -s 1 -n EFI "\${DISK}"
mkdir /boot/efi mkdir /boot/efi
BLKID_BOOT="/dev/disk/by-uuid/\$(blkid -s UUID -o value \${DISK}-part2)" BLKID_BOOT="/dev/disk/by-uuid/\$(blkid -s UUID -o value \${DISK})"
echo "\${BLKID_BOOT} /boot/efi vfat defaults 0 0" >> /etc/fstab echo "\${BLKID_BOOT} /boot/efi vfat defaults 0 0" >> /etc/fstab
mount /boot/efi mount /boot/efi
apt-get install -y grub-efi-amd64 shim-signed apt-get install -y grub-efi-amd64 shim-signed