On Fri, Feb 18, 2011 at 07:54:57PM +0000, Adam D. Barratt wrote: > On Fri, 2011-02-18 at 10:30 +0100, Guido Günther wrote: > > I'd like to update libvirt for the next point release with the following > > two changes: > > > > * [6f95d48] Fix exit status codes in libvirt init script to comply with LSB > > (Closes; #612305) > > * [6e46f0e] Fix wrong regular expression in debian/watch > > > > The first one is important since it resolves problems with cluster > > solutions like pacemaker or rhcs that use the status command to check > > the availability of the daemon. O.k. to upload to p-u? > > This sounds okay but I would like to see a complete debdiff before > upload just to double-check that it looks as I've assumed it will; fwiw, > I'm not aware of anything (other than possibly the odd manual user) that > checks the content of watch files in stable. > Attached. It turned out the watchfile part is already in 0.8.3-5. Cheers, -- Guido
diff -Nru libvirt-0.8.3/debian/changelog libvirt-0.8.3/debian/changelog --- libvirt-0.8.3/debian/changelog 2010-12-01 15:14:03.000000000 +0100 +++ libvirt-0.8.3/debian/changelog 2011-02-18 21:42:16.000000000 +0100 @@ -1,3 +1,11 @@ +libvirt (0.8.3-5+squeeze0) unstable; urgency=low + + [ Laurent Léonard ] + * [6f95d48] Fix exit status codes in libvirt init script to comply with LSB + (Closes: #612305) + + -- Guido Günther <a...@sigxcpu.org> Fri, 18 Feb 2011 21:26:03 +0100 + libvirt (0.8.3-5) unstable; urgency=low [ Laurent Léonard ] diff -Nru libvirt-0.8.3/debian/libvirt-bin.init libvirt-0.8.3/debian/libvirt-bin.init --- libvirt-0.8.3/debian/libvirt-bin.init 2010-11-16 14:11:14.000000000 +0100 +++ libvirt-0.8.3/debian/libvirt-bin.init 2011-02-18 21:32:43.000000000 +0100 @@ -159,6 +159,11 @@ else log_progress_msg "not running" log_end_msg 1 + if [ -f "$PIDFILE" ] ; then + exit 1 + else + exit 3 + fi fi ;; *)