SVN: geninitrd/trunk: geninitrd mod-multipath.sh

[glen]

Author: glen
Date: Fri Feb 27 18:25:07 2009
New Revision: 10156

Modified:
   geninitrd/trunk/geninitrd
   geninitrd/trunk/mod-multipath.sh
Log:
- dm_export is internal to mod-multipath
- dm_deps unused2H

Modified: geninitrd/trunk/geninitrd
==============================================================================
--- geninitrd/trunk/geninitrd	(original)
+++ geninitrd/trunk/geninitrd	Fri Feb 27 18:25:07 2009
@@ -261,7 +261,7 @@
 # @param	$module
 # @param	$mode	[silent]
 #
-# Outputs each dependant module full path including the module itself.
+# Outputs each dependant module full path.
 find_depmod() {
 	local module="$1"
 	local mode="$2"
@@ -535,41 +535,6 @@
 	findmodule "-scsi_wait_scan"
 }
 
-# return dependencies MAJOR:MINOR [MAJOR:MINOR] for DM_NAME
-# TODO: patch `dmsetup export`
-dm_deps() {
-	local dm_name="$1"
-	dmsetup deps $dm_name | sed -e 's/, /:/g;s/^.\+ dependencies[^:]: //;s/[()]//g;'
-}
-
-# export info from dmsetup
-# param can be:
-# - MAJOR:MINOR
-# - /dev/dm-MINOR
-# - /dev/mapper/DM_NAME
-dm_export() {
-	local arg="$1"
-
-	case "$arg" in
-	*:*)
-		local maj=${arg%:*} min=${arg#*:}
-		dmsetup -j $maj -m $min export
-		;;
-	/dev/dm-*)
-		local min=${arg#*dm-}
-		local maj=$(awk '$2 == "device-mapper" {print $1}' /proc/devices)
-		dm_export $maj:$min
-		;;
-	/dev/mapper/*)
-		local dm_name=${arg#/dev/mapper/}
-		dmsetup export $dm_name
-		;;
-	*)
-		die "dm_export: unexpected $arg"
-		;;
-	esac
-}
-
 # find modules for $devpath
 find_modules_for_devpath() {
 	local devpath="$1"

Modified: geninitrd/trunk/mod-multipath.sh
==============================================================================
--- geninitrd/trunk/mod-multipath.sh	(original)
+++ geninitrd/trunk/mod-multipath.sh	Fri Feb 27 18:25:07 2009
@@ -142,3 +142,34 @@
 		debugshell
 	EOF
 }
+
+
+# PRIVATE METHODS
+# export info from dmsetup
+# param can be:
+# - MAJOR:MINOR
+# - /dev/dm-MINOR
+# - /dev/mapper/DM_NAME
+dm_export() {
+	local arg="$1"
+
+	case "$arg" in
+	*:*)
+		local maj=${arg%:*} min=${arg#*:}
+		dmsetup -j $maj -m $min export
+		;;
+	/dev/dm-*)
+		local min=${arg#*dm-}
+		local maj=$(awk '$2 == "device-mapper" {print $1}' /proc/devices)
+		dm_export $maj:$min
+		;;
+	/dev/mapper/*)
+		local dm_name=${arg#/dev/mapper/}
+		dmsetup export $dm_name
+		;;
+	*)
+		die "dm_export: unexpected $arg"
+		;;
+	esac
+}
+