Accepting request 391236 from network:ha-clustering:Factory

1

OBS-URL: https://build.opensuse.org/request/show/391236
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ocfs2-tools?expand=0&rev=63

0009-o2cb-fix-systemd-o2cb.service-failure.patch

@@ -0,0 +1,32 @@
+From 2abe087d41b86198886a076fe222dd6e6537f0d1 Mon Sep 17 00:00:00 2001
+From: Junxiao Bi <junxiao.bi@oracle.com>
+Date: Fri, 1 Apr 2016 11:10:13 +0800
+Subject: [PATCH] o2cb: fix systemd o2cb.service failure
+
+Configfs may have been mounted by "modprobe -s configfs" in
+load_filesystem() on ol7 which has systemd supported, in this
+case, mount_filesystem() will fail and o2cb.service can't be
+started. To fix this, check fs mount status when mount fail,
+if already mounted, don't return error.
+
+Signed-off-by: Junxiao Bi <junxiao.bi@oracle.com>
+Reviewed-by: Eric Ren <zren@suse.com>
+---
+ vendor/common/o2cb.init.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/vendor/common/o2cb.init.sh b/vendor/common/o2cb.init.sh
+index 9e0b31c..2d8c9e4 100755
+--- a/vendor/common/o2cb.init.sh
++++ b/vendor/common/o2cb.init.sh
+@@ -610,6 +610,7 @@ mount_filesystem()
+     mount -t ${FSNAME} ${FSNAME} ${MOUNTPOINT}
+     if [ $? != 0 ]
+     then
++        check_filesystem "$FSNAME" "$MOUNTPOINT" && return 2
+         echo "Unable to mount ${FSNAME} filesystem" >&2
+         return 1
+     fi
+-- 
+2.6.6
+

ocfs2-tools.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Apr 21 09:57:15 UTC 2016 - zren@suse.com
+
+- Add 0009-o2cb-fix-systemd-o2cb.service-failure.patch to fix bsc#963959 
+
 -------------------------------------------------------------------
 Thu Mar 17 04:00:04 UTC 2016 - zren@suse.com
 

ocfs2-tools.spec

@@ -44,6 +44,7 @@ Patch403:       0005-do-not-write-sysconfig-if-status-not-changed.patch
 Patch404:       0006-o2cb-mount-debugfs-when-load-config.patch
 Patch405:       0007-vendor-Add-vendor-files-for-sles12.patch
 Patch406:       0008-ocfs2-tools-add-systemd-support-fix.patch
+Patch407:       0009-o2cb-fix-systemd-o2cb.service-failure.patch
 Patch501:       bnc#96864-ocfs2console-fix-starting-failure.patch
 
 BuildRequires:  autoconf
@@ -157,6 +158,7 @@ OCFS2 filesystem.
 %patch404 -p1
 %patch405 -p1
 %patch406 -p1
+%patch407 -p1
 %patch501 -p1
 
 %build