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

fix mounting order in autoprepare

Browse source
This commit is contained in:
Tobias Powalowski 2023-06-24 19:59:23 +02:00
parent 1b2259d187
commit 1978702a88
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -46,7 +46,7 @@ _autoprepare() {
_FSOPTS="" _FSOPTS=""
command -v mkfs.btrfs &>"${_NO_LOG}" && _FSOPTS="${_FSOPTS} btrfs Btrfs" command -v mkfs.btrfs &>"${_NO_LOG}" && _FSOPTS="${_FSOPTS} btrfs Btrfs"
command -v mkfs.ext4 &>"${_NO_LOG}" && _FSOPTS="${_FSOPTS} ext4 Ext4" command -v mkfs.ext4 &>"${_NO_LOG}" && _FSOPTS="${_FSOPTS} ext4 Ext4"
command -v mkfs.xfs &>"${_NO_LOG}" && _FSOPTS="${_FSOPTS} xfs XFS" command -v mkfs.xfs &>"${_NO_LOG}" && _FSOPTS="${_FSOPTS} xfs XFS"
command -v mkfs.ext3 &>"${_NO_LOG}" && _FSOPTS="${_FSOPTS} ext3 Ext3" command -v mkfs.ext3 &>"${_NO_LOG}" && _FSOPTS="${_FSOPTS} ext3 Ext3"
command -v mkfs.ext2 &>"${_NO_LOG}" && _FSOPTS="${_FSOPTS} ext2 Ext2" command -v mkfs.ext2 &>"${_NO_LOG}" && _FSOPTS="${_FSOPTS} ext2 Ext2"
command -v mkfs.f2fs &>"${_NO_LOG}" && _FSOPTS="${_FSOPTS} f2fs F2FS" command -v mkfs.f2fs &>"${_NO_LOG}" && _FSOPTS="${_FSOPTS} f2fs F2FS"
@ -247,7 +247,7 @@ _autoprepare() {
if [[ -n "${_UEFISYS_BOOTDEV}" ]]; then if [[ -n "${_UEFISYS_BOOTDEV}" ]]; then
_FSSPECS="${_FSSPEC_ROOTDEV} ${_FSSPEC_UEFISYSDEV} ${_FSSPEC_HOMEDEV} ${_FSSPEC_SWAPDEV}" _FSSPECS="${_FSSPEC_ROOTDEV} ${_FSSPEC_UEFISYSDEV} ${_FSSPEC_HOMEDEV} ${_FSSPEC_SWAPDEV}"
else else
_FSSPECS="${_FSSPEC_ROOTDEV} ${_FSSPEC_BOOTDEV} ${_FSSPEC_UEFISYSDEV} ${_FSSPEC_HOMEDEV} ${_FSSPEC_SWAPDEV}" _FSSPECS="${_FSSPEC_ROOTDEV} ${_FSSPEC_UEFISYSDEV} ${_FSSPEC_BOOTDEV} ${_FSSPEC_HOMEDEV} ${_FSSPEC_SWAPDEV}"
fi fi
else else
_FSSPECS="${_FSSPEC_ROOTDEV} ${_FSSPEC_BOOTDEV} ${_FSSPEC_HOMEDEV} ${_FSSPEC_SWAPDEV}" _FSSPECS="${_FSSPEC_ROOTDEV} ${_FSSPEC_BOOTDEV} ${_FSSPEC_HOMEDEV} ${_FSSPEC_SWAPDEV}"

6
usr/lib/archboot/installer/base.sh
View file

@ -30,12 +30,12 @@ fi
_set_title() { _set_title() {
if [[ "${_DESTDIR}" == "/" ]]; then if [[ "${_DESTDIR}" == "/" ]]; then
_TITLE="Archboot Arch Linux (System Setup mode) --> https://archboot.com" _TITLE="Archboot - Arch Linux (System Setup Mode) --> https://archboot.com"
else else
if [[ -e "${_LOCAL_DB}" ]]; then if [[ -e "${_LOCAL_DB}" ]]; then
_TITLE="Archboot Arch Linux Installation (Local mode) --> https://archboot.com" _TITLE="Archboot - Arch Linux Installation (Local Mode) --> https://archboot.com"
else else
_TITLE="Archboot Arch Linux Installation (Online mode) --> https://archboot.com" _TITLE="Archboot - Arch Linux Installation (Online Mode) --> https://archboot.com"
fi fi
fi fi
} }