merge the thing waldi uploaded as 0.32.

it has the changes vorlon asked for so that 2.4 systems
that use the ramdisk value in /etc/kernel-img.conf don't use the wrong tool.

4 files changed, 52 insertions, 28 deletions

diff --git a/debian/changelog b/debian/changelog
index c9dc563..3e5c166 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,36 +1,21 @@
-initramfs-tools (0.34) unstable; urgency=low
+initramfs-tools (0.32) unstable; urgency=low
 
   [ Bastian Blank ]
-  * debian/control: Add mklibs-copy as dependency.
-  * hook-functions use mklibs-copy: Remove copy_exec.
-  * hooks/evms: Use cp instead of copy_exec.
-  * mkinitramfs
-    - Use cp instead of copy_exec.
-    - Call mklibs-copy to collect necessary libs.
-  * Use udevsynthesize.
-  * Add hotplug agents.
-
-  * Bump udev dependency to a working version.
-  * init udev fixes
-    - Start and kill udevd.
-    - Create /dev/.udevdb.
-    - Use udevsynthesize.
-    - Call depmod.
-  * mkinitramfs udev fixes
-    - Install udevd and udevsynthesize instead of udevstart.
-    - Install hotplug agents.
-   * scripts/functions (load_modules)
-    - Don't call depmod and udevstart.
-    - Don't crawl pci devices ourself.
-
-   * hook-functions: Add ibmvscsic to list of scsi modules.
+  * Use mklibs-copy.
+  * Use udevsynthesize instead of udevstart.
+  * hook-functions: Add ibmvscsic to list of scsi modules.
+
+  [ Sven Luther ]
+  * Added --supported-(host|target)-version support for the new post-2.6.13
+    ramdisk-tool policy. Added linux-ramdisk-tool virtual package too.
+    (Closes: #333856)
 
   [ maximilian attems ]
   * Resynchronise with latest upstream release.
   * Place shift after variable outfile assignment.
+  * Fix strange chars in the Depends line resulting in no depends at all.
   * Thanks to Bastian Blank for the fixes concerning the new busybox version.
     (Closes: #334467)
-  * Dont upload with .bzr.backup dirs.
 
   [ Jeff Bailey ]
   * scripts/nfs (mountroot): New variable: NFSOPTS, default to
@@ -47,11 +32,12 @@ initramfs-tools (0.34) unstable; urgency=low
     the kernel's command line (then we're just as verbose as ever)
 
   [ Jonas Smedegaard ]
-  * Use GNU getopt (instead of bash builtin getopts) for improved handling.
+  * Use GNU getopt (instead of bash builtin getopts) for improved long-
+    opts handling.
   * Quote variables.
   * Use test options -n and -z.
 
- -- maximilian attems <maks@sternwelten.at>  Fri, 21 Oct 2005 19:54:27 +0200
+ -- maximilian attems <maks@sternwelten.at>  Wed, 19 Oct 2005 17:42:08 +0200
 
 initramfs-tools (0.31) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 7b5918a..dbff057 100644
--- a/debian/control
+++ b/debian/control
@@ -9,6 +9,7 @@ Standards-Version: 3.6.2.0
 Package: initramfs-tools
 Architecture: all
 Depends: klibc-utils (>= 1.0.14-1ubuntu2), busybox (>= 1:1.01-3), cpio, mdadm, lvm2 (>= 2.01.04-5), udev (>= 0.070-3), mklibs-copy
+Provides: linux-ramdisk-tool
 Description: tools for generating an initramfs
  This package contains tools to create and boot an initramfs for prepackaged
  2.6 Linux kernel. The initramfs is an cpio archive. At boot time, the kernel
diff --git a/mkinitramfs b/mkinitramfs
index 58d42e1..3f0d79b 100755
--- a/mkinitramfs
+++ b/mkinitramfs
@@ -10,7 +10,7 @@ errors_to="2>/dev/null"
 # BUSYBOXDIR="/usr/lib/initramfs-tools/bin/"
 BUSYBOXDIR="/bin" 
 
-OPTIONS=`getopt -o d:ko:r: -n "$0" -- "$@"`
+OPTIONS=`getopt -o d:ko:r: --long supported-host-version:,supported-target-version: -n "$0" -- "$@"`
 
 # Check for non-GNU getopt
 if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi
@@ -40,6 +40,14 @@ while true; do
 		# ignore (FIXME: manpage says differently?!?)
 		shift 2
 		;;
+	--supported-host-version)
+		supported_host_version="$2"
+		shift 2
+		;;
+	--supported-target-version)
+		supported_target_version="$2"
+		shift 2
+		;;
 	--)
 		shift
 		break
@@ -51,6 +59,19 @@ while true; do
 	esac
 done
 
+if [ -n "$supported_host_version" ] || [ -n "$supported_target_version" ]; then
+	if [ -n "$supported_host_version" ]; then
+		host_upstream_version="${supported_host_version%%-*}"
+	fi
+	if [ -n "$supported_target_version" ]; then
+		target_upstream_version="${supported_target_version%%-*}"
+		if dpkg --compare-versions "$target_upstream_version" lt "2.6.12"; then
+			exit 1
+		fi
+	fi
+	exit 0
+fi
+
 # For dependency ordered mkinitramfs hook scripts.
 . /usr/share/initramfs-tools/scripts/functions
 . /usr/share/initramfs-tools/hook-functions
diff --git a/mkinitramfs.8 b/mkinitramfs.8
index a4b1530..0918767 100644
--- a/mkinitramfs.8
+++ b/mkinitramfs.8
@@ -13,6 +13,12 @@ mkinitramfs \- generate an initramfs image
 .RB [ \-r 
 .IR root ] 
 .RI [ version ]
+.B mkinitramfs
+.RB [ \-\-supported-host-version=
+.IR hversion ]
+.RB [ \-\-supported-target-version=
+.IR tversion ]
+
 .SH DESCRIPTION
 The
 .B mkinitramfs 
@@ -42,6 +48,16 @@ Override the
 setting in 
 .IR mkinitramfs.conf .
 
+.TP
+\fB\-\-supported-host-version=\fIhversion
+This option queries if mkinitramfs can create ramdisks on a running kernel of version
+.IR hversion .
+
+.TP
+\fB\-\-supported-target-version=\fItversion
+This option queries if mkinitramfs can create ramdisks for kernel version
+.IR tversion .
+
 .SH FILES
 .TP
 .I /etc/mkinitramfs/initramfs.conf