search for: parse_selector_list

...s.ml | 6 ++++++ mllib/common_utils.mli | 4 ++++ v2v/cmdline.ml | 2 +- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/customize/password.ml b/customize/password.ml index d91c4b5..111240e 100644 --- a/customize/password.ml +++ b/customize/password.ml @@ -60,7 +60,7 @@ and parse_selector_list orig_arg = function let pw = parse_selector_list orig_arg rest in { pw with pw_locked = true } | [ "file"; filename ] -> - { pw_password = Password (read_password_from_file filename); + { pw_password = Password (read_first_line_from_file filename); pw_locked =...

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

...3740 100644 --- a/customize/password.ml +++ b/customize/password.ml @@ -51,7 +51,7 @@ let password_crypto_of_string = function error (f_"password-crypto: unknown algorithm %s, use \"md5\", \"sha256\" or \"sha512\"") arg let rec parse_selector arg = - parse_selector_list arg (string_nsplit ":" arg) + parse_selector_list arg (String.nsplit ":" arg) and parse_selector_list orig_arg = function | [ "lock"|"locked" ] -> diff --git a/customize/ssh_key.ml b/customize/ssh_key.ml index dd6056f..a4e4a51 100644 --- a/customize...

...et, Fifth Floor, Boston, MA 02110-1301 USA. + *) + +open Common_gettext.Gettext +open Common_utils + +open Customize_utils + +open Printf +open Sys +open Unix + +module G = Guestfs + +type ssh_key_selector = +| SystemKey +| KeyFile of string +| KeyString of string + +let rec parse_selector arg = + parse_selector_list arg (string_nsplit ":" arg) + +and parse_selector_list orig_arg = function + | [] | [ "" ] -> + SystemKey + | [ "file"; f ] -> + KeyFile f + | [ "string"; s ] -> + KeyString s + | _ -> + error (f_"invalid ssh-inject selector &...

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.

This adds a customize option: virt-customize --ssh-inject USER[=KEY] virt-builder --ssh-inject USER[=KEY] virt-sysprep --ssh-inject USER[=KEY] In each case this either injects the current (host) user's ssh pubkey into the guest user USER (adding it to ~USER/.ssh/authorized_keys in the guest), or you can specify a particular key. For example: virt-builder fedora-20 --ssh-inject root

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 =

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

v1 was here: https://www.redhat.com/archives/libguestfs/2017-September/msg00135.html This is a more complete evolution of the earlier patch. It replaces most important uses of Str with PCRE throughout the code. It also extends the bindings with some useful features like case-insensitive regexps. The main places I *didn't* touch are the generator (GObject uses Str extensively); and

v1: https://www.redhat.com/archives/libguestfs/2017-September/msg00135.html v2: https://www.redhat.com/archives/libguestfs/2017-September/msg00158.html v3 is almost identical to v2, but I have added 4 extra commits to almost finish the job of replacing Str everywhere possible (note it's not possible to replace Str in common/mlstdutils or the generator because those are pure OCaml). As

...compatible. The firstboot service may not run at boot.") cmd Guestfs_config.host_cpu guest_arch ) end diff --git a/customize/password.ml b/customize/password.ml index 92cb4e495..4ab5a14d1 100644 --- a/customize/password.ml +++ b/customize/password.ml @@ -67,7 +67,7 @@ and parse_selector_list orig_arg = function | [ "disable"|"disabled" ] -> { pw_password = Disabled_password; pw_locked = false } | _ -> - error (f_"invalid password selector '%s'; see the man page") orig_arg + error (f_"invalid password selector ‘%s’; see t...