From 942de0aad06c177897eecaa755c2f8faa775cc4d Mon Sep 17 00:00:00 2001
From: Francois Laupretre <francois@tekwire.net>
Date: Thu, 1 May 2014 01:17:01 +0200
Subject: [PATCH 1/4] Fix in sf_fs: Some legacy functions don't call the new
 functions by the right name

---
 src/sf_fs.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/sf_fs.sh b/src/sf_fs.sh
index 107e3bd..0c3754b 100644
--- a/src/sf_fs.sh
+++ b/src/sf_fs.sh
@@ -33,7 +33,7 @@
 
 function sf_has_dedicated_fs
 {
-sf_fs_is_dedicated $*
+sf_fs_is_mount_point $*
 }
 
 ##----------------------------------------------------------------------------
@@ -68,7 +68,7 @@ function sf_fs_is_mount_point
 
 function sf_get_fs_mnt
 {
-sf_fs_get_mnt $*
+sf_fs_mount_point $*
 }
 
 ##----------------------------------------------------------------------------
@@ -111,7 +111,7 @@ esac
 
 function sf_get_fs_device
 {
-sf_fs_get_device $*
+sf_fs_device $*
 }
 
 ##----------------------------------------------------------------------------

From dd69d747ac4b9d547ffddd741a0231e911284941 Mon Sep 17 00:00:00 2001
From: Francois Laupretre <francois.laupretre@externe.bnpparibas.com>
Date: Tue, 6 May 2014 12:41:50 +0200
Subject: [PATCH 2/4] sf_disk_rescan: Fix (disk resize not detected on VmWare
 under RHEL 6)

---
 src/sf_disk.sh | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/sf_disk.sh b/src/sf_disk.sh
index e5f996b..f57f892 100644
--- a/src/sf_disk.sh
+++ b/src/sf_disk.sh
@@ -183,11 +183,21 @@ function sf_disk_rescan
 {
 typeset i
 
-[ "`uname -s`" = Linux ] || sf_unsupported sf_disk_rescan
-
-for i in /sys/class/scsi_host/host*/scan ; do
-	echo "- - -" >$i
-done
+case "`uname -s`" in
+	Linux)
+		# Use two mechanisms because 1st one does not see disk resizes on a
+		# VM in RHEL 6.
+		for i in /sys/class/scsi_host/host*/scan ; do
+			echo "- - -" >$i
+		done
+		for i in  /sys/class/scsi_device/*/device/rescan ; do
+			echo 1 >$i
+		done
+		;;
+	*)
+		sf_unsupported sf_disk_rescan
+		;;
+esac
 }
 
 #=============================================================================

From e9ddcf2aa176b1251e3789b4f666aa866d59f49f Mon Sep 17 00:00:00 2001
From: Francois Laupretre <francois.laupretre@externe.bnpparibas.com>
Date: Wed, 7 May 2014 10:39:57 +0200
Subject: [PATCH 3/4] Fix in sf_fs_create: wrong function call

---
 src/sf_fs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sf_fs.sh b/src/sf_fs.sh
index 0c3754b..fcfbd67 100644
--- a/src/sf_fs.sh
+++ b/src/sf_fs.sh
@@ -297,7 +297,7 @@ owner=$4
 [ -z "$type" ] && type=`sf_fs_default_type`
 [ -z "$owner" ] && owner=root
 
-sf_fs_is_dedicated $mnt && return 0
+sf_fs_is_mount_point $mnt && return 0
 sf_msg1 "$mnt: Creating file system..."
 
 if [ -d $mnt ] ; then # Securite

From e1f6a76899cba5b9257094f20bf5e0bcfef54512 Mon Sep 17 00:00:00 2001
From: Francois Laupretre <francois.laupretre@externe.bnpparibas.com>
Date: Wed, 7 May 2014 10:49:35 +0200
Subject: [PATCH 4/4] Switch version to 1.26.1

---
 config.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.mk b/config.mk
index 6dfdde6..b449a96 100644
--- a/config.mk
+++ b/config.mk
@@ -18,6 +18,6 @@
 
 INSTALL_DIR = /opt/sysfunc
 
-SOFTWARE_VERSION = 1.26.0
+SOFTWARE_VERSION = 1.26.1
 
 #============================================================================