search for: dib_args

Move the make_dib_args helper function to Common_utils as stringify_args, so it can be used also within Common_utils itself. This is mostly code motion. --- dib/dib.ml | 12 +----------- mllib/common_utils.ml | 10 ++++++++++ mllib/common_utils.mli | 4 ++++ 3 files changed, 15 insertions(+), 11 deletions...

Hi, this series start to implement some of the changes needed to support d-i-b 2.0; normal VM distro builds seem to work correctly, ramdisk builds are still broken and require more efforts. Thanks, Pino Toscano (5): dib: implement get_image_element_array stuff dib: export IMAGE_BLOCK_DEVICE_WITHOUT_PART dib: extract get_required_tool out of require_tool dib: require a Python interpreter

...f HAVE_OCAML_PKG_LIBVIRT SUBDIRS += v2v/test-harness endif +if HAVE_FUSE +SUBDIRS += dib +endif endif # Perl tools. diff --git a/dib/dib.ml b/dib/dib.ml index 87af4eb..17775d8 100644 --- a/dib/dib.ml +++ b/dib/dib.ml @@ -69,13 +69,15 @@ let envvars_string l = let prepare_external ~envvars ~dib_args ~dib_vars ~out_name ~root_label ~rootfs_uuid ~image_cache ~arch ~network ~debug - destdir libdir hooksdir tmpdir fakebindir all_elements element_paths = + destdir libdir hooksdir fakebindir all_elements element_paths = let network_string = if network then "" else "1" in...

Move the OCaml binding to C _exit to an own module. Just code motion, adapting v2v in the process. --- docs/C_SOURCE_FILES | 2 +- mllib/Makefile.am | 5 ++++- mllib/exit-c.c | 33 +++++++++++++++++++++++++++++++++ mllib/exit.ml | 19 +++++++++++++++++++ mllib/exit.mli | 20 ++++++++++++++++++++ v2v/Makefile.am | 1 - v2v/changeuid-c.c | 33

...1)) + ) + ) envvars + +let read_dib_envvars () = + let vars = Array.to_list (Unix.environment ()) in + let vars = List.filter (fun x -> string_prefix x "DIB_") vars in + let vars = List.map (fun x -> x ^ "\n") vars in + String.concat "" vars + +let make_dib_args args = + let args = Array.to_list args in + let rec quote_args = function + | [] -> "" + | x :: xs -> " " ^ (quote x) ^ quote_args xs + in + match args with + | [] -> "" + | app :: xs -> app ^ quote_args xs + +let write_script fn text = + let o...

...1)) + ) + ) envvars + +let read_dib_envvars () = + let vars = Array.to_list (Unix.environment ()) in + let vars = List.filter (fun x -> string_prefix x "DIB_") vars in + let vars = List.map (fun x -> x ^ "\n") vars in + String.concat "" vars + +let make_dib_args args = + let args = Array.to_list args in + let rec quote_args = function + | [] -> "" + | x :: xs -> " " ^ (quote x) ^ quote_args xs + in + match args with + | [] -> "" + | app :: xs -> app ^ quote_args xs + +let write_script fn text = + let o...

...1)) + ) + ) envvars + +let read_dib_envvars () = + let vars = Array.to_list (Unix.environment ()) in + let vars = List.filter (fun x -> string_prefix x "DIB_") vars in + let vars = List.map (fun x -> x ^ "\n") vars in + String.concat "" vars + +let make_dib_args args = + let args = Array.to_list args in + let rec quote_args = function + | [] -> "" + | x :: xs -> " " ^ (quote x) ^ quote_args xs + in + match args with + | [] -> "" + | app :: xs -> app ^ quote_args xs + +let write_script fn text = + let o...

...b var (i + 1) (len - i - 1)) + ) + ) envvars + +let read_dib_envvars () = + let vars = Array.to_list (environment ()) in + let vars = List.filter (fun x -> string_prefix x "DIB_") vars in + List.fold_left (fun acc x -> acc ^ x ^ "\n") "" vars + +let make_dib_args args = + let args = Array.to_list args in + let rec quote_args = function + | [] -> "" + | x :: xs -> sprintf " %s" (quote x) ^ quote_args xs + in + match args with + | [] -> "" + | app :: xs -> app ^ quote_args xs + +let write_script fn text =...

