forked from pool/ocfs2-tools
33 lines
1.1 KiB
Diff
33 lines
1.1 KiB
Diff
|
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
|
||
|
|
|