c/zfsonlinux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: c/zfsonlinux:d855afe7be276f7be4561e55034575055e4ea2e2
Branches Tags
c/zfsonlinux:master c/zfsonlinux:stable-7 c/zfsonlinux:stable-6 c/zfsonlinux:stable-5 c/zfsonlinux:stable-4 c/zfsonlinux:stable-3
c/zfsonlinux:zfs-2.0.6-bullseye
...
compare: c/zfsonlinux:f5ed5be89a89ff5f7ee76c8caaf2115eac2d46c5
Branches Tags
c/zfsonlinux:master c/zfsonlinux:stable-7 c/zfsonlinux:stable-6 c/zfsonlinux:stable-5 c/zfsonlinux:stable-4 c/zfsonlinux:stable-3
c/zfsonlinux:zfs-2.0.6-bullseye

3 Commits
d855afe7be ... f5ed5be89a

Author SHA1 Message Date
Thomas Lamprecht f5ed5be89a bump version to 2.1.12-pve1 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 2023-06-13 15:25:21 +02:00
Stoiko Ivanov 5891aaec34 /lib/zfs-linux/trim: don't exit 1 if last pool isn't nvme-only (Closes: #1030316) 
(cherry picked from debian-upstream[0]
commit 8ed69adac193f6463832f6ae34b5ded88b8014d8)

[0] https://salsa.debian.org/zfsonlinux-team/zfs
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
 2023-06-13 15:23:49 +02:00
Stoiko Ivanov 63e591d8a9 update zfs submodule to 2.1.12 
patches still applied cleanly

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
 2023-06-13 15:23:49 +02:00
3 changed files with 10 additions and 2 deletions
Expand all files Collapse all files
debian/changelog
Vendored
+8
View File
@@ -1,3 +1,11 @@
zfs-linux (2.1.12-pve1) bookworm; urgency=medium
* update ZFS to 2.1.12
* zfs trim: avoid exit-failure if last pool isn't nvme-only
-- Proxmox Support Team <support@proxmox.com> Tue, 13 Jun 2023 15:25:16 +0200
zfs-linux (2.1.11-pve2) bookworm; urgency=medium
* re-build for Debian 12 Bookworm based releases
debian/tree/zfsutils-linux/usr/lib/zfs-linux/trim
Vendored
+1 -1
View File
@@ -60,7 +60,7 @@ do
case "${ret}" in
disable);;
enable) trim_if_not_already_trimming "${pool}" ;;
-|auto) pool_is_nvme_only "${pool}" && trim_if_not_already_trimming "${pool}" ;;
-|auto) if pool_is_nvme_only "${pool}"; then trim_if_not_already_trimming "${pool}"; fi ;;
*) cat > /dev/stderr <<EOF
$0: [WARNING] illegal value "${ret}" for property "${PROPERTY_NAME}" of ZFS dataset "${pool}".
$0: Acceptable choices for this property are: auto, enable, disable. The default is auto.
upstream
+1 -1
Submodule upstream updated: e25f9131d6...86783d7d92