Sync patches with our latest 8.2 branch (#53)

Signed-off-by: Damien Thenot <[email protected]>

SOURCES/0001-backport-of-ccd121cc248d79b749a63d4ad099e6d5f4b8b588.patch

@@ -87,5 +87,5 @@ index aa5a6b1..c752863 100755
  def registerSR(SRClass):
      """Register SR with handler. All SR subclasses should call this in 
 -- 
-2.45.2
+2.46.0
 

SOURCES/0002-Update-xs-sm.service-s-description-for-XCP-ng.patch

@@ -21,5 +21,5 @@ index 99cb313..609c6ef 100644
  Conflicts=shutdown.target
  RefuseManualStop=yes
 -- 
-2.45.2
+2.46.0
 

SOURCES/0003-Add-TrueNAS-multipath-config.patch

@@ -26,5 +26,5 @@ index 9f3dfa7..f63506d 100644
 +	}
  }
 -- 
-2.45.2
+2.46.0
 

SOURCES/0004-feat-drivers-add-CephFS-GlusterFS-and-XFS-drivers.patch

@@ -888,5 +888,5 @@ index dce460e..aff51ae 100755
      if not type in SR.TYPES:
          raise util.SMException("Unsupported SR type: %s" % type)
 -- 
-2.45.2
+2.46.0
 

SOURCES/0005-feat-drivers-add-ZFS-driver-to-avoid-losing-VDI-meta.patch

@@ -201,5 +201,5 @@ index aff51ae..feb7c18 100755
          type = SR.TYPE_FILE
      if not type in SR.TYPES:
 -- 
-2.45.2
+2.46.0
 

SOURCES/0006-Re-add-the-ext4-driver-for-users-who-need-to-transit.patch

@@ -288,5 +288,5 @@ index feb7c18..12e4428 100755
          type = SR.TYPE_FILE
      if not type in SR.TYPES:
 -- 
-2.45.2
+2.46.0
 

SOURCES/0007-feat-drivers-add-LinstorSR-driver.patch

@@ -1,4 +1,4 @@
-From 3b19f4d691a10f0023d936a0328e4a7684b4d3fa Mon Sep 17 00:00:00 2001
+From 2c71c3ce33cd02573824a57bd4b3917b45c890b0 Mon Sep 17 00:00:00 2001
 From: Ronan Abhamon <[email protected]>
 Date: Mon, 16 Mar 2020 15:39:44 +0100
 Subject: [PATCH 007/178] feat(drivers): add LinstorSR driver
@@ -64,8 +64,8 @@ module imports are protected by try.. except... blocks.
  drivers/util.py                 |   46 +-
  linstor/Makefile                |   22 +
  linstor/linstor-monitord.c      |  402 ++++++
- mocks/linstor/__init__.py       |    0
  systemd/linstor-monitor.service |   13 +
+ tests/mocks/linstor/__init__.py |    0
  14 files changed, 5361 insertions(+), 30 deletions(-)
  create mode 100755 drivers/LinstorSR.py
  create mode 100755 drivers/linstor-manager
@@ -74,8 +74,8 @@ module imports are protected by try.. except... blocks.
  create mode 100755 drivers/linstorvolumemanager.py
  create mode 100644 linstor/Makefile
  create mode 100644 linstor/linstor-monitord.c
- create mode 100644 mocks/linstor/__init__.py
  create mode 100644 systemd/linstor-monitor.service
+ create mode 100644 tests/mocks/linstor/__init__.py
 
 diff --git a/Makefile b/Makefile
 index 9bc0a9d..609e182 100755
@@ -5657,9 +5657,6 @@ index 0000000..8161813
 +  close(inotifyFd);
 +  return -ret;
 +}
-diff --git a/mocks/linstor/__init__.py b/mocks/linstor/__init__.py
-new file mode 100644
-index 0000000..e69de29
 diff --git a/systemd/linstor-monitor.service b/systemd/linstor-monitor.service
 new file mode 100644
 index 0000000..5f8f0a7
@@ -5679,6 +5676,9 @@ index 0000000..5f8f0a7
 +
 +[Install]
 +WantedBy=multi-user.target
+diff --git a/tests/mocks/linstor/__init__.py b/tests/mocks/linstor/__init__.py
+new file mode 100644
+index 0000000..e69de29
 -- 
-2.45.2
+2.46.0
 

SOURCES/0008-feat-tests-add-unit-tests-concerning-ZFS-close-xcp-n.patch

@@ -1,4 +1,4 @@
-From c43a4dbdff827fe7a65f93a4fa4b817344c854aa Mon Sep 17 00:00:00 2001
+From 89cee57b097a681edc800be05d1dfc7d97aec995 Mon Sep 17 00:00:00 2001
 From: Ronan Abhamon <[email protected]>
 Date: Tue, 27 Oct 2020 15:04:36 +0100
 Subject: [PATCH 008/178] feat(tests): add unit tests concerning ZFS (close
@@ -205,5 +205,5 @@ index 0000000..6f8040d
 +            failed = True
 +        self.assertTrue(failed)
 -- 
-2.45.2
+2.46.0
 

SOURCES/0009-If-no-NFS-ACLs-provided-assume-everyone.patch

@@ -1,4 +1,4 @@
-From c1f90914648fc31104ebc535f653c9b70d27fc47 Mon Sep 17 00:00:00 2001
+From c338e356dcad6ad17b2f2248ff45fcf983173e0e Mon Sep 17 00:00:00 2001
 From: BenjiReis <[email protected]>
 Date: Thu, 25 Feb 2021 09:54:52 +0100
 Subject: [PATCH 009/178] If no NFS ACLs provided, assume everyone:
@@ -71,5 +71,5 @@ index 71800ab..cef414f 100644
 +        self.assertEqual(len(pread2.mock_calls), 1)
 +        pread2.assert_called_with(['/usr/sbin/showmount', '--no-headers', '-e', 'aServer'])
 -- 
-2.45.2
+2.46.0
 

SOURCES/0010-Added-SM-Driver-for-MooseFS.patch

@@ -1,4 +1,4 @@
-From 46f4c9f02e0c0bacecf4fba09bdf94a419955d10 Mon Sep 17 00:00:00 2001
+From 359dd15436b153bedf32af7768973febc2b84c2f Mon Sep 17 00:00:00 2001
 From: Aleksander Wieliczko <[email protected]>
 Date: Fri, 29 Jan 2021 15:21:23 +0100
 Subject: [PATCH 010/178] Added SM Driver for MooseFS
@@ -386,5 +386,5 @@ index 0000000..5a61cf5
 +        mfssr.detach('asr_uuid')
 +        self.assertTrue(mfssr.attached)
 -- 
-2.45.2
+2.46.0
 

SOURCES/0011-Avoid-usage-of-umount-in-ISOSR-when-legacy_mode-is-u.patch

@@ -1,4 +1,4 @@
-From 78e02205515d1926448d9148e07190278f192fe1 Mon Sep 17 00:00:00 2001
+From c984a5c3510b12c44a9fd2d0297cdb21111d20f7 Mon Sep 17 00:00:00 2001
 From: Ronan Abhamon <[email protected]>
 Date: Thu, 2 Dec 2021 09:28:37 +0100
 Subject: [PATCH 011/178] Avoid usage of `umount` in `ISOSR` when `legacy_mode`
@@ -103,5 +103,5 @@ index 7655f14..03c8851 100644
  class TestISOSR_overNFS(unittest.TestCase):
 
 -- 
-2.45.2
+2.46.0
 

SOURCES/0012-MooseFS-SR-uses-now-UUID-subdirs-for-each-SR.patch

@@ -1,4 +1,4 @@
-From 96777e1aebf0b4bf800d71c03a87908282669971 Mon Sep 17 00:00:00 2001
+From c701f410bdac559ac8384da2f8b40833e5e89866 Mon Sep 17 00:00:00 2001
 From: Ronan Abhamon <[email protected]>
 Date: Wed, 18 May 2022 17:28:09 +0200
 Subject: [PATCH 012/178] MooseFS SR uses now UUID subdirs for each SR
@@ -126,5 +126,5 @@ index be5112c..ab72f4e 100755
              self.detach(sr_uuid)
              if inst.code != errno.ENOENT:
 -- 
-2.45.2
+2.46.0
 

SOURCES/0013-Fix-is_open-call-for-many-drivers-25.patch

@@ -1,4 +1,4 @@
-From ebb716f123eb8b6c4e8b2ff1147926211af183db Mon Sep 17 00:00:00 2001
+From cba6bde2b5243bac634b5e5e910db685355ba83e Mon Sep 17 00:00:00 2001
 From: Ronan Abhamon <[email protected]>
 Date: Thu, 23 Jun 2022 10:36:36 +0200
 Subject: [PATCH 013/178] Fix is_open call for many drivers (#25)
@@ -104,5 +104,5 @@ index 0d60d96..534e6c9 100755
 
      driver = SR.driver(srType)
 -- 
-2.45.2
+2.46.0
 

SOURCES/0014-Remove-SR_CACHING-capability-for-many-SR-types-24.patch

@@ -1,4 +1,4 @@
-From 658d391b17fa66a312401e43b22cefb897ea3b57 Mon Sep 17 00:00:00 2001
+From bf7577ff65e882686af8e7ca1748cfb0b7934a14 Mon Sep 17 00:00:00 2001
 From: Ronan Abhamon <[email protected]>
 Date: Thu, 23 Jun 2022 10:37:07 +0200
 Subject: [PATCH 014/178] Remove SR_CACHING capability for many SR types (#24)
@@ -56,5 +56,5 @@ index ab72f4e..212f1ad 100755
                  "VDI_UPDATE", "VDI_CLONE", "VDI_SNAPSHOT", "VDI_RESIZE", "VDI_MIRROR",
                  "VDI_GENERATE_CONFIG",
 -- 
-2.45.2
+2.46.0
 

SOURCES/0015-Remove-SR_PROBE-from-ZFS-capabilities-37.patch

@@ -1,4 +1,4 @@
-From 7263d70aa77dbc18b40b000811be3cf01ab8f4ad Mon Sep 17 00:00:00 2001
+From 1a7496b75ae96edf79f2da481b54b80e8d2925f8 Mon Sep 17 00:00:00 2001
 From: BenjiReis <[email protected]>
 Date: Fri, 4 Aug 2023 12:10:08 +0200
 Subject: [PATCH 015/178] Remove `SR_PROBE` from ZFS capabilities (#37)
@@ -24,5 +24,5 @@ index d375210..b803211 100644
      'VDI_CREATE',
      'VDI_DELETE',
 -- 
-2.45.2
+2.46.0
 

SOURCES/0016-Fix-vdi-ref-when-static-vdis-are-used.patch

@@ -1,4 +1,4 @@
-From 85c1fa8737facb51f419b0539661f8fffcc36d8d Mon Sep 17 00:00:00 2001
+From 37c79431e2c6654c5afdb6cde6e23c4c321c4cda Mon Sep 17 00:00:00 2001
 From: Guillaume <[email protected]>
 Date: Wed, 16 Aug 2023 13:42:21 +0200
 Subject: [PATCH 016/178] Fix vdi-ref when static vdis are used
@@ -32,5 +32,5 @@ index dd8e20b..6ac3f80 100755
          if needDeflate:
              try:
 -- 
-2.45.2
+2.46.0
 

SOURCES/0017-Tell-users-not-to-edit-multipath.conf-directly.patch

@@ -1,4 +1,4 @@
-From 0d635eac00e89fcfa16856f53947511f0911e2bc Mon Sep 17 00:00:00 2001
+From 9bfcb0be3ff34354c9299bf6e0a90e691f14e813 Mon Sep 17 00:00:00 2001
 From: Samuel Verschelde <[email protected]>
 Date: Fri, 27 Jan 2023 12:03:15 +0100
 Subject: [PATCH 017/178] Tell users not to edit multipath.conf directly
@@ -30,5 +30,5 @@ index f63506d..c854b57 100644
  # multipathd.
  # For information on the syntax refer to `man multipath.conf` and the examples
 -- 
-2.45.2
+2.46.0
 

SOURCES/0018-Add-custom.conf-multipath-configuration-file.patch

@@ -1,4 +1,4 @@
-From 6fc44ae6ca8bf73c576ec9f74b53de0ed51cd5de Mon Sep 17 00:00:00 2001
+From 383f9128fb1a788074a5a6aca09a249bfeaa44f5 Mon Sep 17 00:00:00 2001
 From: Samuel Verschelde <[email protected]>
 Date: Fri, 27 Jan 2023 12:23:13 +0100
 Subject: [PATCH 018/178] Add custom.conf multipath configuration file
@@ -27,5 +27,5 @@ index 0000000..3c8583f
 +
 +# Refer to "man multipath.conf"
 -- 
-2.45.2
+2.46.0
 

SOURCES/0019-Install-etc-multipath-conf.d-custom.conf.patch

@@ -1,4 +1,4 @@
-From 17129f5341223dae7a0b38516e8b01990b61df1d Mon Sep 17 00:00:00 2001
+From 507c2f067878ee88765c5750d3e618c8c63208c7 Mon Sep 17 00:00:00 2001
 From: Samuel Verschelde <[email protected]>
 Date: Fri, 25 Aug 2023 17:47:34 +0200
 Subject: [PATCH 019/178] Install /etc/multipath/conf.d/custom.conf
@@ -48,5 +48,5 @@ index b0ae353..3357cbf 100755
  	  $(SM_STAGING)/$(INIT_DIR)
  	install -m 755 multipath/multipath-root-setup \
 -- 
-2.45.2
+2.46.0
 

SOURCES/0020-Backport-NFS4-only-support.patch

@@ -1,4 +1,4 @@
-From 8f5cd11745a54fcfb127a23494a1fc2af5ed723b Mon Sep 17 00:00:00 2001
+From 2d197ca1c046dce44579f77f4e2ac23397edb9c1 Mon Sep 17 00:00:00 2001
 From: Benjamin Reis <[email protected]>
 Date: Mon, 18 Dec 2023 10:22:26 +0100
 Subject: [PATCH 020/178] Backport NFS4 only support
@@ -426,5 +426,5 @@ index cef414f..9ea807f 100644
          expected = """<?xml version="1.0" ?>
  <nfs-exports>
 -- 
-2.45.2
+2.46.0
 

SOURCES/0021-Backport-probe-for-NFS4-when-rpcinfo-does-not-includ.patch

@@ -1,4 +1,4 @@
-From ee88d74e603d364e0fb958ce867dc38ea61281db Mon Sep 17 00:00:00 2001
+From bcebd6854894ddd9cc6af7d41a54daab7a45f7be Mon Sep 17 00:00:00 2001
 From: Benjamin Reis <[email protected]>
 Date: Mon, 18 Dec 2023 10:35:46 +0100
 Subject: [PATCH 021/178] Backport probe for NFS4 when rpcinfo does not include
@@ -164,5 +164,5 @@ index 9ea807f..3874d8e 100644
          return ([binary, 'remoteserver:remotepath', 'mountpoint', '-o',
                   'soft,proto=transport,vers=%s,acdirmin=0,acdirmax=0' % vers])
 -- 
-2.45.2
+2.46.0
 

SOURCES/0022-feat-LargeBlock-backport-of-largeblocksr-51-55.patch

@@ -1,4 +1,4 @@
-From 86d936b5359bfaee5a3d392daed5c9199839901f Mon Sep 17 00:00:00 2001
+From 52d495879ebf8c1caee78f3e10f7febd65d8ccd3 Mon Sep 17 00:00:00 2001
 From: Damien Thenot <[email protected]>
 Date: Tue, 7 May 2024 15:20:22 +0200
 Subject: [PATCH 022/178] feat(LargeBlock): backport of largeblocksr (#51)
@@ -396,5 +396,5 @@ index 534e6c9..3c7bd34 100755
      import LVHDSR
      import MooseFSSR
 -- 
-2.45.2
+2.46.0
 

SOURCES/0023-feat-LVHDSR-add-a-way-to-modify-config-of-LVMs-56.patch

@@ -1,4 +1,4 @@
-From 906aede91ac5b450e6e11332ab070d0ec7b71dbb Mon Sep 17 00:00:00 2001
+From ec5c7c6cd4732e7f70122ccdb8ccdaf6711e5f31 Mon Sep 17 00:00:00 2001
 From: Ronan Abhamon <[email protected]>
 Date: Tue, 28 May 2024 15:17:21 +0200
 Subject: [PATCH 023/178] feat(LVHDSR): add a way to modify config of LVMs
@@ -106,5 +106,5 @@ index ea0bc17..54930b4 100644
              self._removeTag(lvName, tag)
          del self.lvs[lvName]
 -- 
-2.45.2
+2.46.0