[Debian-ha-commits] [ocfs2-tools] 02/02: Fix mkfs segfault (Closes: #716105)

[Valentin Vidic]

This is an automated email from the git hooks/post-receive script.

vvidic-guest pushed a commit to branch master
in repository ocfs2-tools.

commit c130f5a962cc93b7a68c4cb29c41de2df87e72a7
Author: Valentin Vidic <Valentin.Vidic at CARNet.hr>
Date:   Wed Jul 13 16:26:09 2016 +0200

    Fix mkfs segfault (Closes: #716105)
---
 debian/patches/mkfs-segfault.patch | 11 +++++++++++
 debian/patches/series              |  1 +
 2 files changed, 12 insertions(+)

diff --git a/debian/patches/mkfs-segfault.patch b/debian/patches/mkfs-segfault.patch
new file mode 100644
index 0000000..966a36b
--- /dev/null
+++ b/debian/patches/mkfs-segfault.patch
@@ -0,0 +1,11 @@
+--- a/mkfs.ocfs2/mkfs.c
++++ b/mkfs.ocfs2/mkfs.c
+@@ -883,7 +883,7 @@
+ 		{ "verbose", 0, 0, 'v' },
+ 		{ "quiet", 0, 0, 'q' },
+ 		{ "version", 0, 0, 'V' },
+-		{ "journal-options", 0, 0, 'J'},
++		{ "journal-options", 1, 0, 'J'},
+ 		{ "heartbeat-device", 0, 0, 'H'},
+ 		{ "force", 0, 0, 'F'},
+ 		{ "mount", 1, 0, 'M'},
diff --git a/debian/patches/series b/debian/patches/series
index a2ff6a5..d3d092e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ o2cb-init-script.patch
 ocfs2-udev-rule.patch
 o2cb-ctl-virtio.patch
 debugfs-segfault.patch
+mkfs-segfault.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-ha/ocfs2-tools.git