From: Mark McLoughlin Date: Fri, 23 Feb 2007 12:50:58 +0000 (+0000) Subject: Fri Feb 23 12:49:11 IST 2007 Mark McLoughlin X-Git-Tag: LIBVIRT_0_2_1~65 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fbcd25d3a7dd92aa77b672133c37c0bcfffd8541;p=thirdparty%2Flibvirt.git Fri Feb 23 12:49:11 IST 2007 Mark McLoughlin * qemud/libvirtd.in: add init script for libvirt_qemud * qemud/Makefile.am: install it unless we were configured with --with-init-scripts=none * configure.in: add --with-init-scripts to allow us have different flavour init scripts --- diff --git a/ChangeLog b/ChangeLog index 761f806295..6f8ff3ed8b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +Fri Feb 23 12:49:11 IST 2007 Mark McLoughlin + + * qemud/libvirtd.in: add init script for libvirt_qemud + + * qemud/Makefile.am: install it unless we were configured + with --with-init-scripts=none + + * configure.in: add --with-init-scripts to allow us + have different flavour init scripts + Fri Feb 23 12:46:44 IST 2007 Mark McLoughlin * qemud/qemud.c: add --pid-file and default to writing diff --git a/configure.in b/configure.in index 618bbe73c3..6b3f2fdcab 100644 --- a/configure.in +++ b/configure.in @@ -101,6 +101,23 @@ fi AC_DEFINE_UNQUOTED(QEMUD_PID_FILE, "$QEMUD_PID_FILE", [PID file path for qemud]) AC_MSG_RESULT($QEMUD_PID_FILE) +dnl +dnl init script flavor +dnl +AC_MSG_CHECKING([for init script flavor]) +AC_ARG_WITH(init-script, + AC_HELP_STRING([--with-init-scripts=[redhat|auto|none]], + [Style of init scripts to install (defaults to auto)])) +if test "x$with_init_scripts" = "x" -o "x$with_init_scripts" = "xauto"; then + if test -f /etc/redhat-release ; then + with_init_scripts=redhat + else + with_init_scripts=none + fi +fi +AM_CONDITIONAL(LIBVIRT_INIT_SCRIPTS_RED_HAT, test x$with_init_scripts = xredhat) +AC_MSG_RESULT($with_init_scripts) + dnl dnl allow the creation of iptables rules in chains with a dnl specific prefix rather than in the standard toplevel chains diff --git a/qemud/.cvsignore b/qemud/.cvsignore index eddc7eb323..f5cae4df0b 100644 --- a/qemud/.cvsignore +++ b/qemud/.cvsignore @@ -5,3 +5,4 @@ Makefile.in *.lo *.la libvirt_qemud +libvirtd diff --git a/qemud/Makefile.am b/qemud/Makefile.am index 0a70b188c2..34b2cfc18a 100644 --- a/qemud/Makefile.am +++ b/qemud/Makefile.am @@ -19,3 +19,19 @@ libvirt_qemud_LDFLAGS = $(LIBXML_LIBS) $(SYSFS_LIBS) libvirt_qemud_DEPENDENCIES = libvirt_qemud_LDADD = +EXTRA_DIST = libvirt_qemud.init.in + +if LIBVIRT_INIT_SCRIPTS_RED_HAT +initdir = $(sysconfdir)/rc.d/init.d +init_SCRIPTS = libvirtd + +libvirtd: libvirtd.in + sed \ + -e s!\@localstatedir\@!@localstatedir@! \ + -e s!\@sbindir\@!@sbindir@! \ + -e s!\@sysconfdir\@!@sysconfdir@! \ + < $< > $@ + chmod a+x libvirtd + +CLEANFILES = libvirtd +endif # DBUS_INIT_SCRIPTS_RED_HAT diff --git a/qemud/libvirtd.in b/qemud/libvirtd.in new file mode 100644 index 0000000000..791e34c92e --- /dev/null +++ b/qemud/libvirtd.in @@ -0,0 +1,77 @@ +#!/bin/sh + +# libvirt_qemud: QEMU and virtual network management daemon +# +# chkconfig: 345 97 03 +# description: This is a daemon for managing QEMU guest instances +# and libvirt virtual networks +# See http://libvirt.org +# +# processname: libvirt_qemud +# pidfile: @localstatedir@/run/libvirt_qemud.pid +# + +# Sanity checks. +[ -x @sbindir@/libvirt_qemud ] || exit 0 + +# Source function library. +. @sysconfdir@/rc.d/init.d/functions + +SERVICE=libvirtd +PROCESS=libvirt_qemud + + +RETVAL=0 + +start() { + echo -n $"Starting $SERVICE daemon: " + daemon --check $SERVICE $PROCESS --system --daemon + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && touch @localstatedir@/lock/subsys/$SERVICE +} + +stop() { + echo -n $"Stopping $SERVICE daemon: " + + killproc $PROCESS -TERM + RETVAL=$? + echo + if [ $RETVAL -eq 0 ]; then + rm -f @localstatedir@/lock/subsys/$SERVICE + rm -f @localstatedir@/run/$SERVICE.pid + fi +} + +restart() { + stop + start +} + +reload() { + echo -n $"Reloading $SERVICE configuration: " + + killproc $PROCESS -HUP + RETVAL=$? + echo + return $RETVAL +} + +# See how we were called. +case "$1" in + start|stop|restart|reload) + $1 + ;; + status) + status $PROCESS + RETVAL=$? + ;; + condrestart) + [ -f @localstatedir@/lock/subsys/$SERVICE ] && restart || : + ;; + *) + echo $"Usage: $0 {start|stop|status|restart|condrestart|reload}" + exit 1 + ;; +esac +exit $RETVAL