testing

Makefile

@@ -1,13 +1,6 @@
 all: debianzfs.qcow2
 
-# Generate password
+debianzfs.qcow2: export PKR_VAR_password = "$(pwgen -s 8 1)"
-debianzfs.qcow2: export PKR_VAR_password="$(pwgen -s 8 1)"
-
-# Release info
-debianzfs.qcow2: export PKR_VAR_release=12.0.0
-debianzfs.qcow2: export PKR_VAR_codename=bookworm
-debianzfs.qcow2: export PKR_VAR_sha256=fa3960f6f692fc60a43eec4362d60f754b4a246ab64aa662270dd879a946de84
-
 debianzfs.qcow2:
 	packer build -color=false . | tee debianzfs.log
 

debianzfs.pkr.hcl

@@ -1,11 +1,9 @@
 # Set 'password' using shell var: PKR_VAR_password=$(pwgen -s 8 1)
 variable "password" {}
-variable "release" {}
-variable "sha256" {}
 
-source "qemu" "debian-live" {
+source "qemu" "bullseye-live" {
-  iso_url           = "https://cdimage.debian.org/debian-cd/current-live/amd64/iso-hybrid/debian-live-${var.release}-amd64-standard.iso"
+  iso_url           = "https://cdimage.debian.org/debian-cd/current-live/amd64/iso-hybrid/debian-live-11.5.0-amd64-standard.iso"
-  iso_checksum      = "sha256:${var.sha256}"
+  iso_checksum      = "sha256:8172b188061d098080bb315972becbe9bd387c856866746cee018102cd00fc9b"
   output_directory  = "output"
   shutdown_command  = "echo 'packer' | sudo -S shutdown -P now"
   disk_size         = "5000M"
@@ -21,7 +19,7 @@ source "qemu" "debian-live" {
   disk_interface    = "virtio"
   boot_wait         = "5s"
   boot_command      = [
-        "<enter><wait20>",
+        "<enter><wait10>",
         "<enter><wait>",
         "sudo -i<enter><wait>",
         "read -s userpw<enter><wait>",
@@ -35,11 +33,11 @@ source "qemu" "debian-live" {
 
 build {
   name = "zfs"
-  sources = ["source.qemu.debian-live"]
+  sources = ["source.qemu.bullseye-live"]
 
   provisioner "file" {
     source      = "debianzfs.sh"
-    destination = "/tmp/debianzfs"
+    destination = "/tmp/debianzfs.sh"
   }
 
   provisioner "shell" {
@@ -47,7 +45,7 @@ build {
   }
 
   provisioner "shell" {
-     inline = ["sudo /tmp/debianzfs -i -s0 -p 'changeme' -P 'letmeinzfs!' /dev/vda debianzfs"]
+     inline = ["sudo /tmp/debianzfs.sh -p changeme -P letmeinzfs! /dev/vda debianzfs"]
   }
 
 }

debianzfs.sh

@@ -1,37 +1,24 @@
 #!/bin/bash
 
-# This script is originally based off the "Debian Bullseye Root on ZFS" guide
+# Script is based off official guide: see "Debian Bullseye Root on ZFS"
 # https://openzfs.github.io/openzfs-docs/Getting%20Started/Debian/Debian%20Bullseye%20Root%20on%20ZFS.html
 
 #################
 ### Functions ###
 #################
 function usage () {
-	echo "Usage: $(basename "$0") [-ghimpPrs] <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. 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"
 }
 
 function disk_check () {
-	local DISK="$1"
+	DISK_TYPE=$(file "$1" | awk '{ print $2$3 }')
-	local DISK_TYPE
-	[ -L "$DISK" ] && DISK=$(readlink -f "$DISK")
-	DISK_TYPE=$(file "$DISK" | 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
@@ -112,20 +97,45 @@ function create_root_pool () {
 		rpool $2
 }
 
-function mirror_grub () {
+function part_path () {
-	umount /boot/efi
+	DISK="$1"
-	dd if="$1" of="$2"
+	PART="$2"
-	efibootmgr -c -g -d "$2" -p 2 \
+	[ "$(disk_check "$DISK")" == 1 ] && exit 1
-		-L "debian-${3}" -l '\EFI\debian\grubx64.efi'
+	if [ "${DISK:0:7}" == "/dev/sd" ]; then
-	mount /boot/efi
+		DISK_PART="${DISK}${PART}"
-}
+	elif [ "${DISK:0:9}" == "/dev/nvme" ]; then
-
+		DISK_PART="${DISK}p${PART}"
-function disk_byid_check () {
+	else
-	local BYID="/dev/disk/by-id/"
+		echo "ERROR: Disk not recognized"
-	if [ ! "${1:0:${#BYID}}" == "$BYID" ]; then
-		echo "ERROR: DISK needs to be ${BYID}* format"
 		exit 1
 	fi
+
+	[ "$(disk_check "$DISK_PART")" == 1 ] && exit 1
+	echo "$DISK_PART"
+	exit 0
+}
+
+function part_by_uuid () {
+	OUTPUT=$(
+		blkid -s UUID | grep -e "^${1}.*${2}: UUID=" | \
+		awk '{ print substr($2, 7, length($2)-7) }'
+	)
+
+	if [ -z "$OUTPUT" ]; then
+		echo "ERROR: No disk by-uuid label found for: ${1}, partition ${2}"
+		exit 1
+	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
 }
 
 ################
@@ -133,18 +143,16 @@ function disk_byid_check () {
 ################
 # Static
 export DEBIAN_FRONTEND=noninteractive
-CODENAME="bookworm"
+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;;
@@ -165,8 +173,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;;
 			?)
@@ -179,12 +185,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
@@ -210,27 +210,22 @@ if [ -z "$RPOOLPW" ]; then
 fi
 
 if [ "$DEBUG" == "true" ]; then
-	echo "CODENAME='${CODENAME}'"
+	echo "CODENAME=${CODENAME}"
-	echo "DISK='${DISK}'"
+	echo "DISK=${DISK}"
-	echo "ZFSHOST='${ZFSHOST}'"
+	echo "ZFSHOST=${ZFSHOST}"
-	echo "ZFSROOT='${ZFSROOT}'"
+	echo "ZFSROOT=${ZFSROOT}"
-	echo "MIRROR='${MIRROR}'"
+	echo "MIRROR=${MIRROR}"
-	echo "ROOTPW='${ROOTPW}'"
+	echo "ROOTPW=${ROOTPW}"
-	echo "RPOOLPW='${RPOOLPW}'"
+	echo "RPOOLPW=${RPOOLPW}"
-	echo "PARTSUFFIX='${PARTSUFFIX}'"
-	echo "GRUB_MIRROR='${GRUB_MIRROR}'"
-	echo "IGNORE_BYID='${IGNORE_BYID}'"
 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
 
 ###############################################
@@ -265,27 +260,21 @@ swapoff --all
 # 3. Partition your disk(s)
 # 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_format "$MIRROR"
-	disk_check "${DISK}${PARTSUFFIX}4"
 fi
+sleep 5
 
 # 4. Create the boot pool
 # 5. Create the root pool
 if [ -z "$MIRROR" ]; then
-	create_boot_pool "$ZFSROOT" "${DISK}${PARTSUFFIX}3"
+	create_boot_pool "$ZFSROOT" "$(part_path "$DISK" 3)"
-	create_root_pool "$ZFSROOT" "${DISK}${PARTSUFFIX}4" "$RPOOLPW"
+	create_root_pool "$ZFSROOT" "$(part_path "$DISK" 4)" "$RPOOLPW"
 else
 	create_boot_pool "$ZFSROOT" \
-		"mirror ${DISK}${PARTSUFFIX}3 ${MIRROR}${PARTSUFFIX}3"
+		"mirror $(part_path "$DISK" 3) $(part_path "$MIRROR" 3)"
 	create_root_pool "$ZFSROOT" \
-		"mirror ${DISK}${PARTSUFFIX}4 ${MIRROR}${PARTSUFFIX}4" "$RPOOLPW"
+		"mirror $(part_path "$DISK" 4) $(part_path "$MIRROR" 4)" "$RPOOLPW"
 fi
 
 ###################################
@@ -373,30 +362,35 @@ 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=\"$(part_path "$DISK" 2)\"\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"
+	chmod u+x "$ZFSROOT/usr/local/bin/debianzfs"
 	HELPER_SCRIPT="/root/MIRROR_GRUB_POSTINSTALL.sh"
 	cat <<-GRUBMIRROR > "${ZFSROOT}${HELPER_SCRIPT}"
 	#!/bin/bash
 	# Post-install GRUB mirror helper script
 	/usr/local/bin/debianzfs \
-		-gm ${MIRROR}${PARTSUFFIX}2 \
+		-gm "$MIRROR_PART2_BYUUID" \
-		${DISK}${PARTSUFFIX}2
+		"$DISK_PART2_BYUUID"
 	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
+# Chroot
-echo -e "DISK=\"$DISK\"\nPARTSUFFIX=\"${PARTSUFFIX}\"\nROOTPW=\"${ROOTPW}\"" > "$ZFSROOT/var/tmp/zfsenv"
 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
@@ -404,7 +398,7 @@ unset CDPATH
 cd
 
 # 5. Configure a basic system environment
-ln -fs /proc/self/mounts /etc/mtab
+ln -s /proc/self/mounts /etc/mtab
 apt-get update && apt-get upgrade -y
 apt-get install -y console-setup locales
 
@@ -420,9 +414,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}"
 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})"
 echo "\${BLKID_BOOT} /boot/efi vfat defaults 0 0" >> /etc/fstab
 mount /boot/efi
 apt-get install -y grub-efi-amd64 shim-signed

scripts/setup.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 sudo passwd -d user
-sudo chmod u+x /tmp/debianzfs
+sudo chmod u+x /tmp/debianzfs.sh