Add post-install helper script for GRUB mirror

2022-11-27 20:48:13 -05:00
2 changed files with 40 additions and 99 deletions
--- a/debianzfs.pkr.hcl
+++ b/debianzfs.pkr.hcl
@@ -45,7 +45,7 @@ build {
  }

  provisioner "shell" {
-     inline = ["sudo /tmp/debianzfs.sh -i -s0 -p changeme -P letmeinzfs! /dev/vda debianzfs"]
+     inline = ["sudo /tmp/debianzfs.sh -p changeme -P letmeinzfs! /dev/vda debianzfs"]
  }

 }
--- a/debianzfs.sh
+++ b/debianzfs.sh
@@ -7,31 +7,18 @@
 ### Functions ###
 #################
 function usage () {
-	echo "Usage: $(basename "$0") [-ghimpPrs] <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. You'll likely want: -s"
-	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"
-	echo -e "\n\t-s <PARTSUFFIX>\n\t\tSet the partition suffix for disks, defaults to: -part"
-	echo -e "\t\tSet to a zero '0' to remove the suffix entirely, i.e., -s0"
+	echo "Usage: ./$(basename "$0") [-mpPr] <DISK> <HOSTNAME>"
 }

 function disk_check () {
-	local DISK="$1"
-	local DISK_TYPE
-	[ -L "$DISK" ] && DISK=$(readlink -f "$DISK")
-	DISK_TYPE=$(file "$DISK" | awk '{ print $2$3 }')
+	DISK_TYPE=$(file "$1" | awk '{ print $2$3 }')
 	if [ "$DISK_TYPE" != "blockspecial" ]; then
-		echo "ERROR: Disk '$DISK' is not a block device"
+		echo "ERROR: Disk '$1' is not a block device"
 		exit 1
 	fi
 }

 function disk_status () {
-	local OUTPUT
 	OUTPUT=$(wipefs "$1")
 	if [ -n "$OUTPUT" ]; then
 		echo "ERROR: $1 is not empty"
@@ -41,8 +28,6 @@ function disk_status () {
 }

 function password_prompt () {
-	local password
-	local password_confirm
 	unset PASSWORD_PROMPT_RESULT
 	while true; do
 		read -r -s -p "${1}: " password
@@ -71,7 +56,6 @@ function disk_format () {
 }

 function create_boot_pool () {
-	# shellcheck disable=SC2086
 	zpool create -f \
 		-o ashift=12 \
 		-o autotrim=on -d \
@@ -95,11 +79,10 @@ function create_boot_pool () {
 		-O normalization=formD \
 		-O relatime=on \
 		-O canmount=off -O mountpoint=/boot -R "$1" \
-		bpool $2
+		bpool "$2"
 }

 function create_root_pool () {
-	# shellcheck disable=SC2086
 	echo "$3" | zpool create -f \
 		-o ashift=12 \
 		-o autotrim=on \
@@ -109,43 +92,17 @@ function create_root_pool () {
 		-O normalization=formD \
 		-O relatime=on \
 		-O canmount=off -O mountpoint=/ -R "$1" \
-		rpool $2
-}
-
-function part_path () {
-	local DISK="$1"
-	local PART="$2"
-	[ "$(disk_check "$DISK")" == 1 ] && exit 1
-	if [ "${DISK:0:7}" == "/dev/sd" ]; then
-		DISK_PART="${DISK}${PART}"
-	elif [ "${DISK:0:9}" == "/dev/nvme" ]; then
-		DISK_PART="${DISK}p${PART}"
-	else
-		echo "ERROR: Disk not recognized"
-		exit 1
-	fi
-
-	[ "$(disk_check "$DISK_PART")" == 1 ] && exit 1
-	echo "$DISK_PART"
-	exit 0
+		rpool "$2"
 }

 function mirror_grub () {
 	umount /boot/efi
-	dd if="$1" of="$2"
+	dd if="${1}-part2" of="${2}-part2"
 	efibootmgr -c -g -d "$2" -p 2 \
 		-L "debian-${3}" -l '\EFI\debian\grubx64.efi'
 	mount /boot/efi
 }

-function disk_byid_check () {
-	local BYID="/dev/disk/by-id/"
-	if [ ! "${1:0:${#BYID}}" == "$BYID" ]; then
-		echo "ERROR: DISK needs to be ${BYID}* format"
-		exit 1
-	fi
-}
-
 ################
 ### Settings ###
 ################
@@ -154,15 +111,13 @@ export DEBIAN_FRONTEND=noninteractive
 CODENAME="bullseye"

 # Options
-while getopts ':ghim:p:P:r:s:' OPTION; do
+while getopts ':gm:p:P:r:' OPTION; do
 	case "$OPTION" in
 		g) GRUB_MIRROR="true";;
-		i) IGNORE_BYID="true";;
 		m) MIRROR="$OPTARG";;
 		p) ROOTPW="$OPTARG";;
 		P) RPOOLPW="$OPTARG";;
 		r) ZFSROOT="$OPTARG";;
