zfs: update to 2.2.0.
This commit is contained in:
parent
177b827492
commit
7ab3a13c76
@ -1,56 +0,0 @@
|
|||||||
From eefe83eaa68f7cb4a49c580dd940d3688e42c849 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Toyam Cox <aviator45003@gmail.com>
|
|
||||||
Date: Thu, 30 Jun 2022 13:47:58 -0400
|
|
||||||
Subject: [PATCH] dracut: fix boot on non-zfs-root systems
|
|
||||||
|
|
||||||
Simply prevent overwriting root until it needs to be overwritten.
|
|
||||||
|
|
||||||
Dracut could change this value before this module is called, but won't
|
|
||||||
change the kernel command line.
|
|
||||||
|
|
||||||
Reviewed-by: Andrew J. Hesford <ajh@sideband.org>
|
|
||||||
Signed-off-by: Toyam Cox <vaelatern@voidlinux.org>
|
|
||||||
Closes #13592
|
|
||||||
---
|
|
||||||
contrib/dracut/90zfs/zfs-lib.sh.in | 10 +++++-----
|
|
||||||
1 file changed, 5 insertions(+), 5 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/contrib/dracut/90zfs/zfs-lib.sh.in b/contrib/dracut/90zfs/zfs-lib.sh.in
|
|
||||||
index e44673c2d75..3a43e514d6f 100755
|
|
||||||
--- a/contrib/dracut/90zfs/zfs-lib.sh.in
|
|
||||||
+++ b/contrib/dracut/90zfs/zfs-lib.sh.in
|
|
||||||
@@ -88,11 +88,11 @@ decode_root_args() {
|
|
||||||
return
|
|
||||||
fi
|
|
||||||
|
|
||||||
- root=$(getarg root=)
|
|
||||||
+ xroot=$(getarg root=)
|
|
||||||
rootfstype=$(getarg rootfstype=)
|
|
||||||
|
|
||||||
# shellcheck disable=SC2249
|
|
||||||
- case "$root" in
|
|
||||||
+ case "$xroot" in
|
|
||||||
""|zfs|zfs:|zfs:AUTO)
|
|
||||||
root=zfs:AUTO
|
|
||||||
rootfstype=zfs
|
|
||||||
@@ -100,7 +100,7 @@ decode_root_args() {
|
|
||||||
;;
|
|
||||||
|
|
||||||
ZFS=*|zfs:*)
|
|
||||||
- root="${root#zfs:}"
|
|
||||||
+ root="${xroot#zfs:}"
|
|
||||||
root="${root#ZFS=}"
|
|
||||||
root=$(echo "$root" | tr '+' ' ')
|
|
||||||
rootfstype=zfs
|
|
||||||
@@ -109,9 +109,9 @@ decode_root_args() {
|
|
||||||
esac
|
|
||||||
|
|
||||||
if [ "$rootfstype" = "zfs" ]; then
|
|
||||||
- case "$root" in
|
|
||||||
+ case "$xroot" in
|
|
||||||
"") root=zfs:AUTO ;;
|
|
||||||
- *) root=$(echo "$root" | tr '+' ' ') ;;
|
|
||||||
+ *) root=$(echo "$xroot" | tr '+' ' ') ;;
|
|
||||||
esac
|
|
||||||
return 0
|
|
||||||
fi
|
|
@ -1,6 +1,6 @@
|
|||||||
# Template file for 'zfs'
|
# Template file for 'zfs'
|
||||||
pkgname=zfs
|
pkgname=zfs
|
||||||
version=2.1.13
|
version=2.2.0
|
||||||
revision=1
|
revision=1
|
||||||
build_style=gnu-configure
|
build_style=gnu-configure
|
||||||
configure_args="--with-config=user --with-mounthelperdir=/usr/bin
|
configure_args="--with-config=user --with-mounthelperdir=/usr/bin
|
||||||
@ -10,13 +10,13 @@ hostmakedepends="dracut libtool pkg-config python3 automake"
|
|||||||
makedepends="pam-devel zlib-devel libuuid-devel libblkid-devel libtirpc-devel attr-devel"
|
makedepends="pam-devel zlib-devel libuuid-devel libblkid-devel libtirpc-devel attr-devel"
|
||||||
depends="dkms>=2.2.0.3_9 perl python3 xbps-triggers>=0.121_1
|
depends="dkms>=2.2.0.3_9 perl python3 xbps-triggers>=0.121_1
|
||||||
libzfs>=${version}_${revision}"
|
libzfs>=${version}_${revision}"
|
||||||
conf_files="/etc/zfs/zed.d/zed.rc"
|
conf_files="/etc/zfs/zed.d/zed.rc /usr/src/zfs-${version}/META"
|
||||||
short_desc="Z File System -- userland, pyzfs, and kernel modules (using DKMS)"
|
short_desc="Z File System -- userland, pyzfs, and kernel modules (using DKMS)"
|
||||||
maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
|
maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
|
||||||
license="CDDL-1.0"
|
license="CDDL-1.0"
|
||||||
homepage="https://openzfs.github.io/openzfs-docs/"
|
homepage="https://openzfs.github.io/openzfs-docs/"
|
||||||
distfiles="https://github.com/openzfs/zfs/releases/download/zfs-${version}/zfs-${version}.tar.gz"
|
distfiles="https://github.com/openzfs/zfs/releases/download/zfs-${version}/zfs-${version}.tar.gz"
|
||||||
checksum=06b24cbb3cbc1554e2edf2fcd71d1f8bec4febf4412aeac17070877c44302abd
|
checksum=42035fd059faa25a09cd511b24a57b8ad1285cb69127f2a0043b98562c5ec690
|
||||||
# dkms must be before initramfs-regenerate to build modules before images
|
# dkms must be before initramfs-regenerate to build modules before images
|
||||||
triggers="dkms initramfs-regenerate"
|
triggers="dkms initramfs-regenerate"
|
||||||
dkms_modules="zfs ${version}"
|
dkms_modules="zfs ${version}"
|
||||||
@ -55,6 +55,11 @@ post_install() {
|
|||||||
# Contains ELF binaries. Remove it until upstream has a way to move this
|
# Contains ELF binaries. Remove it until upstream has a way to move this
|
||||||
# into /usr/libexec or similiar.
|
# into /usr/libexec or similiar.
|
||||||
rm -rf ${DESTDIR}/usr/share/zfs/zfs-tests
|
rm -rf ${DESTDIR}/usr/share/zfs/zfs-tests
|
||||||
|
|
||||||
|
# move bash completions to a policy compliant directory
|
||||||
|
vmkdir usr/share/bash-completion/completions
|
||||||
|
mv ${DESTDIR}/etc/bash_completion.d/* \
|
||||||
|
${DESTDIR}/usr/share/bash-completion/completions
|
||||||
}
|
}
|
||||||
|
|
||||||
libzfs_package() {
|
libzfs_package() {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user