search for: quoted_arg

.../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 2>&1 " quoted_args | "dnf" -> sprintf "dnf -y install %s" quoted_args | "pisi" -> sprintf "pisi it %s" quoted_args - | "pacman" -> sprintf "pacman -S %s" quoted_args + | "pacman" -> sprintf "pacman -S --noconf...

...stomize_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 -> error_unimplemented_package_manager (s_"--update") pm + and guest_uninstall_command packages = + let quoted_args = String.concat " " (List.map quote packages) in + match g#inspect_get_package_management root with + | "apk" -> sprintf "apk del %s" quoted_args + | "apt" -> + (* http://unix.stackexchange.com/questions/22820 *) + sprintf " +...

Here are two patches: one fixes the gpg-agent causing unmount to fail after running dnf to install packages. The other ones fixes dhcpcd call in the init program to provide it an interface name. Cédric Bosdonnat (2): appliance init: find NIC name for dhcpcd Make sure gpg-agent is terminated before umount appliance/init | 3 ++- customize/customize_run.ml | 3 ++- 2 files

...> diff --git a/customize/customize_run.ml b/customize/customize_run.ml > index bce0aca..81b0951 100644 > --- a/customize/customize_run.ml > +++ b/customize/customize_run.ml > @@ -96,7 +96,8 @@ exec >>%s 2>&1 > apt-get $apt_opts install %s > " quoted_args > | "dnf" -> > - sprintf "dnf -y install %s" quoted_args > + sprintf "dnf -y install %s > + pkill gpg-agent" quoted_args > | "pisi" -> > sprintf "pisi it %s" quoted_args > | &...

Since Void Linux provides only an /etc/os-release with no VERSION_ID field, then special-case it to avoid that the os-release parsing ignore it. This provides basic distro identification, and icon. --- generator/actions.ml | 4 ++++ inspector/virt-inspector.rng | 1 + src/guestfs-internal.h | 1 + src/inspect-fs-unix.c | 14 ++++++++++++-- src/inspect-fs.c |

...eletions(-) 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 | "yum" -> sprintf "yum -y install %s" quoted_args | "zypper" -> - sprintf "zypper -n --gpg-auto-import-keys in -l %s" quoted_args + sprintf "zypper -n in -l %s" quoted_args | "unknown" -> error (f_"--install is not supported for this guest operating system") |...

...anged, 2 insertions(+) diff --git a/customize/customize_run.ml b/customize/customize_run.ml index 4b3e13c..c9d9d7d 100644 --- a/customize/customize_run.ml +++ b/customize/customize_run.ml @@ -114,6 +114,7 @@ exec >>%s 2>&1 | "pisi" -> sprintf "pisi it %s" quoted_args | "pacman" -> sprintf "pacman -S %s" quoted_args | "urpmi" -> sprintf "urpmi %s" quoted_args + | "xbps" -> sprintf "xbps-install -Sy %s" quoted_args | "yum" -> sprintf "yum -y install %s&...

...on(+), 1 deletion(-) diff --git a/customize/customize_run.ml b/customize/customize_run.ml index f92e9a199..3eacdaca0 100644 --- a/customize/customize_run.ml +++ b/customize/customize_run.ml @@ -181,7 +181,7 @@ exec >>%s 2>&1 | "urpmi" -> sprintf "urpme %s" quoted_args | "xbps" -> sprintf "xbps-remove -Sy %s" quoted_args | "yum" -> sprintf "yum -y remove %s" quoted_args - | "zypper" -> sprintf "zypper -n rm -l %s" quoted_args + | "zypper" -> sprintf "zyppe...

...ze_run.ml > +++ b/customize/customize_run.ml > @@ -94,7 +94,7 @@ exec >>%s 2>&1 > in > > (* http://distrowatch.com/dwres.php?resource=package-management *) > - let guest_install_command packages = > + let rec guest_install_command packages = > let quoted_args = String.concat " " (List.map quote packages) in > match g#inspect_get_package_management root with > | "apk" -> > @@ -116,10 +116,11 @@ exec >>%s 2>&1 > | "urpmi" -> sprintf "urpmi %s" quoted_args > | &...

In cases where parsing the release file failed and so we have an obviously incorrect major version number, don't try to infer the package manager from the major version number. In the bug report, parsing the /etc/redhat-release file of a CentOS 7.1 guest failed, so major version was set to 0, and the package manager was inferred as "up2date". virt-customize then failed with a

...ged, 2 insertions(+), 1 deletion(-) diff --git a/customize/customize_run.ml b/customize/customize_run.ml index bce0aca..81b0951 100644 --- a/customize/customize_run.ml +++ b/customize/customize_run.ml @@ -96,7 +96,8 @@ exec >>%s 2>&1 apt-get $apt_opts install %s " quoted_args | "dnf" -> - sprintf "dnf -y install %s" quoted_args + sprintf "dnf -y install %s + pkill gpg-agent" quoted_args | "pisi" -> sprintf "pisi it %s" quoted_args | "pacman" -> -- 2.1.4

...customize_run.ml b/customize/customize_run.ml > > index bce0aca..81b0951 100644 > > --- a/customize/customize_run.ml > > +++ b/customize/customize_run.ml > > @@ -96,7 +96,8 @@ exec >>%s 2>&1 > > apt-get $apt_opts install %s > > " quoted_args > > | "dnf" -> > > - sprintf "dnf -y install %s" quoted_args > > + sprintf "dnf -y install %s > > + pkill gpg-agent" quoted_args > > | "pisi" -> > > sprintf "pisi it %s&q...

...+++ 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 quote packages) in match g#inspect_get_package_management root with + | "apk" -> + sprintf " + apk update + apk add %s + " quoted_args | "apt" -> (* http://unix.stackexchange...

.....c0e1e44 100644 --- a/customize/customize_run.ml +++ b/customize/customize_run.ml @@ -94,7 +94,7 @@ exec >>%s 2>&1 in (* http://distrowatch.com/dwres.php?resource=package-management *) - let guest_install_command packages = + let rec guest_install_command packages = let quoted_args = String.concat " " (List.map quote packages) in match g#inspect_get_package_management root with | "apk" -> @@ -116,10 +116,11 @@ exec >>%s 2>&1 | "urpmi" -> sprintf "urpmi %s" quoted_args | "yum" -> s...

--- builder/Makefile.am | 3 ++- builder/opensuse.conf.in | 3 +++ builder/opensuse.gpg | 21 +++++++++++++++++++++ configure.ac | 1 + 4 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 builder/opensuse.conf.in create mode 100644 builder/opensuse.gpg diff --git a/builder/Makefile.am b/builder/Makefile.am index 4bed54c..e8f8dfb 100644 ---

...eletions(-) diff --git a/customize/customize_run.ml b/customize/customize_run.ml index 9d97522..ad0ab7f 100644 --- a/customize/customize_run.ml +++ b/customize/customize_run.ml @@ -116,7 +116,7 @@ exec >>%s 2>&1 | "yum" -> sprintf "yum -y install %s" quoted_args | "zypper" -> - sprintf "zypper -n in %s" quoted_args + sprintf "zypper -n --gpg-auto-import-keys in -l %s" quoted_args | "unknown" -> error (f_"--install is not supported for this guest operating system") | pm...

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