diff options
| author | Jeremy Kerr <jk@ozlabs.org> | 2013-03-11 14:07:36 +0800 |
|---|---|---|
| committer | Jeremy Kerr <jk@ozlabs.org> | 2013-04-16 11:41:46 +0800 |
| commit | 12a5c9153ce95ddde7fb14eaba9d779933a3637c (patch) | |
| tree | 0919a8d387e617c01b4a462d7cd9fe0cedbc709c /discover/event-parser.c | |
| parent | bd06734362bb727b09b943688d9b69aa0a84590d (diff) | |
| download | talos-petitboot-12a5c9153ce95ddde7fb14eaba9d779933a3637c.tar.gz talos-petitboot-12a5c9153ce95ddde7fb14eaba9d779933a3637c.zip | |
discover: Consolidate user events by device ID
Currently, we assume all user events are for a new device. This means
that we can never add boot options to an existing device.
This change tries to find an existing (matching by ID) device before
creating a new one in the user event add path.
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Diffstat (limited to 'discover/event-parser.c')
| -rw-r--r-- | discover/event-parser.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/discover/event-parser.c b/discover/event-parser.c index 1eec5c9..c09c5ba 100644 --- a/discover/event-parser.c +++ b/discover/event-parser.c @@ -13,7 +13,7 @@ * Understands params: name, image, args. */ -int parse_user_event(struct device *device, struct event *event) +struct boot_option *parse_user_event(struct device *device, struct event *event) { struct boot_option *opt; const char *p; @@ -54,9 +54,9 @@ int parse_user_event(struct device *device, struct event *event) device_add_boot_option(device, opt); - return 0; + return opt; fail: talloc_free(opt); - return -1; + return NULL; } |
