mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-08-27 02:51:16 +00:00
Don't munge default network XML if uuidgen is not present (John Levon)
This commit is contained in:
parent
13d98d68fc
commit
9e8517c745
@ -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>
|
Thu Dec 18 11:50:58 GMT 2008 Daniel P. Berrange <berrange@redhat.com>
|
||||||
|
|
||||||
Misc daemon bug fixes (John Levon)
|
Misc daemon bug fixes (John Levon)
|
||||||
|
@ -60,7 +60,7 @@ remote_protocol.c: remote_protocol.h
|
|||||||
|
|
||||||
if WITH_LIBVIRTD
|
if WITH_LIBVIRTD
|
||||||
|
|
||||||
UUID=$(shell uuidgen)
|
UUID=$(shell uuidgen 2>/dev/null)
|
||||||
|
|
||||||
sbin_PROGRAMS = libvirtd
|
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
|
mkdir -p $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart
|
||||||
$(INSTALL_DATA) $(srcdir)/default-network.xml \
|
$(INSTALL_DATA) $(srcdir)/default-network.xml \
|
||||||
$(DESTDIR)$(sysconfdir)/$(default_xml_dest)
|
$(DESTDIR)$(sysconfdir)/$(default_xml_dest)
|
||||||
sed -i -e "s,</name>,</name>\n <uuid>$(UUID)</uuid>," \
|
test -z "$(UUID)" || \
|
||||||
$(DESTDIR)$(sysconfdir)/$(default_xml_dest)
|
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 || \
|
test -e $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart/default.xml || \
|
||||||
ln -s ../default.xml \
|
ln -s ../default.xml \
|
||||||
$(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart/default.xml
|
$(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart/default.xml
|
||||||
|
Loading…
Reference in New Issue
Block a user