search for: extra_packages

...n; + image_name : string; + fs_type : string; + size : int64; + root_label : string option; + install_type : string; + image_cache : string option; + compressed : bool; + qemu_img_options : string option; + mkfs_options : string option; + is_ramdisk : bool; + ramdisk_element : string; + extra_packages : string list; + memsize : int option; + network : bool; + smp : int option; + delete_on_failure : bool; + formats : string list; + arch : string; + envvars : string list; +} + +let parse_cmdline () = let usage_msg = sprintf (f_"\ %s: run diskimage-builder elements to generate...

...append_element_path), s_"Add new a elements location"; [ L"exclude-element" ], Getopt.String ("element", append_excluded_element), @@ -167,6 +171,7 @@ read the man page virt-dib(1). [ L"extra-packages" ], Getopt.String ("pkg,...", append_extra_packages), s_"Add extra packages to install"; [ L"checksum" ], Getopt.Set checksum, s_"Generate MD5 and SHA256 checksum files"; + [ L"python" ], Getopt.String ("python", set_python), s_"Set Python interpreter";...

...DB_PATH='"$(datadir)/libosinfo/db"' \ > diff --git a/m4/guestfs_appliance.m4 b/m4/guestfs_appliance.m4 > index 890b1999c..81c43879f 100644 > --- a/m4/guestfs_appliance.m4 > +++ b/m4/guestfs_appliance.m4 > @@ -128,3 +128,14 @@ AC_ARG_WITH([extra-packages], > [EXTRA_PACKAGES="$withval"], > [EXTRA_PACKAGES=]) > AC_SUBST([EXTRA_PACKAGES]) > + > +dnl Set guestfs default path > +AC_ARG_WITH([guestfs-path], > + [AS_HELP_STRING([--with-guestfs-path=PATH], > + [specify guestfs path (default=$libdir/guestfs)])], > +...

Hi, this series start to implement some of the changes needed to support d-i-b 2.0; normal VM distro builds seem to work correctly, ramdisk builds are still broken and require more efforts. Thanks, Pino Toscano (5): dib: implement get_image_element_array stuff dib: export IMAGE_BLOCK_DEVICE_WITHOUT_PART dib: extract get_required_tool out of require_tool dib: require a Python interpreter

Mac OS X uses DYLD_LIBRARY_PATH rather than LD_LIBRARY_PATH. --- run.in | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/run.in b/run.in index a8c2904..bf7ea1b 100755 --- a/run.in +++ b/run.in @@ -77,13 +77,10 @@ fi

Both BaseOS and AppStream are needed. --- virt-p2v-make-kickstart.in | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/virt-p2v-make-kickstart.in b/virt-p2v-make-kickstart.in index 779ba62..cbbfb8a 100644 --- a/virt-p2v-make-kickstart.in +++ b/virt-p2v-make-kickstart.in @@ -176,6 +176,16 @@ repo --name=rhel6_${minor}_server_optional --baseurl=$baseurl/Server/optional/$a

Hi, this series improves virt-dib, adding some upstream changes, and refactoring the handling of output formats. Thanks, Pino Toscano (6): dib: clear up "already provided" message dib: add --checksum dib: pass custom mkfs options after the filesystem type dib: refactor output formats handling dib: clarify "output:" lines in --machine-readable documentation dib:

...t; -linkpkg -cclib '-pthread -lpthread -lutils @LIBTINFO_LIBS@ @LIBCRYPT_LIBS@ @LIBLZMA_LIBS@ @LIBXML2_LIBS@ @LIBINTL@ -lgnu' diff --git a/configure.ac b/configure.ac index d68190a..9d95c2c 100644 --- a/configure.ac +++ b/configure.ac @@ -590,6 +590,15 @@ AC_ARG_WITH([extra-packages], [EXTRA_PACKAGES=]) AC_SUBST([EXTRA_PACKAGES]) +dnl Check if crypt() is provided by a separate library. +old_LIBS="$LIBS" +AC_SEARCH_LIBS([crypt],[crypt]) +LIBS="$old_LIBS" +if test "$ac_cv_search_crypt" = "-lcrypt" ; then + LIBCRYPT_LIBS="-lcrypt" +fi +AC_SUBST...

...sprep \ diff --git a/appliance/packagelist.in b/appliance/packagelist.in index 76c7293..160d9e8 100644 --- a/appliance/packagelist.in +++ b/appliance/packagelist.in @@ -257,3 +257,8 @@ ifelse(VALGRIND_DAEMON,1,valgrind) dnl Define this by doing: ./configure --with-extra-packages="..." EXTRA_PACKAGES +curl +qemu-img +debootstrap +apt +which diff --git a/configure.ac b/configure.ac index 1552bff..8194bb6 100644 --- a/configure.ac +++ b/configure.ac @@ -1740,6 +1740,7 @@ AC_CONFIG_FILES([Makefile customize/Makefile daemon/Makefile df/Makefile...

...7 @@ zerofree ifelse(VALGRIND_DAEMON,1,valgrind) +dnl tools needed by virt-dib +ifelse(REDHAT,1, + qemu-img + which +) +ifelse(DEBIAN,1, + qemu-utils +) +curl +dnl tools optionally used for elements +debootstrap + dnl Define this by doing: ./configure --with-extra-packages="..." EXTRA_PACKAGES diff --git a/configure.ac b/configure.ac index fb387dc..3cd9258 100644 --- a/configure.ac +++ b/configure.ac @@ -1729,6 +1729,7 @@ AC_CONFIG_FILES([Makefile customize/Makefile daemon/Makefile df/Makefile + dib/Makefile...

...ib/cmdline.ml b/dib/cmdline.ml index d013a181e..f5e8ec9cb 100644 --- a/dib/cmdline.ml +++ b/dib/cmdline.ml @@ -145,8 +145,6 @@ read the man page virt-dib(1). let mkfs_options = ref None in let set_mkfs_options arg = mkfs_options := Some arg in - let machine_readable = ref false in - let extra_packages = ref [] in let append_extra_packages arg = List.push_front_list (List.rev (String.nsplit "," arg)) extra_packages in @@ -191,14 +189,13 @@ read the man page virt-dib(1). [ L"smp" ], Getopt.Int ("vcpus", set_smp), s_"Set number of vCP...

...sprep \ diff --git a/appliance/packagelist.in b/appliance/packagelist.in index 76c7293..2f6878e 100644 --- a/appliance/packagelist.in +++ b/appliance/packagelist.in @@ -257,3 +257,7 @@ ifelse(VALGRIND_DAEMON,1,valgrind) dnl Define this by doing: ./configure --with-extra-packages="..." EXTRA_PACKAGES +curl +qemu-img +debootstrap +apt diff --git a/configure.ac b/configure.ac index d4137f6..1f6d21c 100644 --- a/configure.ac +++ b/configure.ac @@ -1703,6 +1703,8 @@ AC_CONFIG_FILES([builder/link.sh], [chmod +x,-w builder/link.sh]) AC_CONFIG_FILES([customize/link.sh],...

.....a4f814b 100644 --- a/appliance/packagelist.in +++ b/appliance/packagelist.in @@ -255,5 +255,12 @@ zerofree ifelse(VALGRIND_DAEMON,1,valgrind) +dnl tools needed by virt-dib +curl +qemu-img +debootstrap +apt +which + dnl Define this by doing: ./configure --with-extra-packages="..." EXTRA_PACKAGES diff --git a/configure.ac b/configure.ac index e0da1ad..9356566 100644 --- a/configure.ac +++ b/configure.ac @@ -1740,6 +1740,7 @@ AC_CONFIG_FILES([Makefile customize/Makefile daemon/Makefile df/Makefile + dib/Makefile...

...ecompress it. tmpfile="$(mktemp -u)" -cp $host_libexecdir/virt-p2v $tmpfile +xzcat $libdir/virt-p2v > $tmpfile md5sum_virt_p2v="$(md5sum $tmpfile | @AWK@ '{print $1}')" strip --strip-all $tmpfile gzip -9 $tmpfile @@ -207,7 +202,6 @@ done < $depsfile -v "extra_packages=$extra_packages" \ -v "md5sum_virt_p2v=$md5sum_virt_p2v" \ -v "repos=$repos" \ - -v "libexecdir=$libexecdir" \ '{ gsub (/__PACKAGE_NAME__/, "@PACKAGE_NAME@"); gsub (/__PACKAGE_VERSION__/, "@PACKAGE_VERSION@"); @@ -221,7...

Store the machine-readable flag globally, just like done for verbose/debug/etc, and enhance create_standard_options to provide --machine-readable automatically. --- common/mlstdutils/std_utils.ml | 4 ++++ common/mlstdutils/std_utils.mli | 7 +++++-- common/mltools/tools_utils.ml | 7 ++++++- common/mltools/tools_utils.mli | 5 ++++- 4 files changed, 19 insertions(+), 4 deletions(-) diff

..._DIST = \ 99-guestfs-serial.rules \ excludefiles.in \ - guestfsd.suppressions \ guestfs_lvm_conf.aug \ guestfs_shadow.aug \ hostfiles.in \ @@ -66,9 +65,6 @@ make.sh: make.sh.in $(top_builddir)/config.log $(top_builddir)/config.status rm -f $@-t PACKAGELIST_CPP_FLAGS = -D$(DISTRO)=1 -DEXTRA_PACKAGES="$(EXTRA_PACKAGES)" -if VALGRIND_DAEMON -PACKAGELIST_CPP_FLAGS += -DVALGRIND_DAEMON=1 -endif packagelist: packagelist.in Makefile m4 $(PACKAGELIST_CPP_FLAGS) $< | \ @@ -76,12 +72,11 @@ packagelist: packagelist.in Makefile cmp -s $@ $@-t || mv $@-t $@ rm -f $@-t -supermin.d/d...

Previously posted here: https://www.redhat.com/archives/libguestfs/2015-June/msg00266.html Rich.

...ring ". + (join '' && '', @{ $preseed_cmds{$di_key} }). "\n"; + } + + return create_webfile($ho, "preseed$sfx", $preseed_file); +} + sub preseed_create ($$;@) { my ($ho, $sfx, %xopts) = @_; @@ -619,22 +742,8 @@ END my $extra_packages = join(",",@extra_packages); - my $preseed_file= (<<END); -d-i mirror/suite string $suite - -d-i debian-installer/locale string en_GB -d-i console-keymaps-at/keymap select gb -d-i keyboard-configuration/xkb-keymap string en_GB - -#d-i debconf/frontend string readline - -d-i mir...

...++ b/appliance/packagelist.in @@ -288,5 +288,10 @@ kpartx dnl (virt-dib) tools optionally used for elements debootstrap +dnl exFAT is not usually available in free software repos +exfat-fuse +exfat-utils +fuse-exfat + dnl Define this by doing: ./configure --with-extra-packages="..." EXTRA_PACKAGES -- 2.9.3

...2 +0100 +++ b/docs/Doxyfile Wed Apr 25 10:24:22 2012 +0100 @@ -747,7 +747,7 @@ COMPACT_LATEX = NO # by the printer. Possible values are: a4, a4wide, letter, legal and # executive. If left blank a4wide will be used. -PAPER_TYPE = a4wide +PAPER_TYPE = a4 # The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX # packages that should be included in the LaTeX output. diff -r 5d796144e8a2 -r 057516cb8433 docs/xen-api/xenapi.tex --- a/docs/xen-api/xenapi.tex Wed Apr 25 10:17:10 2012 +0100 +++ b/docs/xen-api/xenapi.tex Wed Apr 25 10:24:22 2012 +0100 @@ -13,7...