From 9d6567169ea95ffad8a3c9a95218851821d147b8 Mon Sep 17 00:00:00 2001
From: maximilian attems <maks@debian.org>
Date: Sun, 4 Apr 2010 05:30:31 +0200
Subject: scripts/functions: add get_fstype() from scripts/local

allows wider usage.

(closes: #487409)

Reported-by: Christoph Anton Mitterer <calestyo@scientia.net>
Signed-off-by: maximilian attems <maks@debian.org>
---
 scripts/functions | 26 ++++++++++++++++++++++++++
 scripts/local     | 26 --------------------------
 2 files changed, 26 insertions(+), 26 deletions(-)

(limited to 'scripts')

diff --git a/scripts/functions b/scripts/functions
index 0ecb1d6..9b864ae 100644
--- a/scripts/functions
+++ b/scripts/functions
@@ -256,6 +256,32 @@ parse_numeric() {
 	ROOT=/dev/root
 }
 
+# Parameter: device node to check
+# Echos fstype to stdout
+# Return value: indicates if an fs could be recognized
+get_fstype ()
+{
+	local FS FSTYPE FSSIZE RET
+	FS="${1}"
+
+	# vol_id has a more complete list of file systems,
+	# but fstype is more robust
+	eval $(fstype "${FS}" 2> /dev/null)
+	if [ "$FSTYPE" = "unknown" ] &&  command -v blkid >/dev/null 2>&1 ; then
+		FSTYPE=$(blkid -o value -s TYPE "${FS}")
+	elif [ "$FSTYPE" = "unknown" ] && [ -x /lib/udev/vol_id ]; then
+		FSTYPE=$(/lib/udev/vol_id -t "${FS}" 2> /dev/null)
+	fi
+	RET=$?
+
+	if [ -z "${FSTYPE}" ]; then
+		FSTYPE="unknown"
+	fi
+
+	echo "${FSTYPE}"
+	return ${RET}
+}
+
 configure_networking()
 {
 	if [ -n "${BOOTIF}" ]; then
diff --git a/scripts/local b/scripts/local
index 1474073..cca5e8d 100644
--- a/scripts/local
+++ b/scripts/local
@@ -1,31 +1,5 @@
 # Local filesystem mounting			-*- shell-script -*-
 
-# Parameter: device node to check
-# Echos fstype to stdout
-# Return value: indicates if an fs could be recognized
-get_fstype ()
-{
-	local FS FSTYPE FSSIZE RET
-	FS="${1}"
-
-	# vol_id has a more complete list of file systems,
-	# but fstype is more robust
-	eval $(fstype "${FS}" 2> /dev/null)
-	if [ "$FSTYPE" = "unknown" ] &&  command -v blkid >/dev/null 2>&1 ; then
-		FSTYPE=$(blkid -o value -s TYPE "${FS}")
-	elif [ "$FSTYPE" = "unknown" ] && [ -x /lib/udev/vol_id ]; then
-		FSTYPE=$(/lib/udev/vol_id -t "${FS}" 2> /dev/null)
-	fi
-	RET=$?
-
-	if [ -z "${FSTYPE}" ]; then
-		FSTYPE="unknown"
-	fi
-
-	echo "${FSTYPE}"
-	return ${RET}
-}
-
 pre_mountroot()
 {
 	[ "$quiet" != "y" ] && log_begin_msg "Running /scripts/local-top"
-- 
cgit v1.2.3