similar to: [PATCH v2 1/2] builder: add opensuse images sources

On Tue, Sep 29, 2015 at 03:59:34PM +0200, Cédric Bosdonnat wrote: > --- > 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

Hi guys, Here are two patches to get opensuse images in virt-builder. Cédric Bosdonnat (2): Allow curl to follow redirects. builder: add opensuse images sources builder/Makefile.am | 3 ++- builder/downloader.ml | 4 ++-- builder/opensuse.conf.in | 3 +++ builder/opensuse.gpg | 21 +++++++++++++++++++++ configure.ac | 1 + 5 files changed, 29 insertions(+), 3

--- 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 f48efb0..33acb79 100644 ---

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 |

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

This option was considered unsecure, found a fix on the generated opensuse images instead. --- customize/customize_run.ml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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

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

On Wednesday 04 May 2016 14:12:30 Richard W.M. Jones wrote: > For Windows, we now print: > > $ virt-customize -a ./test-data/phony-guests/windows.img --install MSSQL > [ 0.0] Examining the guest ... > [ 14.2] Setting a random seed > virt-customize: warning: random seed could not be set for this type of > guest > [ 14.2] Installing packages: MSSQL > virt-customize:

Otherwise the installation will fail right away, since pacman by default asks for confirmation of the operation. --- customize/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

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

On Tuesday 28 July 2015 15:21:38 Cédric Bosdonnat wrote: > gpg-agent uses /sysroot/dev/null and thus /sysroot/dev can't be > unmounted if gpg-agent is still around. Note that this problem only > affects installing packages on fedora-22 guests. > --- > customize/customize_run.ml | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git

--- customize/customize_run.ml | 10 ++++++++++ 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

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

The `-l` option for some `zypper` subcommands is short for `--auto-agree-with-licenses` and not available on the `zypper rm` command. --- customize/customize_run.ml | 2 +- 1 file changed, 1 insertion(+), 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

On Tue, Feb 25, 2014 at 05:29:08PM +0100, Pino Toscano wrote: > +let xdg_config_dirs ~prog = > + let dirs = > + try Sys.getenv "XDG_CONFIG_DIRS" > + with Not_found -> "/etc/xdg" in This seems to put the virt-builder config files into /etc/xdg/virt-builder which is kind of annoying. Can we move them to a regular default location (/etc/virt-builder)? I

Still don't recommend you use 'make install', but here we go. Rich.

--- customize/customize_run.ml | 2 ++ 1 file changed, 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

gpg-agent uses /sysroot/dev/null and thus /sysroot/dev can't be unmounted if gpg-agent is still around. Note that this problem only affects installing packages on fedora-22 guests. --- customize/customize_run.ml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/customize/customize_run.ml b/customize/customize_run.ml index bce0aca..81b0951 100644 ---

On Tue, Jul 28, 2015 at 07:15:33PM +0200, Pino Toscano wrote: > On Tuesday 28 July 2015 15:21:38 Cédric Bosdonnat wrote: > > gpg-agent uses /sysroot/dev/null and thus /sysroot/dev can't be > > unmounted if gpg-agent is still around. Note that this problem only > > affects installing packages on fedora-22 guests. > > --- > > customize/customize_run.ml | 3 ++-

For Windows, we now print: $ virt-customize -a ./test-data/phony-guests/windows.img --install MSSQL [ 0.0] Examining the guest ... [ 14.2] Setting a random seed virt-customize: warning: random seed could not be set for this type of guest [ 14.2] Installing packages: MSSQL virt-customize: error: '--install' failed because inspection could not determine the package manager for this