Clone/future-install-scripts
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

genfstab: prefer lsblk over blkid

Browse Source 
lsblk has a far nicer interface and is capable of doing its work
without the need for extra privileges to read superblocks (assuming
udev is behaving properly).
This commit is contained in:
Dave Reisner 2013-05-23 13:20:56 -04:00
parent 1d35997222
commit 56e438869c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
genfstab.in
View File

@ -7,8 +7,8 @@ m4_include(common)
write_source() { write_source() {
local src=$1 spec= label= uuid= comment=() local src=$1 spec= label= uuid= comment=()
label=$(blkid -s LABEL -o value "$1" 2>/dev/null) label=$(lsblk -rno LABEL "$1" 2>/dev/null)
uuid=$(blkid -s UUID -o value "$1" 2>/dev/null) uuid=$(lsblk -rno UUID "$1" 2>/dev/null)
# bind mounts do not have a UUID! # bind mounts do not have a UUID!
@ -29,7 +29,7 @@ write_source() {
*) *)
[[ $uuid ]] && comment=("$1" "UUID=$uuid") [[ $uuid ]] && comment=("$1" "UUID=$uuid")
[[ $label ]] && comment+=("LABEL=$label") [[ $label ]] && comment+=("LABEL=$label")
[[ $bytag ]] && spec=$(blkid -s "$bytag" -o value "$1") [[ $bytag ]] && spec=$(lsblk -rno "$bytag" "$1" 2>/dev/null)
;; ;;
esac esac