Changeset 1510 for trunk

Timestamp:

Nov 1, 2008, 5:18:21 PM (16 years ago)

Author:

broder

Message:

Fix the installation of xvm-iscsi-config

Location:

trunk/packages/xvm-iscsi-config/debian

Files:

• rules (modified) (2 diffs)
• xvm-iscsi-config.postinst (modified) (3 diffs)

trunk/packages/xvm-iscsi-config/debian/rules

@@ -6 +6 @@
         /etc/iscsi/iscsid.conf.xvm
 
+DEB_DH_INSTALLINIT_ARGS += --no-start
 DEB_UPDATE_RCD_PARAMS_xvm-iscsi-config += defaults 20 80
 
@@ -13 +14 @@
 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 < $< > $@

trunk/packages/xvm-iscsi-config/debian/xvm-iscsi-config.postinst

@@ -21 +21 @@
 # the debian-policy package
 
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
 
 case "$1" in
@@ -30 +34 @@
         db_get xvm-iscsi-config/password
         PASSWORD="$RET"
+        db_stop
         
         cat >/etc/invirt/conf.d/iscsi <<EOF
@@ -51 +56 @@
 esac
 
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
 exit 0