Changeset 1741

Timestamp:

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

Author:

broder

Message:

Clean up the invirt-console-server init script with some ideas from
debathena-pyhesiodfs

Location:

trunk/packages/invirt-console-server/debian

Files:

• changelog (modified) (1 diff)
• invirt-console-server.init (modified) (4 diffs)

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

@@ +1 @@
+invirt-console-server (0.1.1) unstable; urgency=low
+
+  * Clean up the init script with some ideas from debathena-pyhesiodfs.
+
+ -- Evan Broder <broder@mit.edu>  Sat, 22 Nov 2008 05:25:54 -0500
+
 invirt-console-server (0.1.0) unstable; urgency=low
 

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

@@ -19 +19 @@
 NAME=invirt-console-server
 DAEMON=/usr/bin/invirt-consolefs
-DAEMON_ARGS="/consolefs"
+MOUNTPOINT="/consolefs"
+DAEMON_ARGS="-f $MOUNTPOINT"
 PIDFILE=/var/run/$NAME.pid
 SCRIPTNAME=/etc/init.d/$NAME
@@ -56 +57 @@
     #   1 if daemon was already running
     #   2 if daemon could not be started
-    modprobe fuse
+    
+    # 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 --running -n $NAME && return 1
-    daemon -r -O daemon.info -E daemon.err -n $NAME -U $DAEMON $DAEMON_ARGS || return 2
+    
+    daemon -r -O daemon.info -E daemon.err -n $NAME -- $DAEMON $DAEMON_ARGS || return 2
 }
 
@@ -72 +80 @@
     #   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="$?"
@@ -77 +90 @@
     # Many daemons don't delete their pidfiles when they exit.
     rm -f $PIDFILE
-    umount "$DAEMON_ARGS"
-    return "$RETVAL"
 }