From 038635bb77772bca73197c901c46c34397141a96 Mon Sep 17 00:00:00 2001 From: "Kevin Veen-Birkenbach [aka. Frantz]" Date: Thu, 1 Oct 2020 12:58:06 +0200 Subject: [PATCH] Replaced mkinitcpio variables --- scripts/image/setup.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/image/setup.sh b/scripts/image/setup.sh index b3f89b1..d16e267 100644 --- a/scripts/image/setup.sh +++ b/scripts/image/setup.sh @@ -425,8 +425,8 @@ if [ "$encrypt_system" == "y" ] replace_hooks="HOOKS=(base udev autodetect modconf block sleep netconf dropbear encryptssh filesystems keyboard fsck)" mkinitcpio_path="/etc/mkinitcpio.conf" mkinitcpio_rescue_path="$mkinitcpio_path$rescue_suffix" - search_modules="MODULES=()" - replace_modules="MODULES=(g_cdc usb_f_acm usb_f_ecm smsc95xx g_ether)" + mkinitcpio_search_modules="MODULES=()" + mkinitcpio_replace_modules="MODULES=(g_cdc usb_f_acm usb_f_ecm smsc95xx g_ether)" root_mapper_path="/dev/mapper/root" fstab_path="/mnt/etc/fstab" fstab_rescue_path="$fstab_path$rescue_suffix" @@ -448,7 +448,7 @@ if [ "$encrypt_system" == "y" ] echo "pacman --noconfirm -S --needed $(get_packages "server/luks") &&" echo "cp -v /home/$target_username/.ssh/authorized_keys /etc/dropbear/root_key &&" echo "cp -v $mkinitcpio_path $mkinitcpio_rescue_path &&" - echo "sed -i 's/$search_modules/$replace_modules/g' $mkinitcpio_path &&" + echo "sed -i 's/$mkinitcpio_search_modules/$mkinitcpio_replace_modules/g' $mkinitcpio_path &&" echo "sed -i 's/$search_hooks/$replace_hooks/g' $mkinitcpio_path &&" echo "echo \"Content of $mkinitcpio_path:\$(cat \"$mkinitcpio_path\")\" &&" #Concerning mkinitcpio warning @see https://gist.github.com/imrvelj/c65cd5ca7f5505a65e59204f5a3f7a6d