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
Add conserver-server to -console-server's dependencies.
[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
f347622
..
1d083a3
100755
(executable)
--- a/
debian/invirt-console-server.init
+++ b/
debian/invirt-console-server.init
@@
-22,23
+22,17
@@
MOUNTPOINT="/consolefs"
DAEMON_ARGS="-f $MOUNTPOINT"
PIDFILE=/var/run/$NAME.pid
SCRIPTNAME=/etc/init.d/$NAME
DAEMON_ARGS="-f $MOUNTPOINT"
PIDFILE=/var/run/$NAME.pid
SCRIPTNAME=/etc/init.d/$NAME
+GEN_FILES=(/etc/conserver/invirt-hosts.cf
+ /etc/remctl/acl/invirt-console-server
+ /etc/issue.net.no_tkt
+ /etc/nss-pgsql.conf)
# Exit if the package is not installed
[ -x "$DAEMON" ] || exit 0
# Exit if the package is not installed
[ -x "$DAEMON" ] || exit 0
+. /lib/init/gen-files.sh
. /lib/init/std-init.sh
. /lib/init/std-init.sh
-gen_config()
-{
- for i in /etc/conserver/invirt-hosts.cf \
- /etc/remctl/acl/invirt-console-server \
- /etc/issue.net.no_tkt \
- /etc/nss-pgsql.conf \
- ; do
- mako-render $i.mako > $i
- done
-}
-
#
# Function that starts the daemon/service
#
#
# Function that starts the daemon/service
#
@@
-56,7
+50,7
@@
do_start()
return 1
fi
return 1
fi
- gen_config
+ gen_files
daemon -r -O daemon.info -E daemon.err -n $NAME -- $DAEMON $DAEMON_ARGS || return 2
}
daemon -r -O daemon.info -E daemon.err -n $NAME -- $DAEMON $DAEMON_ARGS || return 2
}
@@
-85,7
+79,7
@@
do_stop()
do_reload()
{
do_reload()
{
- gen_config
+ gen_files
invoke-rc.d conserver-server reload
}
invoke-rc.d conserver-server reload
}