[Debian-ha-commits] [ocfs2-tools] 39/58: o2cb: fix systemd o2cb.service failure

[Valentin Vidic]

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

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

commit deb250ec375d9e849bc207971d0c24bef194d211
Author: Junxiao Bi <junxiao.bi at oracle.com>
Date:   Tue Oct 13 16:19:51 2015 +0800

    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 at oracle.com>
    Reviewed-by: Eric Ren <zren at 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 dedb408..e8d5e8d 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

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