--- mllib/Makefile.am | 3 +++ mllib/dev_t-c.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ mllib/dev_t.ml | 21 +++++++++++++++++++++ mllib/dev_t.mli | 28 ++++++++++++++++++++++++++++ 4 files changed, 104 insertions(+) create mode 100644 mllib/dev_t-c.c create mode 100644 mllib/dev_t.ml create mode 100644 mllib/dev_t.mli diff --git a/mllib/Makefile.am b/mllib/Makefile.am index 25f0081..5e30755 100644 --- a/mllib/Makefile.am +++ b/mllib/Makefile.am @@ -28,6 +28,7 @@ CLEANFILES = *~ *.annot *.cmi *.cmo *.cmx *.cmxa *.o SOURCES_MLI = \ common_utils.mli \ + dev_t.mli \ fsync.mli \ JSON.mli \ mkdtemp.mli \ @@ -40,6 +41,7 @@ SOURCES_ML = \ guestfs_config.ml \ libdir.ml \ common_gettext.ml \ + dev_t.ml \ common_utils.ml \ fsync.ml \ progress.ml \ @@ -52,6 +54,7 @@ SOURCES_ML = \ SOURCES_C = \ ../fish/progress.c \ ../fish/uri.c \ + dev_t-c.c \ fsync-c.c \ mkdtemp-c.c \ progress-c.c \ diff --git a/mllib/dev_t-c.c b/mllib/dev_t-c.c new file mode 100644 index 0000000..036b60d --- /dev/null +++ b/mllib/dev_t-c.c @@ -0,0 +1,52 @@ +/* libguestfs OCaml tools common code + * Copyright (C) 2016 Red Hat Inc. + * + * This program 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 2 of the License, or + * (at your option) any later version. + * + * This program 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 this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include <config.h> + +#include <stdio.h> +#include <stdlib.h> +#include <sys/types.h> + +#include <caml/mlvalues.h> + +/* OCaml doesn't bind the dev_t calls makedev, major and minor. */ + +extern value guestfs_int_mllib_dev_t_makedev (value majv, value minv); +extern value guestfs_int_mllib_dev_t_major (value devv); +extern value guestfs_int_mllib_dev_t_minor (value devv); + +/* NB: This is a "noalloc" call. */ +value +guestfs_int_mllib_dev_t_makedev (value majv, value minv) +{ + return Val_int (makedev (Int_val (majv), Int_val (minv))); +} + +/* NB: This is a "noalloc" call. */ +value +guestfs_int_mllib_dev_t_major (value devv) +{ + return Val_int (major (Int_val (devv))); +} + +/* NB: This is a "noalloc" call. */ +value +guestfs_int_mllib_dev_t_minor (value devv) +{ + return Val_int (minor (Int_val (devv))); +} diff --git a/mllib/dev_t.ml b/mllib/dev_t.ml new file mode 100644 index 0000000..143954a --- /dev/null +++ b/mllib/dev_t.ml @@ -0,0 +1,21 @@ +(* libguestfs OCaml tools common code + * Copyright (C) 2016 Red Hat Inc. + * + * This program 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 2 of the License, or + * (at your option) any later version. + * + * This program 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 this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + *) + +external makedev : int -> int -> int = "guestfs_int_mllib_dev_t_makedev" "noalloc" +external major : int -> int = "guestfs_int_mllib_dev_t_major" "noalloc" +external minor : int -> int = "guestfs_int_mllib_dev_t_minor" "noalloc" diff --git a/mllib/dev_t.mli b/mllib/dev_t.mli new file mode 100644 index 0000000..340ead0 --- /dev/null +++ b/mllib/dev_t.mli @@ -0,0 +1,28 @@ +(* virt-resize + * Copyright (C) 2016 Red Hat Inc. + * + * This program 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 2 of the License, or + * (at your option) any later version. + * + * This program 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 this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + *) + +(** Bindings for [dev_t] related functions [makedev], [major] and [minor]. *) + +val makedev : int -> int -> int +(** makedev(3) *) + +val major : int -> int +(** major(3) *) + +val minor : int -> int +(** minor(3) *) -- 2.7.4

