[kernel] r7227 - in dists/sid/linux-2.6/debian: arch/amd64/xen arch/i386/xen bin

[Bastian Blank]

Author: waldi
Date: Tue Aug 22 15:27:07 2006
New Revision: 7227

Added:
   dists/sid/linux-2.6/debian/templates/image.postinst.simple.in
   dists/sid/linux-2.6/debian/templates/image.prerm.simple.in
Modified:
   dists/sid/linux-2.6/debian/arch/amd64/xen/defines
   dists/sid/linux-2.6/debian/arch/i386/xen/defines
   dists/sid/linux-2.6/debian/bin/gencontrol.py

Log:
* debian/arch/amd64/xen/defines, debian/arch/i386/xen/defines:
  Xen images are initramfs-tools only and produces an initramfs.
* debian/bin/gencontrol.py: Generate postinst and prerm for xen images.
* debian/templates/image.postinst.simple.in,
  debian/templates/image.prerm.simple.in:
  Add simple, initramfs-tools-only postinst and prerm script.


Modified: dists/sid/linux-2.6/debian/arch/amd64/xen/defines
==============================================================================
--- dists/sid/linux-2.6/debian/arch/amd64/xen/defines	(original)
+++ dists/sid/linux-2.6/debian/arch/amd64/xen/defines	Tue Aug 22 15:27:07 2006
@@ -3,7 +3,7 @@
  amd64
 
 [image]
-initramfs: false
+initramfs-generators: initramfs-tools 
 type: plain-xen
 
 [xen]

Modified: dists/sid/linux-2.6/debian/arch/i386/xen/defines
==============================================================================
--- dists/sid/linux-2.6/debian/arch/i386/xen/defines	(original)
+++ dists/sid/linux-2.6/debian/arch/i386/xen/defines	Tue Aug 22 15:27:07 2006
@@ -4,6 +4,7 @@
  k7
 
 [image]
+initramfs-generators: initramfs-tools
 recommends: libc6-xen
 type: plain-xen
 

Modified: dists/sid/linux-2.6/debian/bin/gencontrol.py
==============================================================================
--- dists/sid/linux-2.6/debian/bin/gencontrol.py	(original)
+++ dists/sid/linux-2.6/debian/bin/gencontrol.py	Tue Aug 22 15:27:07 2006
@@ -156,6 +156,11 @@
                 package['Architecture'] = [arch]
                 packages.append(package)
 
+        if vars['type'] == 'plain-xen':
+            for i in ('postinst', 'prerm'):
+                j = self.substitute(self.templates["image.%s.simple" % i], vars)
+                file("debian/%s.%s" % (packages_own[0]['Package'], i), 'w').write(j)
+
         cmds_binary_arch = []
         cmds_binary_arch.append(("$(MAKE) -f debian/rules.real binary-arch-flavour %s" % makeflags,))
         if packages_dummy:

Added: dists/sid/linux-2.6/debian/templates/image.postinst.simple.in
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/templates/image.postinst.simple.in	Tue Aug 22 15:27:07 2006
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+    configure)
+        if [ "$2" ]; then
+	    update-initramfs -u -k @upstreamversion@@abiname@@localversion@
+	else
+	    update-initramfs -c -k @upstreamversion@@abiname@@localversion@
+	fi
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+#DEBHELPER#
+
+exit 0
+
+

Added: dists/sid/linux-2.6/debian/templates/image.prerm.simple.in
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/templates/image.prerm.simple.in	Tue Aug 22 15:27:07 2006
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+    remove)
+        update-initramfs -d -k @upstreamversion@@abiname@@localversion@ || true
+    ;;
+
+    upgrade|deconfigure|failed-upgrade)
+    ;;
+
+    *)
+        echo "prerm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+#DEBHELPER#
+
+exit 0
+
+