From 374aad5bea1bfc2ec87fc6f5fa3ef758527b7fa3 Mon Sep 17 00:00:00 2001 From: Stoiko Ivanov Date: Wed, 2 Dec 2020 20:18:01 +0100 Subject: [PATCH] update submodule and patches for zfs-2.0.0 Signed-off-by: Stoiko Ivanov --- .../0002-always-load-ZFS-module-on-boot.patch | 8 ++++---- ...o-the-zed-binary-on-the-systemd-unit.patch | 6 +++--- ...ith-d-dev-disk-by-id-in-scan-service.patch | 4 ++-- debian/patches/0005-Enable-zed-emails.patch | 2 +- .../0006-dont-symlink-zed-scripts.patch | 4 ++-- .../patches/0007-Use-installed-python3.patch | 19 +++++++----------- ...md-unit-for-importing-specific-pools.patch | 20 ++++++------------- upstream | 2 +- 8 files changed, 26 insertions(+), 39 deletions(-) diff --git a/debian/patches/0002-always-load-ZFS-module-on-boot.patch b/debian/patches/0002-always-load-ZFS-module-on-boot.patch index 2ff27f4..6b1e068 100644 --- a/debian/patches/0002-always-load-ZFS-module-on-boot.patch +++ b/debian/patches/0002-always-load-ZFS-module-on-boot.patch @@ -15,13 +15,13 @@ Signed-off-by: Fabian Grünbichler Signed-off-by: Stoiko Ivanov Signed-off-by: Thomas Lamprecht --- - etc/modules-load.d/zfs.conf.in | 2 +- + etc/modules-load.d/zfs.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/etc/modules-load.d/zfs.conf.in b/etc/modules-load.d/zfs.conf.in +diff --git a/etc/modules-load.d/zfs.conf b/etc/modules-load.d/zfs.conf index 44e1bb3ed..7509b03cb 100644 ---- a/etc/modules-load.d/zfs.conf.in -+++ b/etc/modules-load.d/zfs.conf.in +--- a/etc/modules-load.d/zfs.conf ++++ b/etc/modules-load.d/zfs.conf @@ -1,3 +1,3 @@ # The default behavior is to allow udev to load the kernel modules on demand. # Uncomment the following line to unconditionally load them at boot. diff --git a/debian/patches/0003-Fix-the-path-to-the-zed-binary-on-the-systemd-unit.patch b/debian/patches/0003-Fix-the-path-to-the-zed-binary-on-the-systemd-unit.patch index bd794ac..ebc1850 100644 --- a/debian/patches/0003-Fix-the-path-to-the-zed-binary-on-the-systemd-unit.patch +++ b/debian/patches/0003-Fix-the-path-to-the-zed-binary-on-the-systemd-unit.patch @@ -13,11 +13,11 @@ Signed-off-by: Thomas Lamprecht 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/systemd/system/zfs-zed.service.in b/etc/systemd/system/zfs-zed.service.in -index f4313625e..444e776fd 100644 +index 008075138..570e27707 100644 --- a/etc/systemd/system/zfs-zed.service.in +++ b/etc/systemd/system/zfs-zed.service.in -@@ -3,7 +3,7 @@ Description=ZFS Event Daemon (zed) - Documentation=man:zed(8) +@@ -4,7 +4,7 @@ Documentation=man:zed(8) + ConditionPathIsDirectory=/sys/module/zfs [Service] -ExecStart=@sbindir@/zed -F diff --git a/debian/patches/0004-import-with-d-dev-disk-by-id-in-scan-service.patch b/debian/patches/0004-import-with-d-dev-disk-by-id-in-scan-service.patch index 4ad0db3..12dfde8 100644 --- a/debian/patches/0004-import-with-d-dev-disk-by-id-in-scan-service.patch +++ b/debian/patches/0004-import-with-d-dev-disk-by-id-in-scan-service.patch @@ -14,10 +14,10 @@ Signed-off-by: Thomas Lamprecht 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/systemd/system/zfs-import-scan.service.in b/etc/systemd/system/zfs-import-scan.service.in -index 278f937fe..e8c502a33 100644 +index 6520f3246..1718f98a2 100644 --- a/etc/systemd/system/zfs-import-scan.service.in +++ b/etc/systemd/system/zfs-import-scan.service.in -@@ -12,7 +12,7 @@ ConditionPathExists=!@sysconfdir@/zfs/zpool.cache +@@ -13,7 +13,7 @@ ConditionPathIsDirectory=/sys/module/zfs [Service] Type=oneshot RemainAfterExit=yes diff --git a/debian/patches/0005-Enable-zed-emails.patch b/debian/patches/0005-Enable-zed-emails.patch index ffbd21d..e837d7e 100644 --- a/debian/patches/0005-Enable-zed-emails.patch +++ b/debian/patches/0005-Enable-zed-emails.patch @@ -13,7 +13,7 @@ Signed-off-by: Thomas Lamprecht 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/zed/zed.d/zed.rc b/cmd/zed/zed.d/zed.rc -index 0ef706849..50632bfcb 100644 +index df560f921..4ce7af744 100644 --- a/cmd/zed/zed.d/zed.rc +++ b/cmd/zed/zed.d/zed.rc @@ -15,7 +15,7 @@ diff --git a/debian/patches/0006-dont-symlink-zed-scripts.patch b/debian/patches/0006-dont-symlink-zed-scripts.patch index 921bab7..078f6d6 100644 --- a/debian/patches/0006-dont-symlink-zed-scripts.patch +++ b/debian/patches/0006-dont-symlink-zed-scripts.patch @@ -16,10 +16,10 @@ Forwarded: no need 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/zed/zed.d/Makefile.am b/cmd/zed/zed.d/Makefile.am -index 716db2b2f..57fed7fdf 100644 +index 8b2d0c200..118c96547 100644 --- a/cmd/zed/zed.d/Makefile.am +++ b/cmd/zed/zed.d/Makefile.am -@@ -52,6 +52,6 @@ install-data-hook: +@@ -48,6 +48,6 @@ install-data-hook: for f in $(zedconfdefaults); do \ test -f "$(DESTDIR)$(zedconfdir)/$${f}" -o \ -L "$(DESTDIR)$(zedconfdir)/$${f}" || \ diff --git a/debian/patches/0007-Use-installed-python3.patch b/debian/patches/0007-Use-installed-python3.patch index 59769d6..789ce2a 100644 --- a/debian/patches/0007-Use-installed-python3.patch +++ b/debian/patches/0007-Use-installed-python3.patch @@ -4,16 +4,11 @@ Date: Tue, 5 May 2020 22:15:16 -0600 Subject: [PATCH] Use installed python3 --- - debian/patches/0004-prefer-python3-tests.patch | 0 .../functional/cli_root/zfs_program/zfs_program_json.ksh | 6 +++--- .../tests/functional/rsend/send_encrypted_files.ksh | 2 +- .../tests/functional/rsend/send_realloc_dnode_size.ksh | 2 +- - 4 files changed, 5 insertions(+), 5 deletions(-) - create mode 100644 debian/patches/0004-prefer-python3-tests.patch + 3 files changed, 5 insertions(+), 5 deletions(-) -diff --git a/debian/patches/0004-prefer-python3-tests.patch b/debian/patches/0004-prefer-python3-tests.patch -new file mode 100644 -index 000000000..e69de29bb diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_program/zfs_program_json.ksh b/tests/zfs-tests/tests/functional/cli_root/zfs_program/zfs_program_json.ksh index 3788543b0..c7ee4ae9a 100755 --- a/tests/zfs-tests/tests/functional/cli_root/zfs_program/zfs_program_json.ksh @@ -33,7 +28,7 @@ index 3788543b0..c7ee4ae9a 100755 typeset -i cnt=0 diff --git a/tests/zfs-tests/tests/functional/rsend/send_encrypted_files.ksh b/tests/zfs-tests/tests/functional/rsend/send_encrypted_files.ksh -index 6288178f8..d4475b369 100755 +index f89cb3b31..375d483f7 100755 --- a/tests/zfs-tests/tests/functional/rsend/send_encrypted_files.ksh +++ b/tests/zfs-tests/tests/functional/rsend/send_encrypted_files.ksh @@ -87,7 +87,7 @@ log_must xattrtest -f 10 -x 3 -s 32768 -r -k -p /$TESTPOOL/$TESTFS2/xattrsadir @@ -42,19 +37,19 @@ index 6288178f8..d4475b369 100755 log_must touch /$TESTPOOL/$TESTFS2/attrs -log_must eval "python -c 'print \"a\" * 4096' | \ +log_must eval "python3 -c 'print \"a\" * 4096' | \ - attr -s bigval /$TESTPOOL/$TESTFS2/attrs" + set_xattr_stdin bigval /$TESTPOOL/$TESTFS2/attrs" log_must zfs set compression=off xattr=on $TESTPOOL/$TESTFS2 diff --git a/tests/zfs-tests/tests/functional/rsend/send_realloc_dnode_size.ksh b/tests/zfs-tests/tests/functional/rsend/send_realloc_dnode_size.ksh -index 12a72fa09..aceec7880 100755 +index 394fe95bb..43560aac5 100755 --- a/tests/zfs-tests/tests/functional/rsend/send_realloc_dnode_size.ksh +++ b/tests/zfs-tests/tests/functional/rsend/send_realloc_dnode_size.ksh @@ -93,7 +93,7 @@ log_must zfs snapshot $POOL/fs@c # 4. Create an empty file and add xattrs to it to exercise reclaiming a # dnode that requires more than 1 slot for its bonus buffer (Zol #7433) log_must zfs set compression=on xattr=sa $POOL/fs --log_must eval "python -c 'print \"a\" * 512' | attr -s bigval /$POOL/fs/attrs" -+log_must eval "python3 -c 'print \"a\" * 512' | attr -s bigval /$POOL/fs/attrs" +-log_must eval "python -c 'print \"a\" * 512' | ++log_must eval "python3 -c 'print \"a\" * 512' | + set_xattr_stdin bigval /$POOL/fs/attrs" log_must zfs snapshot $POOL/fs@d - # 5. Generate initial and incremental streams diff --git a/debian/patches/0008-Add-systemd-unit-for-importing-specific-pools.patch b/debian/patches/0008-Add-systemd-unit-for-importing-specific-pools.patch index c5d2781..98aaf02 100644 --- a/debian/patches/0008-Add-systemd-unit-for-importing-specific-pools.patch +++ b/debian/patches/0008-Add-systemd-unit-for-importing-specific-pools.patch @@ -13,9 +13,9 @@ can contain characters which will be escaped by systemd. Signed-off-by: Stoiko Ivanov --- etc/systemd/system/50-zfs.preset.in | 1 + - etc/systemd/system/Makefile.am | 2 ++ - etc/systemd/system/zfs-import@.service.in | 17 +++++++++++++++++ - 3 files changed, 20 insertions(+) + etc/systemd/system/Makefile.am | 1 + + etc/systemd/system/zfs-import@.service.in | 16 ++++++++++++++++ + 3 files changed, 18 insertions(+) create mode 100644 etc/systemd/system/zfs-import@.service.in diff --git a/etc/systemd/system/50-zfs.preset.in b/etc/systemd/system/50-zfs.preset.in @@ -31,10 +31,10 @@ index e4056a92c..030611419 100644 enable zfs-mount.service enable zfs-share.service diff --git a/etc/systemd/system/Makefile.am b/etc/systemd/system/Makefile.am -index 4e14467a0..ae72102af 100644 +index c374a52ac..25d1b99d7 100644 --- a/etc/systemd/system/Makefile.am +++ b/etc/systemd/system/Makefile.am -@@ -5,6 +5,7 @@ systemdunit_DATA = \ +@@ -7,6 +7,7 @@ systemdunit_DATA = \ zfs-zed.service \ zfs-import-cache.service \ zfs-import-scan.service \ @@ -42,17 +42,9 @@ index 4e14467a0..ae72102af 100644 zfs-mount.service \ zfs-share.service \ zfs-volume-wait.service \ -@@ -16,6 +17,7 @@ EXTRA_DIST = \ - $(top_srcdir)/etc/systemd/system/zfs-zed.service.in \ - $(top_srcdir)/etc/systemd/system/zfs-import-cache.service.in \ - $(top_srcdir)/etc/systemd/system/zfs-import-scan.service.in \ -+ $(top_srcdir)/etc/systemd/system/zfs-import@.service.in \ - $(top_srcdir)/etc/systemd/system/zfs-mount.service.in \ - $(top_srcdir)/etc/systemd/system/zfs-share.service.in \ - $(top_srcdir)/etc/systemd/system/zfs-import.target.in \ diff --git a/etc/systemd/system/zfs-import@.service.in b/etc/systemd/system/zfs-import@.service.in new file mode 100644 -index 000000000..2db9fdaab +index 000000000..9b4ee9371 --- /dev/null +++ b/etc/systemd/system/zfs-import@.service.in @@ -0,0 +1,16 @@ diff --git a/upstream b/upstream index d2632f0..dcbf847 160000 --- a/upstream +++ b/upstream @@ -1 +1 @@ -Subproject commit d2632f0cc196a685428115ab023bf4fe3d8e5806 +Subproject commit dcbf8474933cb22b90dbd7f514c8a4c71ea4c1cf