1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
|
From a29d36c9ac41aa3aa4818c277c9c0e20cbd6175b Mon Sep 17 00:00:00 2001
From: Peter Rajnoha <prajnoha@redhat.com>
Date: Mon, 10 Feb 2014 13:28:13 +0100
Subject: [PATCH 1/2] wiping: wipe DM_snapshot_cow signature without prompt in
newly created LVs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The libblkid can detect DM_snapshot_cow signature and when creating
new LVs with blkid wiping used (allocation/use_blkid_wiping=1 lvm.conf
setting and --wipe y used at the same time - which it is by default).
Do not issue any prompts about this signature when new LV is created
and just wipe it right away without asking questions. Still keep the
log in verbose mode though.
Conflicts:
WHATS_NEW
lib/device/dev-type.c
[backported to 2.02.105 by Thomas Bächler, thomas@archlinux.org]
---
WHATS_NEW | 2 ++
lib/device/dev-type.c | 47 ++++++++++++++++++++++++++++++++---------------
lib/device/dev-type.h | 6 +++++-
lib/metadata/lv_manip.c | 4 +++-
lib/metadata/metadata.c | 4 +++-
5 files changed, 45 insertions(+), 18 deletions(-)
diff --git a/WHATS_NEW b/WHATS_NEW
index 26b63ae..d2a3482 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,3 +1,5 @@
+ Wipe DM_snapshot_cow signature without prompt in new LVs with blkid wiping.
+
Version 2.02.105 - 20th January 2014
====================================
Fix thin LV flagging for udev to skip scanning only if the LV is wiped.
diff --git a/lib/device/dev-type.c b/lib/device/dev-type.c
index 78b093c..d2ff71e 100644
--- a/lib/device/dev-type.c
+++ b/lib/device/dev-type.c
@@ -449,17 +449,25 @@ out:
#ifdef BLKID_WIPING_SUPPORT
+static inline int _type_in_flag_list(const char *type, uint32_t flag_list)
+{
+ return (((flag_list & TYPE_LVM2_MEMBER) && !strcmp(type, "LVM2_member")) ||
+ ((flag_list & TYPE_LVM1_MEMBER) && !strcmp(type, "LVM1_member")) ||
+ ((flag_list & TYPE_DM_SNAPSHOT_COW) && !strcmp(type, "DM_snapshot_cow")));
+}
+
static int _blkid_wipe(blkid_probe probe, struct device *dev, const char *name,
- int exclude_lvm_member, int yes, force_t force)
+ uint32_t types_to_exclude, uint32_t types_no_prompt,
+ int yes, force_t force)
{
+ static const char* msg_wiping = "Wiping %s signature on %s.";
const char *offset = NULL, *type = NULL, *magic = NULL,
*usage = NULL, *label = NULL, *uuid = NULL;
loff_t offset_value;
size_t len;
if (!blkid_probe_lookup_value(probe, "TYPE", &type, NULL)) {
- if (exclude_lvm_member &&
- (!strcmp(type, "LVM1_member") || !strcmp(type, "LVM2_member")))
+ if (_type_in_flag_list(type, types_to_exclude))
return 1;
if (!blkid_probe_lookup_value(probe, "SBMAGIC_OFFSET", &offset, NULL) &&
blkid_probe_lookup_value(probe, "SBMAGIC", &magic, &len))
@@ -483,12 +491,15 @@ static int _blkid_wipe(blkid_probe probe, struct device *dev, const char *name,
"UUID=\"%s\" TYPE=\"%s\" USAGE=\"%s\"",
name, offset, label, uuid, type, usage);
- if (!yes && (force == PROMPT) &&
- yes_no_prompt("WARNING: %s signature detected on %s at offset %s. "
- "Wipe it? [y/n] ", type, name, offset) != 'y')
- return_0;
+ if (!_type_in_flag_list(type, types_no_prompt)) {
+ if (!yes && (force == PROMPT) &&
+ yes_no_prompt("WARNING: %s signature detected on %s at offset %s. "
+ "Wipe it? [y/n] ", type, name, offset) != 'y')
+ return_0;
+ log_print_unless_silent(msg_wiping, type, name);
+ } else
+ log_verbose(msg_wiping, type, name);
- log_print_unless_silent("Wiping %s signature on %s.", type, name);
if (!dev_set(dev, offset_value, len, 0)) {
log_error("Failed to wipe %s signature on %s.", type, name);
return 0;
@@ -498,7 +509,8 @@ static int _blkid_wipe(blkid_probe probe, struct device *dev, const char *name,
}
static int _wipe_known_signatures_with_blkid(struct device *dev, const char *name,
- int exclude_lvm_member,
+ uint32_t types_to_exclude,
+ uint32_t types_no_prompt,
int yes, force_t force)
{
blkid_probe probe = NULL;
@@ -526,7 +538,7 @@ static int _wipe_known_signatures_with_blkid(struct device *dev, const char *nam
while (!blkid_do_probe(probe)) {
found++;
- if (_blkid_wipe(probe, dev, name, exclude_lvm_member, yes, force))
+ if (_blkid_wipe(probe, dev, name, types_to_exclude, types_no_prompt, yes, force))
wiped++;
}
@@ -580,7 +592,8 @@ static int _wipe_signature(struct device *dev, const char *type, const char *nam
}
static int _wipe_known_signatures_with_lvm(struct device *dev, const char *name,
- int exclude_lvm_member,
+ uint32_t types_to_exclude __attribute__((unused)),
+ uint32_t types_no_prompt __attribute__((unused)),
int yes, force_t force)
{
if (!_wipe_signature(dev, "software RAID md superblock", name, 4, yes, force, dev_is_md) ||
@@ -592,16 +605,20 @@ static int _wipe_known_signatures_with_lvm(struct device *dev, const char *name,
}
int wipe_known_signatures(struct cmd_context *cmd, struct device *dev,
- const char *name, int exclude_lvm_member,
- int yes, force_t force)
+ const char *name, uint32_t types_to_exclude,
+ uint32_t types_no_prompt, int yes, force_t force)
{
#ifdef BLKID_WIPING_SUPPORT
if (find_config_tree_bool(cmd, allocation_use_blkid_wiping_CFG, NULL))
return _wipe_known_signatures_with_blkid(dev, name,
- exclude_lvm_member, yes, force);
+ types_to_exclude,
+ types_no_prompt,
+ yes, force);
#endif
return _wipe_known_signatures_with_lvm(dev, name,
- exclude_lvm_member, yes, force);
+ types_to_exclude,
+ types_no_prompt,
+ yes, force);
}
#ifdef __linux__
diff --git a/lib/device/dev-type.h b/lib/device/dev-type.h
index 284280e..b1520ee 100644
--- a/lib/device/dev-type.h
+++ b/lib/device/dev-type.h
@@ -60,8 +60,12 @@ int dev_is_swap(struct device *dev, uint64_t *signature);
int dev_is_luks(struct device *dev, uint64_t *signature);
/* Signature wiping. */
+#define TYPE_LVM1_MEMBER 0x001
+#define TYPE_LVM2_MEMBER 0x002
+#define TYPE_DM_SNAPSHOT_COW 0x004
int wipe_known_signatures(struct cmd_context *cmd, struct device *dev, const char *name,
- int exclude_lvm_member, int yes, force_t force);
+ uint32_t types_to_exclude, uint32_t types_no_prompt,
+ int yes, force_t force);
/* Type-specific device properties */
unsigned long dev_md_stripe_width(struct dev_types *dt, struct device *dev);
diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c
index f45c89f..66f3bd7 100644
--- a/lib/metadata/lv_manip.c
+++ b/lib/metadata/lv_manip.c
@@ -5448,7 +5448,9 @@ int wipe_lv(struct logical_volume *lv, struct wipe_params wp)
if (wp.do_wipe_signatures) {
log_verbose("Wiping known signatures on logical volume \"%s/%s\"",
lv->vg->name, lv->name);
- if (!wipe_known_signatures(lv->vg->cmd, dev, name, 0, wp.yes, wp.force))
+ if (!wipe_known_signatures(lv->vg->cmd, dev, name, 0,
+ TYPE_DM_SNAPSHOT_COW,
+ wp.yes, wp.force))
stack;
}
diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c
index 4d4778b..e4e1771 100644
--- a/lib/metadata/metadata.c
+++ b/lib/metadata/metadata.c
@@ -1372,7 +1372,9 @@ static int pvcreate_check(struct cmd_context *cmd, const char *name,
goto bad;
}
- if (!wipe_known_signatures(cmd, dev, name, 1, pp->yes, pp->force)) {
+ if (!wipe_known_signatures(cmd, dev, name,
+ TYPE_LVM1_MEMBER | TYPE_LVM2_MEMBER,
+ 0, pp->yes, pp->force)) {
log_error("Aborting pvcreate on %s.", name);
goto bad;
}
--
1.9.0
|
