From: Theodore Ts'o <tytso@mit.edu>
Date: Sat, 13 May 2006 13:05:01 +0000 (-0400)
Subject: Fix problem with creating initrd's for 2.4 systems on Debian
X-Git-Tag: E2FSPROGS-1_39~22
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=7eef87483168f284561414a56b5378a3102639bb;p=tools%2Fe2fsprogs.git

Fix problem with creating initrd's for 2.4 systems on Debian

Recent glibc's no longer accept LD_ASSUME_KERNEL=2.4; this must be LD_ASSUME_KERNEL=2.4.1.   Also, only set LD_ASSUME_KERNEL if we
are not using a 2.4 kernel (and are presumably using something newer)

Addresses Debian Bug: #364516

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
---

diff --git a/debian/initrd-tools.e2fsprogs b/debian/initrd-tools.e2fsprogs
index 75e1f77..7260159 100644
--- a/debian/initrd-tools.e2fsprogs
+++ b/debian/initrd-tools.e2fsprogs
@@ -9,8 +9,12 @@ cp /usr/lib/e2initrd_helper $INITRDDIR/bin/e2initrd_helper
 
 case "$VERSION" in
     2.4.*)
-    	LD_ASSUME_KERNEL=2.4
-	export LD_ASSUME_KERNEL
+        case "uname -r" in
+	    2.4.*)  :   ;;
+	    *)  LD_ASSUME_KERNEL=2.4.1
+	        export LD_ASSUME_KERNEL
+		;;
+        esac
 	;;
 esac