Since only one binary package is installed, remove unnecessary package name from...

Also remove invirt-reload script, activate trigger invirt-reload instead

diff --git a/debian/invirt-base.dirs b/debian/dirs
similarity index 100%
rename from debian/invirt-base.dirs
rename to debian/dirs

diff --git a/debian/invirt-base.install b/debian/install
similarity index 100%
rename from debian/invirt-base.install
rename to debian/install

diff --git a/debian/invirt-base.triggers b/debian/invirt-base.triggers
deleted file mode 100644 (file)
index 0f1906f..0000000
--- a/debian/invirt-base.triggers
+++ /dev/null
@@ -1 +0,0 @@
-interest invirt-reload

diff --git a/debian/invirt-base.postinst b/debian/postinst
similarity index 81%
rename from debian/invirt-base.postinst
rename to debian/postinst
index 2ca852d..13cb82b 100755 (executable)
--- a/debian/invirt-base.postinst
+++ b/debian/postinst
@@ -26,7 +26,11 @@ case "$1" in
     ;;
 
     triggered)
-        INVIRT_RELOAD_NOTRIGGER=y invirt-reload
+        for script in $(run-parts --test /etc/init.d); do
+            if [ "${script#/etc/init.d/invirt-}" != "$script" ]; then
+                invoke-rc.d "${script#/etc/init.d/}" force-reload
+            fi
+        done
     ;;
 
     *)
@@ -41,5 +45,3 @@ esac
 #DEBHELPER#
 
 exit 0
-
-

diff --git a/debian/triggers b/debian/triggers
new file mode 100644 (file)
index 0000000..108956d
--- /dev/null
+++ b/debian/triggers
@@ -0,0 +1 @@
+interest-await invirt-reload

diff --git a/scripts/invirt-reload b/scripts/invirt-reload
deleted file mode 100755 (executable)
index 7792f50..0000000
--- a/scripts/invirt-reload
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-if [ x"$INVIRT_RELOAD_NOTRIGGER" = x ] && \
-    [ "$DPKG_MAINTSCRIPT_PACKAGE" != '' ] && \
-    [ $# = 0 ] && \
-    dpkg-trigger --check-supported 2>/dev/null; then
-    if dpkg-trigger --no-await invirt-reload; then
-        echo "invirt-reload: deferring update (trigger activated)"
-        exit 0
-    fi
-fi
-
-for script in $(run-parts --test /etc/init.d); do
-    if [ "${script#/etc/init.d/invirt-}" != "$script" ]; then
-       invoke-rc.d "${script#/etc/init.d/}" force-reload
-    fi
-done