Skip to content
Snippets Groups Projects
Commit 08d662d9 authored by Pietsch, Martin's avatar Pietsch, Martin
Browse files

bugfix: blkid returns no type of swap partition

parent 8c6eec20
Branches
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
files/diskspreparation.sh
+ 11
− 0
View file @ 08d662d9
...@@ -345,6 +345,11 @@ generateFSTab() { ...@@ -345,6 +345,11 @@ generateFSTab() {
dmp=$(echo ${part} | cut -f 5 -d ";") dmp=$(echo ${part} | cut -f 5 -d ";")
pass=$(echo ${part} | cut -f 6 -d ";") pass=$(echo ${part} | cut -f 6 -d ";")
if [ "${fs}" = "" ];
then
fs=$(echo ${part} | cut -f 2 -d ";")
fi
if [ "${fs}" = "swap" -o "${fs}" = "linux-swap" ]; if [ "${fs}" = "swap" -o "${fs}" = "linux-swap" ];
then then
mntpnt="none" mntpnt="none"
...@@ -396,6 +401,12 @@ createTargetDirectoryLayout(){ ...@@ -396,6 +401,12 @@ createTargetDirectoryLayout(){
fs=$(blkid -s TYPE -o value ${partdev}) fs=$(blkid -s TYPE -o value ${partdev})
mntpnt=$(echo ${part} | cut -f 3 -d ";") mntpnt=$(echo ${part} | cut -f 3 -d ";")
opts=$(echo ${part} | cut -f 4 -d ";") opts=$(echo ${part} | cut -f 4 -d ";")
if [ "${fs}" = "" ];
then
fs=$(echo ${part} | cut -f 2 -d ";")
fi
if [ "${fs}" = "swap" -o "${fs}" = "linux-swap" ]; if [ "${fs}" = "swap" -o "${fs}" = "linux-swap" ];
then then
mntpnt="none" mntpnt="none"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment