r4452 - in dists/trunk/utils/initrd-tools: . debian

[Sven Luther]

Author: luther
Date: 2005-10-14 07:54:59 +0000 (Fri, 14 Oct 2005)
New Revision: 4452

Modified:
   dists/trunk/utils/initrd-tools/debian/changelog
   dists/trunk/utils/initrd-tools/debian/control
   dists/trunk/utils/initrd-tools/mkinitrd
   dists/trunk/utils/initrd-tools/mkinitrd.8
Log:
Added --supported-(host|target)-version support for the new post-2.6.13
ramdisk-tool policy. Added linux-ramdisk-tool virtual package too.
(Closes: #333857)


Modified: dists/trunk/utils/initrd-tools/debian/changelog
===================================================================
--- dists/trunk/utils/initrd-tools/debian/changelog	2005-10-14 07:29:26 UTC (rev 4451)
+++ dists/trunk/utils/initrd-tools/debian/changelog	2005-10-14 07:54:59 UTC (rev 4452)
@@ -11,8 +11,13 @@
   [ dann frazier ]
   * Don't assume update-modules is available during postrm (closes: #330446)
 
- -- dann frazier <dannf at debian.org>  Tue, 27 Sep 2005 22:25:43 -0600
+  [ 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: #333857)
 
+ -- Sven Luther <luther at debian.org>  Fri, 14 Oct 2005 07:50:57 +0000
+
 initrd-tools (0.1.82) unstable; urgency=low
 
   * Simon Horman

Modified: dists/trunk/utils/initrd-tools/debian/control
===================================================================
--- dists/trunk/utils/initrd-tools/debian/control	2005-10-14 07:29:26 UTC (rev 4451)
+++ dists/trunk/utils/initrd-tools/debian/control	2005-10-14 07:54:59 UTC (rev 4452)
@@ -9,6 +9,7 @@
 Package: initrd-tools
 Architecture: all
 Depends: coreutils | fileutils (>= 4.1.9) | stat (>= 3.0), cpio, cramfsprogs (>= 1.1-4), dash, util-linux (>= 2.11b-3)
+Provides: linux-ramdisk-tool
 Description: tools to create initrd image for prepackaged Linux kernel
  This package contains tools needed to generate an initrd image suitable for
  booting a prepackaged Linux kernel image (as shipped with the Debian main

Modified: dists/trunk/utils/initrd-tools/mkinitrd
===================================================================
--- dists/trunk/utils/initrd-tools/mkinitrd	2005-10-14 07:29:26 UTC (rev 4451)
+++ dists/trunk/utils/initrd-tools/mkinitrd	2005-10-14 07:54:59 UTC (rev 4452)
@@ -1309,7 +1309,7 @@
 CONFDIR=/etc/mkinitrd
 unset keep croot cmkimage out || :
 
-while getopts "d:km:o:r:" flag; do
+while getopts "d:km:o:r:-:" flag; do
 	case $flag in
 	d)
 		CONFDIR="$OPTARG"
@@ -1335,6 +1335,16 @@
 	r)
 		croot=$OPTARG
 		;;
+	-)
+		case ${OPTARG%=*} in
+			supported-host-version)
+				supported_host_version=${OPTARG#*=}
+				;;
+			supported-target-version)
+				supported_target_version=${OPTARG#*=}
+				;;
+		esac
+		;;
 	*)
 		usage
 		;;
@@ -1342,6 +1352,19 @@
 done
 shift $(($OPTIND - 1))
 
+if [ "$supported_host_version" ] || [ "$supported_target_version" ]; then
+	if [ "$supported_host_version" ]; then
+		host_upstream_version=${supported_host_version%%-*}
+	fi
+	if [ "$supported_target_version" ]; then
+		target_upstream_version=${supported_target_version%%-*}
+		if dpkg --compare-versions "$target_upstream_version" ge "2.6.13"; then
+			exit 1
+		fi
+	fi
+	exit 0
+fi
+
 if ! [ $out ] || [ $# -gt 1 ]; then
 	usage
 fi

Modified: dists/trunk/utils/initrd-tools/mkinitrd.8
===================================================================
--- dists/trunk/utils/initrd-tools/mkinitrd.8	2005-10-14 07:29:26 UTC (rev 4451)
+++ dists/trunk/utils/initrd-tools/mkinitrd.8	2005-10-14 07:54:59 UTC (rev 4452)
@@ -36,6 +36,12 @@
 .IR root ]
 .RI [ version ]
 
+.B mkinitrd
+.RB [ \-\-supported-host-version=
+.IR hversion ]
+.RB [ \-\-supported-target-version=
+.IR tversion ] 
+
 .SH DESCRIPTION
 
 The
@@ -55,6 +61,15 @@
 
 .PP
 
+The second syntax returns 0 if mkinitrd can create an initrd running on a kernel
+of the given host version (
+.IR hversion
+) and for a kernel of the given target version (
+.IR tversions
+), and 1 otherwise.
+
+.PP
+
 The directory structure can be customised by placing scripts into
 .IR confdir/scripts .
 They will be run using
@@ -138,6 +153,16 @@
 in
 .IR mkinitrd.conf .
 
+.TP
+\fB\-\-supported-host-version=\fIhversion
+This option queries if the mkinitrd can create ramdisks on a running kernel of version
+.IR hversion .
+
+.TP
+\fB\-\-supported-target-version=\fItversion
+This option queries if the mkinitrd can create ramdisks for kernel version
+.IR tversion .
+
 .SH FILES
 
 .TP