From 7bdfa6999c43ea0b75c0d12cb463492e683cc514 Mon Sep 17 00:00:00 2001
From: Martin Pietsch <martin.pietsch@tu-dresden.de>
Date: Wed, 13 Nov 2019 13:28:21 +0100
Subject: [PATCH] bugfixes: disk preparation script
---
files/diskspreparation.sh | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/files/diskspreparation.sh b/files/diskspreparation.sh
index 7fa01ec..512e89a 100755
--- a/files/diskspreparation.sh
+++ b/files/diskspreparation.sh
@@ -63,7 +63,7 @@ convertByteToSize() {
validateScheme() {
local lbl=$(echo ${diskdata[0]} | cut -f 6 -d ":")
local retval=1
- local scheme=$(eval echo \$DISK_$(echo $1 | tr [a-z] [A-Z])_SCHEME)
+ local scheme=$(eval echo \$DISK_$(echo $1 | tr [a-z] [A-Z])_SCHEME | tr [A-Z] [a-z])
if [ "x${scheme}" = "x${lbl}" ];
then
@@ -79,7 +79,7 @@ validateScheme() {
# return:
# none
initialDiskScheme() {
- local scheme=$(eval echo \$DISK_$(echo $1 | tr [a-z] [A-Z])_SCHEME)
+ local scheme=$(eval echo \$DISK_$(echo $1 | tr [a-z] [A-Z])_SCHEME | tr [A-Z] [a-z])
if [ ${scheme} = "mbr" ];
then
@@ -110,7 +110,7 @@ validateDiskPartitionLayout() {
then
for idx in $(seq 1 1 ${#parts[@]})
do
- gsize=$(convertSizeToByte $(echo ${parts[$((${idx} - 1))]} | cut -f 1 -d ":"))
+ gsize=$(convertSizeToByte $(echo ${parts[$((${idx} - 1))]} | cut -f 1 -d ";"))
dsize=$(convertSizeToByte $(echo ${diskdata[${idx}]} | cut -f 4 -d ":"))
diffperc=$(dc -e "2k $dsize $gsize - 100 * $gsize / p" | sed -e "s/^-//g")
@@ -139,7 +139,7 @@ validateDiskPartitionLayout() {
# none
initialDiskPartitionLayout() {
declare -a parts=()
- local scheme=$(eval echo \$DISK_$(echo $1 | tr [a-z] [A-Z])_SCHEME)
+ local scheme=$(eval echo \$DISK_$(echo $1 | tr [a-z] [A-Z])_SCHEME | tr [A-Z] [a-z])
local start=$(convertSizeToByte "1MiB")
local fs=""
local size=""
@@ -149,9 +149,9 @@ initialDiskPartitionLayout() {
# create partitions
for part in $(eval "for p in \${DISK_$(echo $1 | tr [a-z] [A-Z])_PARTITIONS[@]}; do echo \$p; done ")
do
- fs=$(echo ${part} | cut -f 2 -d ":")
- fsize=$(echo ${part} | cut -f 1 -d ":")
- size=$(convertSizeToByte $(echo ${part} | cut -f 1 -d ":"))
+ fs=$(echo ${part} | cut -f 2 -d ";")
+ fsize=$(echo ${part} | cut -f 1 -d ";")
+ size=$(convertSizeToByte $(echo ${part} | cut -f 1 -d ";"))
end=$((${start} + ${size}))
case ${scheme} in
"mbr" | "msdos")
@@ -190,7 +190,7 @@ setDiskPartitionFlags() {
idx=1
for part in $(eval "for p in \${DISK_$(echo $1 | tr [a-z] [A-Z])_PARTITIONS[@]}; do echo \$p; done ")
do
- flags=$(echo ${part} | cut -f 8 -d ":")
+ flags=$(echo ${part} | cut -f 8 -d ";")
if [ -n "${flags}" ];
then
for flag in $(echo ${flags} | sed "s/,/ /g")
@@ -249,12 +249,12 @@ formatDiskPartitions() {
parts+=(${part})
done
- for part in $(parted -s -m /dev/$1 print | sed -e "1,2d;s/[\ ;]//g" | cut -f 1,5 -d ":")
+ for part in $(parted -s -m /dev/$1 print | sed -e "1,2d;s/[\ ;]//g" | cut -f 1,5 -d ";")
do
idx=$(echo ${part} | cut -f 1 -d ":")
dfs=$(echo ${part} | cut -f 2 -d ":")
- gfs=$(echo ${parts[$((${idx} - 1))]} | cut -f 2 -d ":")
- format=$(echo ${parts[$((${idx} - 1))]} | cut -f 7 -d ":" | tr "[A-Z]" "[a-z]")
+ gfs=$(echo ${parts[$((${idx} - 1))]} | cut -f 2 -d ";")
+ format=$(echo ${parts[$((${idx} - 1))]} | cut -f 7 -d ";" | tr "[A-Z]" "[a-z]")
if [ "${dfs}" != "${gfs}" -o "${format}" = "true" ];
then
@@ -294,10 +294,10 @@ generateFSTab() {
do
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 ":")
- pass=$(echo ${part} | cut -f 6 -d ":")
+ mntpnt=$(echo ${part} | cut -f 3 -d ";")
+ opts=$(echo ${part} | cut -f 4 -d ";")
+ dmp=$(echo ${part} | cut -f 5 -d ";")
+ pass=$(echo ${part} | cut -f 6 -d ";")
if [ "${fs}" = "swap" -o "${fs}" = "linux-swap" ];
then
--
GitLab