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 mountpoint tool and remove unneeded quotes from data

Browse Source
This commit is contained in:
Krizsán Péter 2024-11-25 12:11:30 +01:00
parent 67f550b00a
commit e702fe8c40
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libs/create_fstab.sh
View File

@ -8,11 +8,8 @@ _create_fstab()
local d_root= local d_root=
local d_boot= local d_boot=
if [ -n "$1" ] ; then if [ -n "$1" ] ; then
# In case of an invalid mount point (not existing folder) we return here # In case of an invalid mount point or not existing folder we return here
if [ ! -d "$1" ] ; then mountpoint "$1" || return 1
echo "The given mount point is invalid: $1"
return 1
fi
# If a mount point is given then we generate fstab based on that mount point. # If a mount point is given then we generate fstab based on that mount point.
d_root="$(realpath -sm "$1")" d_root="$(realpath -sm "$1")"
@ -49,29 +46,28 @@ _create_fstab()
local swap_priority=0 local swap_priority=0
local values= local values=
local IFS=$'\n' local IFS=$'\n'
for line in $(lsblk -P -o MOUNTPOINT,PATH,PARTUUID,FSTYPE | grep -vE '(MOUNTPOINT="")|(PATH="")|(PARTUUID="")|(FSTYPE="")') ; do for line in $(lsblk -P -o MOUNTPOINT,PATH,PARTUUID,FSTYPE -x MOUNTPOINT | grep -vE '(MOUNTPOINT="")|(PATH="")|(PARTUUID="")|(FSTYPE="")') ; do
mount_point=$(awk '{gsub("MOUNTPOINT=","",$1); print $1}' <<< "$line") mount_point=$(awk '{gsub(/MOUNTPOINT=|"/,"",$1); print $1}' <<< "$line")
device_path=$(awk '{gsub("PATH=","",$2); print $2}' <<< "$line") device_path=$(awk '{gsub(/PATH=|"/,"",$2); print $2}' <<< "$line")
partition_uuid=$(awk '{gsub("PARTUUID=","",$3); print $3}' <<< "$line") partition_uuid=$(awk '{gsub(/"/,"",$3); print $3}' <<< "$line")
file_system_type=$(awk '{gsub("FSTYPE=","",$4); print $4}' <<< "$line") file_system_type=$(awk '{gsub(/FSTYPE=|"/,"",$4); print $4}' <<< "$line")
if [ -z "$mount_point" ] || [ -z "$device_path" ] || [ -z "$partition_uuid" ] || [ -z "$file_system_type" ]; then if [ -z "$mount_point" ] || [ -z "$device_path" ] || [ -z "$partition_uuid" ] || [ -z "$file_system_type" ]; then
continue continue
fi fi
partition_uuid="PARTUUID=$partition_uuid"
options="defaults" options="defaults"
dump=0 dump=0
fsck=0 fsck=0
if [ "$mount_point" == "\"$d_root\"" ] ; then if [ "$mount_point" == "$d_root" ] ; then
device_path="/" device_path="/"
dump=1 dump=1
fsck=1 fsck=1
elif [ "$mount_point" == "\"$d_boot\"" ] ; then elif [ "$mount_point" == "$d_boot" ] ; then
device_path="/boot" device_path="/boot"
options="noauto,$options" options="noauto,$options"
elif [ "$mount_point" == "\"[SWAP]\"" ] ; then elif [ "$mount_point" == "[SWAP]" ] ; then
device_path="swap" device_path="swap"
swap_priority=$((swap_priority+1)) swap_priority=$((swap_priority+1))
options="pri=$swap_priority" options="pri=$swap_priority"