From 1978702a88e924b2c094125231102abea729519c Mon Sep 17 00:00:00 2001 From: Tobias Powalowski Date: Sat, 24 Jun 2023 19:59:23 +0200 Subject: [PATCH] fix mounting order in autoprepare --- usr/lib/archboot/installer/autoprepare.sh | 4 ++-- usr/lib/archboot/installer/base.sh | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/usr/lib/archboot/installer/autoprepare.sh b/usr/lib/archboot/installer/autoprepare.sh index ecb0a709e..ac14fc842 100644 --- a/usr/lib/archboot/installer/autoprepare.sh +++ b/usr/lib/archboot/installer/autoprepare.sh @@ -46,7 +46,7 @@ _autoprepare() { _FSOPTS="" command -v mkfs.btrfs &>"${_NO_LOG}" && _FSOPTS="${_FSOPTS} btrfs Btrfs" 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.ext2 &>"${_NO_LOG}" && _FSOPTS="${_FSOPTS} ext2 Ext2" command -v mkfs.f2fs &>"${_NO_LOG}" && _FSOPTS="${_FSOPTS} f2fs F2FS" @@ -247,7 +247,7 @@ _autoprepare() { if [[ -n "${_UEFISYS_BOOTDEV}" ]]; then _FSSPECS="${_FSSPEC_ROOTDEV} ${_FSSPEC_UEFISYSDEV} ${_FSSPEC_HOMEDEV} ${_FSSPEC_SWAPDEV}" else - _FSSPECS="${_FSSPEC_ROOTDEV} ${_FSSPEC_BOOTDEV} ${_FSSPEC_UEFISYSDEV} ${_FSSPEC_HOMEDEV} ${_FSSPEC_SWAPDEV}" + _FSSPECS="${_FSSPEC_ROOTDEV} ${_FSSPEC_UEFISYSDEV} ${_FSSPEC_BOOTDEV} ${_FSSPEC_HOMEDEV} ${_FSSPEC_SWAPDEV}" fi else _FSSPECS="${_FSSPEC_ROOTDEV} ${_FSSPEC_BOOTDEV} ${_FSSPEC_HOMEDEV} ${_FSSPEC_SWAPDEV}" diff --git a/usr/lib/archboot/installer/base.sh b/usr/lib/archboot/installer/base.sh index 3ce4bf04e..b0b6e53ad 100644 --- a/usr/lib/archboot/installer/base.sh +++ b/usr/lib/archboot/installer/base.sh @@ -30,12 +30,12 @@ fi _set_title() { if [[ "${_DESTDIR}" == "/" ]]; then - _TITLE="Archboot Arch Linux (System Setup mode) --> https://archboot.com" + _TITLE="Archboot - Arch Linux (System Setup Mode) --> https://archboot.com" else 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 - _TITLE="Archboot Arch Linux Installation (Online mode) --> https://archboot.com" + _TITLE="Archboot - Arch Linux Installation (Online Mode) --> https://archboot.com" fi fi }