similar to: [PATCH] customize: Unconditionally set the machine-id if not set already.

Some filesystems, such as FAT doesn't support file ownership, so show warning instead of error on EPERM. --- customize/customize_run.ml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/customize/customize_run.ml b/customize/customize_run.ml index dbb77df..f2dbaa2 100644 --- a/customize/customize_run.ml +++ b/customize/customize_run.ml @@ -290,7 +290,13 @@ exec

FAT doesn't support file ownership, so show info instead of error. --- customize/customize_run.ml | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/customize/customize_run.ml b/customize/customize_run.ml index dbb77df..40d19ac 100644 --- a/customize/customize_run.ml +++ b/customize/customize_run.ml @@ -289,8 +289,20 @@ exec >>%s 2>&1 let

Some filesystems, such as FAT doesn't support file ownership, so show warning instead of error on EPERM. Maros Zatko (1): customize: fix --upload to FAT partition (RHBZ#1196101) customize/customize_run.ml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) -- 1.9.3

In commit ae6f726ecc3bc1b67fd76e51a7b1e1a33d4dcfc0 we started to use the virt-customize code to replace various virt-sysprep operations. This had the effect of adding many more possible operations to virt-sysprep, but some of them (specifically --install) did not work unless the appliance network is enabled. It was not enabled in virt-sysprep, so these operations never worked. This change does

Put in a list the errnos to expose, filling the content of the Guestfs.Errno submodule from that. Also, generate a separate guestfs-c-errnos.c with the implementations of the functions returning the errno codes. Only code motion and refactoring, no actual changes on the content of the ocaml Guestfs module. --- .gitignore | 1 + generator/main.ml | 1 + generator/ocaml.ml | 77

FAT doesn't support file ownership, so show warning instead of error. --- customize/customize_run.ml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/customize/customize_run.ml b/customize/customize_run.ml index dbb77df..306b7f2 100644 --- a/customize/customize_run.ml +++ b/customize/customize_run.ml @@ -290,7 +290,10 @@ exec >>%s 2>&1 let perms =

This appends a single line to a file, with some cleverness involving guessing the right line endings to use. Also adds a test. --- builder/test-virt-builder.sh | 57 +++++++++++++++++++++++++++++++++++- customize/Makefile.am | 2 ++ customize/append_line.ml | 70 ++++++++++++++++++++++++++++++++++++++++++++ customize/append_line.mli | 20 +++++++++++++ customize/customize_run.ml

Check that a path provided to --edit exists already; while the is_file call later will fail for non-existing files, with an explicit check a better error message can be provided. --- customize/customize_run.ml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/customize/customize_run.ml b/customize/customize_run.ml index ff7bd0d..054ee53 100644 --- a/customize/customize_run.ml +++

I discovered that 'dnf upgrade' doesn't actually upgrade to the latest versions of packages unless you also supply the '--best' flag. This also changes update -> upgrade, since apparently 'dnf update' is deprecated. --- customize/customize_run.ml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/customize/customize_run.ml

This option was considered unsecure, found a fix on the generated opensuse images instead. --- customize/customize_run.ml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/customize/customize_run.ml b/customize/customize_run.ml index ad0ab7f..6cb2328 100644 --- a/customize/customize_run.ml +++ b/customize/customize_run.ml @@ -116,7 +116,7 @@ exec >>%s 2>&1

--- customize/customize_run.ml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/customize/customize_run.ml b/customize/customize_run.ml index ed3c818..48475af 100644 --- a/customize/customize_run.ml +++ b/customize/customize_run.ml @@ -97,6 +97,11 @@ exec >>%s 2>&1 let guest_install_command packages = let quoted_args = String.concat " " (List.map

--update invokes a distribution update, updating all the installed packages and not just some "core" ones. --- customize/customize_run.ml | 2 +- generator/customize.ml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/customize/customize_run.ml b/customize/customize_run.ml index 82c4edd..83e70a6 100644 --- a/customize/customize_run.ml +++

Otherwise the installation will fail right away, since pacman by default asks for confirmation of the operation. --- customize/customize_run.ml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/customize/customize_run.ml b/customize/customize_run.ml index 6f0d615..3e759a2 100644 --- a/customize/customize_run.ml +++ b/customize/customize_run.ml @@ -117,7 +117,7 @@ exec >>%s

Wrap the command around an heredoc only if setarch needs to be used; otherwise the heredoc will not be run at all. Fix commit d875346ad441d4762455ea1b41d57ad6174d9b63. --- customize/customize_run.ml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/customize/customize_run.ml b/customize/customize_run.ml index 2283272..9d97522 100644 ---

When running (eg) dnf on a 32 bit i686 guest when the host is 64 bit x86_64, dnf believes it is running on a 64 bit machine and so tries to install x86_64 packages. We can 'trick' dnf into believing it's a 32 bit machine using the setarch program. $ virt-builder fedora-22 --arch i686 --install 'gperf' ... [ 27.4] Installing packages: gperf ... Running transaction test Error:

Add the copy-in operation to virt-customize/builder/sysprep, so it is possible to easily copy directories at once in the guest. --- builder/cmdline.ml | 2 +- customize/customize_run.ml | 4 ++++ generator/customize.ml | 13 +++++++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/builder/cmdline.ml b/builder/cmdline.ml index 1c6ab98..9dad141 100644 ---

Allows user to recursively truncate files in PATH. e.g.: virt-builder --truncate-recursive /var/log Relates to RHBZ#119673 --- builder/cmdline.ml | 3 ++- customize/customize_run.ml | 6 ++++++ generator/customize.ml | 8 ++++++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/builder/cmdline.ml b/builder/cmdline.ml index b7e7e07..debc789 100644 ---

From: Maros Zatko <hacxman@gmail.com> This adds --move SOURCE:DEST, equivalent of calling g#mv src dst. RFE: RHBZ#1203817 --- builder/cmdline.ml | 2 +- customize/customize_run.ml | 4 ++++ generator/customize.ml | 10 ++++++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/builder/cmdline.ml b/builder/cmdline.ml index c863ad2..7adde02 100644 ---

In cases where we are asked to run commands in the guest (eg. options such as --run-command or --install), give a clear error in the cases where the guest arch is not compatible with the host arch. --- customize/customize_run.ml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/customize/customize_run.ml b/customize/customize_run.ml index 08cff0b..0f1d72a 100644 ---

--- customize/customize_run.ml | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/customize/customize_run.ml b/customize/customize_run.ml index 0f1d72a..cd4616c 100644 --- a/customize/customize_run.ml +++ b/customize/customize_run.ml @@ -338,15 +338,19 @@ exec >>%s 2>&1 if ops.flags.selinux_relabel then ( msg (f_"SELinux