summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/patches/libdiskfs-fix0001-libdiskfs-improve-error-handling.patch33
-rw-r--r--debian/patches/series1
2 files changed, 34 insertions, 0 deletions
diff --git a/debian/patches/libdiskfs-fix0001-libdiskfs-improve-error-handling.patch b/debian/patches/libdiskfs-fix0001-libdiskfs-improve-error-handling.patch
new file mode 100644
index 00000000..4e435d53
--- /dev/null
+++ b/debian/patches/libdiskfs-fix0001-libdiskfs-improve-error-handling.patch
@@ -0,0 +1,33 @@
+From b12e298fd7b6fbfd45140d327d02dfc84ca9d0fc Mon Sep 17 00:00:00 2001
+From: Justus Winter <justus@gnupg.org>
+Date: Tue, 19 Apr 2016 11:58:33 +0200
+Subject: [PATCH hurd] libdiskfs: improve error handling
+
+* libdiskfs/boot-start.c (diskfs_start_bootstrap): Improve error
+handling.
+---
+ libdiskfs/boot-start.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/libdiskfs/boot-start.c b/libdiskfs/boot-start.c
+index 60bf33d..0fb3e89 100644
+--- a/libdiskfs/boot-start.c
++++ b/libdiskfs/boot-start.c
+@@ -291,12 +291,13 @@ diskfs_start_bootstrap ()
+ /* Supply no intarray, since we have no info for it.
+ With none supplied, it will use the defaults. */
+ NULL, 0, 0, 0, 0, 0);
++ if (err)
++ error (1, err, "Executing '%s'", exec_argv);
+ free (exec_argv);
+ free (exec_env);
+ mach_port_deallocate (mach_task_self (), root_pt);
+ mach_port_deallocate (mach_task_self (), startup_pt);
+ mach_port_deallocate (mach_task_self (), bootpt);
+- assert_perror (err);
+ }
+
+ /* We look like an execserver to the execserver itself; it makes this
+--
+2.1.4
+
diff --git a/debian/patches/series b/debian/patches/series
index d7c0084f..289a34f9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -39,3 +39,4 @@ crash0001-xxx-crash-logging-works.patch
gpg0001-trans-add-identity-translator.patch
gpg0002-trans-add-transparent-GnuPG-translator.patch
fix0001-mach-defpager-fix-error-handling.patch
+libdiskfs-fix0001-libdiskfs-improve-error-handling.patch