External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

Fix initscript to check daemon pidfile

Browse Source 
The libvirtd initscript could get confused between the system and
session instances of the daemon. To avoid this it is neccessary
to check the pidfile explicitly.

* daemon/libvirtd.init.in: Always check the pidfile of the system
  daemon to avoid confusion with the session daemons
This commit is contained in:
Daniel P. Berrange 2009-11-12 19:31:48 +00:00
parent 308b85330a
commit ce62916b6e
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
daemon/libvirtd.init.in
View File

@ -40,6 +40,7 @@
SERVICE=libvirtd SERVICE=libvirtd
PROCESS=libvirtd PROCESS=libvirtd
PIDFILE=@localstatedir@/run/$SERVICE.pid
LIBVIRTD_CONFIG= LIBVIRTD_CONFIG=
LIBVIRTD_ARGS= LIBVIRTD_ARGS=
@ -59,7 +60,7 @@ start() {
echo -n $"Starting $SERVICE daemon: " echo -n $"Starting $SERVICE daemon: "
mkdir -p @localstatedir@/cache/libvirt mkdir -p @localstatedir@/cache/libvirt
rm -rf @localstatedir@/cache/libvirt/* rm -rf @localstatedir@/cache/libvirt/*
KRB5_KTNAME=$KRB5_KTNAME daemon --check $SERVICE $PROCESS --daemon $LIBVIRTD_CONFIG_ARGS $LIBVIRTD_ARGS KRB5_KTNAME=$KRB5_KTNAME daemon --pidfile $PIDFILE --check $SERVICE $PROCESS --daemon $LIBVIRTD_CONFIG_ARGS $LIBVIRTD_ARGS
RETVAL=$? RETVAL=$?
echo echo
[ $RETVAL -eq 0 ] && touch @localstatedir@/lock/subsys/$SERVICE [ $RETVAL -eq 0 ] && touch @localstatedir@/lock/subsys/$SERVICE
@ -68,12 +69,12 @@ start() {
stop() { stop() {
echo -n $"Stopping $SERVICE daemon: " echo -n $"Stopping $SERVICE daemon: "
killproc $PROCESS killproc -p $PIDFILE $PROCESS
RETVAL=$? RETVAL=$?
echo echo
if [ $RETVAL -eq 0 ]; then if [ $RETVAL -eq 0 ]; then
rm -f @localstatedir@/lock/subsys/$SERVICE rm -f @localstatedir@/lock/subsys/$SERVICE
rm -f @localstatedir@/run/$SERVICE.pid rm -f $PIDFILE
rm -rf @localstatedir@/cache/libvirt/* rm -rf @localstatedir@/cache/libvirt/*
fi fi
} }
@ -86,7 +87,7 @@ restart() {
reload() { reload() {
echo -n $"Reloading $SERVICE configuration: " echo -n $"Reloading $SERVICE configuration: "
killproc $PROCESS -HUP killproc -p $PIDFILE $PROCESS -HUP
RETVAL=$? RETVAL=$?
echo echo
return $RETVAL return $RETVAL
@ -98,7 +99,7 @@ case "$1" in
$1 $1
;; ;;
status) status)
status $PROCESS status -p $PIDFILE $PROCESS
RETVAL=$? RETVAL=$?
;; ;;
force-reload) force-reload)