提交 9e8517c7 编写于 作者: D Daniel P. Berrange

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

上级 13d98d68
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)
......
......@@ -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
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册