3:07 a.m.
A NEW API blkid.
It can print the device attributes.
Use it after list-devices, we can list ower devices and the attributes
of each device.
Use it like:
blkid <device>
It's should be a usefull function.
Signed-off-by: Wanlong Gao <gaowanlong(a)cn.fujitsu.com>
---
daemon/blkid.c | 75 ++++++++++++++++++++++++++++++++++++++++
generator/generator_actions.ml | 38 ++++++++++++++++++++
src/MAX_PROC_NR | 2 +-
3 files changed, 114 insertions(+), 1 deletions(-)
diff --git a/daemon/blkid.c b/daemon/blkid.c
index 6d395c1..a7fd6bc 100644
--- a/daemon/blkid.c
+++ b/daemon/blkid.c
@@ -83,3 +83,78 @@ do_vfs_uuid (const char *device)
{
return get_blkid_tag (device, "UUID");
}
+
+char **
+do_blkid(const char *device)
+{
+ int r;
+ char *out = NULL, *err = NULL;
+ char **lines = NULL;
+
+ char **ret = NULL;
+ int size = 0, alloc = 0;
+
+ const char *blkid[] = {"blkid", "-p", "-i",
"-o", "export", device, NULL};
+ r = commandv(&out, &err, blkid);
+ if (r == -1) {
+ reply_with_error("%s", err);
+ goto error;
+ }
+
+ /* Split the command output into lines */
+ lines = split_lines(out);
+ if (lines == NULL) {
+ reply_with_perror("malloc");
+ goto error;
+ }
+
+ /* Parse the output of blkid -p -i -o export:
+ * UUID=b6d83437-c6b4-4bf0-8381-ef3fc3578590
+ * VERSION=1.0
+ * TYPE=ext2
+ * USAGE=filesystem
+ * MINIMUM_IO_SIZE=512
+ * PHYSICAL_SECTOR_SIZE=512
+ * LOGICAL_SECTOR_SIZE=512
+ * PART_ENTRY_SCHEME=dos
+ * PART_ENTRY_TYPE=0x83
+ * PART_ENTRY_NUMBER=6
+ * PART_ENTRY_OFFSET=642875153
+ * PART_ENTRY_SIZE=104857600
+ * PART_ENTRY_DISK=8:0
+ */
+ for (char **i = lines; *i != NULL; i++) {
+ char *line = *i;
+
+ /* Skip blank lines (shouldn't happen) */
+ if (line[0] == '\0') continue;
+
+ /* Split the line in 2 at the equals sign */
+ char *eq = strchr(line, '=');
+ if (eq) {
+ *eq = '\0'; eq++;
+
+ /* Add the key/value pair to the output */
+ if (add_string(&ret, &size, &alloc, line) == -1 ||
+ add_string(&ret, &size, &alloc, eq) == -1) goto error;
+ } else {
+ fprintf(stderr, "blkid: unexpected blkid output ignored: %s", line);
+ }
+ }
+
+ free(out);
+ free(err);
+ free(lines);
+
+ if (add_string(&ret, &size, &alloc, NULL) == -1) return NULL;
+
+ return ret;
+
+error:
+ free(out);
+ free(err);
+ if (lines) free(lines);
+ if (ret) free_strings(ret);
+
+ return NULL;
+}
diff --git a/generator/generator_actions.ml b/generator/generator_actions.ml
index 0e39e2f..55e8d5d 100644
--- a/generator/generator_actions.ml
+++ b/generator/generator_actions.ml
@@ -6538,6 +6538,44 @@ The name of the MD device.
This command deactivates the MD array named C<md>. The
device is stopped, but it is not destroyed or zeroed.");
+ ("blkid", (RHashtable "info", [Device "device"], []),
303, [],
+ [InitScratchFS, Always, TestOutputHashtable (
+ [["blkid"; "/dev/sdb1"]],
+ ["TYPE", "ext2";
+ "USAGE", "filesystem";
+ "PART_ENTRY_NUMBER", "1";
+ "PART_ENTRY_TYPE", "0x83";
+ "PART_ENTRY_OFFSET", "128";
+ "PART_ENTRY_SIZE", "102145"])],
+ "print block device attributes",
+ "\
+This command returns block device attributes for C<device>. The following fields
are
+usually present in the returned hash. Other fields may also be present.
+
+=over
+
+=item C<UUID>
+
+The uuid of this device.
+
+=item C<LABEL>
+
+The label of this device.
+
+=item C<VERSION>
+
+The version of blkid command.
+
+=item C<TYPE>
+
+The filesystem type or RAID of this device.
+
+=item C<USAGE>
+
+The usage of this device, for example C<filesystem> or C<raid>.
+
+=back");
+
]
let all_functions = non_daemon_functions @ daemon_functions
diff --git a/src/MAX_PROC_NR b/src/MAX_PROC_NR
index 274f714..8160622 100644
--- a/src/MAX_PROC_NR
+++ b/src/MAX_PROC_NR
@@ -1 +1 @@
-302
+303
--
1.7.8.rc4