But allow the warning to be turned off using --no-warn-if-partition. Ming Xie tried to create a bootable USB key using 'virt-p2v-make-disk -o /dev/sdX1'. That works, but doesn't create a bootable key because it puts everything into the first partition. Emit a warning if someone tries to do this to try to prevent user error: virt-builder: warning: output device (/dev/sdb1) is a partition. If you are writing to a USB key or external drive then you probably need to write to the whole device, not to a partition. If this warning is wrong then you can disable it with --no-warn-if-partition --- builder/builder.ml | 9 +++++++++ builder/cmdline.ml | 6 ++++++ builder/cmdline.mli | 1 + builder/virt-builder.pod | 9 +++++++++ 4 files changed, 25 insertions(+) diff --git a/builder/builder.ml b/builder/builder.ml index 3c17ccd..affce10 100644 --- a/builder/builder.ml +++ b/builder/builder.ml @@ -280,6 +280,15 @@ let main () = (* --- If we get here, we want to create a guest. --- *) + (* Warn if the user might be writing to a partition on a USB key. *) + (match cmdline.output with + | Some device when is_partition device -> + if cmdline.warn_if_partition then + warning (f_"output device (%s) is a partition. If you are writing to a USB key or external drive then you probably need to write to the whole device, not to a partition. If this warning is wrong then you can disable it with --no-warn-if-partition") + device; + | Some _ | None -> () + ); + (* Download the template, or it may be in the cache. *) let template = let template, delete_on_exit = diff --git a/builder/cmdline.ml b/builder/cmdline.ml index f872bd4..7b33013 100644 --- a/builder/cmdline.ml +++ b/builder/cmdline.ml @@ -51,6 +51,7 @@ type cmdline = { smp : int option; sources : (string * string) list; sync : bool; + warn_if_partition : bool; } let parse_cmdline () = @@ -115,6 +116,7 @@ let parse_cmdline () = let add_source arg = sources := arg :: !sources in let sync = ref true in + let warn_if_partition = ref true in let argspec = [ "--arch", Arg.Set_string arch, "arch" ^ " " ^ s_"Set the output architecture"; @@ -163,6 +165,8 @@ let parse_cmdline () = "--smp", Arg.Int set_smp, "vcpus" ^ " " ^ s_"Set number of vCPUs"; "--source", Arg.String add_source, "URL" ^ " " ^ s_"Set source URL"; "--no-sync", Arg.Clear sync, " " ^ s_"Do not fsync output file on exit"; + "--no-warn-if-partition", Arg.Clear warn_if_partition, + " " ^ s_"Do not warn if writing to a partition"; ] in let customize_argspec, get_customize_ops = Customize_cmdline.argspec () in let customize_argspec = @@ -212,6 +216,7 @@ read the man page virt-builder(1). let smp = !smp in let sources = List.rev !sources in let sync = !sync in + let warn_if_partition = !warn_if_partition in (* No arguments and machine-readable mode? Print some facts. *) if args = [] && machine_readable then ( @@ -324,4 +329,5 @@ read the man page virt-builder(1). gpg = gpg; list_format = list_format; memsize = memsize; network = network; ops = ops; output = output; size = size; smp = smp; sources = sources; sync = sync; + warn_if_partition = warn_if_partition; } diff --git a/builder/cmdline.mli b/builder/cmdline.mli index 4c201dd..854db61 100644 --- a/builder/cmdline.mli +++ b/builder/cmdline.mli @@ -39,6 +39,7 @@ type cmdline = { smp : int option; sources : (string * string) list; sync : bool; + warn_if_partition : bool; } val parse_cmdline : unit -> cmdline diff --git a/builder/virt-builder.pod b/builder/virt-builder.pod index be5b568..cd3be9d 100644 --- a/builder/virt-builder.pod +++ b/builder/virt-builder.pod @@ -496,6 +496,15 @@ Note that you should not point I<--source> to sources that you don't trust (unless the source is signed by someone you do trust). See also the I<--no-network> option. +=item B<--no-warn-if-partition> + +Do not emit a warning if the output device is a partition. This +warning avoids a common user error when writing to a USB key or +external drive, when you should normally write to the whole device +(S<I<--output /dev/sdX>>), not to a partition on the device +(S<I<--output /dev/sdX1>>). Use this option to I<suppress> this +warning. + =item B<-v> =item B<--verbose> -- 2.7.4