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

[Sven Luther]

Author: luther
Date: 2005-10-24 07:00:47 +0000 (Mon, 24 Oct 2005)
New Revision: 4622

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:
Adapted initrd-tools to the 9.008.3 k-p method (return 2 instead of 1).
Removed the linux-ramdisk-tool provides, since we don't want this to 
satisfy the 2.6.14+ kernel dependency.


Modified: dists/trunk/utils/initrd-tools/debian/changelog
===================================================================
--- dists/trunk/utils/initrd-tools/debian/changelog	2005-10-23 21:04:57 UTC (rev 4621)
+++ dists/trunk/utils/initrd-tools/debian/changelog	2005-10-24 07:00:47 UTC (rev 4622)
@@ -1,9 +1,19 @@
 initrd-tools (0.1.84) unstable; urgency=low
 
+  [ Simon Horman ]
   * Add Sven Luther and myself an uploaders
 
- -- Simon Horman <horms at debian.org>  Mon, 17 Oct 2005 12:18:53 +0900
+  [ Sven Luther ]
+  * removed the linux-ramdisk-tool virtual package, as we really don't want
+    this one to be used for post 2.6.13 kernels, altough it seems it may work
+    for the generic cases (no lvm i think).
+  * Now --supported-(host|target)-version returns 2 in case of negative, to
+    distinguish from the 1 returned in case of normal failure (like using an
+    older version of initrd-tools with no --supported-(host|target)-version
+    support.
 
+ -- Sven Luther <luther at debian.org>  Mon, 24 Oct 2005 08:53:40 +0200
+
 initrd-tools (0.1.83) unstable; urgency=low
 
   [ Simon Horman ]

Modified: dists/trunk/utils/initrd-tools/debian/control
===================================================================
--- dists/trunk/utils/initrd-tools/debian/control	2005-10-23 21:04:57 UTC (rev 4621)
+++ dists/trunk/utils/initrd-tools/debian/control	2005-10-24 07:00:47 UTC (rev 4622)
@@ -9,7 +9,6 @@
 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-23 21:04:57 UTC (rev 4621)
+++ dists/trunk/utils/initrd-tools/mkinitrd	2005-10-24 07:00:47 UTC (rev 4622)
@@ -1373,7 +1373,7 @@
 	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
+			exit 2
 		fi
 	fi
 	exit 0

Modified: dists/trunk/utils/initrd-tools/mkinitrd.8
===================================================================
--- dists/trunk/utils/initrd-tools/mkinitrd.8	2005-10-23 21:04:57 UTC (rev 4621)
+++ dists/trunk/utils/initrd-tools/mkinitrd.8	2005-10-24 07:00:47 UTC (rev 4622)
@@ -66,7 +66,7 @@
 .IR hversion
 ) and for a kernel of the given target version (
 .IR tversions
-), and 1 otherwise.
+), and 2 otherwise.
 
 .PP