[kernel] r7228 - in dists/sid/linux-2.6/debian: bin

[Bastian Blank]

Author: waldi
Date: Tue Aug 22 16:42:32 2006
New Revision: 7228

Added:
   dists/sid/linux-2.6/debian/templates/image.xen.postinst.in
      - copied, changed from r7227, /dists/sid/linux-2.6/debian/templates/image.postinst.simple.in
   dists/sid/linux-2.6/debian/templates/image.xen.postrm.in
   dists/sid/linux-2.6/debian/templates/image.xen.prerm.in
      - copied, changed from r7227, /dists/sid/linux-2.6/debian/templates/image.prerm.simple.in
Removed:
   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/bin/gencontrol.py

Log:
* debian/bin/gencontrol.py: Update.
* debian/templates/image.xen.postinst.in:
  Move from debian/templates/image.postinst.simple.in.
* debian/templates/image.xen.postrm.in: Add.
* debian/templates/image.xen.prerm.in:
  Move from debian/templates/image.prerm.simple.in.


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 16:42:32 2006
@@ -157,8 +157,8 @@
                 packages.append(package)
 
         if vars['type'] == 'plain-xen':
-            for i in ('postinst', 'prerm'):
-                j = self.substitute(self.templates["image.%s.simple" % i], vars)
+            for i in ('postinst', 'postrm', 'prerm'):
+                j = self.substitute(self.templates["image.xen.%s" % i], vars)
                 file("debian/%s.%s" % (packages_own[0]['Package'], i), 'w').write(j)
 
         cmds_binary_arch = []

Copied: dists/sid/linux-2.6/debian/templates/image.xen.postinst.in (from r7227, /dists/sid/linux-2.6/debian/templates/image.postinst.simple.in)
==============================================================================
--- /dists/sid/linux-2.6/debian/templates/image.postinst.simple.in	(original)
+++ dists/sid/linux-2.6/debian/templates/image.xen.postinst.in	Tue Aug 22 16:42:32 2006
@@ -1,14 +1,15 @@
-#!/bin/sh
+#!/bin/bash
 
 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
+            update-initramfs -u -k @upstreamversion@@abiname@@localversion@
+        else
+            update-initramfs -c -k @upstreamversion@@abiname@@localversion@
+            command -v update-grub > /dev/null && update-grub
+        fi
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

Added: dists/sid/linux-2.6/debian/templates/image.xen.postrm.in
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/templates/image.xen.postrm.in	Tue Aug 22 16:42:32 2006
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+set -e
+
+case "$1" in
+    remove)
+        command -v update-grub > /dev/null && update-grub
+    ;;
+
+    purge|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+    ;;
+
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+#DEBHELPER#
+
+exit 0

Copied: dists/sid/linux-2.6/debian/templates/image.xen.prerm.in (from r7227, /dists/sid/linux-2.6/debian/templates/image.prerm.simple.in)
==============================================================================
--- /dists/sid/linux-2.6/debian/templates/image.prerm.simple.in	(original)
+++ dists/sid/linux-2.6/debian/templates/image.xen.prerm.in	Tue Aug 22 16:42:32 2006
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 set -e