...ache; @@ -553,29 +553,32 @@ let main () = function | "qcow2" | "raw" | "vhd" -> true | _ -> false - ) formats in + ) cmdline.formats in let formats_img_nonraw = List.filter ((<>) "raw") formats_img in prepare_aux ~envvars ~dib_args ~dib_vars ~log_file ~out_name:image_basename - ~rootfs_uuid ~arch ~network ~root_label ~install_type ~debug - ~extra_packages - auxtmpdir all_elements; + ~rootfs_uuid ~arch ~network:cmdline.network ~root_label + ~install_type:cmdline.install_type ~debug +...

...ld it be pulled in on all builds? I think you can consider moving these to the respective distro-specific sections of appliance/packagelist.in, and you don't need the comment. However when packaging it for Fedora we'll need to split out the dependencies again. > +let prepare_external ~dib_args ~dib_vars ~out_name ~root_label ~rootfs_uuid > + ~image_cache ~arch ~network ~debug > + destdir libdir hooksdir tmpdir fakebindir all_elements element_paths = > + let network_string = if network then "" else "1" in > + > + let run_extra = sprintf "\ >...

...ring; envvars : string list; checksum : bool; + python : string option; } val parse_cmdline : unit -> cmdline diff --git a/dib/dib.ml b/dib/dib.ml index 1df9aff..ab5481a 100644 --- a/dib/dib.ml +++ b/dib/dib.ml @@ -74,6 +74,7 @@ let envvars_string l = let prepare_external ~envvars ~dib_args ~dib_vars ~out_name ~root_label ~rootfs_uuid ~image_cache ~arch ~network ~debug ~fs_type ~checksum + ~python destdir libdir fakebindir loaded_elements all_elements element_paths = let network_string = if network then "" else "1" in let checksum_string = if checksum...

Hi, this patch series does changes mostly in virt-dib, few bug fixes and a couple of new features (mostly implemented upstream already). In addition, one new API is added, and a new optional argument for an existing API is added (the latter is not needed, but could be useful anyway). Thanks, Pino Toscano (10): dib: fix listing envvars in fake-sudo dib: source dib "die" script in

...ackaging it for Fedora we'll need to > split out the dependencies again. Just wondering if I should resurrect my past idea for different appliances ("flavours") with own sets of extra packages, tailored for specific usages (e.g. rescue, dib, etc). > > +let prepare_external ~dib_args ~dib_vars ~out_name ~root_label ~rootfs_uuid > > + ~image_cache ~arch ~network ~debug > > + destdir libdir hooksdir tmpdir fakebindir all_elements element_paths = > > + let network_string = if network then "" else "1" in > > + > > + let run_extr...

...IB=$mysysroot/tmp/aux/lib -export _PREFIX=$mysysroot/tmp/aux/elements +export _LIB=$mysysroot/tmp/in_target.aux/lib +export _PREFIX=$mysysroot/tmp/in_target.aux/elements export ARCH=%s -export TMP_HOOKS_PATH=$mysysroot/tmp/aux/hooks +export TMP_HOOKS_PATH=$mysysroot/tmp/in_target.aux/hooks export DIB_ARGS=\"%s\" -export DIB_MANIFEST_SAVE_DIR=\"$mysysroot/tmp/aux/out/${IMAGE_NAME}.d\" +export DIB_MANIFEST_SAVE_DIR=\"$mysysroot/tmp/in_target.aux/out/${IMAGE_NAME}.d\" export IMAGE_BLOCK_DEVICE=$blockdev export IMAGE_ELEMENT=\"%s\" export DIB_ENV=%s @@ -204,11...

The real sudo does it as well, and leaving them when preserving the environment (-E) maybe breaks the applications, as e.g. chroot will have a TMPDIR path pointing outside of it. --- dib/dib.ml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dib/dib.ml b/dib/dib.ml index df83ba1..d15cd19 100644 --- a/dib/dib.ml +++ b/dib/dib.ml @@ -301,6 +301,11 @@ if [ -z \"$preserve_env\" ];

Hi, this series improves virt-dib, adding some upstream changes, and refactoring the handling of output formats. Thanks, Pino Toscano (6): dib: clear up "already provided" message dib: add --checksum dib: pass custom mkfs options after the filesystem type dib: refactor output formats handling dib: clarify "output:" lines in --machine-readable documentation dib:

Add an optional parameter to disable this behaviour, so the Curl module in v2v won't print user-sensible data (like passwords). --- builder/checksums.ml | 1 - builder/downloader.ml | 1 - builder/sigchecker.ml | 1 - mllib/common_utils.ml | 4 +++- mllib/common_utils.mli | 7 +++++-- v2v/curl.ml | 2 +- 6 files changed, 9 insertions(+), 7 deletions(-) diff --git