search for: idbyte

...mp;err, str_sfdisk, param, device, partnum_str, NULL); if (r == -1) { - reply_with_error ("sfdisk --print-id: %s", err); + reply_with_error ("sfdisk %s: %s", param, err); return -1; } @@ -729,6 +755,8 @@ do_part_set_mbr_id (const char *device, int partnum, int idbyte) return -1; } + const char *param = test_sfdisk_has_part_type () ? "--part-type" : "--change-id"; + char partnum_str[16]; snprintf (partnum_str, sizeof partnum_str, "%d", partnum); @@ -741,9 +769,9 @@ do_part_set_mbr_id (const char *device, int partn...

...; - - /* It's printed in hex ... */ - unsigned id; - if (sscanf (out, "%x", &id) != 1) { - reply_with_error ("sfdisk --print-id: cannot parse output: %s", out); - return -1; - } - - return id; -} - int do_part_set_mbr_id (const char *device, int partnum, int idbyte) { diff --git a/daemon/parted.ml b/daemon/parted.ml new file mode 100644 index 000000000..6be41cf66 --- /dev/null +++ b/daemon/parted.ml @@ -0,0 +1,55 @@ +(* guestfs-inspection + * Copyright (C) 2009-2017 Red Hat Inc. + * + * This program is free software; you can redistribute it and/or modify + *...

From: "Richard W.M. Jones" <rjones at redhat.com> This reverts commit a9c8123c72db47bcab8dd738e8d5256a9ae87f11. --- daemon/file.c | 18 +++--------------- daemon/parted.c | 3 +-- 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/daemon/file.c b/daemon/file.c index 057e15d..91746e0 100644 --- a/daemon/file.c +++ b/daemon/file.c @@ -525,7 +525,7 @@

...); /* It's printed in hex ... */ - int id; + unsigned id; if (sscanf (out, "%x", &id) != 1) { reply_with_error ("sfdisk --print-id: cannot parse output: %s", out); return -1; @@ -775,7 +775,8 @@ do_part_set_mbr_id (const char *device, int partnum, int idbyte) snprintf (partnum_str, sizeof partnum_str, "%d", partnum); char idbyte_str[16]; - snprintf (idbyte_str, sizeof partnum_str, "%x", idbyte); /* NB: hex */ + /* NB: hex */ + snprintf (idbyte_str, sizeof partnum_str, "%x", (unsigned) idbyte); CLEANUP_FREE...

...); /* It's printed in hex ... */ - int id; + unsigned id; if (sscanf (out, "%x", &id) != 1) { reply_with_error ("sfdisk --print-id: cannot parse output: %s", out); return -1; @@ -775,7 +775,8 @@ do_part_set_mbr_id (const char *device, int partnum, int idbyte) snprintf (partnum_str, sizeof partnum_str, "%d", partnum); char idbyte_str[16]; - snprintf (idbyte_str, sizeof partnum_str, "%x", idbyte); /* NB: hex */ + /* NB: hex */ + snprintf (idbyte_str, sizeof partnum_str, "%x", (unsigned) idbyte); CLEANUP_FREE...

...c9a84b..01ae91c 100644 --- a/daemon/parted.c +++ b/daemon/parted.c @@ -30,6 +30,7 @@ GUESTFSD_EXT_CMD(str_parted, parted); GUESTFSD_EXT_CMD(str_sfdisk, sfdisk); +GUESTFSD_EXT_CMD(str_sgdisk, sgdisk); /* Notes: * @@ -802,3 +803,131 @@ do_part_set_mbr_id (const char *device, int partnum, int idbyte) return 0; } + +int +do_part_set_gpt_type(const char *device, int partnum, const char *guid) +{ + if (partnum <= 0) { + reply_with_error ("partition number must be >= 1"); + return -1; + } + + char *typecode = NULL; + if (asprintf (&typecode, "%i:%s", p...

I'm currently working on gobject bindings for libguestfs. I haven't got as far as compiling anything yet, but I've attached the C header for initial review. Matt -- Matthew Booth, RHCA, RHCSS Red Hat Engineering, Virtualisation Team GPG ID: D33C3490 GPG FPR: 3733 612D 2D05 5458 8A8A 1600 3441 EA19 D33C 3490 -------------- next part -------------- An embedded and

...param, device, partnum_str, NULL); + r = command (&out, &err, "sfdisk", param, device, partnum_str, NULL); if (r == -1) { reply_with_error ("sfdisk %s: %s", param, err); return -1; @@ -585,7 +581,7 @@ do_part_set_mbr_id (const char *device, int partnum, int idbyte) udev_settle (); - r = command (NULL, &err, str_sfdisk, + r = command (NULL, &err, "sfdisk", param, device, partnum_str, idbyte_str, NULL); if (r == -1) { reply_with_error ("sfdisk %s: %s", param, err); @@ -600,7 +596,7 @@ do_part_set_mbr...

...param, device, partnum_str, NULL); + r = command (&out, &err, "sfdisk", param, device, partnum_str, NULL); if (r == -1) { reply_with_error ("sfdisk %s: %s", param, err); return -1; @@ -585,7 +583,7 @@ do_part_set_mbr_id (const char *device, int partnum, int idbyte) udev_settle (); - r = command (NULL, &err, str_sfdisk, + r = command (NULL, &err, "sfdisk", param, device, partnum_str, idbyte_str, NULL); if (r == -1) { reply_with_error ("sfdisk %s: %s", param, err); @@ -600,7 +598,7 @@ do_part_set_mbr...

...[ InitEmpty, Always, TestResultTrue ( [["part_init"; "/dev/sda"; "mbr"]; @@ -5501,7 +5501,7 @@ See also C<guestfs_part_set_bootable>." }; { defaults with name = "part_get_mbr_id"; added = (1, 3, 2); - style = RInt "idbyte", [Device "device"; Int "partnum"], []; + style = RInt "idbyte", [String (Device, "device"); Int "partnum"], []; fish_output = Some FishOutputHexadecimal; tests = [ InitEmpty, Always, TestResult ( @@ -5521,7 +5521,7 @@ types...

Very large but mechanical change to the generator. Rich.

This is a follow-up to the other generator changes in: https://www.redhat.com/archives/libguestfs/2017-February/msg00217.html Rich.

...ce, partnum_str, NULL); + r = command (&out, &err, str_sfdisk, "--print-id", device, partnum_str, NULL); if (r == -1) { reply_with_error ("sfdisk --print-id: %s", err); free (out); @@ -786,7 +789,7 @@ do_part_set_mbr_id (const char *device, int partnum, int idbyte) udev_settle (); - r = command (NULL, &err, "sfdisk", + r = command (NULL, &err, str_sfdisk, "--change-id", device, partnum_str, idbyte_str, NULL); if (r == -1) { reply_with_error ("sfdisk --change-id: %s", err); diff --git a/da...

Version 1 was here: https://www.redhat.com/archives/libguestfs/2017-June/msg00003.html This patch series reimplements a few more APIs in OCaml, including some very important core APIs like ?list_filesystems? and ?mount?. All the tests pass after this. The selection of APIs that I have moved may look a little random, but in fact they are all APIs consumed by the inspection code (and some more

...ce, partnum_str, NULL); + r = command (&out, &err, str_sfdisk, "--print-id", device, partnum_str, NULL); if (r == -1) { reply_with_error ("sfdisk --print-id: %s", err); free (out); @@ -786,7 +789,7 @@ do_part_set_mbr_id (const char *device, int partnum, int idbyte) udev_settle (); - r = command (NULL, &err, "sfdisk", + r = command (NULL, &err, str_sfdisk, "--change-id", device, partnum_str, idbyte_str, NULL); if (r == -1) { reply_with_error ("sfdisk --change-id: %s", err); diff --git a/da...

This is a simpler patch that removes GUESTFSD_EXT_CMD completely.

Replace GUESTFSD_EXT_CMD with a command line option ‘./guestfsd --print-external-commands’

v2 was here: https://www.redhat.com/archives/libguestfs/2017-June/msg00008.html This series gets as far as a working (and faster) reimplementation of ‘guestfs_list_filesystems’. I also have another patch series on top of this one which reimplements the inspection APIs inside the daemon, but that needs a bit more work still, since inspection turns out to be a very large piece of code. Rich.

I think this fixes everything mentioned: - Added the Optgroups module as suggested. - Remove command temporary files. - Replace command ~flags with ?fold_stdout_on_stderr. - Nest _with_mounted function. - Rebase & retest. Rich.

v1 was posted here: https://www.redhat.com/archives/libguestfs/2017-July/msg00098.html This series now depends on two small patches which I posted separately: https://www.redhat.com/archives/libguestfs/2017-July/msg00207.html https://www.redhat.com/archives/libguestfs/2017-July/msg00209.html v1 -> v2: - Previously changes to generator/daemon.ml were made incrementally through the patch