cluster: RHEL56 - resource-agents: Support ext4 in fs.sh

Lon Hohberger lon at fedoraproject.org
Fri Sep 24 22:27:21 UTC 2010


Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=1d2a31568a1b502b65bb33358424539911e55d4d
Commit:        1d2a31568a1b502b65bb33358424539911e55d4d
Parent:        f2bfc93101e06cba918c2bb0c11ab6d668788019
Author:        Lon Hohberger <lhh at redhat.com>
AuthorDate:    Wed Sep 22 10:10:58 2010 -0400
Committer:     Lon Hohberger <lhh at redhat.com>
CommitterDate: Fri Sep 24 18:26:26 2010 -0400

resource-agents: Support ext4 in fs.sh

Resolves: rhbz#636550

Signed-off-by: Lon Hohberger <lhh at redhat.com>
---
 rgmanager/src/resources/fs.sh |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/rgmanager/src/resources/fs.sh b/rgmanager/src/resources/fs.sh
index a2148f4..ce3e983 100755
--- a/rgmanager/src/resources/fs.sh
+++ b/rgmanager/src/resources/fs.sh
@@ -384,7 +384,7 @@ verify_fstype()
 	[ -z "$OCF_RESKEY_fstype" ] && return 0
 
 	case $OCF_RESKEY_fstype in
-	ext2|ext3|jfs|xfs|reiserfs|vfat|tmpfs|vxfs)
+	ext2|ext3|ext4|jfs|xfs|reiserfs|vfat|tmpfs|vxfs)
 		return 0
 		;;
 	*)
@@ -417,7 +417,7 @@ verify_options()
 		esac
 
 		case $OCF_RESKEY_fstype in
-		ext2|ext3)
+		ext2|ext3|ext4)
 			case $o in
 			bsddf|minixdf|check|check=*|nocheck|debug)
 				continue
@@ -433,7 +433,8 @@ verify_options()
 				;;
 			esac
 
-			if [ "$OCF_RESKEY_fstype" = "ext3" ]; then
+			if [ "$OCF_RESKEY_fstype" = "ext3" ] ||
+			   [ "$OCF_RESKEY_fstype" = "ext4" ] ; then
 				case $0 in
 				noload|data=*)
 					continue
@@ -908,6 +909,7 @@ Cannot mount $dev on $mp, the device or mount point is already in use!"
         case "$fstype" in
         reiserfs) typeset fsck_needed="" ;;
         ext3)     typeset fsck_needed="" ;;
+        ext4)     typeset fsck_needed="" ;;
         jfs)      typeset fsck_needed="" ;;
         xfs)      typeset fsck_needed="" ;;
 	vxfs)	  typeset fsck_needed="" ;;


More information about the cluster-commits mailing list