Update Ubuntu patches

debian/patches/ubuntu/0001-Revert-etc-systemd-zfs-mount-generator-output-tweaks.patch

@@ -14,20 +14,20 @@ Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com>
  .../system-generators/zfs-mount-generator.c   | 22 ++++++++++++-------
  1 file changed, 14 insertions(+), 8 deletions(-)
 
-diff --git a/etc/systemd/system-generators/zfs-mount-generator.c b/etc/systemd/system-generators/zfs-mount-generator.c
-index b806339deb..8deeed9df0 100644
---- a/etc/systemd/system-generators/zfs-mount-generator.c
-+++ b/etc/systemd/system-generators/zfs-mount-generator.c
-@@ -281,7 +281,7 @@ line_worker(char *line, const char *cachefile)
+Index: zfs-linux/etc/systemd/system-generators/zfs-mount-generator.c
+===================================================================
+--- zfs-linux.orig/etc/systemd/system-generators/zfs-mount-generator.c
++++ zfs-linux/etc/systemd/system-generators/zfs-mount-generator.c
+@@ -270,7 +270,7 @@ line_worker(char *line, const char *cach
 
  	if (strcmp(p_encroot, "-") != 0) {
- 		char *keyloadunit =
+ 		char *keyloadunit = *(tofree++) =
 -		    systemd_escape(p_encroot, "zfs-load-key@", ".service");
 +		    systemd_escape(p_encroot, "zfs-load-key-", ".service");
+ 		if (keyloadunit == NULL)
+ 			goto err;
 
- 		if (strcmp(dataset, p_encroot) == 0) {
- 			const char *keymountdep = NULL;
-@@ -360,27 +360,33 @@ line_worker(char *line, const char *cachefile)
+@@ -354,27 +354,33 @@ line_worker(char *line, const char *cach
  			    "# dataset is a parent of the root filesystem.\n"
  			    "StandardOutput=null\n"
  			    "StandardError=null\n"
@@ -68,6 +68,3 @@ index b806339deb..8deeed9df0 100644
  				"'\n",
  				dataset, dataset);
  			/* END CSTYLED */
--- 
-2.32.0
-