root/archboot
1
0
Fork 0
mirror of https://gitlab.archlinux.org/tpowa/archboot.git synced 2024-09-20 03:50:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

start adding SWAP file support

Browse source
This commit is contained in:
Tobias Powalowski 2024-06-05 21:56:14 +02:00
parent e17e69e4e4
commit 11f719ce1d
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
usr/lib/archboot/installer/mountpoints.sh
View file

@ -23,7 +23,6 @@ _clear_fs_values() {
_SKIP_FILESYSTEM=""
_DOMKFS=""
_LABEL_NAME=""
_FSTYPE=""
_FS_OPTIONS=""
_BTRFS_DEVS=""
_BTRFS_LEVEL=""
@ -80,6 +79,7 @@ _enter_mountpoint() {
_FS_OPTIONS="-U clear --size ${_SWAPFILE_SIZE}M --file"
done
if ! [[ "${_FSTYPE}" == "swap" ]]; then
_SKIP_FILESYSTEM=1
_DOMKFS=1
_LABEL_NAME="SWAP"
fi
@ -257,7 +257,7 @@ _mountpoints() {
_clear_fs_values
_check_btrfs_filesystem_creation
! [[ "${_DEV}" == "> NONE" || "${_DEV}" == "> FILE" ]] && _FSTYPE="$(${_LSBLK} FSTYPE "${_DEV}" 2>"${_NO_LOG}")"
if [[ -z "${_SWAP_DONE}" && "${_FSTYPE}" == "swap" ]] || [[ "${_DEV}" == "> NONE" ]]; then
if [[ -z "${_SWAP_DONE}" && "${_FSTYPE}" == "swap" ]] || [[ "${_DEV}" == "> NONE" ]] || [[ "${_DEV}" == "> NONE" ]]; then
_SKIP_FILESYSTEM=1
fi
# _CREATE_MOUNTPOINTS switch for create filesystem and only mounting filesystem