Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
manjaro-architect
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
61
Issues
61
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Requirements
Requirements
List
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Applications
manjaro-architect
Commits
1bf268fa
Commit
1bf268fa
authored
Feb 09, 2019
by
dalto
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't offer swapfile for zfs or btrfs
parent
17f74fcf
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
2 deletions
+6
-2
lib/util-disk.sh
lib/util-disk.sh
+6
-2
No files found.
lib/util-disk.sh
View file @
1bf268fa
...
...
@@ -442,8 +442,12 @@ mount_current_partition() {
}
make_swap
()
{
# Ask user to select partition or create swapfile
DIALOG
"
$_PrepMntPart
"
--menu
"
\n
$_SelSwpBody
\n
"
0 0 12
"
$_SelSwpNone
"
$"-"
"
$_SelSwpFile
"
$"-"
${
PARTITIONS
}
2>
${
ANSWER
}
||
return
0
# Ask user to select partition or create swapfile if swapfiles are valid for the root filesystem
if
[[
$(
findmnt
-ln
-o
FSTYPE
${
MOUNTPOINT
}
)
==
"zfs"
||
$(
findmnt
-ln
-o
FSTYPE
${
MOUNTPOINT
}
)
==
"btrfs"
]]
;
then
DIALOG
"
$_PrepMntPart
"
--menu
"
\n
$_SelSwpBody
\n
"
0 0 12
"
$_SelSwpNone
"
$"-"
${
PARTITIONS
}
2>
${
ANSWER
}
||
return
0
else
DIALOG
"
$_PrepMntPart
"
--menu
"
\n
$_SelSwpBody
\n
"
0 0 12
"
$_SelSwpNone
"
$"-"
"
$_SelSwpFile
"
$"-"
${
PARTITIONS
}
2>
${
ANSWER
}
||
return
0
fi
if
[[
$(
cat
${
ANSWER
}
)
!=
"
$_SelSwpNone
"
]]
;
then
PARTITION
=
$(
cat
${
ANSWER
}
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment