From f97cb2266a9f1ef11b2094addf1fdea49496ea05 Mon Sep 17 00:00:00 2001 From: "Kevin Veen-Birkenbach [aka. Frantz]" Date: Thu, 1 Oct 2020 13:05:05 +0200 Subject: [PATCH] Refaktored 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 8620087..10ad020 100644 --- a/scripts/image/setup.sh +++ b/scripts/image/setup.sh @@ -421,14 +421,14 @@ if [ "$encrypt_system" == "y" ] # The following variable is neccessary because of a bug @see https://bbs.archlinux.de/viewtopic.php?id=33554 destination_encrypted_partition_path="/dev/mmcblk0p3" rescue_suffix=".$(date +%s).rescue" - search_hooks="HOOKS=(base udev autodetect modconf block filesystems keyboard fsck)" - 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" 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_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" fstab_path="/mnt/etc/fstab" fstab_rescue_path="$fstab_path$rescue_suffix" @@ -452,7 +452,7 @@ if [ "$encrypt_system" == "y" ] echo "cp -v $mkinitcpio_path $mkinitcpio_rescue_path &&" echo "sed -i 's/$mkinitcpio_search_modules/$mkinitcpio_replace_modules/g' $mkinitcpio_path &&" echo "sed -i 's/$mkinitcpio_search_binaries/$mkinitcpio_replace_binaries/g' $mkinitcpio_path &&" - echo "sed -i 's/$search_hooks/$replace_hooks/g' $mkinitcpio_path &&" + echo "sed -i 's/$mkinitcpio_search_hooks/$mkinitcpio_replace_hooks/g' $mkinitcpio_path &&" echo "echo \"Content of $mkinitcpio_path:\$(cat \"$mkinitcpio_path\")\" &&" #Concerning mkinitcpio warning @see https://gist.github.com/imrvelj/c65cd5ca7f5505a65e59204f5a3f7a6d echo "mkinitcpio -P &&"