-
Notifications
You must be signed in to change notification settings - Fork 493
/
0017-gpt-add-search-by-disk-uuid-command.patch
277 lines (263 loc) · 9.1 KB
/
0017-gpt-add-search-by-disk-uuid-command.patch
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
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
From a4ecd2c5ff6cb23af51977a622dca5fc2a9b7cef Mon Sep 17 00:00:00 2001
From: Alex Crawford <alex.crawford@coreos.com>
Date: Mon, 31 Aug 2015 15:15:48 -0700
Subject: [PATCH] gpt: add search by disk uuid command
[markubo: Update to grub-2.06-42.amzn2022. Search functions take a more
general search_flags parameter now instead of a no_floppy flag.]
Signed-off-by: Markus Boehme <markubo@amazon.com>
---
Makefile.util.def | 1 +
grub-core/Makefile.core.def | 5 ++++
grub-core/commands/search.c | 28 +++++++++++++++++++++--
grub-core/commands/search_disk_uuid.c | 5 ++++
grub-core/commands/search_wrap.c | 5 ++++
grub-core/lib/gpt.c | 21 +++++++++++++++++
include/grub/gpt_partition.h | 4 ++++
include/grub/search.h | 3 +++
tests/gpt_unit_test.c | 33 +++++++++++++++++++++++++++
9 files changed, 103 insertions(+), 2 deletions(-)
create mode 100644 grub-core/commands/search_disk_uuid.c
diff --git a/Makefile.util.def b/Makefile.util.def
index 8f74405..33ce60d 100644
--- a/Makefile.util.def
+++ b/Makefile.util.def
@@ -1408,6 +1408,7 @@ program = {
common = tests/lib/unit_test.c;
common = grub-core/commands/search_part_label.c;
common = grub-core/commands/search_part_uuid.c;
+ common = grub-core/commands/search_disk_uuid.c;
common = grub-core/disk/host.c;
common = grub-core/kern/emu/hostfs.c;
common = grub-core/lib/gpt.c;
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
index 3cde624..3096cd4 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -1162,6 +1162,11 @@ module = {
common = commands/search_part_label.c;
};
+module = {
+ name = search_disk_uuid;
+ common = commands/search_disk_uuid.c;
+};
+
module = {
name = setpci;
common = commands/setpci.c;
diff --git a/grub-core/commands/search.c b/grub-core/commands/search.c
index bb0c7cb..ec03c75 100644
--- a/grub-core/commands/search.c
+++ b/grub-core/commands/search.c
@@ -30,7 +30,8 @@
#include <grub/i18n.h>
#include <grub/disk.h>
#include <grub/partition.h>
-#if defined(DO_SEARCH_PART_UUID) || defined(DO_SEARCH_PART_LABEL)
+#if defined(DO_SEARCH_PART_UUID) || defined(DO_SEARCH_PART_LABEL) || \
+ defined(DO_SEARCH_DISK_UUID)
#include <grub/gpt_partition.h>
#endif
@@ -88,7 +89,7 @@ iterate_device (const char *name, void *data)
grub_device_close (dev);
}
-#ifdef DO_SEARCH_FS_UUID
+#if defined(DO_SEARCH_FS_UUID) || defined(DO_SEARCH_DISK_UUID)
#define compare_fn grub_strcasecmp
#else
#define compare_fn grub_strcmp
@@ -128,6 +129,25 @@ iterate_device (const char *name, void *data)
grub_free (quid);
}
+ grub_device_close (dev);
+ }
+ }
+#elif defined(DO_SEARCH_DISK_UUID)
+ {
+ grub_device_t dev;
+ char *quid;
+
+ dev = grub_device_open (name);
+ if (dev)
+ {
+ if (grub_gpt_disk_uuid (dev, &quid) == GRUB_ERR_NONE)
+ {
+ if (grub_strcmp (quid, ctx->key) == 0)
+ found = 1;
+
+ grub_free (quid);
+ }
+
grub_device_close (dev);
}
}
@@ -379,6 +399,8 @@ GRUB_MOD_INIT(search_part_uuid)
GRUB_MOD_INIT(search_part_label)
#elif defined (DO_SEARCH_FS_UUID)
GRUB_MOD_INIT(search_fs_uuid)
+#elif defined (DO_SEARCH_DISK_UUID)
+GRUB_MOD_INIT(search_disk_uuid)
#else
GRUB_MOD_INIT(search_label)
#endif
@@ -397,6 +419,8 @@ GRUB_MOD_FINI(search_part_uuid)
GRUB_MOD_FINI(search_part_label)
#elif defined (DO_SEARCH_FS_UUID)
GRUB_MOD_FINI(search_fs_uuid)
+#elif defined (DO_SEARCH_DISK_UUID)
+GRUB_MOD_FINI(search_disk_uuid)
#else
GRUB_MOD_FINI(search_label)
#endif
diff --git a/grub-core/commands/search_disk_uuid.c b/grub-core/commands/search_disk_uuid.c
new file mode 100644
index 0000000..fba96f6
--- /dev/null
+++ b/grub-core/commands/search_disk_uuid.c
@@ -0,0 +1,5 @@
+#define DO_SEARCH_DISK_UUID 1
+#define FUNC_NAME grub_search_disk_uuid
+#define COMMAND_NAME "search.disk_uuid"
+#define HELP_MESSAGE N_("Search devices by disk UUID. If VARIABLE is specified, the first device found is set to a variable.")
+#include "search.c"
diff --git a/grub-core/commands/search_wrap.c b/grub-core/commands/search_wrap.c
index 82f8e63..c8152b1 100644
--- a/grub-core/commands/search_wrap.c
+++ b/grub-core/commands/search_wrap.c
@@ -40,6 +40,8 @@ static const struct grub_arg_option options[] =
0, 0},
{"part-uuid", 'U', 0, N_("Search devices by a partition UUID."),
0, 0},
+ {"disk-uuid", 'U', 0, N_("Search devices by a disk UUID."),
+ 0, 0},
{"set", 's', GRUB_ARG_OPTION_OPTIONAL,
N_("Set a variable to the first device found."), N_("VARNAME"),
ARG_TYPE_STRING},
@@ -78,6 +80,7 @@ enum options
SEARCH_FS_UUID,
SEARCH_PART_LABEL,
SEARCH_PART_UUID,
+ SEARCH_DISK_UUID,
SEARCH_SET,
SEARCH_NO_FLOPPY,
SEARCH_EFIDISK_ONLY,
@@ -203,6 +206,8 @@ grub_cmd_search (grub_extcmd_context_t ctxt, int argc, char **args)
grub_search_part_label (id, var, flags, hints, nhints);
else if (state[SEARCH_PART_UUID].set)
grub_search_part_uuid (id, var, flags, hints, nhints);
+ else if (state[SEARCH_DISK_UUID].set)
+ grub_search_disk_uuid (id, var, flags, hints, nhints);
else if (state[SEARCH_FILE].set)
grub_search_fs_file (id, var, flags, hints, nhints);
else
diff --git a/grub-core/lib/gpt.c b/grub-core/lib/gpt.c
index aedc4f7..e162baf 100644
--- a/grub-core/lib/gpt.c
+++ b/grub-core/lib/gpt.c
@@ -108,6 +108,27 @@ grub_gpt_part_uuid (grub_device_t device, char **uuid)
return GRUB_ERR_NONE;
}
+grub_err_t
+grub_gpt_disk_uuid (grub_device_t device, char **uuid)
+{
+ grub_gpt_t gpt = grub_gpt_read (device->disk);
+ if (!gpt)
+ goto done;
+
+ grub_errno = GRUB_ERR_NONE;
+
+ if (gpt->status & GRUB_GPT_PRIMARY_HEADER_VALID)
+ *uuid = grub_gpt_guid_to_str (&gpt->primary.guid);
+ else if (gpt->status & GRUB_GPT_BACKUP_HEADER_VALID)
+ *uuid = grub_gpt_guid_to_str (&gpt->backup.guid);
+ else
+ grub_errno = grub_error (GRUB_ERR_BUG, "No valid GPT header");
+
+done:
+ grub_gpt_free (gpt);
+ return grub_errno;
+}
+
static grub_uint64_t
grub_gpt_size_to_sectors (grub_gpt_t gpt, grub_size_t size)
{
diff --git a/include/grub/gpt_partition.h b/include/grub/gpt_partition.h
index 1eb2f7b..16fdd7f 100644
--- a/include/grub/gpt_partition.h
+++ b/include/grub/gpt_partition.h
@@ -232,4 +232,8 @@ grub_err_t grub_gpt_part_label (grub_device_t device, char **label);
* The uuid is in a new buffer and should be freed by the caller. */
grub_err_t grub_gpt_part_uuid (grub_device_t device, char **uuid);
+/* Return the disk uuid of the device DEVICE in UUID.
+ * The uuid is in a new buffer and should be freed by the caller. */
+grub_err_t grub_gpt_disk_uuid (grub_device_t device, char **uuid);
+
#endif /* ! GRUB_GPT_PARTITION_HEADER */
diff --git a/include/grub/search.h b/include/grub/search.h
index 66722a6..a5f56b2 100644
--- a/include/grub/search.h
+++ b/include/grub/search.h
@@ -40,5 +40,8 @@ void grub_search_part_uuid (const char *key, const char *var,
void grub_search_part_label (const char *key, const char *var,
enum search_flags flags,
char **hints, unsigned nhints);
+void grub_search_disk_uuid (const char *key, const char *var,
+ enum search_flags flags,
+ char **hints, unsigned nhints);
#endif
diff --git a/tests/gpt_unit_test.c b/tests/gpt_unit_test.c
index 7a1af46..60f6017 100644
--- a/tests/gpt_unit_test.c
+++ b/tests/gpt_unit_test.c
@@ -614,6 +614,37 @@ search_part_uuid_test (void)
close_disk (&data);
}
+static void
+search_disk_uuid_test (void)
+{
+ struct test_data data;
+ const char disk_uuid[] = "69c131ad-67d6-46c6-93c4-124c755256ac";
+ const char bogus_uuid[] = "1534c928-c50e-4866-9daf-6a9fd7918a76";
+ const char *test_result;
+ char *expected_result;
+
+ open_disk (&data);
+
+ expected_result = grub_xasprintf ("%s", data.dev->disk->name);
+ grub_env_unset ("test_result");
+ grub_search_disk_uuid (disk_uuid, "test_result", 0, NULL, 0);
+ test_result = grub_env_get ("test_result");
+ grub_test_assert (test_result && strcmp (test_result, expected_result) == 0,
+ "wrong device: %s (%s)", test_result, expected_result);
+ grub_free (expected_result);
+
+ grub_env_unset ("test_result");
+ grub_search_disk_uuid (bogus_uuid, "test_result", 0, NULL, 0);
+ test_result = grub_env_get ("test_result");
+ grub_test_assert (test_result == NULL,
+ "unexpected device: %s", test_result);
+ grub_test_assert (grub_errno == GRUB_ERR_FILE_NOT_FOUND,
+ "unexpected error: %s", grub_errmsg);
+ grub_errno = GRUB_ERR_NONE;
+
+ close_disk (&data);
+}
+
void
grub_unit_test_init (void)
{
@@ -628,6 +659,7 @@ grub_unit_test_init (void)
grub_test_register ("gpt_repair_test", repair_test);
grub_test_register ("gpt_search_part_label_test", search_part_label_test);
grub_test_register ("gpt_search_uuid_test", search_part_uuid_test);
+ grub_test_register ("gpt_search_disk_uuid_test", search_disk_uuid_test);
}
void
@@ -641,5 +673,6 @@ grub_unit_test_fini (void)
grub_test_unregister ("gpt_repair_test");
grub_test_unregister ("gpt_search_part_label_test");
grub_test_unregister ("gpt_search_part_uuid_test");
+ grub_test_unregister ("gpt_search_disk_uuid_test");
grub_fini_all ();
}
--
2.36.1