February 2013 - Libguestfs - libguestfs List Archives

enable build for ocaml bytecode
by Olaf Hering 28 Feb '14

28 Feb '14

This is a first attempt to build libguestfs with just a ocaml bytecode compiler. The three tools written in ocaml will be build only when an ocamlopt compiler is available. Olaf --- Makefile.am | 5 ++++- configure.ac | 2 ++ ocaml/Makefile.am | 20 +++++++++++++++++--- resize/Makefile.am | 2 +- sparsify/Makefile.am | 2 +- sysprep/Makefile.am | 2 +- 6 files changed, 26 insertions(+), 7 deletions(-) Index: libguestfs-1.20.1/Makefile.am =================================================================== --- libguestfs-1.20.1.orig/Makefile.am +++ libguestfs-1.20.1/Makefile.am @@ -74,7 +74,10 @@ if HAVE_PERL SUBDIRS += perl perl/examples endif if HAVE_OCAML -SUBDIRS += ocaml ocaml/examples +SUBDIRS += ocaml +endif +if HAVE_OCAMLOPT +SUBDIRS += ocaml/examples endif if HAVE_PYTHON SUBDIRS += python python/examples Index: libguestfs-1.20.1/configure.ac =================================================================== --- libguestfs-1.20.1.orig/configure.ac +++ libguestfs-1.20.1/configure.ac @@ -865,6 +865,8 @@ AS_IF([test "x$enable_ocaml" != "xno"], ]) AM_CONDITIONAL([HAVE_OCAML], [test "x$OCAMLC" != "xno" && test "x$OCAMLFIND" != "xno"]) +AM_CONDITIONAL([HAVE_OCAMLOPT], + [test "x$OCAMLOPT" != "xno" && test "x$OCAMLC" != "xno" && test "x$OCAMLFIND" != "xno"]) AM_CONDITIONAL([HAVE_OCAMLDOC], [test "x$OCAMLDOC" != "xno"]) Index: libguestfs-1.20.1/ocaml/Makefile.am =================================================================== --- libguestfs-1.20.1.orig/ocaml/Makefile.am +++ libguestfs-1.20.1/ocaml/Makefile.am @@ -43,10 +43,20 @@ CLEANFILES += t/*.cmi t/*.cmo t/*.cmx t/ if HAVE_OCAML +DATA_HOOK_FILES = META *.so *.a *.cma \ + *.cmi $(srcdir)/*.mli +if HAVE_OCAMLOPT +DATA_HOOK_FILES += *.cmx *.cmxa +endif + OCAMLCFLAGS = -g -warn-error CDEFLMPSUVYZX OCAMLOPTFLAGS = $(OCAMLCFLAGS) -noinst_DATA = mlguestfs.cma mlguestfs.cmxa META +noinst_DATA = mlguestfs.cma +if HAVE_OCAMLOPT +noinst_DATA += mlguestfs.cmxa +endif +noinst_DATA += META # Build the C part into a library, so that automake handles the C # compilation step for us. Note that we don't directly use this @@ -101,9 +111,13 @@ TESTS = run-bindtests \ $(patsubst %,%.opt,$(test_progs))) noinst_DATA += \ - bindtests.bc bindtests.opt \ + bindtests.bc +if HAVE_OCAMLOPT +noinst_DATA += \ + bindtests.opt \ $(test_progs:%=%.bc) \ $(test_progs:%=%.opt) +endif bindtests.bc: bindtests.cmo mlguestfs.cma mkdir -p t @@ -217,7 +231,7 @@ install-data-hook: $(OCAMLFIND) install \ -ldconf ignore -destdir $(DESTDIR)$(OCAMLLIB) \ guestfs \ - META *.so *.a *.cma *.cmx *.cmxa *.cmi $(srcdir)/*.mli + $(DATA_HOOK_FILES) rm $(DESTDIR)$(OCAMLLIB)/guestfs/bindtests.* rm $(DESTDIR)$(OCAMLLIB)/guestfs/libguestfsocaml.a Index: libguestfs-1.20.1/resize/Makefile.am =================================================================== --- libguestfs-1.20.1.orig/resize/Makefile.am +++ libguestfs-1.20.1/resize/Makefile.am @@ -40,7 +40,7 @@ SOURCES = \ resize_utils.ml \ resize_utils_tests.ml -if HAVE_OCAML +if HAVE_OCAMLOPT # Note this list must be in dependency order. OBJECTS = \ Index: libguestfs-1.20.1/sparsify/Makefile.am =================================================================== --- libguestfs-1.20.1.orig/sparsify/Makefile.am +++ libguestfs-1.20.1/sparsify/Makefile.am @@ -36,7 +36,7 @@ SOURCES = \ sparsify_gettext.ml \ sparsify_utils.ml -if HAVE_OCAML +if HAVE_OCAMLOPT # Note this list must be in dependency order. OBJECTS = \ Index: libguestfs-1.20.1/sysprep/Makefile.am =================================================================== --- libguestfs-1.20.1.orig/sysprep/Makefile.am +++ libguestfs-1.20.1/sysprep/Makefile.am @@ -86,7 +86,7 @@ SOURCES = \ utils.ml \ utils.mli -if HAVE_OCAML +if HAVE_OCAMLOPT # Note this list must be in dependency order. OBJECTS = \

2 8

[PATCH] sysprep: handle distro specific sysv scripts
by Olaf Hering 12 Dec '13

12 Dec '13

Currently firstboot would only work on redhat-based images. Handle redhat-based, suse-based and debian guests, error out in case of an unknown distro. Update firstboot.sh: - make sure scripts exists and can be executed - add LSB header to avoid insserv warnings later on - run script only if called with "start" Update functions, pass only required options. Signed-off-by: Olaf Hering <olaf(a)aepfle.de> diff --git a/sysprep/firstboot.ml b/sysprep/firstboot.ml index 97cd8a9..c5296a1 100644 --- a/sysprep/firstboot.ml +++ b/sysprep/firstboot.ml @@ -28,14 +28,35 @@ let firstboot_dir = "/usr/lib/virt-sysprep" let firstboot_sh = sprintf "\ #!/bin/sh - +### BEGIN INIT INFO +# Provides: virt-sysprep +# Required-Start: $null +# Should-Start: $all +# Required-Stop: $null +# Should-Stop: $all +# Default-Start: 2 3 5 +# Default-Stop: 0 1 6 +# Short-Description: Start scripts to run once at next boot +# Description: Start scripts to run once at next boot +# These scripts run the first time the guest boots, +# and then are deleted. Output or errors from the scripts +# are written to ~root/virt-sysprep-firstboot.log. +### END INIT INFO + d=%s/scripts logfile=~root/virt-sysprep-firstboot.log -for f in $d/* ; do - echo '=== Running' $f '===' >>$logfile - $f >>$logfile 2>&1 - rm $f -done +if test \"$1\" = \"start\" +then + for f in $d/* ; do + if test -x \"$f\" + then + echo '=== Running' $f '===' >>$logfile + $f >>$logfile 2>&1 + rm -f $f + fi + done +fi " firstboot_dir let firstboot_service = sprintf "\ @@ -56,7 +77,7 @@ WantedBy=default.target let failed fs = ksprintf (fun msg -> failwith (s_"firstboot: failed: " ^ msg)) fs -let rec install_service g root = +let rec install_service g distro = g#mkdir_p firstboot_dir; g#mkdir_p (sprintf "%s/scripts" firstboot_dir); g#write (sprintf "%s/firstboot.sh" firstboot_dir) firstboot_sh; @@ -64,18 +85,18 @@ let rec install_service g root = (* systemd, else assume sysvinit *) if g#is_dir "/etc/systemd" then - install_systemd_service g root + install_systemd_service g else - install_sysvinit_service g root + install_sysvinit_service g distro (* Install the systemd firstboot service, if not installed already. *) -and install_systemd_service g root = +and install_systemd_service g = g#write (sprintf "%s/firstboot.service" firstboot_dir) firstboot_service; g#mkdir_p "/etc/systemd/system/default.target.wants"; g#ln_sf (sprintf "%s/firstboot.service" firstboot_dir) "/etc/systemd/system/default.target.wants" -and install_sysvinit_service g root = +and install_sysvinit_redhat g = g#mkdir_p "/etc/rc.d/rc2.d"; g#mkdir_p "/etc/rc.d/rc3.d"; g#mkdir_p "/etc/rc.d/rc5.d"; @@ -86,12 +107,51 @@ and install_sysvinit_service g root = g#ln_sf (sprintf "%s/firstboot.sh" firstboot_dir) "/etc/rc.d/rc5.d/99virt-sysprep-firstboot" +(* Make firstboot.sh look like a runlevel script to avoid insserv warnings. *) +and install_sysvinit_suse g = + g#mkdir_p "/etc/init.d/rc2.d"; + g#mkdir_p "/etc/init.d/rc3.d"; + g#mkdir_p "/etc/init.d/rc5.d"; + g#ln_sf (sprintf "%s/firstboot.sh" firstboot_dir) + "/etc/init.d/virt-sysprep-firstboot"; + g#ln_sf "../virt-sysprep-firstboot" + "/etc/init.d/rc2.d/S99virt-sysprep-firstboot"; + g#ln_sf "../virt-sysprep-firstboot" + "/etc/init.d/rc3.d/S99virt-sysprep-firstboot"; + g#ln_sf "../virt-sysprep-firstboot" + "/etc/init.d/rc5.d/S99virt-sysprep-firstboot" + +and install_sysvinit_debian g = + g#mkdir_p "/etc/init.d"; + g#mkdir_p "/etc/rc2.d"; + g#mkdir_p "/etc/rc3.d"; + g#mkdir_p "/etc/rc5.d"; + g#ln_sf (sprintf "%s/firstboot.sh" firstboot_dir) + "/etc/init.d/virt-sysprep-firstboot"; + g#ln_sf "/etc/init.d/virt-sysprep-firstboot" + "/etc/rc2.d/S99virt-sysprep-firstboot"; + g#ln_sf "/etc/init.d/virt-sysprep-firstboot" + "/etc/rc3.d/S99virt-sysprep-firstboot"; + g#ln_sf "/etc/init.d/virt-sysprep-firstboot" + "/etc/rc5.d/S99virt-sysprep-firstboot" + +and install_sysvinit_service g distro = + match distro with + | ("fedora"|"rhel"|"centos"|"scientificlinux"|"redhat-based") -> + install_sysvinit_redhat g + | ("opensuse"|"sles"|"suse-based") -> + install_sysvinit_suse g + | "debian" -> + install_sysvinit_debian g + | _ -> + failed "guest type %s is not supported" distro + let add_firstboot_script g root id content = let typ = g#inspect_get_type root in let distro = g#inspect_get_distro root in match typ, distro with | "linux", _ -> - install_service g root; + install_service g distro; let t = Int64.of_float (Unix.time ()) in let r = string_random8 () in let filename = sprintf "%s/scripts/%Ld-%s-%s" firstboot_dir t r id in -- 1.7.12

2 8

Some fixes for building the Debian package for 1.20.2
by Hilko Bengen 05 Mar '13

05 Mar '13

I needed to add a few patches to be able to build libguestfs 1.20.2 out of tree. Mostly srcdir/builddir issues -- I think that I had posted something for building the daemon before. As mentioned on IRC, I found that compiling (Ruby bindings) caused config.h file shipped with the Ruby headers to be included rather than ${builddir}/config.h. This can be fixed because the relevant checks can be performed in the extconf.rb script as well. Cheers, -Hilko

2 10

virt-v2v F18 guest on F18 failure
by Ryan Barry 01 Mar '13

01 Mar '13

Run with LIBGUESTFS_ATTACH_METHOD=appliance Fails with: inspect_os: mount_ro: /dev/sda on / (options: 'ro'): mount: /dev/sda is already mounted or /sysroot busy at /usr/share/perl5/vendor_perl/Sys/VirtConvert/GuestfsHandle.pm line 194. virt-inspector works as expected libguestfs-test-tool.log: http://pastebin.ca/2317900 virt-v2v.log: http://iaindb.pastebin.ca/2317938 Any suggestions? -- while (!asleep) {sheep++;}

4 8

[PATCH v2 0/5] Fix SELinux security contexts so we can access shared disks (RHBZ#912499).
by Richard W.M. Jones 01 Mar '13

01 Mar '13

Link to version 1: https://www.redhat.com/archives/libguestfs/2013-February/thread.html#00122 Changes since version 1: - I've pushed two (of the three) code refactoring patches. The third one proved rather hard to move. - selinuxnorelabel option is no more. Instead there is a second internal API (internal_set_libvirt_selinux_norelabel_disks). - fixed bogus commit message - various other very minor fixes Rich.

2 12

[PATCH 0/7] Fix SELinux security contexts so we can access shared disks (RHBZ#912499).
by Richard W.M. Jones 28 Feb '13

28 Feb '13

https://bugzilla.redhat.com/show_bug.cgi?id=912499 (especially comments 7 & 10) This patch set is the final fix so that we can access disks in use by other guests when SELinux and sVirt are enabled. Previously such disks were inaccessible because sVirt labels the disks with a random SELinux label to prevent other instances of qemu from being able to read them. So naturally the libguestfs appliance (ie. qemu) cannot read these disks, not even if it is running as root. The fix is to read that SELinux label from libvirt, then label the libguestfs appliance the same way, so it can access the disks. This is done by modifying the guestfs_add_domain call so that it reads the label from libvirt, and passes the label through to the libvirt back end which uses it when creating the appliance. It's actually a bit more complex than this because we have to label the overlay disks and the appliance disk correctly. These patches are only the final part of the whole fix. I have already pushed fixes to virt-df and virt-alignment-scan (34e77af1bf + 6e3aab2f0c + several dependent commits) so that these tools now use just one appliance per guest, allowing us to label that appliance correctly, because if an appliance is attached to multiple guests then there is no single label that could be used. As a result of the total complexity of this fix, I very much doubt that it can be backported to 1.20. Rich.

4 30

parallelization
by Colin Walters 26 Feb '13

26 Feb '13

So Richard recently blogged about running many libguestfs mounts in parallel. I actually want parallelization in the other way; I use guestmount to access a disk image, and my program is multithreaded. It does read/write and most especially calls to link() and fdatasync() from threads. However, this all ends up being serialized, because the guestfsd protocol is synchronous, and the daemon side is single-threaded. Related to this, the qemu instance is always booted with only one vCPU. Have there been any thoughts on fixing this?

3 3

virt-ls question (was: Re: libguestfs)
by Richard W.M. Jones 26 Feb '13

26 Feb '13

On Mon, Feb 25, 2013 at 06:31:36PM +0100, Khan Ferdous Wahid wrote: > Hi, > I would like to know if it is possible to "Find everything modified in the > last 10 minutes" as you did for last 7 days in > > virt-ls -lR -d guest --time-days / | awk '$6 <= 7' You can use: virt-ls -lR -d guest --time-relative / | awk '$6 <= 10' > Where should I look for it? Which source file contains the code? Thank you. The source is here: https://github.com/libguestfs/libguestfs/blob/master/cat/virt-ls.c#L813 Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming blog: http://rwmj.wordpress.com Fedora now supports 80 OCaml packages (the OPEN alternative to F#)

2 2

Proposed API for guestconv library
by Matthew Booth 25 Feb '13

25 Feb '13

guestconv will be a new, re-usable library to perform guest OS conversions when moving between hypervisors. I've attached 3 files to this email which are relevant to the proposed API. guestconv.h is the proposed C binding. example.c is the simplest possible usage of the API. It converts the first detected root of the guest, accepting all defaults. root.xml is an example description returned by inspection. The first 2 should be self-explanatory, but root.xml requires more explanation. /guestconv/info contains generic information about the detected guest OS. It can't be modified. /guestconv/devices contains a list of detected devices. It can be modified to affect the choice of driver for each device. Each element has an id which uniquely identifies the specific device of a particular type, and the selected driver. Available driver options are given as child elements. If an element is deleted from /guestconv/devices it will be unconfigured. There are a couple of potential issues I see with it myself: Firstly, modifying XML isn't the cleanest API ever. However, I can't think of a better solution which would be similarly flexible, and work well with language bindings. Secondly, it doesn't cover the case of an EC2->KVM conversion where you will need to do additional transformations before conversion. Specifically you'll need to add a partition table and boot loader. You could potentially argue that this kind of transformation is out of scope for the tool. However, it would introduce changes that you would have to take into account during conversion due to altered device names. I think we need to be able to support it without a major API change, even if we don't support it initially. I'll try to post an update which supports this, although ideas are welcome in the meantime. Matt

3 3

virt-edit Guestname /boot/grub/grub.conf error
by Sandeep Raman 25 Feb '13

25 Feb '13

Hello, I get the following message on virt-edit Guestname /boot/grub/grub.conf. I have executed the command. guestmount –ro -a /var/lib/nova/instances/instance-00000001/disk -m /dev/sda1 /mnt guestmount -d instance-00000001 -i –ro /mnt root@compute:~# virt-edit instance-00000001 /boot/grub/grub.conf libguestfs: error: error: domain is a live virtual machine. Writing to the disks of a running virtual machine can cause disk corruption. Either use read-only access, or if the guest is running the guestfsd daemon specify live access. In most libguestfs tools these options are –ro or –live respectively. Consult the documentation for further information. root@compute:~# Please help how to get past this. Regards, Sandeep.

2 2