[Pkg-mono-svn-commits] [SCM] xsp branch, master-experimental, updated. debian/2.6.5-1

[Jo Shields]

The following commit has been merged in the master-experimental branch:
commit c8a1e1582333ee6e35e13ac39f79b48ea592c5f6
Author: Jo Shields <directhex at apebox.org>
Date:   Mon Aug 9 01:21:24 2010 +0100

    Make daemon enabled or disabled on the basis of the start_boot value of /etc/default/mono-xspX. As a side effect of this, the init script will no longer die horribly if the default file is missing or junk.

diff --git a/debian/changelog b/debian/changelog
index 98eabcb..23ac389 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,12 @@
 xsp (2.6.5-1) UNRELEASED; urgency=low
 
   * New upstream release
+  * debian/mono-xsp1.default,
+    debian/mono-xsp1.init,
+    debian/mono-xsp2.init:
+    + Make daemon enabled or disabled on the basis of the start_boot value 
+      of /etc/default/mono-xspX. As a side effect of this, the init script 
+      will no longer die horribly if the default file is missing or junk.
 
  -- Jo Shields <directhex at apebox.org>  Sat, 07 Aug 2010 20:36:51 +0100
 
diff --git a/debian/mono-xsp1.default b/debian/mono-xsp1.default
index a19fec3..539582b 100644
--- a/debian/mono-xsp1.default
+++ b/debian/mono-xsp1.default
@@ -1,6 +1,9 @@
 # Defaults for mono-xsp, official version
 # sourced by /etc/init.d/mono-xsp
 
+# Should we start it?
+start_boot=true
+
 # User and group by default
 user=www-data
 group=www-data
diff --git a/debian/mono-xsp1.init b/debian/mono-xsp1.init
index cbd5816..e314b2e 100755
--- a/debian/mono-xsp1.init
+++ b/debian/mono-xsp1.init
@@ -27,6 +27,7 @@ DEFAULT=/etc/default/$NAME
 CFGDIR=/etc/xsp
 VIRTUALFILE=$CFGDIR/debian.webapp
 MONO_SHARED_DIR=/var/run/$NAME
+start_boot=false
 
 # Use LSB
 . /lib/lsb/init-functions
@@ -35,6 +36,10 @@ MONO_SHARED_DIR=/var/run/$NAME
 test -x $DAEMON || exit 0
 test -f $DEFAULT && . $DEFAULT	
 
+if [ "x$start_boot" != "xtrue" ] ; then
+    exit 0
+fi
+
 if [ ! -e $MONO_SHARED_DIR ]; then
 	mkdir $MONO_SHARED_DIR
 	chown $user:$group $MONO_SHARED_DIR
diff --git a/debian/mono-xsp2.init b/debian/mono-xsp2.init
index 0fa6ea2..8dd3b57 100755
--- a/debian/mono-xsp2.init
+++ b/debian/mono-xsp2.init
@@ -27,6 +27,7 @@ DEFAULT=/etc/default/$NAME
 CFGDIR=/etc/xsp2
 VIRTUALFILE=$CFGDIR/debian.webapp
 MONO_SHARED_DIR=/var/run/$NAME
+start_boot=false
 
 # Use LSB
 . /lib/lsb/init-functions
@@ -35,6 +36,10 @@ MONO_SHARED_DIR=/var/run/$NAME
 test -x $DAEMON || exit 0
 test -f $DEFAULT && . $DEFAULT	
 
+if [ "x$start_boot" != "xtrue" ] ; then
+    exit 0
+fi
+
 if [ ! -e $MONO_SHARED_DIR ]; then
 	mkdir $MONO_SHARED_DIR   
 	chown $user:$group $MONO_SHARED_DIR

-- 
xsp