From ddb51715a408ce379e8c3aeba9ffe36294516399 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Mon, 17 May 2010 18:39:55 +0200
Subject: [PATCH] initramfs-tools: some fixes for scripts/local, bump to
 0.99.1.

---
 srcpkgs/initramfs-tools/files/mkinitramfs       | 3 +++
 srcpkgs/initramfs-tools/files/scripts/functions | 3 +--
 srcpkgs/initramfs-tools/template                | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/initramfs-tools/files/mkinitramfs b/srcpkgs/initramfs-tools/files/mkinitramfs
index 5217fc3893..400cc568ac 100755
--- a/srcpkgs/initramfs-tools/files/mkinitramfs
+++ b/srcpkgs/initramfs-tools/files/mkinitramfs
@@ -262,6 +262,9 @@ for b in $(cd "${DESTDIR}/scripts" && find . -mindepth 1 -type d); do
 	cache_run_scripts "${DESTDIR}" "/scripts/${b#./}"
 done
 
+# Copy in tsort(1).
+copy_exec /bin/tsort /bin
+
 # generate module deps
 depmod -a -b "${DESTDIR}" ${version}
 rm -f "${DESTDIR}/lib/modules/${version}"/modules.*map
diff --git a/srcpkgs/initramfs-tools/files/scripts/functions b/srcpkgs/initramfs-tools/files/scripts/functions
index 3b1df69122..b11ee63a9d 100644
--- a/srcpkgs/initramfs-tools/files/scripts/functions
+++ b/srcpkgs/initramfs-tools/files/scripts/functions
@@ -280,8 +280,7 @@ get_fstype ()
 
 	# 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
+	if 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)
diff --git a/srcpkgs/initramfs-tools/template b/srcpkgs/initramfs-tools/template
index 8f520bd6cd..98e55ce2b3 100644
--- a/srcpkgs/initramfs-tools/template
+++ b/srcpkgs/initramfs-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'initramfs-tools'
 pkgname=initramfs-tools
-version=0.99.debian0.94.4
+version=0.99.1.debian0.94.4
 build_style=custom-install
 short_desc="Tools for generating an initramfs"
 maintainer="Juan RP <xtraeme@gmail.com>"