mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-19 19:40:37 +02:00
retry systemd automounting
This commit is contained in:
parent
1f01c65879
commit
5bdd4585c1
3 changed files with 6 additions and 2 deletions
|
@ -4,7 +4,7 @@ Highlights:
|
|||
setup:
|
||||
- cleanup hwdetect code
|
||||
- create XBOOTLDR partition with vfat by default
|
||||
- allow systemd-auto-gpt setup without syncinc files to ESP
|
||||
- allow systemd-auto-gpt setup without syncing files to ESP
|
||||
---
|
||||
2024.03 Highlights:
|
||||
- kernel 6.8.x
|
||||
|
|
|
@ -248,6 +248,7 @@ _mountpoints() {
|
|||
# reformat device, if already swap partition format
|
||||
if [[ "${_FSTYPE}" == "swap" && -n "${_SWAP_DONE}" ]]; then
|
||||
_FSTYPE=""
|
||||
_LABEL_NAME="SWAP"
|
||||
_DOMKFS=1
|
||||
fi
|
||||
# reformat vfat, root cannot be vfat format
|
||||
|
@ -561,6 +562,9 @@ _mkfs() {
|
|||
_GUID_VALUE="$(${_LSBLK} PARTTYPE "${1}")"
|
||||
if ! [[ "${_GUID_VALUE}" == "933ac7e1-2eb4-4f13-b844-0e14e2aef915" && "${5}" == "/home" ||\
|
||||
"${_GUID_VALUE}" == "0657fd6d-a4ab-43c4-84e5-0933c84b4f4f" && "${5}" == "swap" ||\
|
||||
"${_GUID_VALUE}" == "c12a7328-f81f-11d2-ba4b-00a0c93ec93b" && "${5}" == "/efi" ||\
|
||||
"${_GUID_VALUE}" == "c12a7328-f81f-11d2-ba4b-00a0c93ec93b" && "${5}" == "/boot" ||\
|
||||
"${_GUID_VALUE}" == "bc13c2ff-59e6-4262-a352-b275fd6f7172" && "${5}" == "/boot" && "${2}" == "vfat" ||\
|
||||
"${5}" == "/" ]]; then
|
||||
echo -n "${_DEV} ${5} ${2} defaults 0 " >>/tmp/.fstab
|
||||
_check_filesystem_fstab "$@"
|
||||
|
|
|
@ -23,7 +23,7 @@ _auto_partition() {
|
|||
fi
|
||||
if [[ -z "${_SKIP_SWAP}" ]]; then
|
||||
_progress "65" "Creating SWAP partition..."
|
||||
echo "size=+${_SWAPDEV_SIZE}M, type=0657FD6D-A4AB-43C4-84E5-0933C84B4F4F, name=ARCH_LINUX_SWAP" | sfdisk -a "${_DISK}" &>"${_LOG}"
|
||||
echo "size=+${_SWAPDEV_SIZE}M, type=0657FD6D-A4AB-43C4-84E5-0933C84B4F4F, name=SWAP" | sfdisk -a "${_DISK}" &>"${_LOG}"
|
||||
fi
|
||||
_progress "70" "Creating ROOT partition..."
|
||||
[[ "${_RUNNING_ARCH}" == "aarch64" ]] && _GUID_TYPE=B921B045-1DF0-41C3-AF44-4C6F280D3FAE
|
||||
|
|
Loading…
Reference in a new issue