mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-20 03:50:37 +02:00
set-default subvolume
This commit is contained in:
parent
9446afb915
commit
cedae81c34
2 changed files with 3 additions and 5 deletions
|
@ -272,10 +272,8 @@ _autoprepare() {
|
||||||
"${_BTRFS_DEVS}" "${_BTRFS_LEVEL}" "${_BTRFS_SUBVOLUME}" "${_BTRFS_COMPRESS}" || return 1
|
"${_BTRFS_DEVS}" "${_BTRFS_LEVEL}" "${_BTRFS_SUBVOLUME}" "${_BTRFS_COMPRESS}" || return 1
|
||||||
sleep 1
|
sleep 1
|
||||||
# set default subvolume for systemd-gpt-autogenerator
|
# set default subvolume for systemd-gpt-autogenerator
|
||||||
if [[ "${_FSTYPE}" == "btrfs" ]]; then
|
if [[ "${_FSTYPE}" == "btrfs" ]]; then
|
||||||
[[ "${_MP}" == "/" ]] && _BTRFS_SUBVOLUME="root"
|
btrfs subvolume set-default "${_DESTDIR}"/${_MP} || return 1
|
||||||
[[ "${_MP}" == "/home" ]] && _BTRFS_SUBVOLUME="home"
|
|
||||||
btrfs subvolume set-default "${_BTRFS_SUBVOLUME}" "${_DESTDIR}"/${_MP} || return 1
|
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
_dialog --infobox "Auto-Prepare was successful.\nContinuing in 5 seconds..." 4 40
|
_dialog --infobox "Auto-Prepare was successful.\nContinuing in 5 seconds..." 4 40
|
||||||
|
|
|
@ -380,7 +380,7 @@ _mkfs() {
|
||||||
# https://www.freedesktop.org/software/systemd/man/systemd-gpt-auto-generator.html
|
# https://www.freedesktop.org/software/systemd/man/systemd-gpt-auto-generator.html
|
||||||
# systemd supports detection on GPT disks:
|
# systemd supports detection on GPT disks:
|
||||||
# GRUB and rEFInd don't support /efi automount!
|
# GRUB and rEFInd don't support /efi automount!
|
||||||
# disabled for now "${_GUID_VALUE}" == "c12a7328-f81f-11d2-ba4b-00a0c93ec93b" && "${5}" == "/efi"
|
# disabled for now this check: "${_GUID_VALUE}" == "c12a7328-f81f-11d2-ba4b-00a0c93ec93b" && "${5}" == "/efi"
|
||||||
# /boot or /efi as ESP: c12a7328-f81f-11d2-ba4b-00a0c93ec93b
|
# /boot or /efi as ESP: c12a7328-f81f-11d2-ba4b-00a0c93ec93b
|
||||||
# /boot as Extended Boot Loader Partition: bc13c2ff-59e6-4262-a352-b275fd6f7172
|
# /boot as Extended Boot Loader Partition: bc13c2ff-59e6-4262-a352-b275fd6f7172
|
||||||
# swap: 0657fd6d-a4ab-43c4-84e5-0933c84b4f4f
|
# swap: 0657fd6d-a4ab-43c4-84e5-0933c84b4f4f
|
||||||
|
|
Loading…
Reference in a new issue