Merge branch 'develop'

flaupretre · May 7, 2014 · f56c0a5 · f56c0a5
2 parents 5624f5f + e1f6a76
commit f56c0a5
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 10 deletions.
diff --git a/config.mk b/config.mk
@@ -18,6 +18,6 @@
 
 INSTALL_DIR = /opt/sysfunc
 
-SOFTWARE_VERSION = 1.26.0
+SOFTWARE_VERSION = 1.26.1
 
 #============================================================================
diff --git 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
 }
 
 #=============================================================================
diff --git 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 $*
 }
 
 ##----------------------------------------------------------------------------
@@ -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