Following Pavel's suggestion to make uuid command I implemented probe
command similar to grub-probe
--
Regards
Vladimir 'phcoder' Serbinenko
diff --git a/ChangeLog b/ChangeLog
index 34c5bc1..f22780f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2009-06-08 Vladimir Serbinenko <phco...@gmail.com>
+
+ probe command
+
+ * commands/probe.c: new file
+ * conf/common.rmk (pkglib_MODULES): add probe.mod
+ (probe_mod_SOURCES): new variable
+ (probe_mod_CFLAGS): likewise
+ (probe_mod_LDFLAGS): likewise
+ * conf/i386-coreboot.rmk (grub_emu_SOURCES): add commands/probe.c
+ * conf/i386-ieee1275.rmk: likewise
+ * conf/i386-pc.rmk: likewise
+ * conf/powerpc-ieee1275.rmk: likewise
+ * conf/sparc64-ieee1275.rmk: likewise
+
2009-06-09 Oliver Henshaw <oliver.hens...@gmail.com>
* bus/usb/ohci.c (grub_ohci_pci_iter): Link struct only after
diff --git a/commands/probe.c b/commands/probe.c
new file mode 100644
index 0000000..788755d
--- /dev/null
+++ b/commands/probe.c
@@ -0,0 +1,160 @@
+/*
+ * GRUB -- GRand Unified Bootloader
+ * Copyright (C) 2009 Free Software Foundation, Inc.
+ *
+ * GRUB is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GRUB is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GRUB. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <grub/types.h>
+#include <grub/misc.h>
+#include <grub/mm.h>
+#include <grub/err.h>
+#include <grub/dl.h>
+#include <grub/device.h>
+#include <grub/disk.h>
+#include <grub/partition.h>
+#include <grub/net.h>
+#include <grub/fs.h>
+#include <grub/file.h>
+#include <grub/misc.h>
+#include <grub/env.h>
+#include <grub/extcmd.h>
+
+static const struct grub_arg_option options[] =
+ {
+ {"target", 't', 0,
+ "print filesystem module, partition map module, "
+ "disk provider, UUID or label [default=fs]\n",
+ "(fs|fs_label|fs_uuid|partmap|provider)", ARG_TYPE_STRING},
+ {"set", 's', GRUB_ARG_OPTION_OPTIONAL,
+ "set a variable to return value", "VAR", ARG_TYPE_STRING},
+ {0, 0, 0, 0, 0, 0}
+ };
+
+static grub_err_t
+grub_cmd_probe (grub_extcmd_t cmd,
+ int argc, char **args)
+{
+ struct grub_arg_list *state = cmd->state;
+ grub_device_t dev;
+ grub_fs_t fs;
+ char *ptr;
+ grub_err_t err;
+
+ if (argc < 1)
+ return grub_error (GRUB_ERR_BAD_ARGUMENT, "device name required");
+
+ ptr = args[0] + grub_strlen (args[0]) - 1;
+ if (args[0][0] == '(' && *ptr == ')')
+ {
+ *ptr = 0;
+ dev = grub_device_open (args[0] + 1);
+ *ptr =')';
+ }
+ else
+ dev = grub_device_open (args[0]);
+ if (! dev)
+ return grub_error (GRUB_ERR_BAD_DEVICE, "couldn't open device");
+
+ if (grub_strcmp (state[0].arg, "provider") == 0)
+ {
+ const char *val = "none";
+ if (dev->net)
+ val = dev->net->dev->name;
+ if (dev->disk)
+ val = dev->disk->dev->name;
+ if (state[1].set)
+ grub_env_set (state[1].arg, val);
+ else
+ grub_printf ("%s", val);
+ return GRUB_ERR_NONE;
+ }
+ if (grub_strcmp (state[0].arg, "partmap") == 0)
+ {
+ const char *val = "none";
+ if (dev->disk && dev->disk->partition)
+ val = dev->disk->partition->partmap->name;
+ if (state[1].set)
+ grub_env_set (state[1].arg, val);
+ else
+ grub_printf ("%s", val);
+ return GRUB_ERR_NONE;
+ }
+ fs = grub_fs_probe (dev);
+ if (! fs)
+ return grub_error (GRUB_ERR_UNKNOWN_FS, "unrecognised fs");
+ if (grub_strcmp (state[0].arg, "fs") == 0)
+ {
+ if (state[1].set)
+ grub_env_set (state[1].arg, fs->name);
+ else
+ grub_printf ("%s", fs->name);
+ return GRUB_ERR_NONE;
+ }
+ if (grub_strcmp (state[0].arg, "fs_uuid") == 0)
+ {
+ char *uuid;
+ if (! fs->uuid)
+ return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
+ "uuid for this FS isn't supported yet");
+ err = fs->uuid (dev, &uuid);
+ if (err)
+ return err;
+ if (! uuid)
+ return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
+ "uuid for this FS isn't supported yet");
+
+ if (state[1].set)
+ grub_env_set (state[1].arg, uuid);
+ else
+ grub_printf ("%s", uuid);
+ grub_free (uuid);
+ return GRUB_ERR_NONE;
+ }
+ if (grub_strcmp (state[0].arg, "fs_label") == 0)
+ {
+ char *label;
+ if (! fs->label)
+ return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
+ "label for this FS isn't supported yet");
+ err = fs->label (dev, &label);
+ if (err)
+ return err;
+ if (! label)
+ return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
+ "uuid for this FS isn't supported yet");
+
+ if (state[1].set)
+ grub_env_set (state[1].arg, label);
+ else
+ grub_printf ("%s", label);
+ grub_free (label);
+ return GRUB_ERR_NONE;
+ }
+ return grub_error (GRUB_ERR_BAD_ARGUMENT, "unrecognised target");
+}
+
+static grub_extcmd_t cmd;
+
+GRUB_MOD_INIT(probe)
+{
+ cmd = grub_register_extcmd ("probe", grub_cmd_probe, GRUB_COMMAND_FLAG_BOTH,
+ "probe [--target=target] [DEVICE]",
+ "Retrieve device info.", options);
+}
+
+GRUB_MOD_FINI(probe)
+{
+ grub_unregister_extcmd (cmd);
+}
diff --git a/conf/common.rmk b/conf/common.rmk
index 9780341..b75f50e 100644
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -354,7 +354,7 @@ pkglib_MODULES += minicmd.mod extcmd.mod hello.mod handler.mod \
terminfo.mod test.mod blocklist.mod hexdump.mod \
read.mod sleep.mod loadenv.mod crc.mod parttool.mod \
pcpart.mod memrw.mod boot.mod normal.mod sh.mod lua.mod \
- gptsync.mod true.mod
+ gptsync.mod true.mod probe.mod
# For gptsync.mod.
gptsync_mod_SOURCES = commands/gptsync.c
@@ -491,6 +491,11 @@ true_mod_SOURCES = commands/true.c
true_mod_CFLAGS = $(COMMON_CFLAGS)
true_mod_LDFLAGS = $(COMMON_LDFLAGS)
+# For probe.mod.
+probe_mod_SOURCES = commands/probe.c
+probe_mod_CFLAGS = $(COMMON_CFLAGS)
+probe_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
# For normal.mod.
normal_mod_SOURCES = normal/main.c normal/cmdline.c normal/dyncmd.c \
normal/autofs.c normal/handler.c \
@@ -585,3 +590,4 @@ gzio_mod_LDFLAGS = $(COMMON_LDFLAGS)
bufio_mod_SOURCES = io/bufio.c
bufio_mod_CFLAGS = $(COMMON_CFLAGS)
bufio_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
diff --git a/conf/i386-coreboot.rmk b/conf/i386-coreboot.rmk
index 2f768c0..f2e0dc6 100644
--- a/conf/i386-coreboot.rmk
+++ b/conf/i386-coreboot.rmk
@@ -61,7 +61,7 @@ grub_emu_SOURCES = commands/minicmd.c commands/cat.c commands/cmp.c \
commands/configfile.c commands/echo.c commands/help.c \
commands/handler.c commands/ls.c commands/test.c \
commands/search.c commands/blocklist.c commands/hexdump.c \
- commands/gptsync.c \
+ commands/gptsync.c commands/probe.c \
lib/hexdump.c commands/i386/cpuid.c \
disk/host.c disk/loopback.c \
\
diff --git a/conf/i386-ieee1275.rmk b/conf/i386-ieee1275.rmk
index 961e616..817a266 100644
--- a/conf/i386-ieee1275.rmk
+++ b/conf/i386-ieee1275.rmk
@@ -61,7 +61,7 @@ grub_emu_SOURCES = commands/minicmd.c commands/cat.c commands/cmp.c \
commands/handler.c commands/ls.c commands/test.c \
commands/search.c commands/blocklist.c commands/hexdump.c \
lib/hexdump.c commands/halt.c commands/reboot.c \
- commands/gptsync.c commands/i386/cpuid.c \
+ commands/gptsync.c commands/probe.c commands/i386/cpuid.c \
disk/host.c disk/loopback.c \
\
fs/affs.c fs/cpio.c fs/fat.c fs/ext2.c fs/hfs.c \
diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index 0af07f9..e9496f6 100644
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -127,7 +127,7 @@ grub_emu_SOURCES = commands/minicmd.c commands/cat.c commands/cmp.c \
commands/handler.c commands/ls.c commands/test.c \
commands/search.c commands/blocklist.c commands/hexdump.c \
lib/hexdump.c commands/i386/pc/halt.c commands/reboot.c \
- commands/gptsync.c commands/i386/cpuid.c \
+ commands/gptsync.c commands/probe.c commands/i386/cpuid.c \
disk/host.c disk/loopback.c disk/scsi.c \
fs/fshelp.c \
\
diff --git a/conf/powerpc-ieee1275.rmk b/conf/powerpc-ieee1275.rmk
index 8b5be2b..b8a0309 100644
--- a/conf/powerpc-ieee1275.rmk
+++ b/conf/powerpc-ieee1275.rmk
@@ -45,7 +45,7 @@ grub_emu_SOURCES = commands/minicmd.c commands/cat.c commands/cmp.c \
commands/search.c commands/handler.c commands/test.c \
commands/ls.c commands/blocklist.c commands/hexdump.c \
lib/hexdump.c commands/halt.c commands/reboot.c \
- commands/gptsync.c \
+ commands/gptsync.c commands/probe.c \
disk/loopback.c \
\
fs/affs.c fs/cpio.c fs/fat.c fs/ext2.c fs/hfs.c \
diff --git a/conf/sparc64-ieee1275.rmk b/conf/sparc64-ieee1275.rmk
index d16501b..5700937 100644
--- a/conf/sparc64-ieee1275.rmk
+++ b/conf/sparc64-ieee1275.rmk
@@ -101,6 +101,7 @@ grub_emu_SOURCES = commands/boot.c commands/cat.c commands/cmp.c \
commands/configfile.c commands/help.c \
commands/search.c commands/handler.c commands/test.c \
commands/ls.c commands/blocklist.c commands/hexdump.c \
+ commands/probe.c \
lib/hexdump.c commands/halt.c commands/reboot.c \
disk/loopback.c \
\
_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
http://lists.gnu.org/mailman/listinfo/grub-devel
