Marcus Meissner
f45a4f9a5e
forward-port several patches from sle11sp3.bnc#831518 OBS-URL: https://build.opensuse.org/request/show/227422 OBS-URL: https://build.opensuse.org/package/show/Base:System/lvm2?expand=0&rev=85
56 lines
2.2 KiB
Diff
56 lines
2.2 KiB
Diff
---
|
|
lib/config/defaults.h | 1 +
|
|
lib/display/display.c | 14 ++++++++++----
|
|
lib/display/display.h | 1 +
|
|
3 files changed, 12 insertions(+), 4 deletions(-)
|
|
|
|
Index: LVM2.2.02.98/lib/display/display.c
|
|
===================================================================
|
|
--- LVM2.2.02.98.orig/lib/display/display.c 2012-10-15 22:24:58.000000000 +0800
|
|
+++ LVM2.2.02.98/lib/display/display.c 2014-03-20 12:24:55.761578040 +0800
|
|
@@ -535,10 +535,16 @@ int lvdisplay_full(struct cmd_context *c
|
|
lv->vg->cmd->dev_dir, lv->vg->name, lv->name);
|
|
else if (lv_is_visible(lv)) {
|
|
/* Thin pool does not have /dev/vg/name link */
|
|
- if (!lv_is_thin_pool(lv))
|
|
- log_print("LV Path %s%s/%s",
|
|
- lv->vg->cmd->dev_dir,
|
|
- lv->vg->name, lv->name);
|
|
+ if (!lv_is_thin_pool(lv)) {
|
|
+ if (find_config_tree_bool(cmd, "global/display_dm_name_for_lv_name",
|
|
+ DEFAULT_DISPLAY_DM_NAME_FOR_LV_NAME)) {
|
|
+ log_print("LV Path %smapper/%s-%s", lv->vg->cmd->dev_dir,
|
|
+ lv->vg->name, lv->name);
|
|
+ } else {
|
|
+ log_print("LV Path %s%s/%s", lv->vg->cmd->dev_dir,
|
|
+ lv->vg->name, lv->name);
|
|
+ }
|
|
+ }
|
|
log_print("LV Name %s", lv->name);
|
|
} else
|
|
log_print("Internal LV Name %s", lv->name);
|
|
Index: LVM2.2.02.98/lib/display/display.h
|
|
===================================================================
|
|
--- LVM2.2.02.98.orig/lib/display/display.h 2014-03-20 12:24:30.403397837 +0800
|
|
+++ LVM2.2.02.98/lib/display/display.h 2014-03-20 12:24:55.761578040 +0800
|
|
@@ -18,6 +18,7 @@
|
|
|
|
#include "metadata-exported.h"
|
|
#include "locking.h"
|
|
+#include "defaults.h"
|
|
|
|
#include <stdint.h>
|
|
|
|
Index: LVM2.2.02.98/lib/config/defaults.h
|
|
===================================================================
|
|
--- LVM2.2.02.98.orig/lib/config/defaults.h 2014-03-20 12:24:30.403397837 +0800
|
|
+++ LVM2.2.02.98/lib/config/defaults.h 2014-03-20 12:25:27.958815335 +0800
|
|
@@ -31,6 +31,7 @@
|
|
#define DEFAULT_PROC_DIR "/proc"
|
|
#define DEFAULT_OBTAIN_DEVICE_LIST_FROM_UDEV 1
|
|
#define DEFAULT_SYSFS_SCAN 1
|
|
+#define DEFAULT_DISPLAY_DM_NAME_FOR_LV_NAME 0
|
|
#define DEFAULT_MD_COMPONENT_DETECTION 1
|
|
#define DEFAULT_MD_CHUNK_ALIGNMENT 1
|
|
#define DEFAULT_MULTIPATH_COMPONENT_DETECTION 1
|