r3003 - in trunk/utils/initrd-tools: . debian

[maximilian attems]

Author: maks-guest
Date: 2005-04-28 08:04:11 +0000 (Thu, 28 Apr 2005)
New Revision: 3003

Modified:
   trunk/utils/initrd-tools/debian/changelog
   trunk/utils/initrd-tools/mkinitrd
   trunk/utils/initrd-tools/mkinitrd.8
Log:
poke already deeper,
add /etc/mkinitrd/DSDT if this file exists to be loaded by acpi.


Modified: trunk/utils/initrd-tools/debian/changelog
===================================================================
--- trunk/utils/initrd-tools/debian/changelog	2005-04-28 07:52:07 UTC (rev 3002)
+++ trunk/utils/initrd-tools/debian/changelog	2005-04-28 08:04:11 UTC (rev 3003)
@@ -8,6 +8,7 @@
   * Maximilian Attems
     - Resynchronise with Ubuntu:
       * Error message should refer to mdadm, not raidtools2.
+      * Take /etc/mkinitrd/DSDT and put it in the initrd if it exists.
 
  -- Steve Langasek <vorlon@debian.org>  Sun, 10 Apr 2005 15:38:08 -0700
 

Modified: trunk/utils/initrd-tools/mkinitrd
===================================================================
--- trunk/utils/initrd-tools/mkinitrd	2005-04-28 07:52:07 UTC (rev 3002)
+++ trunk/utils/initrd-tools/mkinitrd	2005-04-28 08:04:11 UTC (rev 3003)
@@ -1294,7 +1294,7 @@
 		cmkimage=$OPTARG
 		;;
 	o)
-		exec > "$OPTARG"
+		initrd_file="${OPTARG}"
 		out=yes
 		;;
 	r)
@@ -1379,4 +1379,9 @@
 
 umask "$UMASK"
 gendir $workdir
-eval "$(printf "$MKIMAGE" $workdir/initrd $FD/3)" 3>&1 >&2
+eval "$(printf "$MKIMAGE" $workdir/initrd ${initrd_file})" 3>&1 >&2
+
+if [ -e /etc/mkinitrd/DSDT ]; then
+       echo -n "INITRDDSDT123DSDT123" >>${initrd_file}
+       cat /etc/mkinitrd/DSDT >>${initrd_file}
+fi

Modified: trunk/utils/initrd-tools/mkinitrd.8
===================================================================
--- trunk/utils/initrd-tools/mkinitrd.8	2005-04-28 07:52:07 UTC (rev 3002)
+++ trunk/utils/initrd-tools/mkinitrd.8	2005-04-28 08:04:11 UTC (rev 3003)
@@ -184,6 +184,11 @@
 .I version
 respectively.
 
+.TP
+.I /etc/mkinitrd/DSDT
+If this file exists, it will be appended to the initrd in a way that causes
+it to be loaded by ACPI.
+
 .SH NOTES
 
 By default