From fce15d70607346a840efccac4afe003346296e11 Mon Sep 17 00:00:00 2001 From: pkr Date: Thu, 14 Nov 2024 09:42:37 +0100 Subject: [PATCH] Move master.sh patch to correct place --- lfsSetup.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lfsSetup.sh b/lfsSetup.sh index 7a72507..5e2e2f6 100755 --- a/lfsSetup.sh +++ b/lfsSetup.sh @@ -212,6 +212,9 @@ if [ -n "$2" ] ; then sed -i "$((LINE_NUMBER+1))i$ADDITIONAL_CONFIGS" "$SCRIPT_DIR" fi +# Patch master.sh to run also the grub config related script +sed -i '/^ .*10\*grub/s/^/#/g' "$DIR_SETUP/LFS/master.sh" + # Enter to setup folder and start installer cd "$DIR_SETUP" yes "yes" | ./jhalfs run @@ -248,9 +251,6 @@ if [[ $2 == *"wpa_supplicant"* ]] ; then sed -i "/wpa_supplicant@/s/@.*/@wlan0/" "$(find "$1/blfs_root/scripts/" -type f -iname "*-wpa_supplicant")" fi -# Patch master.sh to run also the grub config related script -sed -i '/^ .*10\*grub/s/^/#/g' "$DIR_SETUP/LFS/master.sh" - # Patch grub script GRUB_SCRIPT=$(find "$DIR_COMMANDS" -type f -iname "1*-grub") if [ -n "$GRUB_SCRIPT" ] ; then