[kernel] r6781 - in dists/trunk/utils/initrd-tools: debian

[maximilian attems]

Author: maks-guest
Date: Tue Jun  6 10:16:46 2006
New Revision: 6781

Modified:
   dists/trunk/utils/initrd-tools/debian/changelog
   dists/trunk/utils/initrd-tools/mkinitrd

Log:
merge initrd-tools nmu


Modified: dists/trunk/utils/initrd-tools/debian/changelog
==============================================================================
--- dists/trunk/utils/initrd-tools/debian/changelog	(original)
+++ dists/trunk/utils/initrd-tools/debian/changelog	Tue Jun  6 10:16:46 2006
@@ -1,3 +1,11 @@
+initrd-tools (0.1.84.1) unstable; urgency=high
+
+  * NMU
+  * Use LD_ASSUME_KERNEL=2.4.1 since glibc has been changed to refuse to
+    work with kernel 2.4(.0). Closes: #364338
+
+ -- Joey Hess <joeyh at debian.org>  Sun, 23 Apr 2006 18:59:54 -0400
+
 initrd-tools (0.1.84) unstable; urgency=low
 
   [ Simon Horman ]

Modified: dists/trunk/utils/initrd-tools/mkinitrd
==============================================================================
--- dists/trunk/utils/initrd-tools/mkinitrd	(original)
+++ dists/trunk/utils/initrd-tools/mkinitrd	Tue Jun  6 10:16:46 2006
@@ -840,7 +840,7 @@
 	if [ $oldstyle ]; then
 		x=$(
 			LD_LIBRARY_PATH=$INITRD_LD_LIBRARY_PATH \
-			LD_ASSUME_KERNEL=2.4 ldd "$i"
+			LD_ASSUME_KERNEL=2.4.1 ldd "$i"
 		)
 	else
 		x=$(