Compare commits

..

No commits in common. "9977148dd6a2d5470dc720c513724adb646cd642" and "ead7a9f24e018499a8ee819a0bc915bb993e9292" have entirely different histories.

2 changed files with 51 additions and 75 deletions

View File

@ -45,7 +45,7 @@ build {
} }
provisioner "shell" { 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"]
} }
} }

View File

@ -7,31 +7,18 @@
### Functions ### ### Functions ###
################# #################
function usage () { 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 () { 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 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 exit 1
fi fi
} }
function disk_status () { function disk_status () {
local OUTPUT
OUTPUT=$(wipefs "$1") OUTPUT=$(wipefs "$1")
if [ -n "$OUTPUT" ]; then if [ -n "$OUTPUT" ]; then
echo "ERROR: $1 is not empty" echo "ERROR: $1 is not empty"
@ -41,8 +28,6 @@ function disk_status () {
} }
function password_prompt () { function password_prompt () {
local password
local password_confirm
unset PASSWORD_PROMPT_RESULT unset PASSWORD_PROMPT_RESULT
while true; do while true; do
read -r -s -p "${1}: " password read -r -s -p "${1}: " password
@ -113,8 +98,8 @@ function create_root_pool () {
} }
function part_path () { function part_path () {
local DISK="$1" DISK="$1"
local PART="$2" PART="$2"
[ "$(disk_check "$DISK")" == 1 ] && exit 1 [ "$(disk_check "$DISK")" == 1 ] && exit 1
if [ "${DISK:0:7}" == "/dev/sd" ]; then if [ "${DISK:0:7}" == "/dev/sd" ]; then
DISK_PART="${DISK}${PART}" DISK_PART="${DISK}${PART}"
@ -130,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
local 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
} }
################ ################
@ -154,15 +146,13 @@ export DEBIAN_FRONTEND=noninteractive
CODENAME="bullseye" CODENAME="bullseye"
# Options # Options
while getopts ':ghim:p:P:r:s:' 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";;
r) ZFSROOT="$OPTARG";; r) ZFSROOT="$OPTARG";;
s) PARTSUFFIX="$OPTARG";;
?) ?)
usage usage
exit 1;; exit 1;;
@ -183,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;;
?) ?)
@ -197,12 +185,6 @@ fi
# Verify variables # Verify variables
[ -z "$ZFSROOT" ] && ZFSROOT="/mnt" [ -z "$ZFSROOT" ] && ZFSROOT="/mnt"
if [ -z "$PARTSUFFIX" ]; then
PARTSUFFIX="-part"
elif [ "$PARTSUFFIX" == "0" ]; then
PARTSUFFIX=""
fi
if [ -z "$DISK" ]; then if [ -z "$DISK" ]; then
echo "ERROR: DISK not set" echo "ERROR: DISK not set"
usage usage
@ -228,27 +210,22 @@ if [ -z "$RPOOLPW" ]; then
fi fi
if [ "$DEBUG" == "true" ]; then 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 fi
# Are the DISK paths block devices? AND # Are the DISK paths block devices? AND
# 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
############################################### ###############################################
@ -283,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}${PARTSUFFIX}3"
disk_check "${DISK}${PARTSUFFIX}4"
if [ -n "$MIRROR" ]; then if [ -n "$MIRROR" ]; then
disk_check "${DISK}${PARTSUFFIX}3" disk_format "$MIRROR"
disk_check "${DISK}${PARTSUFFIX}4"
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}${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 else
create_boot_pool "$ZFSROOT" \ create_boot_pool "$ZFSROOT" \
"mirror ${DISK}${PARTSUFFIX}3 ${MIRROR}${PARTSUFFIX}3" "mirror $(part_path "$DISK" 3) $(part_path "$MIRROR" 3)"
create_root_pool "$ZFSROOT" \ create_root_pool "$ZFSROOT" \
"mirror ${DISK}${PARTSUFFIX}4 ${MIRROR}${PARTSUFFIX}4" "$RPOOLPW" "mirror $(part_path "$DISK" 4) $(part_path "$MIRROR" 4)" "$RPOOLPW"
fi fi
################################### ###################################
@ -391,30 +362,35 @@ deb http://deb.debian.org/debian ${CODENAME}-updates main contrib
deb-src http://deb.debian.org/debian ${CODENAME}-updates main contrib deb-src http://deb.debian.org/debian ${CODENAME}-updates main contrib
EOF 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 # Copy self and GRUB mirror helper script into chroot
if [ -n "$MIRROR" ]; then if [ -n "$MIRROR" ]; then
cp "$0" "$ZFSROOT/usr/local/bin/debianzfs" 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" HELPER_SCRIPT="/root/MIRROR_GRUB_POSTINSTALL.sh"
cat <<-GRUBMIRROR > "${ZFSROOT}${HELPER_SCRIPT}" cat <<-GRUBMIRROR > "${ZFSROOT}${HELPER_SCRIPT}"
#!/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}${PARTSUFFIX}2 \ -gm $(disk_by_id "$MIRROR") \
${DISK}${PARTSUFFIX}2 $(disk_by_id "$DISK")
GRUBMIRROR GRUBMIRROR
fi 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 /dev /mnt/dev
mount --make-private --rbind /proc /mnt/proc mount --make-private --rbind /proc /mnt/proc
mount --make-private --rbind /sys /mnt/sys 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 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
@ -438,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}\${PARTSUFFIX}2" 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}\${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 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