diff options
| author | Jeremy Kerr <jk@ozlabs.org> | 2013-09-23 17:01:15 +0800 |
|---|---|---|
| committer | Jeremy Kerr <jk@ozlabs.org> | 2013-09-23 17:01:15 +0800 |
| commit | 7a0a735a5c1db0e0b1816300c8ad211326bfcde6 (patch) | |
| tree | 2a61c8a9a96be78233351ab846ad3c9810d4c723 /discover | |
| parent | e39c5ad541830cecbd331f877ef43ded738a9251 (diff) | |
| download | talos-petitboot-7a0a735a5c1db0e0b1816300c8ad211326bfcde6.tar.gz talos-petitboot-7a0a735a5c1db0e0b1816300c8ad211326bfcde6.zip | |
discover: clear default_timeout waiter on timeout
We don't want cancel_default to try to remove an already-removed waiter.
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Diffstat (limited to 'discover')
| -rw-r--r-- | discover/device-handler.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/discover/device-handler.c b/discover/device-handler.c index 02ae688..95d2039 100644 --- a/discover/device-handler.c +++ b/discover/device-handler.c @@ -327,6 +327,8 @@ static int default_timeout(void *arg) return 0; } + handler->timeout_waiter = NULL; + pb_log("Timeout expired, booting default option %s\n", opt->option->id); boot(handler, handler->default_boot_option, NULL, |
