Libguestfs - Oct 2012 - [PATCH 0/2] launch: Add add_drive 'label' option

This completes the implementation previously posted here:

https://www.redhat.com/archives/libguestfs/2012-October/msg00002.html

Instead of using 'serial', the option is now called 'label' and
these
are collectively called disk labels.

Also the updated patch adds a test.

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#)
http://cocan.org/getting_started_with_ocaml_on_red_hat_and_fedora

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
libguestfs lets you edit virtual machines.  Supports shell scripting,
bindings from many languages.  http://libguestfs.org
-------------- next part --------------
>From 6614d4f1d66921bf002067539b42c126d4bbfdb7 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones at redhat.com>
Date: Wed, 3 Oct 2012 11:46:07 +0100
Subject: [PATCH 1/2] build: Use 'tmp-d' as name of temporary directory
 instead of 'tmp'.

When building supermin.d/daemon.img, use 'tmp-d' instead of
'tmp'
as the name of the temporary directory.

This is just code motion.
---
 appliance/Makefile.am | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/appliance/Makefile.am b/appliance/Makefile.am
index fb1f676..6d8b74a 100644
--- a/appliance/Makefile.am
+++ b/appliance/Makefile.am
@@ -76,12 +76,12 @@ stamp-supermin: make.sh packagelist excludelist
 supermin.d/daemon.img: ../daemon/guestfsd guestfsd.suppressions
 	mkdir -p supermin.d
 	rm -f $@ $@-t
-	rm -rf tmp
-	mkdir -p tmp$(DAEMON_SUPERMIN_DIR) tmp/etc
-	ln ../daemon/guestfsd tmp$(DAEMON_SUPERMIN_DIR)/guestfsd
-	ln $(srcdir)/guestfsd.suppressions tmp/etc/guestfsd.suppressions
-	( cd tmp && find | cpio --quiet -o -H newc ) > $@-t
-	rm -rf tmp
+	rm -rf tmp-d
+	mkdir -p tmp-d$(DAEMON_SUPERMIN_DIR) tmp-d/etc
+	ln ../daemon/guestfsd tmp-d$(DAEMON_SUPERMIN_DIR)/guestfsd
+	ln $(srcdir)/guestfsd.suppressions tmp-d/etc/guestfsd.suppressions
+	( cd tmp-d && find | cpio --quiet -o -H newc ) > $@-t
+	rm -rf tmp-d
 	mv $@-t $@
 
 supermin.d/init.img: init
-- 
1.7.11.4

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
virt-df lists disk usage of guests without needing to install any
software inside the virtual machine.  Supports Linux and Windows.
http://et.redhat.com/~rjones/virt-df/
-------------- next part --------------