-		s) PARTSUFFIX="$OPTARG";;
 		?)
 			usage
 			exit 1;;
@@ -183,8 +138,6 @@ if [ "$GRUB_MIRROR" == "true" ]; then
 			[Yy]*)
 				disk_check "$DISK"
 				disk_check "$MIRROR"
-				[ -z "$IGNORE_BYID" ] && disk_byid_check "$DISK"
-				[ -z "$IGNORE_BYID" ] && disk_byid_check "$MIRROR"
 				mirror_grub "$DISK" "$MIRROR" 2
 				exit 0;;
 			?)
@@ -197,12 +150,6 @@ fi
 # Verify variables
 [ -z "$ZFSROOT" ] && ZFSROOT="/mnt"

-if [ -z "$PARTSUFFIX" ]; then
-	PARTSUFFIX="-part"
-elif [ "$PARTSUFFIX" == "0" ]; then
-	PARTSUFFIX=""
-fi
-
 if [ -z "$DISK" ]; then
 	echo "ERROR: DISK not set"
 	usage
@@ -228,27 +175,22 @@ if [ -z "$RPOOLPW" ]; then
 fi

 if [ "$DEBUG" == "true" ]; then
-	echo "CODENAME='${CODENAME}'"
-	echo "DISK='${DISK}'"
-	echo "ZFSHOST='${ZFSHOST}'"
-	echo "ZFSROOT='${ZFSROOT}'"
-	echo "MIRROR='${MIRROR}'"
-	echo "ROOTPW='${ROOTPW}'"
-	echo "RPOOLPW='${RPOOLPW}'"
-	echo "PARTSUFFIX='${PARTSUFFIX}'"
-	echo "GRUB_MIRROR='${GRUB_MIRROR}'"
-	echo "IGNORE_BYID='${IGNORE_BYID}'"
+	echo "CODENAME=${CODENAME}"
+	echo "DISK=${DISK}"
+	echo "ZFSHOST=${ZFSHOST}"
+	echo "ZFSROOT=${ZFSROOT}"
+	echo "MIRROR=${MIRROR}"
+	echo "ROOTPW=${ROOTPW}"
+	echo "RPOOLPW=${RPOOLPW}"
 fi

 # Are the DISK paths block devices? AND
 # Are the DISK pathes empty devices? i.e., no filesystem signatures
 disk_check "$DISK"
 disk_status "$DISK"
-[ -z "$IGNORE_BYID" ] && disk_byid_check "$DISK"
 if [ -n "$MIRROR" ]; then
 	disk_check "$MIRROR"
 	disk_status "$MIRROR"
-	[ -z "$IGNORE_BYID" ] && disk_byid_check "$MIRROR"
 fi

 ###############################################
@@ -256,7 +198,7 @@ fi
 ###############################################

 # Display commands
-set -xe
+set -x

 # 1. Boot the Debian GNU/Linux Live CD... done
 # 2. Setup and update the repositories
@@ -284,26 +226,19 @@ swapoff --all
 # UEFI booting + boot pool + ZFS native encryption
 disk_format "$DISK"
 [ -n "$MIRROR" ] && disk_format "$MIRROR"
-sleep 5
-
-# Check for partitions 3 and 4
-disk_check "${DISK}${PARTSUFFIX}3"
-disk_check "${DISK}${PARTSUFFIX}4"
-if [ -n "$MIRROR" ]; then
-	disk_check "${DISK}${PARTSUFFIX}3"
-	disk_check "${DISK}${PARTSUFFIX}4"
-fi

 # 4. Create the boot pool
+if [ -z "$MIRROR" ]; then
+	create_boot_pool "$ZFSROOT" "${DISK}3"
+else
+	create_boot_pool "$ZFSROOT" "mirror ${DISK}3 ${MIRROR}3"
+fi
+
 # 5. Create the root pool
 if [ -z "$MIRROR" ]; then
