unblock initramfs-tools 0.92k

[maximilian attems <max@stro.at>]

hello,

this version adds support for make deb-kpg build linux images.
this is quite important as kernel-package seems on the leave.
this support is quite easy to add as it runs hooks on postinst
and postrm. tbm also added two d-i related fixes for Lenny version.
glantank-update-kernel got merged in flash-kernel, so no need
to call it.

thanks for hinting into Lenny.

-- 
maks

diff --git a/conf/initramfs.conf b/conf/initramfs.conf
index 4a89a89..a2bd8db 100644
--- a/conf/initramfs.conf
+++ b/conf/initramfs.conf
@@ -4,8 +4,6 @@
 #
 # Note that configuration options from this file can be overriden
 # by config files in the /etc/initramfs-tools/conf.d directory.
-# In particular, Debian installer may set MODULES in the file
-# /etc/initramfs-tools/conf.d/driver-policy.
 
 #
 # MODULES: [ most | netboot | dep | list ]
diff --git a/debian/changelog b/debian/changelog
index 1ab7e6e..44f6103 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+initramfs-tools (0.92k) unstable; urgency=high
+
+  [ Martin Michlmayr ]
+  * update initramfs.conf according to latest Debian Installer.
+  * update-initramfs: don't run glantank-update-kernel.
+
+  [ maximilian attems ]
+  * auto_add_modules: add dasd_diag_mod to dasd section.
+  * initramfs-tools: Add support for linux-2.6 make deb-pkg target.
+
+ -- maximilian attems <maks@debian.org>  Tue, 16 Sep 2008 14:55:04 +0200
+
 initramfs-tools (0.92j) unstable; urgency=high
 
   [ Gerfried Fuchs ]
diff --git a/debian/initramfs-tools.install b/debian/initramfs-tools.install
index fb1c088..71670ef 100644
--- a/debian/initramfs-tools.install
+++ b/debian/initramfs-tools.install
@@ -10,3 +10,4 @@ conf/modules		usr/share/initramfs-tools
 update-initramfs	usr/sbin
 debian/script		usr/share/bug/initramfs-tools
 debian/lintian/initramfs-tools	usr/share/lintian/overrides
+kernel			etc
diff --git a/debian/rules b/debian/rules
index 2a5ae55..1376aa9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 pre-build::
 	chmod +x init mkinitramfs
 	chmod +x hooks/*
-	for x in `find scripts/ -maxdepth 1 -type d | tail -n+2`; do \
+	for x in `find scripts/ kernel/ -maxdepth 1 -type d | tail -n+2`; do \
 	  chmod -R +x $$x; \
 	done
diff --git a/hook-functions b/hook-functions
index e9f2368..53867da 100644
--- a/hook-functions
+++ b/hook-functions
@@ -358,9 +358,6 @@ auto_add_modules()
 	;;
 	block)
 		copy_modules_dir kernel/drivers/block
-		for x in dasd_diag_mod; do
-			manual_add_modules "${x}"
-		done
 	;;
 	# FIXME: can be removed after Lenny release
 	ieee1394)
@@ -379,7 +376,7 @@ auto_add_modules()
 		done
 	;;
 	dasd)
-		for x in dasd_eckd_mod dasd_fba_mod; do
+		for x in dasd_diag_mod dasd_eckd_mod dasd_fba_mod; do
 			manual_add_modules "${x}"
 		done
 	;;
diff --git a/kernel/postinst.d/update-initramfs b/kernel/postinst.d/update-initramfs
new file mode 100755
index 0000000..2d3b391
--- /dev/null
+++ b/kernel/postinst.d/update-initramfs
@@ -0,0 +1,7 @@
+#!/bin/sh
+#
+
+[ -z "$1" ] && exit 0
+
+# create initramfs - update runs do_bootloader
+update-initramfs -t -u -k "$1"
diff --git a/kernel/postrm.d/update-initramfs b/kernel/postrm.d/update-initramfs
new file mode 100755
index 0000000..432d672
--- /dev/null
+++ b/kernel/postrm.d/update-initramfs
@@ -0,0 +1,7 @@
+#!/bin/sh
+#
+
+[ -z "$1" ] && exit 0
+
+# delete initramfs
+update-initramfs -d -k "$1"
diff --git a/update-initramfs b/update-initramfs
index 9830a7d..11f630f 100755
--- a/update-initramfs
+++ b/update-initramfs
@@ -265,9 +265,6 @@ run_bootloader()
 	if flash-kernel --supported >/dev/null 2>&1; then
 		flash-kernel
 	fi
-	if glantank-update-kernel --supported >/dev/null 2>&1; then
-		glantank-update-kernel
-	fi
 }
 
 compare_sha1()