similar to: [PATCH] customize: Add --ssh-inject option for injecting SSH keys.

This adds a customize option: virt-customize --ssh-inject USER virt-customize --ssh-inject USER:string:KEY_STRING virt-customize --ssh-inject USER:file:FILENAME (ditto for virt-builder and virt-sysprep) In each case this injects into the guest user USER a) the current (host) user's ssh pubkey b) the key specified as KEY_STRING c) the key in FILENAME adding it to

Pass to --commands-from-file the name of a file containing customization commands in each line, as if they were specified as command line arguments. This eases the reuse of commands among different builder/customize/sysprep invocations. --- builder/cmdline.ml | 3 +- customize/customize_run.ml | 5 +++ generator/customize.ml | 98 ++++++++++++++++++++++++++++++++++++++++++++-- 3

Hi, this is the v2 of a series introducing basic support for registering/attaching/unregistering RHEL guests using subscription-manager, so it is possible to do for example: $ virt-customize -a rhel-guest.qcow2 \ --sm-credentials user:file:/path/to/password-file --sm-register \ --sm-attach file:/path/to/pool-file \ --install pkg1 --install pkg2 .. \ --sm-remove --sm-unregister

Both ssh-copy-id and ssh create .ssh as 0700. ssh-copy-id creates .ssh/authorized_keys as 0600. Thanks: Ryan Sawhill for finding the bug. --- customize/ssh_key.ml | 4 ++-- src/guestfs.pod | 17 +++++++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/customize/ssh_key.ml b/customize/ssh_key.ml index 09664bf..dd6056f 100644 --- a/customize/ssh_key.ml +++

Turn the snippet reading user information from /etc/passwd in a slightly more generic function, so there is no need to copy&paste for other details. Mostly code motion. --- customize/ssh_key.ml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/customize/ssh_key.ml b/customize/ssh_key.ml index a4e4a51..7c482e7 100644 --- a/customize/ssh_key.ml +++

--- customize/customize_run.ml | 30 ++++++++++++++++++++++++++++++ generator/customize.ml | 17 +++++++++++++++-- 2 files changed, 45 insertions(+), 2 deletions(-) diff --git a/customize/customize_run.ml b/customize/customize_run.ml index c9d9d7d..b2506d1 100644 --- a/customize/customize_run.ml +++ b/customize/customize_run.ml @@ -151,6 +151,31 @@ exec >>%s 2>&1 | pm ->

Fixes RHBZ#119673. Maros Zatko (1): customize: add --truncate option (RHBZ#119673) builder/cmdline.ml | 2 +- customize/customize_run.ml | 4 ++++ generator/customize.ml | 9 +++++++++ 3 files changed, 14 insertions(+), 1 deletion(-) -- 1.9.3

From: Maros Zatko <hacxman@gmail.com> This adds --copy SOURCE:DEST, equivalent of calling g#cp_a src dst. RFE: RHBZ#1203817 Maros Zatko (1): customize: add --copy builder/cmdline.ml | 2 +- customize/customize_run.ml | 4 ++++ generator/customize.ml | 10 ++++++++++ 3 files changed, 15 insertions(+), 1 deletion(-) -- 1.9.3

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

Allows user to recursively truncate all files in a directory. Related to RHBZ#119673 Maros Zatko (1): customize: add --truncate-recursive option builder/cmdline.ml | 3 ++- customize/customize_run.ml | 6 ++++++ generator/customize.ml | 8 ++++++++ 3 files changed, 16 insertions(+), 1 deletion(-) -- 1.9.3

Str is a pretty ugly regexp module. Let's try to replace it with PCRE. This series of commits goes some small way towards that eventual goal. - - - I wonder if there was a deep reason why we had this? let unix2dos s = String.concat "\r\n" (Str.split_delim (Str.regexp_string "\n") s) I replaced it with what I think should be (nearly) equivalent: let unix2dos s =

Allows user to recursively truncate all files in a directory. Related to RHBZ#119673 Maros Zatko (1): customize: add --truncate-recursive option builder/cmdline.ml | 3 ++- customize/customize_run.ml | 4 ++++ generator/customize.ml | 8 ++++++++ mllib/common_utils.ml | 8 ++++++++ mllib/common_utils.mli | 2 ++ 5 files changed, 24 insertions(+), 1 deletion(-) -- 1.9.3

--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 +++

There's not going to be an easy way to present this patch. It's huge and interconnected. Anyway, what it does is lay the groundwork for a new tool which I'm calling 'virt-customize'. virt-customize is virt-builder, but without the part where it downloads a template from a respository. Just the part where it customizes the template, that is, installing packages, editing

Add simple operations for RHEL guests using subscription-manager, so it is possible to e.g. install software on them. --- builder/Makefile.am | 1 + builder/virt-builder.pod | 47 ++++++++++++++++++ customize/Makefile.am | 2 + customize/customize_run.ml | 34 +++++++++++++ customize/subscription_manager.ml | 53 ++++++++++++++++++++

When creating ~/.ssh and ~/.ssh/authorized_keys (in case they are missing), change their ownership to the target user. If not, they are owned by root. --- customize/ssh_key.ml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/customize/ssh_key.ml b/customize/ssh_key.ml index 7c482e7..d05816c 100644 --- a/customize/ssh_key.ml +++ b/customize/ssh_key.ml @@ -115,20 +115,24

The second patch is obviously not complete yet - for discussion only. Rich.

Hide/prevent the use of bad string functions like String.lowercase. These are replaced by safe functions that won't break UTF-8 strings. Other miscellaneous refactoring. Rich.

Also this updates the common submodule to include the changes. Fixes: https://github.com/rwmjones/guestfs-tools/issues/12 --- common | 2 +- generator/customize.ml | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/common b/common index d61cd820b4..bbb54714ce 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit

Doing this allows us to remove the Customize_utils module completely, since it becomes empty. Rich.