-	create_boot_pool "$ZFSROOT" "${DISK}${PARTSUFFIX}3"
-	create_root_pool "$ZFSROOT" "${DISK}${PARTSUFFIX}4" "$RPOOLPW"
+	create_root_pool "$ZFSROOT" "${DISK}4" "$RPOOLPW"
 else
-	create_boot_pool "$ZFSROOT" \
-		"mirror ${DISK}${PARTSUFFIX}3 ${MIRROR}${PARTSUFFIX}3"
-	create_root_pool "$ZFSROOT" \
-		"mirror ${DISK}${PARTSUFFIX}4 ${MIRROR}${PARTSUFFIX}4" "$RPOOLPW"
+	create_root_pool "$ZFSROOT" "mirror ${DISK}4 ${MIRROR}4" "$RPOOLPW"
 fi

 ###################################
@@ -391,33 +326,39 @@ deb http://deb.debian.org/debian ${CODENAME}-updates main contrib
 deb-src http://deb.debian.org/debian ${CODENAME}-updates main contrib
 EOF

+# 4. Bind the virtual filesystems from the LiveCD environment to the new system and chroot into it
+# Copy DISK/MIRROR vars under ZFSROOT
+echo -e "DISK=${DISK}\nROOTPW=${ROOTPW}" > "$ZFSROOT/var/tmp/zfsenv"
+
 # Copy self and GRUB mirror helper script into chroot
 if [ -n "$MIRROR" ]; then
 	cp "$0" "$ZFSROOT/usr/local/bin/debianzfs"
-	chmod +x "$ZFSROOT/usr/local/bin/debianzfs"
-	HELPER_SCRIPT="/root/MIRROR_GRUB_POSTINSTALL.sh"
+	chmod u+x "$ZFSROOT/usr/local/bin/debianzfs"
+	DDIF=$(find /dev/disk/by-id -lname ../../"$(basename "$DISK")" | tail -n1)
+	DDOF=$(find /dev/disk/by-id -lname ../../"$(basename "$MIRROR")" | tail -n1)
+	HELPER_SCRIPT="/root/INSTALL_GRUB_POSTINSTALL.sh"
 	cat <<-GRUBMIRROR > "${ZFSROOT}${HELPER_SCRIPT}"
 	#!/bin/bash
 	# Post-install GRUB mirror helper script
 	/usr/local/bin/debianzfs \
-		-gm ${MIRROR}${PARTSUFFIX}2 \
-		${DISK}${PARTSUFFIX}2
+		-gm $DDOF \
+		$DDIF
 	GRUBMIRROR
 fi

-# 4. Bind the virtual filesystems from the LiveCD environment to the new system and chroot into it
+# Bind
 mount --make-private --rbind /dev /mnt/dev
 mount --make-private --rbind /proc /mnt/proc
 mount --make-private --rbind /sys /mnt/sys

-# Copy DISK/MIRROR vars under ZFSROOT and chroot
-echo -e "DISK=\"$DISK\"\nPARTSUFFIX=\"${PARTSUFFIX}\"\nROOTPW=\"${ROOTPW}\"" > "$ZFSROOT/var/tmp/zfsenv"
+# Chroot
 cat << CHROOT | chroot /mnt bash --login
 # Setup
 export DEBIAN_FRONTEND=noninteractive
+export LC_CTYPE=en_US.UTF-8
+export LC_ALL=en_US.UTF-8
 set -ex
 . /var/tmp/zfsenv
-rm -f /var/tmp/zfsenv
 unset CDPATH
 cd

@@ -438,9 +379,9 @@ echo REMAKE_INITRD=yes > /etc/dkms/zfs.conf
 # Install GRUB for UEFI booting
 apt-get install -y dosfstools

-mkdosfs -F 32 -s 1 -n EFI "\${DISK}\${PARTSUFFIX}2"
+mkdosfs -F 32 -s 1 -n EFI "\${DISK}2"
 mkdir /boot/efi
-BLKID_BOOT="/dev/disk/by-uuid/\$(blkid -s UUID -o value \${DISK}\${PARTSUFFIX}2)"
+BLKID_BOOT="/dev/disk/by-uuid/\$(blkid -s UUID -o value \${DISK}2)"
 echo "\${BLKID_BOOT} /boot/efi vfat defaults 0 0" >> /etc/fstab
 mount /boot/efi
 apt-get install -y grub-efi-amd64 shim-signed