From: Dietmar Maurer <dietmar@proxmox.com>
Date: Tue, 31 Jan 2012 06:02:14 +0000 (+0100)
Subject: install target-x86_64.conf to /etc/kvm
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;ds=sidebyside;h=8b7e35182aba87372ba5da5d322791557b744c15;p=pve-qemu-kvm.git

install target-x86_64.conf to /etc/kvm

And try to remove dir /etc/qemu in postinst.
---

diff --git a/debian/postinst b/debian/postinst
new file mode 100755
index 0000000..65bc9e7
--- /dev/null
+++ b/debian/postinst
@@ -0,0 +1,64 @@
+#!/bin/bash
+
+# Abort if any command returns an error value 
+set -e
+
+case "$1" in
+  configure)
+
+    # remove stale /etc/qemu (files are in /etc/kvm)
+    rm /etc/qemu/target-x86_64.conf || true
+    rmdir /etc/qemu || true
+
+    # There are three sub-cases:
+    if test "${2+set}" != set; then
+      # We're being installed by an ancient dpkg which doesn't remember
+      # which version was most recently configured, or even whether
+      # there is a most recently configured version.
+      :
+
+    elif test -z "$2" -o "$2" = "<unknown>"; then
+      # The package has not ever been configured on this system, or was
+      # purged since it was last configured.
+      :
+
+    else
+      # Version $2 is the most recently configured version of this
+      # package.
+      :
+
+    fi ;;
+  abort-upgrade)
+    # Back out of an attempt to upgrade this package FROM THIS VERSION
+    # to version $2.  Undo the effects of "prerm upgrade $2".
+    :
+
+    ;;
+  abort-remove)
+    if test "$2" != in-favour; then
+      echo "$0: undocumented call to \`postinst $*'" 1>&2
+      exit 0
+    fi
+    # Back out of an attempt to remove this package, which was due to
+    # a conflict with package $3 (version $4).  Undo the effects of
+    # "prerm remove in-favour $3 $4".
+    :
+
+    ;;
+  abort-deconfigure)
+    if test "$2" != in-favour -o "$5" != removing; then
+      echo "$0: undocumented call to \`postinst $*'" 1>&2
+      exit 0
+    fi
+    # Back out of an attempt to deconfigure this package, which was
+    # due to package $6 (version $7) which we depend on being removed
+    # to make way for package $3 (version $4).  Undo the effects of
+    # "prerm deconfigure in-favour $3 $4 removing $6 $7".
+    :
+
+    ;;
+  *) echo "$0: didn't understand being called with \`$1'" 1>&2
+     exit 0;;
+esac
+
+exit 0
diff --git a/debian/rules b/debian/rules
index e5ee1bf..4967b67 100755
--- a/debian/rules
+++ b/debian/rules
@@ -81,6 +81,13 @@ install: build
 
 	install -D -m 0755 $(CURDIR)/debian/kvm-ifup $(destdir)/etc/kvm/kvm-ifup
 	install -D -m 0755 $(CURDIR)/debian/kvm-ifdown $(destdir)/etc/kvm/kvm-ifdown
+
+	# move target-x86_64.conf to correct location
+	mv $(destdir)/etc/qemu/target-x86_64.conf $(destdir)/etc/kvm/
+
+	# /etc/qemu should be empty now
+	rmdir $(destdir)/etc/qemu
+
 	# we do not need openbios files (sparc/ppc)
 	rm -rf $(destdir)/usr/share/kvm/openbios-*
 	# remove ppc files