From a59090ab9d021bdfc13e9216fe4a804d675ef500 Mon Sep 17 00:00:00 2001
From: oddlama <oddlama@oddlama.org>
Date: Sun, 11 Oct 2020 21:45:26 +0200
Subject: [PATCH] Install btrfs-progs and omit systemd in dracut because it
 fails (surprise lol)

---
 scripts/functions.sh       | 20 +++++++++++++-------
 scripts/internal_config.sh | 16 ++++++++++------
 scripts/main.sh            |  9 +++++++++
 3 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/scripts/functions.sh b/scripts/functions.sh
index d16361d..9c82bdf 100644
--- a/scripts/functions.sh
+++ b/scripts/functions.sh
@@ -362,6 +362,7 @@ disk_format() {
 disk_format_btrfs() {
 	local ids="${arguments[ids]}"
 	local label="${arguments[label]}"
+	local raid_type="${arguments[raid_type]}"
 	if [[ $disk_action_summarize_only == "true" ]]; then
 		local id
 		# Splitting is intentional here
@@ -384,15 +385,20 @@ disk_format_btrfs() {
 	done
 	devices_desc="${devices_desc:0:-2}"
 
-	einfo "Creating btrfs on $devices_desc"
-	if [[ -v "arguments[label]" ]]; then
-		mkfs.btrfs -q -L "$label" "${devices[@]}" \
-			|| die "Could not create btrfs on $devices_desc"
-	else
-		mkfs.btrfs -q "${devices[@]}" \
-			|| die "Could not create btrfs on $devices_desc"
+	# Collect extra arguments
+	extra_args=()
+	if [[ -v "arguments[raid_type]" ]]; then
+		extra_args+=("-d" "$raid_type")
 	fi
 
+	if [[ -v "arguments[label]" ]]; then
+		extra_args+=("-L" "$label")
+	fi
+
+	einfo "Creating btrfs on $devices_desc"
+	mkfs.btrfs -q "${extra_args[@]}" "${devices[@]}" \
+		|| die "Could not create btrfs on $devices_desc"
+
 	init_btrfs "${devices[0]}" "btrfs array ($devices_desc)"
 }
 
diff --git a/scripts/internal_config.sh b/scripts/internal_config.sh
index c2901be..444cc13 100644
--- a/scripts/internal_config.sh
+++ b/scripts/internal_config.sh
@@ -20,6 +20,8 @@ LUKS_HEADER_BACKUP_DIR="$TMP_DIR/luks-headers"
 USED_RAID=false
 # Flag to track usage of luks (needed to check for cryptsetup existence)
 USED_LUKS=false
+# Flag to track usage of btrfs
+USED_BTRFS=false
 
 # An array of disk related actions to perform
 DISK_ACTIONS=()
@@ -206,7 +208,7 @@ create_dummy() {
 
 # Named arguments:
 # id:     Id of the device / partition created earlier
-# type:   One of (bios, efi, swap, ext4, btrfs)
+# type:   One of (bios, efi, swap, ext4)
 # label:  The label for the formatted disk
 format() {
 	local known_arguments=('+id' '+type' '?label')
@@ -214,7 +216,7 @@ format() {
 	declare -A arguments; parse_arguments "$@"
 
 	verify_existing_id id
-	verify_option type bios efi swap ext4 btrfs
+	verify_option type bios efi swap ext4
 
 	DISK_ACTIONS+=("action=format" "$@" ";")
 }
@@ -223,7 +225,9 @@ format() {
 # ids:     List of ids for devices / partitions created earlier. Must contain at least 1 element.
 # label:   The label for the formatted disk
 format_btrfs() {
-	local known_arguments=('+ids' '?label')
+	USED_BTRFS=true
+
+	local known_arguments=('+ids' '?raid_type' '?label')
 	local extra_arguments=()
 	declare -A arguments; parse_arguments "$@"
 
@@ -371,7 +375,7 @@ create_raid0_luks_layout() {
 #   swap=<size>                Create a swap partition with given size, or no swap if set to false
 #   type=[efi|bios]            Selects the boot type. Defaults to efi.
 #   luks=[true|false]          Encrypt root partitions / devices? Defaults to false.
-#   raid_type=[stripe|mirror]  Select raid type. Defaults to stripe.
+#   raid_type=[raid0|raid1]    Select raid type. Defaults to raid0.
 create_btrfs_raid_layout() {
 	local known_arguments=('+swap' '?type' '?raid_type' '?luks')
 	local extra_arguments=()
@@ -381,7 +385,7 @@ create_btrfs_raid_layout() {
 		|| die_trace 1 "Expected at least one positional argument (the devices)"
 	local device="${extra_arguments[0]}"
 	local size_swap="${arguments[swap]}"
-	local raid_type="${arguments[raid_type]:-stripe}"
+	local raid_type="${arguments[raid_type]:-raid0}"
 	local type="${arguments[type]}"
 	local use_luks="${arguments[luks]:-false}"
 	local efi=true
@@ -424,7 +428,7 @@ create_btrfs_raid_layout() {
 	format id="part_${type}_dev0" type="$type" label="$type"
 	[[ $size_swap != "false" ]] && \
 	format id="part_swap_dev0" type=swap label=swap
-	format_btrfs ids="$root_ids" label=root
+	format_btrfs ids="$root_ids" label=root raid_type="$raid_type"
 
 	if [[ $type == "efi" ]]; then
 		DISK_ID_EFI="part_${type}_dev0"
diff --git a/scripts/main.sh b/scripts/main.sh
index 7849879..6cfaac9 100755
--- a/scripts/main.sh
+++ b/scripts/main.sh
@@ -150,6 +150,8 @@ generate_initramfs() {
 		&& modules+=("mdraid")
 	[[ $USED_LUKS == "true" ]] \
 		&& modules+=("crypt crypt-gpg")
+	[[ $USED_BTRFS == "true" ]] \
+		&& modules+=("btrfs")
 
 	local kver="$(readlink /usr/src/linux)"
 	kver="${kver#linux-}"
@@ -162,6 +164,7 @@ generate_initramfs() {
 		--no-compress \
 		--no-hostonly \
 		--ro-mnt \
+		--omit          "systemd" \
 		--add           "bash ${modules[*]}" \
 		--force \
 		"$output"
@@ -339,6 +342,12 @@ main_install_gentoo_in_chroot() {
 		try emerge --verbose sys-fs/cryptsetup
 	fi
 
+	# Install btrfs-progs if we used btrfs
+	if [[ $USED_BTRFS == "true" ]]; then
+		einfo "Installing btrfs-progs"
+		try emerge --verbose sys-fs/btrfs-progs
+	fi
+
 	# Install kernel and initramfs
 	install_kernel