search for: sshkeyselector

...a/generator/customize.ml b/generator/customize.ml index 82ecb79..d5e72ac 100644 --- a/generator/customize.ml +++ b/generator/customize.ml @@ -43,6 +43,7 @@ and op_type = | PasswordSelector of string (* password selector *) | UserPasswordSelector of string (* user:selector *) | SSHKeySelector of string (* user:selector *) +| StringFn of (string * string) (* string, function name *) let ops = [ { op_name = "chmod"; @@ -56,6 +57,29 @@ I<Note>: C<PERMISSIONS> by default would be decimal, unless you prefix it with C<0> to get octal, ie...

...-sm-attach. Exits if the format + is not valid. *) diff --git a/generator/customize.ml b/generator/customize.ml index f57aba6..2196e9e 100644 --- a/generator/customize.ml +++ b/generator/customize.ml @@ -44,6 +44,7 @@ and op_type = | UserPasswordSelector of string (* user:selector *) | SSHKeySelector of string (* user:selector *) | StringFn of (string * string) (* string, function name *) +| SMPoolSelector of string (* pool selector *) let ops = [ { op_name = "chmod"; @@ -327,6 +328,44 @@ It cannot delete directories, only regular files. =back...

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

...cb79 100644 --- a/generator/customize.ml +++ b/generator/customize.ml @@ -42,6 +42,7 @@ and op_type = | TargetLinks of string (* target:link[:link...] *) | PasswordSelector of string (* password selector *) | UserPasswordSelector of string (* user:selector *) +| SSHKeySelector of string (* user:selector *) let ops = [ { op_name = "chmod"; @@ -260,6 +261,22 @@ It cannot delete directories, only regular files. =back"; }; + { op_name = "ssh-inject"; + op_type = SSHKeySelector "USER[:SELECTOR]"; + op_discrim...

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

...t;; + op_type = Unit; + op_discrim = "`SMUnregister"; + op_shortdesc = "Unregister using subscription-manager"; + op_pod_longdesc = "\ +Unregister the guest using C<subscription-manager>."; + }; + { op_name = "ssh-inject"; op_type = SSHKeySelector "USER[:SELECTOR]"; op_discrim = "`SSHInject"; @@ -428,6 +486,7 @@ type flag = { and flag_type = | FlagBool of bool (* boolean is the default value *) | FlagPasswordCrypto of string +| FlagSMConfig of string let flags = [ { flag_name = "no-logf...

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

...quot;--%s\" ],\n" name; + pr " [ L\"%s\" ],\n" name; pr " Getopt.String (\n"; pr " s_\"%s\",\n" v; pr " fun s ->\n"; @@ -734,7 +735,7 @@ let rec argspec () = | { op_type = SSHKeySelector v; op_name = name; op_discrim = discrim; op_shortdesc = shortdesc; op_pod_longdesc = longdesc } -> pr " (\n"; - pr " [ \"--%s\" ],\n" name; + pr " [ L\"%s\" ],\n" name; pr " Getopt.String (\...

v1 -> v2: - Further fixes to Getopt int parsing. - Completed the L/S changes. - Fixed the test suite so it passes now. Also we don't need the special-case tests for 64 bit arch. Rich.

v3 -> v4: - Pushed the first patch upstream since it was ACKed. - Prevent use of M except for the special virt-v2v options. - Sort the options after added --help etc. - Make corresponding fixes to the tests. Rich.

v2 -> v3: - Add M variant and test it. Rich.

Hi, this series introduces a basic support for registering/attaching/unregistering RHEL guests using subscription-manager, so it is possible to do for example: $ cat <<EOF > sm.conf [general] username=user password=pass [attach-0] pool=ID EOF $ virt-customize -a rhel-guest.qcow2 \ --sm-config sm.conf --sm-register --sm-attach 0 \ --install pkg1 --install pkg2

...,\n"; > - pr " s_\"%s\" ^ \" \" ^ s_\"%s\"\n" v shortdesc; > + pr " s_\"%s\"\n" shortdesc; > pr " ),\n"; > pr " Some %S, %S;\n" v longdesc > | { op_type = SSHKeySelector v; op_name = name; op_discrim = discrim; > op_shortdesc = shortdesc; op_pod_longdesc = longdesc } -> > pr " (\n"; > - pr " \"--%s\",\n" name; > - pr " Arg.String (\n"; > + pr " [ \"-...

...; pr " ),\n"; - pr " s_\"%s\" ^ \" \" ^ s_\"%s\"\n" v shortdesc; + pr " s_\"%s\"\n" shortdesc; pr " ),\n"; pr " Some %S, %S;\n" v longdesc | { op_type = SSHKeySelector v; op_name = name; op_discrim = discrim; op_shortdesc = shortdesc; op_pod_longdesc = longdesc } -> pr " (\n"; - pr " \"--%s\",\n" name; - pr " Arg.String (\n"; + pr " [ \"--%s\" ],\n" nam...

...; pr " ),\n"; - pr " s_\"%s\" ^ \" \" ^ s_\"%s\"\n" v shortdesc; + pr " s_\"%s\"\n" shortdesc; pr " ),\n"; pr " Some %S, %S;\n" v longdesc | { op_type = SSHKeySelector v; op_name = name; op_discrim = discrim; op_shortdesc = shortdesc; op_pod_longdesc = longdesc } -> pr " (\n"; - pr " \"--%s\",\n" name; - pr " Arg.String (\n"; + pr " [ \"--%s\" ],\n" nam...

...; pr " ),\n"; - pr " s_\"%s\" ^ \" \" ^ s_\"%s\"\n" v shortdesc; + pr " s_\"%s\"\n" shortdesc; pr " ),\n"; pr " Some %S, %S;\n" v longdesc | { op_type = SSHKeySelector v; op_name = name; op_discrim = discrim; op_shortdesc = shortdesc; op_pod_longdesc = longdesc } -> pr " (\n"; - pr " \"--%s\",\n" name; - pr " Arg.String (\n"; + pr " [ \"--%s\" ],\n" nam...