Don't munge default network XML if uuidgen is not present (John Levon)

diff --git a/ChangeLog b/ChangeLog
index 0af52424879799f4a40c27ef8ad09159a3ae198a..3744da2c5fce483f23719ad6c38baeeec45b91e4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Dec 18 11:54:58 GMT 2008 Daniel P. Berrange <berrange@redhat.com>
+
+       * qemud/Makefile.am: Don't munge default network XML if
+       uuidgen is not present (John Levon)
+
 Thu Dec 18 11:50:58 GMT 2008 Daniel P. Berrange <berrange@redhat.com>
 
        Misc daemon bug fixes (John Levon)

diff --git a/qemud/Makefile.am b/qemud/Makefile.am
index b050bfa6834105be19d7468103c90df0402324cc..8983416c08d5a8f0caeeaf091c80b0bb60dfb59b 100644 (file)
--- a/qemud/Makefile.am
+++ b/qemud/Makefile.am
@@ -60,7 +60,7 @@ remote_protocol.c: remote_protocol.h
 
 if WITH_LIBVIRTD
 
-UUID=$(shell uuidgen)
+UUID=$(shell uuidgen 2>/dev/null)
 
 sbin_PROGRAMS = libvirtd
 
@@ -144,8 +144,9 @@ install-data-local: install-init install-data-sasl install-data-polkit \
        mkdir -p $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart
        $(INSTALL_DATA) $(srcdir)/default-network.xml \
          $(DESTDIR)$(sysconfdir)/$(default_xml_dest)
-       sed -i -e "s,</name>,</name>\n  <uuid>$(UUID)</uuid>," \
-         $(DESTDIR)$(sysconfdir)/$(default_xml_dest)
+       test -z "$(UUID)" || \
+         sed -i -e "s,</name>,</name>\n  <uuid>$(UUID)</uuid>," \
+           $(DESTDIR)$(sysconfdir)/$(default_xml_dest)
        test -e $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart/default.xml || \
            ln -s ../default.xml \
            $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart/default.xml