similar to: [PATCH] remove leading tabs in zypp driver

Signed-off-by: Olaf Hering <olaf at aepfle.de> --- src/supermin_zypp_rpm.ml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/supermin_zypp_rpm.ml b/src/supermin_zypp_rpm.ml index 720f50a..1c6243d 100644 --- a/src/supermin_zypp_rpm.ml +++ b/src/supermin_zypp_rpm.ml @@ -175,12 +175,18 @@ let rec zypp_rpm_list_files pkg = let mode = int_of_string mode

--- .gitignore | 6 +- .gitmodules | 3 - HACKING | 41 +++ Makefile.am | 6 +- README | 7 +- TODO | 61 +--- autobuild.sh | 65 ---- autogen.sh | 12 - configure.ac | 27

The new run_shell helper is a copy of run_python, and will be used by upcoming changes. Signed-off-by: Olaf Hering <olaf at aepfle.de> --- src/supermin_utils.ml | 9 +++++++++ src/supermin_utils.mli | 5 +++++ 2 files changed, 14 insertions(+) diff --git a/src/supermin_utils.ml b/src/supermin_utils.ml index f98e09a..cb8a27e 100644 --- a/src/supermin_utils.ml +++ b/src/supermin_utils.ml

An attempt to use installed files in zypp driver. Add also a comment about the theory of operation. Enable set -x in shell only in verbose mode. This adds a dependency to xmlstarlet, which is required to parse zypper output. Signed-off-by: Olaf Hering <olaf at aepfle.de> --- src/supermin_zypp_rpm.ml | 93 +++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 80 insertions(+), 13

--- src/febootstrap_debian.ml | 65 +++++++++++++++++++++++++++++++++++++------- 1 files changed, 54 insertions(+), 11 deletions(-) diff --git a/src/febootstrap_debian.ml b/src/febootstrap_debian.ml index 23f3593..bb10f15 100644 --- a/src/febootstrap_debian.ml +++ b/src/febootstrap_debian.ml @@ -28,6 +28,9 @@ open Febootstrap_cmdline (* Create a temporary directory for use by all the

The current mode of operation in the zypp driver is to download all packages into a temporary pkg-cache-dir. Installed packages in the root filesystem are ignored, otherwise zypper would download only a subset of packages, and it would not provide a list of all required dependencies. Remove the getuid check to force an empty root directory and use the configured system repositories. This works

This takes a list of package names, adding them to the image without pulling any dependencies. Only implemented for Debian at the moment. zypper wasn't build-tested because I don't have the dependency. --- src/.depend | 2 +- src/supermin.ml | 6 +++--- src/supermin_cmdline.ml | 13 ++++++++++--- src/supermin_cmdline.mli | 10

Joseph, Please try my modified versions of these patches. These are compile-tested on Fedora and they don't break any existing functionality, but I don't have either urpmi nor a statically-linked xz so I cannot fully test them. I have also fixed detection of zlib (2/3). Rich.

This is an attempt to handle a different --reposd-dir in the zypp_rpm driver. Up to now the system repositories in /etc/zypp/repos.d were used. To specify a different set of repositories for zypp a parser for a simple zypper.conf is added in this patch. It just looks for reposdir= in section main, like this: [main] reposdir=/path/to/other/repofiles If the config file provided via

Hi, During compilation of guestfs I get the following error: *supermin -v -o supermin.d --names augeas-libs btrfs-progs cryptsetup cryptsetup-luks e2fsprogs e4fsprogs genisoimage gfs-utils gfs2-utils grub hfsplus-tools hivex iproute iputils kernel libcap libldm MAKEDEV nilfs-utils ntfsprogs ntfs-3g openssh-clients pcre reiserfs-utils libselinux syslinux-extlinux systemd vim-minimal xz yajl

On Thu, Jul 11, 2013 at 10:50:01AM +0300, Or Goshen wrote: > Now, I installed supermin from git. During configuration it discovered > zypper: > > *checking for zypper... zypper > checking for yum... no > checking for rpm... rpm > checking for yumdownloader... no > checking for aptitude... no > checking for apt-cache... apt-cache > checking for dpkg... no >

--- src/dpkg.ml | 3 ++- src/package_handler.ml | 1 + src/package_handler.mli | 4 ++++ src/pacman.ml | 2 +- src/rpm.ml | 2 +- 5 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/dpkg.ml b/src/dpkg.ml index c28354a..5a650b8 100644 --- a/src/dpkg.ml +++ b/src/dpkg.ml @@ -166,7 +166,8 @@ let dpkg_get_all_files pkgs = let config = try

Listmates I'm running rsync 3.02 and I have a simple thing I'm trying to do, but rsync won't let me do it. What I'm trying to do is consolidate saved rpms on openSuSE 11.0 to a central server for local updates. openSuSE saves the rpms in: /var/cache/zypp/packages/<repository name> I have written a script that parses all the file names and creates temp files that holds

On Fri, May 31, Richard W.M. Jones wrote: > On Fri, May 31, 2013 at 10:41:47AM +0200, Olaf Hering wrote: > > Use basename of external helper instead of 'no' for external supermin > > helpers. This gives a clear error messages what binary is actually > > missing, and it is now possible to install the missing package without > > recompiling libguestfs. In addition

This is just refactoring, with no behaviour changes. --- src/mode_prepare.ml | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/src/mode_prepare.ml b/src/mode_prepare.ml index 7c8221e..7759c58 100644 --- a/src/mode_prepare.ml +++ b/src/mode_prepare.ml @@ -128,28 +128,28 @@ let prepare debug (copy_kernel, format, host_cpu, * be

--- src/build.ml | 43 ++++++++++++++++++++++++++----------------- src/chroot.ml | 12 +++++++----- src/dpkg.ml | 17 +++++++++++++++-- src/ext2.ml | 8 +++++++- 4 files changed, 55 insertions(+), 25 deletions(-) diff --git a/src/build.ml b/src/build.ml index 9225184..205701b 100644 --- a/src/build.ml +++ b/src/build.ml @@ -106,11 +106,7 @@ let rec build debug *) let files =

On Mon, Oct 08, Richard W.M. Jones wrote: > On Mon, Oct 08, 2012 at 08:50:47PM +0200, Olaf Hering wrote: > > On Mon, Oct 08, Richard W.M. Jones wrote: > > > > > But out of interest, how are you creating this appliance? I thought > > > we'd ripped out support for old-style appliances from the rest of the > > > toolchain ... > > > > I use

* Richard W.M. Jones: > This seems to change the result of this (very important and complex) > function. Since you didn't answer my followup message, I take it that I failed to convince you. I noticed that I can get away with leaving the structure of the function as-is, just changing the type... What do you think about this diff? Cheers, -Hilko diff --git a/src/build.ml

On Tue, Jun 11, Richard W.M. Jones wrote: > But supermin is supposed to ignore packages that don't exist in the > distro. This is a bug in supermin or the zypp plugin for supermin. It looks like zypper has no "ignore unknown packages/provides" flag. zypper .. install $pkg is called with an unknown package then zypper will just abort because it expects valid input. Maybe

On Fri, May 31, 2013 at 01:38:06PM +0200, Olaf Hering wrote: > But this requires that febootstrap or supermin is in BuildRequires:, > while this change removes the hard dependency of BuildRequires:. But I > see, if the appliance is enabled then it would now fail with this > change. In my packaging the appliance is not enabled because zypp > support in supermin is not yet complete,