← Back to branch summary

~ubuntu-branches/debian/sid/lvm2/sid

« back to all changes in this revision

Viewing changes to .pc/dm-event-api.patch/daemons/dmeventd/libdevmapper-event.c

  • Committer: Package Import Robot
  • Author(s): Bastian Blank
  • Date: 2014-09-06 19:26:39 UTC
  • mfrom: (1.1.19)
  • Revision ID: package-import@ubuntu.com-20140906192639-lm0cr77p48uenvi8
Tags: 2.02.111-1
* New upstream version.
* Install more systemd units:
  - Add dm-event.service and dm-event.socket to dmeventd.
  - Add lvm2-monitor.service to lvm2 and start it.
* Enable monitoring by default:
  - Add dependency on dmeventd to lvm2 and liblvm2cmd2.02.

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/dm-event-api.patch/daemons/dmeventd/libdevmapper-event.c
297
297
                FD_ZERO(&fds);
298
298
                FD_SET(fifos->server, &fds);
299
299
                ret = select(fifos->server + 1, &fds, NULL, NULL, &tval);
300
 
                if ((ret < 0) && (errno != EINTR)) {
 
300
                if (ret < 0) {
 
301
                        if (errno == EINTR)
 
302
                                continue;
301
303
                        log_error("Unable to talk to event daemon");
302
304
                        return 0;
303
305
                }
304
306
                if (ret == 0)
305
307
                        break;
306
308
                ret = read(fifos->server, drainbuf, sizeof(drainbuf));
 
309
                if (ret < 0) {
 
310
                        if ((errno == EINTR) || (errno == EAGAIN))
 
311
                                continue;
 
312
                        log_error("Unable to talk to event daemon");
 
313
                        return 0;
 
314
                }
307
315
        }
308
316
 
309
317
        while (bytes < size) {