diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2011-01-04 19:56:11 +0700 |
|---|---|---|
| committer | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2011-01-04 19:56:11 +0700 |
| commit | 9db69882bee2d528d706d61d34ef7741122330be (patch) | |
| tree | f46c4ed5cae58956cd165e552ea4e366fd9b1a6c /miscutils/watchdog.c | |
| parent | 3f357a9c754805c4c38793749927aeda82797735 (diff) | |
| parent | e4dcba1c103dc28e927e004791e331aaf604383d (diff) | |
| download | busybox-w32-9db69882bee2d528d706d61d34ef7741122330be.tar.gz busybox-w32-9db69882bee2d528d706d61d34ef7741122330be.tar.bz2 busybox-w32-9db69882bee2d528d706d61d34ef7741122330be.zip | |
Merge commit 'e4dcba1c103dc28e927e004791e331aaf604383d'
Conflicts:
libbb/make_directory.c
Diffstat (limited to 'miscutils/watchdog.c')
| -rw-r--r-- | miscutils/watchdog.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/miscutils/watchdog.c b/miscutils/watchdog.c index 332539658..36902a214 100644 --- a/miscutils/watchdog.c +++ b/miscutils/watchdog.c | |||
| @@ -21,7 +21,7 @@ static void watchdog_shutdown(int sig UNUSED_PARAM) | |||
| 21 | { | 21 | { |
| 22 | static const char V = 'V'; | 22 | static const char V = 'V'; |
| 23 | 23 | ||
| 24 | write(3, &V, 1); /* Magic, see watchdog-api.txt in kernel */ | 24 | write(3, &V, 1); /* Magic, see watchdog-api.txt in kernel */ |
| 25 | if (ENABLE_FEATURE_CLEAN_UP) | 25 | if (ENABLE_FEATURE_CLEAN_UP) |
| 26 | close(3); | 26 | close(3); |
| 27 | exit(EXIT_SUCCESS); | 27 | exit(EXIT_SUCCESS); |