diff options
| -rw-r--r-- | daemon/lvm.c | 42 | ||||
| -rw-r--r-- | generator/generator_actions.ml | 16 | ||||
| -rw-r--r-- | src/MAX_PROC_NR | 2 |
3 files changed, 59 insertions, 1 deletions
diff --git a/daemon/lvm.c b/daemon/lvm.c index 0df27e2f..2691daab 100644 --- a/daemon/lvm.c +++ b/daemon/lvm.c @@ -709,3 +709,45 @@ do_is_lv (const char *device) free_strings (lvs); return 0; } + +/* Similar to is_lv above (RHBZ#638899). */ +char * +do_lvm_canonical_lv_name (const char *device) +{ + struct stat stat1, stat2; + + int r = stat (device, &stat1); + if (r == -1) { + reply_with_perror ("stat: %s", device); + return NULL; + } + + char **lvs = do_lvs (); + if (lvs == NULL) + return NULL; + + size_t i; + for (i = 0; lvs[i] != NULL; ++i) { + r = stat (lvs[i], &stat2); + if (r == -1) { + reply_with_perror ("stat: %s", lvs[i]); + free_strings (lvs); + return NULL; + } + if (stat1.st_rdev == stat2.st_rdev) { /* found it */ + char *r = strdup (lvs[i]); + if (r == NULL) { + reply_with_perror ("strdup"); + free_strings (lvs); + } + free_strings (lvs); + return r; + } + } + + free_strings (lvs); + + /* not found */ + reply_with_error ("%s: not a logical volume", device); + return NULL; +} diff --git a/generator/generator_actions.ml b/generator/generator_actions.ml index 695a73d7..38f1db3b 100644 --- a/generator/generator_actions.ml +++ b/generator/generator_actions.ml @@ -5208,6 +5208,22 @@ see the L<pread(2)> system call. See also C<guestfs_pread>."); + ("lvm_canonical_lv_name", (RString "lv", [Device "lvname"], []), 277, [], + [InitBasicFSonLVM, IfAvailable "lvm2", TestOutput ( + [["lvm_canonical_lv_name"; "/dev/mapper/VG-LV"]], "/dev/VG/LV"); + InitBasicFSonLVM, IfAvailable "lvm2", TestOutput ( + [["lvm_canonical_lv_name"; "/dev/VG/LV"]], "/dev/VG/LV")], + "get canonical name of an LV", + "\ +This converts alternative naming schemes for LVs that you +might find to the canonical name. For example, C</dev/mapper/VG-LV> +is converted to C</dev/VG/LV>. + +This command returns an error if the C<lvname> parameter does +not refer to a logical volume. + +See also C<guestfs_is_lv>."); + ] let all_functions = non_daemon_functions @ daemon_functions diff --git a/src/MAX_PROC_NR b/src/MAX_PROC_NR index 15007f1b..26817477 100644 --- a/src/MAX_PROC_NR +++ b/src/MAX_PROC_NR @@ -1 +1 @@ -276 +277 |