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

Use the new _patch_fstab function and removed the old one

Browse Source
This commit is contained in:
Krizsán Péter 2024-11-25 21:44:26 +01:00
parent ea52335338
commit 3b633fcdd2
2 changed files with 8 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
lfsSetup.sh
View File

@ -29,40 +29,6 @@ patchKernelVersion()
fi fi
} }
# Function that createst an fstab based on the incoming folder
createFstab()
{
# Get mount info from lsblk output
LSBLK_INFO=$(lsblk -l -o MOUNTPOINT,PATH,NAME,PKNAME,PARTUUID,FSTYPE,PTTYPE | sed "/^ /d")
printf "# Begin /etc/fstab\n\n"
printf '%-45s %-11s %-4s %-16s %-4s %-10s\n' "# File system (PARTUUID)" "mount-point" "type" "options" "dump" "fsck"
printf '#%104s\n\n' "order"
# Find the root mount point
DIR_ROOT=$(grep "^$1 " <<< "$LSBLK_INFO")
if [ -z "$DIR_ROOT" ] ; then
DIR_ROOT=$(grep "^/ " <<< "$LSBLK_INFO")
fi
if [ -n "$DIR_ROOT" ] ; then
printf '%-45s %-11s %-4s %-16s %-4s %-10s\n' "PARTUUID=$(awk '{print $5}' <<< "$DIR_ROOT")" / "$(awk '{print $6}' <<< "$DIR_ROOT")" defaults 1 1
fi
# Find if there is a separate boot drive
DIR_BOOT=$(grep "^$1/boot " <<< "$LSBLK_INFO")
if [ -n "$DIR_BOOT" ] ; then
printf '%-45s %-11s %-4s %-16s %-4s %-10s\n' "PARTUUID=$(awk '{print $5}' <<< "$DIR_BOOT")" /boot "$(awk '{print $6}' <<< "$DIR_BOOT")" noauto,defaults 0 0
fi
# Find if there is a swap partition
DIR_SWAP=$(grep "^\[SWAP\] " <<< "$LSBLK_INFO")
if [ -n "$DIR_SWAP" ] ; then
printf '%-45s %-11s %-4s %-16s %-4s %-10s\n' "PARTUUID=$(awk '{print $5}' <<< "$DIR_SWAP")" swap "$(awk '{print $6}' <<< "$DIR_SWAP")" pri=1 0 0
fi
printf "\n# End /etc/fstab\n"
}
# Check if the lfs mount point folder is specified as the first argument # Check if the lfs mount point folder is specified as the first argument
if [ -z "$1" ] if [ -z "$1" ]
then then
@ -258,11 +224,8 @@ if [ -n "$NET_SCRIPT" ] ; then
fi fi
# Patch fstab script # Patch fstab script
FSTAB_SCRIPT=$(find "$DIR_COMMANDS" -type f -iname "*-fstab") source libs/func_fstab.sh
if [ -n "$FSTAB_SCRIPT" ] ; then _patch_fstab $1 || return 1
sed -i '/^cat /,/^EOF/{/^cat /!{/^EOF/!d}}' "$FSTAB_SCRIPT"
sed -i "/^cat /a $(createFstab "$1" | sed '$!s/$/\\/')" "$FSTAB_SCRIPT"
fi
# Patch LFS kernel script to keep build folder and add new user # Patch LFS kernel script to keep build folder and add new user
KERNEL_SCRIPT=$(find "$DIR_COMMANDS" -type f -iname "*-kernel") KERNEL_SCRIPT=$(find "$DIR_COMMANDS" -type f -iname "*-kernel")

11
libs/func_fstab.sh
View File

@ -110,7 +110,7 @@ _patch_fstab()
# Check if the folder exists # Check if the folder exists
local script_folder="$1/jhalfs/lfs-commands" local script_folder="$1/jhalfs/lfs-commands"
if [ ! -d "$script_folder" ] ; then if [ ! -d "$script_folder" ] ; then
echo "Invalid folder: $script_folder" echo "Invalid folder: $script_folder" >&2
return 1 return 1
fi fi
@ -118,7 +118,7 @@ _patch_fstab()
local fstab_script= local fstab_script=
fstab_script=$(find "$script_folder" -type f -iname "*-fstab") fstab_script=$(find "$script_folder" -type f -iname "*-fstab")
if [ ! -f "$fstab_script" ] ; then if [ ! -f "$fstab_script" ] ; then
echo "Cannot find fstab script." echo "Cannot find fstab script." >&2
return 1 return 1
fi fi
@ -126,10 +126,11 @@ _patch_fstab()
local new_fstab= local new_fstab=
new_fstab=$(_create_fstab "$1") new_fstab=$(_create_fstab "$1")
if [ -z "$new_fstab" ] ; then if [ -z "$new_fstab" ] ; then
echo "Failed to create new fstab." echo "Failed to create new fstab." >&2
return 1
fi fi
# Replace old fstab with the new one # Replace old fstab with the new one
sed -i '/^cat /,/^EOF/{/^cat /!{/^EOF/!d}}' "$fstab_script" || { echo "Error while removing old fstab from script." ; return 1 ;} sed -i '/^cat /,/^EOF/{/^cat /!{/^EOF/!d}}' "$fstab_script" || { echo "Error while removing old fstab from script." >&2 ; return 1 ;}
sed -i "/^cat /a $(sed '$!s/$/\\/' <<< "$new_fstab")" "$fstab_script" || { echo "Error while adding new fstab to script." ; return 1 ;} sed -i "/^cat /a $(sed '$!s/$/\\/' <<< "$new_fstab")" "$fstab_script" || { echo "Error while adding new fstab to script." >&2 ; return 1 ;}
} }