Merge branch 'main' into feature/store-i18n

# Conflicts:
#	roles/update/README.md
#	roles/web-app-bluesky/templates/extra_locations.conf.j2
#	roles/web-app-opentalk/templates/nginx/extra.conf.j2
#	scripts/install/filesystem.sh
This commit is contained in:
kevinveenbirkenbach committed 2026-10-22 10:57:53 +02:00
commit 4c4b00a0e9
15 files changed
+263 -21

No files matched your search

+5 -5
View File
@@ -135,13 +135,13 @@ install_pacman() {
install_dnf_native() {
case "${ID:-}" in
fedora)
retry_dnf dnf install -y e2fsprogs btrfs-progs
retry_dnf dnf --refresh install -y e2fsprogs btrfs-progs
return
;;
esac
log "adding EPEL, the only place the EL family carries btrfs-progs"
retry_dnf dnf install -y epel-release
retry_dnf dnf install -y e2fsprogs btrfs-progs
retry_dnf dnf --refresh install -y epel-release
retry_dnf dnf --refresh install -y e2fsprogs btrfs-progs
}
# Param: $1 path segment of the zfsonlinux repository, `fedora` or `epel`
@@ -233,7 +233,7 @@ install_dnf() {
log "zfs userland version: ${zfs_version}"
if ! command -v rpmbuild >/dev/null 2>&1; then
retry_dnf dnf install -y rpm-build
retry_dnf dnf --refresh install -y rpm-build
fi
local topdir=/tmp/zfs-kmod-container
@@ -261,7 +261,7 @@ SPEC
if [ -n "${source_rpm}" ]; then
install_zfs_from_source "${source_rpm}" "${before}"
else
retry_dnf dnf install -y zfs
retry_dnf dnf --refresh install -y zfs
dnf remove -y zfs-release
fi