diff options
author | Jeremy Kerr <jk@ozlabs.org> | 2013-10-01 10:42:04 +0800 |
---|---|---|
committer | Jeremy Kerr <jk@ozlabs.org> | 2013-10-01 12:51:55 +0800 |
commit | b201464a18c990ea6df0f2878e532618d4936c53 (patch) | |
tree | 2c942759ba458f74d9b5a8a7071bfd8193bca733 /discover/device-handler.h | |
parent | ffc167572a9d56c52908aebefe62ba3e3e2a9cf8 (diff) | |
download | petitboot-b201464a18c990ea6df0f2878e532618d4936c53.zip petitboot-b201464a18c990ea6df0f2878e532618d4936c53.tar.gz |
discover: Allow for already-mounted devices
When we start the discover server, we may find that devices are already
mounted. In this case, mount_device will fail, and we'll abort the
parse.
This change uses /proc/self/mounts to check if new devices are already
mounted, and uses the existing mount point.
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Diffstat (limited to 'discover/device-handler.h')
-rw-r--r-- | discover/device-handler.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/discover/device-handler.h b/discover/device-handler.h index 854be48..9d477db 100644 --- a/discover/device-handler.h +++ b/discover/device-handler.h @@ -33,8 +33,10 @@ struct discover_device { const char *uuid; const char *label; - const char *mount_path; + char *mount_path; const char *device_path; + bool mounted; + bool unmount; bool notified; |