diff options
| author | marius <marius@FreeBSD.org> | 2005-03-19 01:46:37 +0000 |
|---|---|---|
| committer | marius <marius@FreeBSD.org> | 2005-03-19 01:46:37 +0000 |
| commit | 8581a4176e4ffbdb958ffd7bd6d7582b343504f1 (patch) | |
| tree | 0bda7893e9853a77b2fc02d355c8f689308d2c05 | |
| parent | 0374d92c587a78be14f1847634e9419f0f8bb22b (diff) | |
| download | FreeBSD-src-8581a4176e4ffbdb958ffd7bd6d7582b343504f1.zip FreeBSD-src-8581a4176e4ffbdb958ffd7bd6d7582b343504f1.tar.gz | |
When disarming a watchdog by using an interval of WD_TO_NEVER a non-zero
return value of the ioctl doesn't indicate that the command has failed
so don't let watchdog(8) return an error in this case.
MFC after: 3 days
| -rw-r--r-- | usr.sbin/watchdogd/watchdogd.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/usr.sbin/watchdogd/watchdogd.c b/usr.sbin/watchdogd/watchdogd.c index 0c1b625..321fc5d 100644 --- a/usr.sbin/watchdogd/watchdogd.c +++ b/usr.sbin/watchdogd/watchdogd.c @@ -120,7 +120,8 @@ main(int argc, char *argv[]) timeout |= WD_PASSIVE; else timeout |= WD_ACTIVE; - if (watchdog_patpat() < 0) + if (watchdog_patpat() < 0 && + (timeout & WD_INTERVAL) != WD_TO_NEVER) err(EX_OSERR, "patting the dog"); return (EX_OK); } |
