similar to: OpenGL + DIB

Implement the "squash" output format, i.e. a squashfs compressed filesystem. This was implemented in diskimage-builder upstream as commit 9d13084c4183b63587e1f5e4b03395a8df6538f6. --- dib/Makefile.am | 1 + dib/output_format_squashfs.ml | 39 +++++++++++++++++++++++++++++++++++++++ dib/utils.ml | 1 + dib/virt-dib.pod | 6 ++++++ 4 files

d-i-b 2.0 is written in Python, and thus it passes the information about the interpreter used for it (sys.executable) to the scripts that need it; this mechanism replaces the old discovery of what is the default Python interpreter in the system. Since we are not Python-based, look for 'python' and use it as default interpreter, with the --python command line option to set a different one.

On Wednesday 12 August 2015 10:33:00 John Eckersberg wrote: > If a function name, with its trailing parentheses, is in the > environment , trying to unset it will error out with a message of "not > a valid identifier". In this case, try to unset it again with the -f > option which can handle the parentheses in the supplied identifier. > --- > dib/dib.ml | 2 +- > 1

Hi, trying out Modo302 with Wine 1.0 through Ubuntu 8.04, had some success so far and appears to be working nearly fully accept for two problems we seem to be having. The first is minor, and only appears to effect drop down menu where the entrys are unselectable, which was suggested maybe a Wine focus bug? We can work round this to some degree within Modo by modifying the layout. But the second

Just stylistic change, no functional change. --- dib/dib.ml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dib/dib.ml b/dib/dib.ml index 06a1f67..35ae6b7 100644 --- a/dib/dib.ml +++ b/dib/dib.ml @@ -781,9 +781,8 @@ let main () = ) @ mkfs_options @ [ "-t"; cmdline.fs_type; blockdev ] in ignore (g#debug "sh" (Array.of_list ([ "mkfs" ]

--- dib/Makefile.am | 5 ++- dib/cmdline.ml | 49 +++++++++++++++++++++--- dib/cmdline.mli | 51 +++++++++++++++++++++++++ dib/dib.ml | 113 ++++++++++++++++++++++++++++++-------------------------- 4 files changed, 158 insertions(+), 60 deletions(-) create mode 100644 dib/cmdline.mli diff --git a/dib/Makefile.am b/dib/Makefile.am index 0786d64..ad1fd6a 100644 --- a/dib/Makefile.am +++

When I turned off debug and actually looked at the normal output, this is a bit noisy... [jeckersb@baozi libguestfs]$ ./run virt-dib -B ~/git/diskimage-builder/lib/ --element-path ~/git/diskimage-builder/elements/ fedora-minimal [ 0.0] Elements: base fedora-minimal [ 0.0] Expanded elements: base dib-init-system dib-run-parts fedora-minimal install-types package-installs pkg-map redhat-common

Provided as common options for all the OCaml-based tools. --- builder/virt-builder.pod | 2 ++ dib/virt-dib.pod | 6 ++++++ get-kernel/virt-get-kernel.pod | 6 ++++++ 3 files changed, 14 insertions(+) diff --git a/builder/virt-builder.pod b/builder/virt-builder.pod index fc49d4d..710f006 100644 --- a/builder/virt-builder.pod +++ b/builder/virt-builder.pod @@ -451,6 +451,8 @@

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(-) diff --git a/dib/dib.ml b/dib/dib.ml index b988f14..a76eb5e 100644 ---

Use a common function to remove duplicates in an unsorted list. Just refactoring, with no behaviour change. --- dib/cmdline.ml | 2 +- dib/utils.ml | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/dib/cmdline.ml b/dib/cmdline.ml index 1fd6c71..144e5a7 100644 --- a/dib/cmdline.ml +++ b/dib/cmdline.ml @@ -107,7 +107,7 @@ read the man page virt-dib(1). let formats =

If a function name, with its trailing parentheses, is in the environment , trying to unset it will error out with a message of "not a valid identifier". In this case, try to unset it again with the -f option which can handle the parentheses in the supplied identifier. --- dib/dib.ml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dib/dib.ml b/dib/dib.ml index

If a function name, with its trailing parentheses, is in the environment , trying to unset it will error out with a message of "not a valid identifier". In this case, try to unset it again with the -f option which can handle the parentheses in the supplied identifier. --- dib/dib.ml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dib/dib.ml b/dib/dib.ml index

If a function name, with its trailing parentheses, is in the environment , trying to unset it will error out with a message of "not a valid identifier". Handle this as a special case, and unset it with the -f option which can handle the parentheses in the supplied identifier. --- dib/dib.ml | 1 + 1 file changed, 1 insertion(+) diff --git a/dib/dib.ml b/dib/dib.ml index

--- customize/customize_main.ml | 5 ++--- dib/dib.ml | 5 ++--- resize/resize.ml | 13 ++----------- sysprep/sysprep_operation.ml | 5 +---- 4 files changed, 7 insertions(+), 21 deletions(-) diff --git a/customize/customize_main.ml b/customize/customize_main.ml index e161e82..13d40bc 100644 --- a/customize/customize_main.ml +++ b/customize/customize_main.ml @@

--- dib/dib.ml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dib/dib.ml b/dib/dib.ml index 4a0c9ee..06a1f67 100644 --- a/dib/dib.ml +++ b/dib/dib.ml @@ -467,7 +467,7 @@ let main () = let elements = if cmdline.is_ramdisk then [cmdline.ramdisk_element] @ elements else elements in - message (f_"Elements: %s") (String.concat " "

Query awk for the list of environment variables, instead of trying to extract the list from the output of `env`: the old approach breaks when any of the environment variable contains more than one line. --- dib/dib.ml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dib/dib.ml b/dib/dib.ml index 71b1f7f..54ea2ae 100644 --- a/dib/dib.ml +++ b/dib/dib.ml @@ -289,7 +289,7 @@ if [

Use the new helper for spawning parallel commands, and redirecting their stdout to file. --- dib/dib.ml | 42 ++++++++++-------------------------------- 1 file changed, 10 insertions(+), 32 deletions(-) diff --git a/dib/dib.ml b/dib/dib.ml index 8d078aa..eca47fa 100644 --- a/dib/dib.ml +++ b/dib/dib.ml @@ -980,45 +980,23 @@ let main () = List.iter ( fun fn -> message

I've been using the Max version of the DIB engine for a long time now, and it was always useful because it sped up everything so much. There were of course occasional glitches graphically (noticeably a few font colour issues though these were still less severe than the font color issues without max's engine). Once Huw started work on the new DIB engine that was going to go into the main

Improve the grammar, and the wording, and make few details explicit. No change in the actual content. --- dib/virt-dib.pod | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/dib/virt-dib.pod b/dib/virt-dib.pod index 7083e78..be7550a 100644 --- a/dib/virt-dib.pod +++ b/dib/virt-dib.pod @@ -206,7 +206,7 @@ B<docker>. =item C<qcow2>

This fixes this error I'm hitting when trying to run virt-dib: $ ./run virt-dib -v -x -B ~/git/diskimage-builder/lib/ --element-path ~/git/diskimage-builder/elements/ fedora-minimal [ 0.0] Elements: base fedora-minimal [ 0.0] Expanded elements: base dib-init-system dib-run-parts fedora-minimal install-types package-installs pkg-map redhat-common rpm-distro yum yum-minimal [ 0.0] Carried