From 3cf5b8d6ae7dc2c149b47339ef2a556c99289806 Mon Sep 17 00:00:00 2001 From: "Kevin Veen-Birkenbach [aka. Frantz]" Date: Thu, 1 Oct 2020 14:33:35 +0200 Subject: [PATCH] Solved bugs --- scripts/image/setup.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/image/setup.sh b/scripts/image/setup.sh index 0b6fec4..6259b70 100644 --- a/scripts/image/setup.sh +++ b/scripts/image/setup.sh @@ -419,14 +419,14 @@ if [ "$encrypt_system" == "y" ] then # Adapted this instruction for setting up encrypted systems @see https://gist.github.com/gea0/4fc2be0cb7a74d0e7cc4322aed710d38 # The following variable is neccessary because of a bug @see https://bbs.archlinux.de/viewtopic.php?id=33554 - encrypted_partition_uuid=$(blkid | grep $encrypted_partition_path | sed -n 's/.*UUID=\"\([^\"]*\)\".*/\1/p' ) + encrypted_partition_uuid=$(blkid | grep "$encrypted_partition_path" | sed -n 's/.*UUID=\"\([^\"]*\)\".*/\1/p') rescue_suffix=".$(date +%s).rescue" mkinitcpio_path="/etc/mkinitcpio.conf" mkinitcpio_rescue_path="$mkinitcpio_path$rescue_suffix" mkinitcpio_search_modules="MODULES=()" mkinitcpio_replace_modules="MODULES=(g_cdc usb_f_acm usb_f_ecm smsc95xx g_ether)" mkinitcpio_search_binaries="BINARIES=()" - mkinitcpio_replace_binaries="BINARIES=(/usr/lib/libgcc_s.so.1)" + mkinitcpio_replace_binaries=$(echo "BINARIES=(/usr/lib/libgcc_s.so.1)"| sed -e 's/[\/&]/\\&/g') mkinitcpio_search_hooks="HOOKS=(base udev autodetect modconf block filesystems keyboard fsck)" mkinitcpio_replace_hooks="HOOKS=(base udev autodetect modconf block sleep netconf dropbear encryptssh filesystems keyboard fsck)" root_mapper_path="/dev/mapper/root"