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

remove btrfs corrections, subvolumes are mandatory so no need to change permissions

Browse source
This commit is contained in:
Tobias Powalowski 2023-01-24 09:34:20 +01:00
parent edb857795f
commit 30a7cdc887
2 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -231,10 +231,10 @@ _autoprepare() {
## <partnum>:<fstype>:<mountpoint>:<labelname> ## <partnum>:<fstype>:<mountpoint>:<labelname>
## The partitions in FSSPECS list should be listed in the "mountpoint" order. ## The partitions in FSSPECS list should be listed in the "mountpoint" order.
## Make sure the "root" partition is defined first in the FSSPECS list ## Make sure the "root" partition is defined first in the FSSPECS list
_FSSPEC_ROOTDEV="${_ROOTDEV_NUM}:${_FSTYPE}:/:ARCH_ROOT"
_FSSPEC_HOMEDEV="${_HOMEDEV_NUM}:${_FSTYPE}:/home:ARCH_HOME"
_FSSPEC_SWAPDEV="${_SWAPDEV_NUM}:swap:swap:ARCH_SWAP" _FSSPEC_SWAPDEV="${_SWAPDEV_NUM}:swap:swap:ARCH_SWAP"
_FSSPEC_ROOTDEV="${_ROOTDEV_NUM}:${_FSTYPE}:/:ARCH_ROOT"
_FSSPEC_BOOTDEV="${_BOOTDEV_NUM}:ext2:/boot:ARCH_BOOT" _FSSPEC_BOOTDEV="${_BOOTDEV_NUM}:ext2:/boot:ARCH_BOOT"
_FSSPEC_HOMEDEV="${_HOMEDEV_NUM}:${_FSTYPE}:/home:ARCH_HOME"
_FSSPEC_UEFISYSDEV="${_UEFISYSDEV_NUM}:vfat:${_UEFISYS_MP}:ESP" _FSSPEC_UEFISYSDEV="${_UEFISYSDEV_NUM}:vfat:${_UEFISYS_MP}:ESP"
if [[ -n "${_GUIDPARAMETER}" ]]; then if [[ -n "${_GUIDPARAMETER}" ]]; then
if [[ -n "${_UEFISYS_BOOTDEV}" ]]; then if [[ -n "${_UEFISYS_BOOTDEV}" ]]; then

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

@ -335,15 +335,6 @@ _mkfs() {
fi fi
# btrfs needs balancing on fresh created raid, else weird things could happen # btrfs needs balancing on fresh created raid, else weird things could happen
[[ "${2}" == "btrfs" && -n "${4}" ]] && btrfs balance start --full-balance "${3}""${5}" &>"${_LOG}" [[ "${2}" == "btrfs" && -n "${4}" ]] && btrfs balance start --full-balance "${3}""${5}" &>"${_LOG}"
# change permission of base directories to correct permission
# to avoid btrfs issues
if [[ "${5}" == "/tmp" ]]; then
chmod 1777 "${3}""${5}"
elif [[ "${5}" == "/root" ]]; then
chmod 750 "${3}""${5}"
else
chmod 755 "${3}""${5}"
fi
fi fi
# add to .device-names for config files # add to .device-names for config files
#shellcheck disable=SC2155 #shellcheck disable=SC2155