[Pkg-libvirt-commits] [libguestfs] 25/59: generator: customize: Insert whitespace between entries.
Hilko Bengen
bengen at moszumanska.debian.org
Wed Nov 26 22:04:04 UTC 2014
This is an automated email from the git hooks/post-receive script.
bengen pushed a commit to branch master
in repository libguestfs.
commit ffbc2ea01fc0f3c36c88a31b8d4365018147e2b5
Author: Richard W.M. Jones <rjones at redhat.com>
Date: Sat Nov 1 21:08:53 2014 +0000
generator: customize: Insert whitespace between entries.
Just a whitespace change.
(cherry picked from commit 0121f4fd56770de4efd454b058a28ea39bf41807)
---
generator/customize.ml | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/generator/customize.ml b/generator/customize.ml
index a138e90..8642a54 100644
--- a/generator/customize.ml
+++ b/generator/customize.ml
@@ -54,6 +54,7 @@ Change the permissions of C<FILE> to C<PERMISSIONS>.
I<Note>: C<PERMISSIONS> by default would be decimal, unless you prefix
it with C<0> to get octal, ie. use C<0700> not C<700>.";
};
+
{ op_name = "delete";
op_type = String "PATH";
op_discrim = "`Delete";
@@ -64,6 +65,7 @@ contents, recursively).
See also: I<--upload>, I<--scrub>.";
};
+
{ op_name = "edit";
op_type = StringPair "FILE:EXPR";
op_discrim = "`Edit";
@@ -78,6 +80,7 @@ Note that this option is only available when Perl 5 is installed.
See L<virt-edit(1)/NON-INTERACTIVE EDITING>.";
};
+
{ op_name = "firstboot";
op_type = String "SCRIPT";
op_discrim = "`FirstbootScript";
@@ -96,6 +99,7 @@ order that they appear on the command line.
See also I<--run>.";
};
+
{ op_name = "firstboot-command";
op_type = String "'CMD+ARGS'";
op_discrim = "`FirstbootCommand";
@@ -109,6 +113,7 @@ order that they appear on the command line.
See also I<--run>.";
};
+
{ op_name = "firstboot-install";
op_type = StringList "PKG,PKG..";
op_discrim = "`FirstbootPackages";
@@ -121,6 +126,7 @@ installed when the guest first boots using the guest's package manager
For an overview on the different ways to install packages, see
L<virt-builder(1)/INSTALLING PACKAGES>.";
};
+
{ op_name = "hostname";
op_type = String "HOSTNAME";
op_discrim = "`Hostname";
@@ -129,6 +135,7 @@ L<virt-builder(1)/INSTALLING PACKAGES>.";
Set the hostname of the guest to C<HOSTNAME>. You can use a
dotted hostname.domainname (FQDN) if you want.";
};
+
{ op_name = "install";
op_type = StringList "PKG,PKG..";
op_discrim = "`InstallPackages";
@@ -143,6 +150,7 @@ L<virt-builder(1)/INSTALLING PACKAGES>.
See also I<--update>.";
};
+
{ op_name = "link";
op_type = TargetLinks "TARGET:LINK[:LINK..]";
op_discrim = "`Link";
@@ -151,6 +159,7 @@ See also I<--update>.";
Create symbolic link(s) in the guest, starting at C<LINK> and
pointing at C<TARGET>.";
};
+
{ op_name = "mkdir";
op_type = String "DIR";
op_discrim = "`Mkdir";
@@ -161,6 +170,7 @@ Create a directory in the guest.
This uses S<C<mkdir -p>> so any intermediate directories are created,
and it also works if the directory already exists.";
};
+
{ op_name = "password";
op_type = UserPasswordSelector "USER:SELECTOR";
op_discrim = "`Password";
@@ -172,6 +182,7 @@ create the user account).
See L<virt-builder(1)/USERS AND PASSWORDS> for the format of
the C<SELECTOR> field, and also how to set up user accounts.";
};
+
{ op_name = "root-password";
op_type = PasswordSelector "SELECTOR";
op_discrim = "`RootPassword";
@@ -185,6 +196,7 @@ the C<SELECTOR> field, and also how to set up user accounts.
Note: In virt-builder, if you I<don't> set I<--root-password>
then the guest is given a I<random> root password.";
};
+
{ op_name = "run";
op_type = String "SCRIPT";
op_discrim = "`Script";
@@ -207,6 +219,7 @@ in the same order that they appear on the command line.
See also: I<--firstboot>, I<--attach>, I<--upload>.";
};
+
{ op_name = "run-command";
op_type = String "'CMD+ARGS'";
op_discrim = "`Command";
@@ -226,6 +239,7 @@ in the same order that they appear on the command line.
See also: I<--firstboot>, I<--attach>, I<--upload>.";
};
+
{ op_name = "scrub";
op_type = String "FILE";
op_discrim = "`Scrub";
@@ -245,6 +259,7 @@ It cannot delete directories, only regular files.
=back";
};
+
{ op_name = "timezone";
op_type = String "TIMEZONE";
op_discrim = "`Timezone";
@@ -253,6 +268,7 @@ It cannot delete directories, only regular files.
Set the default timezone of the guest to C<TIMEZONE>. Use a location
string like C<Europe/London>";
};
+
{ op_name = "update";
op_type = Unit;
op_discrim = "`Update";
@@ -264,6 +280,7 @@ template to their latest versions.
See also I<--install>.";
};
+
{ op_name = "upload";
op_type = StringPair "FILE:DEST";
op_discrim = "`Upload";
@@ -282,6 +299,7 @@ name as on the local filesystem.
See also: I<--mkdir>, I<--delete>, I<--scrub>.";
};
+
{ op_name = "write";
op_type = StringPair "FILE:CONTENT";
op_discrim = "`Write";
@@ -315,6 +333,7 @@ the image was built, use this option.
See also: L</LOG FILE>.";
};
+
{ flag_name = "password-crypto";
flag_type = FlagPasswordCrypto "md5|sha256|sha512";
flag_ml_var = "password_crypto";
@@ -340,6 +359,7 @@ If you want to do that, then you should use the I<--edit> option
to modify C</etc/sysconfig/authconfig> (Fedora, RHEL) or
C</etc/pam.d/common-password> (Debian, Ubuntu).";
};
+
{ flag_name = "selinux-relabel";
flag_type = FlagBool false (* XXX - the default in virt-builder *);
flag_ml_var = "selinux_relabel";
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libguestfs.git
More information about the Pkg-libvirt-commits
mailing list