From 12ae22ac82e51e8d8477ce6e4c55f849253a9da4 Mon Sep 17 00:00:00 2001
From: Christoph Johannes Kleine <linux@cj-k.de>
Date: Mon, 4 Nov 2019 00:15:31 +0100
Subject: [PATCH] ersetze unkorrektes sed mit nativem blkid
Der sed Befehl hat die partuuid anstatt der uuid ausgegeben
---
files/diskspreparation.sh | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/files/diskspreparation.sh b/files/diskspreparation.sh
index aecf916..7fa01ec 100755
--- a/files/diskspreparation.sh
+++ b/files/diskspreparation.sh
@@ -292,9 +292,8 @@ generateFSTab() {
idx=1
for part in $(eval "for p in \${DISK_$(echo ${disk} | tr [a-z] [A-Z])_PARTITIONS[@]}; do echo \$p; done ")
do
- blkidout=$(blkid /dev/${disk}${idx})
- uuid=$(echo ${blkidout} | sed "s/^.*UUID=\([^\ ]*\).*$/\1/g;s/\"//g")
- fs=$(echo ${blkidout} | sed "s/^.*TYPE=\([^\ ]*\).*$/\1/g;s/\"//g")
+ uuid=$(blkid -s UUID -o value /dev/${disk}${idx})
+ fs=$(blkid -s TYPE -o value /dev/${disk}${idx})
mntpnt=$(echo ${part} | cut -f 3 -d ":")
opts=$(echo ${part} | cut -f 4 -d ":")
dmp=$(echo ${part} | cut -f 5 -d ":")
--
GitLab