linux-from-scratch/custom_blfs_packages
1
0
Fork 0
mirror of https://github.com/krizsipeti/custom_blfs_packages.git synced 2025-01-23 14:32:21 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move master.sh patch to correct place

Browse Source
This commit is contained in:
pkr 2024-11-14 09:42:37 +01:00
parent 6837012d6e
commit fce15d7060
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lfsSetup.sh
View File

@ -212,6 +212,9 @@ if [ -n "$2" ] ; then
sed -i "$((LINE_NUMBER+1))i$ADDITIONAL_CONFIGS" "$SCRIPT_DIR" sed -i "$((LINE_NUMBER+1))i$ADDITIONAL_CONFIGS" "$SCRIPT_DIR"
fi 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 # Enter to setup folder and start installer
cd "$DIR_SETUP" cd "$DIR_SETUP"
yes "yes" | ./jhalfs run 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")" sed -i "/wpa_supplicant@/s/@.*/@wlan0/" "$(find "$1/blfs_root/scripts/" -type f -iname "*-wpa_supplicant")"
fi 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 # Patch grub script
GRUB_SCRIPT=$(find "$DIR_COMMANDS" -type f -iname "1*-grub") GRUB_SCRIPT=$(find "$DIR_COMMANDS" -type f -iname "1*-grub")
if [ -n "$GRUB_SCRIPT" ] ; then if [ -n "$GRUB_SCRIPT" ] ; then