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

fix missing Breaks/Replaces for zfs-initramfs

Browse Source 
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
This commit is contained in:
Stoiko Ivanov 2018-10-30 11:14:28 +01:00 committed by Thomas Lamprecht
parent 1bb9f57dcf
commit b6c5bd4c51
2 changed files with 44 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
zfs-patches/0008-Add-Breaks-Replaces-to-zfs-initramfs.patch Normal file
View File

@ -0,0 +1,43 @@
From 5ac80068e911d3b0935903f713c5f492d518da91 Mon Sep 17 00:00:00 2001
From: Stoiko Ivanov <s.ivanov@proxmox.com>
Date: Mon, 29 Oct 2018 15:49:20 +0100
Subject: [PATCH] Add Breaks/Replaces to zfs-initramfs
addressing the move of zdev initramfs hook from zfsutils-linux to
zfs-initramfs
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
---
debian/control | 2 ++
debian/control.in | 2 ++
2 files changed, 4 insertions(+)
diff --git a/debian/control b/debian/control
index 4d22ff50..a414e449 100644
--- a/debian/control
+++ b/debian/control
@@ -117,6 +117,8 @@ Depends: busybox-initramfs | busybox-static | busybox,
zfs-modules | zfs-dkms,
zfsutils-linux (>= ${binary:Version}),
${misc:Depends}
+Breaks: zfsutils-linux (<= 0.7.11-pve1~bpo1)
+Replaces: zfsutils-linux (<= 0.7.11-pve1~bpo1)
Description: OpenZFS root filesystem capabilities for Linux - initramfs
The Z file system is a pooled filesystem designed for maximum data
integrity, supporting data snapshots, multiple copies, and data
diff --git a/debian/control.in b/debian/control.in
index 96154c5c..b9c34331 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -117,6 +117,8 @@ Depends: busybox-initramfs | busybox-static | busybox,
zfs-modules | zfs-dkms,
zfsutils-linux (>= ${binary:Version}),
${misc:Depends}
+Breaks: zfsutils-linux (<= 0.7.11-pve1~bpo1)
+Replaces: zfsutils-linux (<= 0.7.11-pve1~bpo1)
Description: OpenZFS root filesystem capabilities for Linux - initramfs
The Z file system is a pooled filesystem designed for maximum data
integrity, supporting data snapshots, multiple copies, and data
--
2.11.0

1
zfs-patches/series
View File

@ -5,3 +5,4 @@
0005-Fix-race-in-dnode_check_slots_free.patch 0005-Fix-race-in-dnode_check_slots_free.patch
0006-Reduce-taskq-and-context-switch-cost-of-zio-pipe.patch 0006-Reduce-taskq-and-context-switch-cost-of-zio-pipe.patch
0007-deadlock-between-mm_sem-and-tx-assign-in-zfs_write-a.patch 0007-deadlock-between-mm_sem-and-tx-assign-in-zfs_write-a.patch
0008-Add-Breaks-Replaces-to-zfs-initramfs.patch