From 9e8517c74538f23f37468f26898c903050c287fd Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Thu, 18 Dec 2008 11:54:34 +0000 Subject: [PATCH] Don't munge default network XML if uuidgen is not present (John Levon) --- ChangeLog | 5 +++++ qemud/Makefile.am | 7 ++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0af5242487..3744da2c5f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Dec 18 11:54:58 GMT 2008 Daniel P. Berrange + + * 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 Misc daemon bug fixes (John Levon) diff --git a/qemud/Makefile.am b/qemud/Makefile.am index b050bfa683..8983416c08 100644 --- 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,,\n $(UUID)," \ - $(DESTDIR)$(sysconfdir)/$(default_xml_dest) + test -z "$(UUID)" || \ + sed -i -e "s,,\n $(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