Compare commits
2 Commits
68be554e71
...
3968b96ed4
| Author | SHA1 | Date | |
|---|---|---|---|
| 3968b96ed4 | |||
| 32ce077088 |
Vendored
+9
@@ -1,3 +1,12 @@
|
||||
zfs-linux (2.2.3-pve2) bookworm; urgency=medium
|
||||
|
||||
* fix #4835: order zfs-import@ before -cache/-scan
|
||||
|
||||
* backport (module) patches from the 2.2.4 staging tree for better Linux 6.8
|
||||
support
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Mon, 08 Apr 2024 17:43:35 +0200
|
||||
|
||||
zfs-linux (2.2.3-pve1) bookworm; urgency=medium
|
||||
|
||||
* update to new ZFS upstream 2.2.3 release
|
||||
|
||||
@@ -10,13 +10,16 @@ by scanning /dev/disk/by-id, irrespective of the existence and content of
|
||||
the instance name is used unescaped (see systemd.unit(5)), since zpool names
|
||||
can contain characters which will be escaped by systemd.
|
||||
|
||||
Its instances are ordered before the other two "big" import services to avoid
|
||||
races and spurious (cosmetic!) service failures.
|
||||
|
||||
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
|
||||
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
||||
---
|
||||
etc/Makefile.am | 1 +
|
||||
etc/systemd/system/50-zfs.preset | 1 +
|
||||
etc/systemd/system/zfs-import@.service.in | 16 ++++++++++++++++
|
||||
3 files changed, 18 insertions(+)
|
||||
etc/systemd/system/zfs-import@.service.in | 18 ++++++++++++++++
|
||||
3 files changed, 20 insertions(+)
|
||||
create mode 100644 etc/systemd/system/zfs-import@.service.in
|
||||
|
||||
diff --git a/etc/Makefile.am b/etc/Makefile.am
|
||||
@@ -48,7 +51,7 @@ new file mode 100644
|
||||
index 000000000..9b4ee9371
|
||||
--- /dev/null
|
||||
+++ b/etc/systemd/system/zfs-import@.service.in
|
||||
@@ -0,0 +1,16 @@
|
||||
@@ -0,0 +1,18 @@
|
||||
+[Unit]
|
||||
+Description=Import ZFS pool %i
|
||||
+Documentation=man:zpool(8)
|
||||
@@ -57,6 +60,8 @@ index 000000000..9b4ee9371
|
||||
+After=cryptsetup.target
|
||||
+After=multipathd.target
|
||||
+Before=zfs-import.target
|
||||
+Before=zfs-import-scan.service
|
||||
+Before=zfs-import-cache.service
|
||||
+
|
||||
+[Service]
|
||||
+Type=oneshot
|
||||
|
||||
Reference in New Issue
Block a user