Hello community, here is the log from the commit of package ocfs2-tools for openSUSE:Factory checked in at 2016-04-28 16:55:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ocfs2-tools (Old) and /work/SRC/openSUSE:Factory/.ocfs2-tools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ocfs2-tools" Changes: -------- --- /work/SRC/openSUSE:Factory/ocfs2-tools/ocfs2-tools.changes 2016-03-17 16:49:49.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ocfs2-tools.new/ocfs2-tools.changes 2016-04-28 16:59:14.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Apr 21 09:57:15 UTC 2016 - [email protected] + +- Add 0009-o2cb-fix-systemd-o2cb.service-failure.patch to fix bsc#963959 + +------------------------------------------------------------------- New: ---- 0009-o2cb-fix-systemd-o2cb.service-failure.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ocfs2-tools.spec ++++++ --- /var/tmp/diff_new_pack.dOj1gv/_old 2016-04-28 16:59:17.000000000 +0200 +++ /var/tmp/diff_new_pack.dOj1gv/_new 2016-04-28 16:59:17.000000000 +0200 @@ -44,6 +44,7 @@ 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 @@ %patch404 -p1 %patch405 -p1 %patch406 -p1 +%patch407 -p1 %patch501 -p1 %build ++++++ 0009-o2cb-fix-systemd-o2cb.service-failure.patch ++++++ >From 2abe087d41b86198886a076fe222dd6e6537f0d1 Mon Sep 17 00:00:00 2001 From: Junxiao Bi <[email protected]> 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 <[email protected]> Reviewed-by: Eric Ren <[email protected]> --- 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
