Changeset 2630

Timestamp:

Dec 17, 2009, 5:56:04 PM (14 years ago)

Author:

broder

Message:

Pass --no-start to dh_installinit in invirt-dev and run the initscript
by hand.

This works around a bug where init scripts are started before Python
modules have been fully installed.

Location:

trunk/packages/invirt-dev/debian

Files:

• invirt-dev.postinst (modified) (3 diffs)
• invirt-dev.prerm (modified) (2 diffs)
• rules (modified) (1 diff)

trunk/packages/invirt-dev/debian/invirt-dev.postinst

@@ -21 +21 @@
         fi
 
-        invirt-build-conf
-            
         cat >>/etc/sudoers <<EOF
 ### BEGIN invirt-dev
@@ -28 +26 @@
 ### END invirt-dev
 EOF
+
         echo "-----"
         echo "invirt-dev: run"
@@ -45 +44 @@
     ;;
 esac
+
+if [ -x /etc/init.d/invirt-dev ]; then
+    if hash invoke-rc.d 2>/dev/null; then
+        invoke-rc.d invirt-dev start
+    else
+        /etc/init.d/invirt-dev start
+    fi
+fi

trunk/packages/invirt-dev/debian/invirt-dev.prerm

@@ -20 +20 @@
 case "$1" in
     remove|upgrade|deconfigure)
-        perl -i.bak -ne 's%^### (BEGIN|END) invirt-dev\s*$%%m && ($skip = ($1 eq "BEGIN")); print unless $skip;' /etc/sudoers
+        perl -i.bak -ne 's%^### (BEGIN|END) invirt-dev\s*$%%m && ($skip = ($1 eq "BEGIN")); print unless $skip;' /etc/sudoers        
     ;;
 
@@ -32 +32 @@
 esac
 
+if [ -x /etc/init.d/invirt-dev ]; then
+    if hash invoke-rc.d 2>/dev/null; then
+        invoke-rc.d invirt-dev stop
+    else
+        /etc/init.d/invirt-dev stop
+    fi
+fi
+
 # dh_installdeb will replace this with shell code automatically
 # generated by other debhelper scripts.

trunk/packages/invirt-dev/debian/rules

@@ -2 +2 @@
 
 DEB_PYTHON_SYSTEM=pysupport
+
+# We use --no-start instead of letting dh_installinit do its thing
+# because, in the postinst, dh_installinit's automatically added code
+# runs before dh_pysupport's automatically added code.
+#
+# This means that when the initscript is started, Python modules
+# installed by the package haven't been fully installed yet.
+DEB_DH_INSTALLINIT_ARGS += --no-start
 
 include /usr/share/cdbs/1/rules/debhelper.mk