Changeset 1743 for trunk/packages/invirt-remote-server/debian

Timestamp:

Nov 22, 2008, 5:36:27 AM (16 years ago)

Author:

broder

Message:

Steal debathena-pyhesiodfs's ideas for invirt-remote-server, too

Location:

trunk/packages/invirt-remote-server/debian

Files:

• changelog (modified) (1 diff)
• invirt-remote-server.init (modified) (5 diffs)

trunk/packages/invirt-remote-server/debian/changelog

@@ +1 @@
+invirt-remote-server (0.1.4) unstable; urgency=low
+
+  * Steal some init script ideas from debathena-pyhesiodfs
+
+ -- Evan Broder <broder@mit.edu>  Sat, 22 Nov 2008 05:31:49 -0500
+
 invirt-remote-server (0.1.3) unstable; urgency=low
 

trunk/packages/invirt-remote-server/debian/invirt-remote-server.init

@@ -16 +16 @@
 DESC="the Invirt remctl configuration filesystem"
 DAEMON=/usr/sbin/invirt-remconffs
-DAEMON_ARGS="/etc/remctl/remconffs"
+MOUNTPOINT="/etc/remctl/remconffs"
+DAEMON_ARGS="-f $MOUNTPOINT"
 PIDFILE=/var/run/$NAME.pid
 SCRIPTNAME=/etc/init.d/$NAME
@@ -27 +28 @@
 . /lib/init/std-init.sh
 
+#
+# Function that starts the daemon/service
+#
 do_start()
 {
@@ -33 +37 @@
     #   1 if daemon was already running
     #   2 if daemon could not be started
-    gen_files
-    modprobe fuse
-    daemon --running -n $NAME && return 1
-    daemon -r -O daemon.info -E daemon.err -n $NAME -U $DAEMON $DAEMON_ARGS || return 2
+    
+    # Try to make sure fuse is setup
+    [ -e /dev/fuse ] || modprobe fuse || return 2
+    
+    if cat /proc/mounts | grep " $MOUNTPOINT " >/dev/null 2>&1; then
+        return 1
+    fi
+    
+    gen_config
+    
+    daemon -r -O daemon.info -E daemon.err -n $NAME -- $DAEMON $DAEMON_ARGS || return 2
 }
 
+#
+# Function that stops the daemon/service
+#
 do_stop()
 {
@@ -46 +60 @@
     #   2 if daemon could not be stopped
     #   other if a failure occurred
+    
+    if ! cat /proc/mounts | grep " $MOUNTPOINT " >/dev/null 2>&1; then
+        return 1
+    fi
+    
     daemon --stop -n $NAME
     RETVAL="$?"
@@ -51 +70 @@
     # Many daemons don't delete their pidfiles when they exit.
     rm -f $PIDFILE
-    umount "$DAEMON_ARGS"
-    return "$RETVAL"
+}
+
+do_reload()
+{
+    gen_config
 }