diff options
| author | Jeremy Kerr <jk@ozlabs.org> | 2013-12-05 14:32:28 +0800 |
|---|---|---|
| committer | Jeremy Kerr <jk@ozlabs.org> | 2013-12-05 14:42:14 +0800 |
| commit | 97cf71f1f2f07210bc160d1f04c0b13d5bcd5b74 (patch) | |
| tree | 5662994a626cf249ae27ef779d6287aebd343097 /discover | |
| parent | 80e13403f7135e85d5f38e041a51b03891c656f7 (diff) | |
| download | talos-petitboot-97cf71f1f2f07210bc160d1f04c0b13d5bcd5b74.tar.gz talos-petitboot-97cf71f1f2f07210bc160d1f04c0b13d5bcd5b74.zip | |
discover/boot: Fix condition for updating boot params
In commit 823958fb, we change to use struct process, but left in the
check for rc == BOOT_HOOK_EXIT_UPDATE. We actually want to check
process->exit_status here, not rc.
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Diffstat (limited to 'discover')
| -rw-r--r-- | discover/boot.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/discover/boot.c b/discover/boot.c index 13dfe0c..83bcc7b 100644 --- a/discover/boot.c +++ b/discover/boot.c @@ -266,11 +266,9 @@ static void run_boot_hooks(struct boot_task *task) /* if the hook returned with BOOT_HOOK_EXIT_UPDATE, * then we process stdout to look for updated params */ - if (rc == BOOT_HOOK_EXIT_UPDATE) { - boot_hook_update(task, hooks[i]->d_name, - process->stdout_buf); - boot_hook_setenv(task); - } + boot_hook_update(task, hooks[i]->d_name, + process->stdout_buf); + boot_hook_setenv(task); } process_release(process); |
