From: Michael Prokop <mika@grml.org>
Date: Wed, 9 May 2012 11:34:40 +0000 (+0200)
Subject: Drop deprecated debian/patches/14_no_blkid_on_lenny.patch
X-Git-Tag: v3.0_a27-1+grml.1~3
X-Git-Url: http://git.grml.org/?a=commitdiff_plain;ds=sidebyside;h=39679793d147502b2d9a329bffff320e20e8165e;p=live-boot-grml.git

Drop deprecated debian/patches/14_no_blkid_on_lenny.patch
---

diff --git a/debian/patches/14_no_blkid_on_lenny.patch b/debian/patches/14_no_blkid_on_lenny.patch
deleted file mode 100644
index adc283e..0000000
--- a/debian/patches/14_no_blkid_on_lenny.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 14_no_blkid_on_lenny.dpatch by Michael Prokop <mika@grml.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: util-linux of lenny doesn't ship the initramfs-tools file
-## DP: /usr/share/initramfs-tools/hooks/utillinux yet which ensures
-## DP: that blkid is available, so therefore fall back to
-## DP: /lib/udev/vol_id in /scripts/live as well
-
-@DPATCH@
-Index: live-boot-grml/scripts/live
-===================================================================
---- live-boot-grml.orig/scripts/live	2011-12-06 22:10:25.000000000 +0100
-+++ live-boot-grml/scripts/live	2011-12-06 22:10:30.000000000 +0100
-@@ -1810,7 +1810,12 @@
- 
- 	if is_supported_fs ${fstype}
- 	then
--		devuid=$(blkid -o value -s UUID "$devname")
-+		# lenny
-+		if command -v blkid >/dev/null 2>&1 ; then
-+			devuid=$(blkid -o value -s UUID "${devname}")
-+	        elif [ -x /lib/udev/vol_id ]; then
-+	                devuid=$(/lib/udev/vol_id --uuid "${devname}" 2>/dev/null)
-+	        fi
- 		[ -n "$devuid" ] && grep -qs "\<$devuid\>" $tried && continue
- 		mount -t ${fstype} -o ro,noatime "${devname}" ${mountpoint} || continue
- 		[ -n "$devuid" ] && echo "$devuid" >> $tried
diff --git a/debian/patches/series b/debian/patches/series
index 40b5f11..45924af 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,7 +4,6 @@
 11_dhcphostname.patch
 12_uuid_support.patch
 13_always_display_warnings_and_failures.patch
-14_no_blkid_on_lenny.patch
 15_networking_grml.patch
 16_nodhcp.patch
 19_revert_toram_bootoption_to_expected_behaviour.patch