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

[Simon Horman]

Author: horms
Date: 2005-09-26 03:08:40 +0000 (Mon, 26 Sep 2005)
New Revision: 4279

Modified:
   dists/trunk/utils/initrd-tools/debian/changelog
   dists/trunk/utils/initrd-tools/mkinitrd
Log:
  * Make sure that path to output image is always fully qualified,
    else an image with a relative will not end up where requested
    (closes: #329614)


Modified: dists/trunk/utils/initrd-tools/debian/changelog
===================================================================
--- dists/trunk/utils/initrd-tools/debian/changelog	2005-09-25 20:33:07 UTC (rev 4278)
+++ dists/trunk/utils/initrd-tools/debian/changelog	2005-09-26 03:08:40 UTC (rev 4279)
@@ -3,8 +3,11 @@
   [Simon Horman]
   * Clarify naming of scripts that will be run.
     Thanks to Simon Schoar. (Closes: #324351)
+  * Make sure that path to output image is always fully qualified,
+    else an image with a relative will not end up where requested
+    (closes: #329614)
 
- -- Simon Horman <horms at debian.org>  Wed, 24 Aug 2005 12:34:33 +0900
+ -- Simon Horman <horms at debian.org>  Mon, 26 Sep 2005 12:04:43 +0900
 
 initrd-tools (0.1.82) unstable; urgency=low
 

Modified: dists/trunk/utils/initrd-tools/mkinitrd
===================================================================
--- dists/trunk/utils/initrd-tools/mkinitrd	2005-09-25 20:33:07 UTC (rev 4278)
+++ dists/trunk/utils/initrd-tools/mkinitrd	2005-09-26 03:08:40 UTC (rev 4279)
@@ -1327,6 +1327,9 @@
 		;;
 	o)
 		initrd_file="${OPTARG}"
+		if [ "$initrd_file" = "${initrd_file#/}" ]; then
+			initrd_file="${ORIGDIR}/$initrd_file"
+		fi
 		out=yes
 		;;
 	r)