Fix the installation of xvm-iscsi-config

svn path=/trunk/packages/xvm-iscsi-config/; revision=1510

diff --git a/debian/rules b/debian/rules
index 9d05696..9394358 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,7 @@ DEB_DIVERT_EXTENSION = .xvm
 DEB_DIVERT_FILES_xvm-iscsi-config += \
        /etc/iscsi/iscsid.conf.xvm
 
+DEB_DH_INSTALLINIT_ARGS += --no-start
 DEB_UPDATE_RCD_PARAMS_xvm-iscsi-config += defaults 20 80
 
 include /usr/share/cdbs/1/rules/config-package.mk
@@ -12,5 +13,8 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 
 common-build-indep:: debian/iscsid.conf.xvm.mako
 
+binary-post-install/xvm-iscsi-config::
+       touch $(DEB_DESTDIR)/etc/iscsi/iscsid.conf.xvm
+
 debian/iscsid.conf.xvm.mako: $(call debian_check_files,/etc/iscsi/iscsid.conf)
        debian/transform_iscsid.conf.xvm.mako < $< > $@

diff --git a/debian/xvm-iscsi-config.postinst b/debian/xvm-iscsi-config.postinst
index 7c743da..12226e3 100755 (executable)
--- a/debian/xvm-iscsi-config.postinst
+++ b/debian/xvm-iscsi-config.postinst
@@ -20,6 +20,10 @@ set -e
 # for details, see http://www.debian.org/doc/debian-policy/ or
 # the debian-policy package
 
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
 
 case "$1" in
     configure)
@@ -29,6 +33,7 @@ case "$1" in
         USERNAME="$RET"
         db_get xvm-iscsi-config/password
         PASSWORD="$RET"
+        db_stop
         
         cat >/etc/invirt/conf.d/iscsi <<EOF
 iscsi:
@@ -50,9 +55,4 @@ EOF
     ;;
 esac
 
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
 exit 0