projects
/
invirt/packages/invirt-console.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Clean up the invirt-console-server init script with some ideas from
[invirt/packages/invirt-console.git]
/
debian
/
invirt-console-server.init
diff --git
a/debian/invirt-console-server.init
b/debian/invirt-console-server.init
index
3b60f73
..
17e44bb
100755
(executable)
--- a/
debian/invirt-console-server.init
+++ b/
debian/invirt-console-server.init
@@
-18,7
+18,8
@@
PATH=/sbin:/usr/sbin:/bin:/usr/bin
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
@@
-55,10
+56,17
@@
do_start()
# 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
- 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
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
}
#
}
#
@@
-71,13
+79,16
@@
do_stop()
# 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"
}
do_reload()
}
do_reload()