Blame SOURCES/lvm2-2_03_13-devices-don-t-use-deleted-loop-backing-file-for-devi.patch
|
 |
d16add |
lib/device/device_id.c | 6 +++++-
|
|
|
d16add |
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
|
d16add |
|
|
|
d16add |
diff --git a/lib/device/device_id.c b/lib/device/device_id.c
|
|
|
d16add |
index 67f72e5..1b98487 100644
|
|
|
d16add |
--- a/lib/device/device_id.c
|
|
|
d16add |
+++ b/lib/device/device_id.c
|
|
|
d16add |
@@ -325,8 +325,12 @@ const char *device_id_system_read(struct cmd_context *cmd, struct device *dev, u
|
|
|
d16add |
else if (idtype == DEV_ID_TYPE_MD_UUID)
|
|
|
d16add |
_read_sys_block(cmd, dev, "md/uuid", sysbuf, sizeof(sysbuf));
|
|
|
d16add |
|
|
|
d16add |
- else if (idtype == DEV_ID_TYPE_LOOP_FILE)
|
|
|
d16add |
+ else if (idtype == DEV_ID_TYPE_LOOP_FILE) {
|
|
|
d16add |
_read_sys_block(cmd, dev, "loop/backing_file", sysbuf, sizeof(sysbuf));
|
|
|
d16add |
+ /* if backing file is deleted, fall back to devname */
|
|
|
d16add |
+ if (strstr(sysbuf, "(deleted)"))
|
|
|
d16add |
+ sysbuf[0] = '\0';
|
|
|
d16add |
+ }
|
|
|
d16add |
|
|
|
d16add |
else if (idtype == DEV_ID_TYPE_DEVNAME) {
|
|
|
d16add |
if (!(idname = strdup(dev_name(dev))))
|