debathena-pyhesiodfs
svn path=/trunk/packages/invirt-console-server/; revision=1741
+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
* Add real caching to consolefs
invirt-console-server (0.1.0) unstable; urgency=low
* Add real caching to consolefs
DESC="the Invirt console server"
NAME=invirt-console-server
DAEMON=/usr/bin/invirt-consolefs
DESC="the Invirt console server"
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
PIDFILE=/var/run/$NAME.pid
SCRIPTNAME=/etc/init.d/$NAME
# 0 if daemon has been started
# 1 if daemon was already running
# 2 if daemon could not be started
# 0 if daemon has been started
# 1 if daemon was already running
# 2 if daemon could not be started
+
+ # 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
+
- 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
# 1 if daemon was already stopped
# 2 if daemon could not be stopped
# other if a failure occurred
# 1 if daemon was already stopped
# 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="$?"
[ "$RETVAL" = 2 ] && return 2
# Many daemons don't delete their pidfiles when they exit.
rm -f $PIDFILE
daemon --stop -n $NAME
RETVAL="$?"
[ "$RETVAL" = 2 ] && return 2
# Many daemons don't delete their pidfiles when they exit.
rm -f $PIDFILE
- umount "$DAEMON_ARGS"
- return "$RETVAL"