diff --git a/ChangeLog b/ChangeLog index d90a12833b2b2874e479e8c279b512e1cd6081e0..ba7d14f46399eeb505841e7d1727fdbcc01653a6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Wed Mar 07 11:53:22 IST 2007 Mark McLoughlin + + * qemud/default-network.xml: add a default network + + * qemud/Makefile.am: install it, and the autostart symlink + + * libvirt.spec.in: update + Tue Mar 06 17:02:12 EST 2007 Daniel P. Berrange * src/hash.c: virGetDomain and virGetNetwork require that both diff --git a/libvirt.spec.in b/libvirt.spec.in index af0360d8d2ec83a0ea7d4774efc5ee1632d5def9..3943878a953b431a5546b97ebb037591bdfa9ed0 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -96,6 +96,8 @@ fi %config %{_sysconfdir}/libvirt/ %config %{_sysconfdir}/libvirt/qemu/ %config %{_sysconfdir}/libvirt/qemu/networks/ +%config %{_sysconfdir}/libvirt/qemu/networks/default.xml +%config %{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml %{_sysconfdir}/rc.d/init.d/libvirtd %{_localstatedir}/run/libvirt/ %attr(4755, root, root) %{_libexecdir}/libvirt_proxy diff --git a/qemud/Makefile.am b/qemud/Makefile.am index ba726fef3b3aa02bc8b08b359ad7ab4f6834afa5..2dcb469e8b2a28b4871b09f90b021df170e30055 100644 --- a/qemud/Makefile.am +++ b/qemud/Makefile.am @@ -20,7 +20,17 @@ libvirt_qemud_LDFLAGS = $(LIBXML_LIBS) $(SYSFS_LIBS) libvirt_qemud_DEPENDENCIES = libvirt_qemud_LDADD = -EXTRA_DIST = libvirtd.in +install-data-local: + mkdir -p $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart + $(INSTALL_DATA) $(srcdir)/default-network.xml $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml + ln -s ../default.xml $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart/default.xml + +uninstall-local: + rm -f $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart/default.xml + rm -f $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml + rmdir $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart || : + +EXTRA_DIST = libvirtd.in default-network.xml if LIBVIRT_INIT_SCRIPTS_RED_HAT initdir = $(sysconfdir)/rc.d/init.d diff --git a/qemud/default-network.xml b/qemud/default-network.xml new file mode 100644 index 0000000000000000000000000000000000000000..b8f039536d78d1d5a569b1033b283605a34213d2 --- /dev/null +++ b/qemud/default-network.xml @@ -0,0 +1,9 @@ + + default + + + + + + +