On 04/25/2014 05:28 AM, Daniel P. Berrange wrote:
> The virnetsocket.c API is hardcoded to pass --timeout=30 to
> any daemon it auto-starts. For inexplicable reasons the virtlockd
> daemon did not implement the --timeout option, so it would
> immediately exit on autostart with an error.
>
> Signed-off-by: Daniel P. Berrange <berrange@xxxxxxxxxx>
> ---
> src/locking/lock_daemon.c | 20 ++++++++++++++++++++
> 1 file changed, 20 insertions(+)
>
> @@ -1226,6 +1229,7 @@ int main(int argc, char **argv) {
> while (1) {
> int optidx = 0;
> int c;
> + char *tmp;
>
> c = getopt_long(argc, argv, "ldf:p:t:vVh", opts, &optidx);
Oh my - we were previously accepting -t (but not --timeout) then doing
nothing with it.
>
> @@ -1244,6 +1248,16 @@ int main(int argc, char **argv) {
> godaemon = 1;
> break;
>
> + case 't':
ACK
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
Attachment:
signature.asc
Description: OpenPGP digital signature
-- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list