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

other logic

Browse source
This commit is contained in:
Tobias Powalowski 2023-01-10 22:39:06 +01:00
parent a326b821a4
commit 58d7c9eefd
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -172,7 +172,7 @@ _mountpoints() {
# _ASK_MOUNTPOINTS switch for create filesystem and only mounting filesystem # _ASK_MOUNTPOINTS switch for create filesystem and only mounting filesystem
# _SKIP_FILESYSTEM for btrfs # _SKIP_FILESYSTEM for btrfs
if [[ -n "${_ASK_MOUNTPOINTS}" && -z "${_SKIP_FILESYSTEM}" ]]; then if [[ -n "${_ASK_MOUNTPOINTS}" && -z "${_SKIP_FILESYSTEM}" ]]; then
_select_filesystem && _create_filesystem && _btrfs_subvolume _select_filesystem && _create_filesystem
else else
if [[ "${_FSTYPE}" == "btrfs" ]]; then if [[ "${_FSTYPE}" == "btrfs" ]]; then
_FSTYPE="btrfs" _FSTYPE="btrfs"
@ -205,11 +205,10 @@ _mountpoints() {
# _ASK_MOUNTPOINTS switch for create filesystem and only mounting filesystem # _ASK_MOUNTPOINTS switch for create filesystem and only mounting filesystem
# _SKIP_FILESYSTEM for btrfs # _SKIP_FILESYSTEM for btrfs
if [[ -n "${_ASK_MOUNTPOINTS}" && -z "${_SKIP_FILESYSTEM}" ]]; then if [[ -n "${_ASK_MOUNTPOINTS}" && -z "${_SKIP_FILESYSTEM}" ]]; then
_enter_mountpoint && _select_filesystem && _create_filesystem && _btrfs_subvolume _enter_mountpoint && _select_filesystem && _create_filesystem
else else
_enter_mountpoint _enter_mountpoint
if [[ "${_FSTYPE}" == "btrfs" ]]; then if [[ "${_FSTYPE}" == "btrfs" ]]; then
_FSTYPE="btrfs"
_SKIP_FILESYSTEM=1 _SKIP_FILESYSTEM=1
_btrfs_subvolume _btrfs_subvolume
fi fi