From afa1d92a9ff6ea66f9c145f6eabf5e1aa086c95e Mon Sep 17 00:00:00 2001
From: "Daniel P. Berrange" <berrange@redhat.com>
Date: Mon, 12 Mar 2007 16:32:43 +0000
Subject: [PATCH] Autogenerate UUID for default network

---
 ChangeLog       |  8 +++++++-
 libvirt.spec.in | 18 ++++++++++++------
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0dcfee96f1..bcec9857d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
-Mon Mar 10 10:09:11 EST 2007 Daniel P. Berrange <berrange@redhat.com>
+Mon Mar 12 12:32:11 EST 2007 Daniel P. Berrange <berrange@redhat.com>
+
+	* libvirt.spec.in: Generate a random UUID for the default network
+	for each RPM installation. Mark /etc directories as %dir as needed
+	and make files mode 0700 to protect passwords for VNC server
+
+Mon Mar 12 10:09:11 EST 2007 Daniel P. Berrange <berrange@redhat.com>
 
 	* qemud/Makefile.am: Generate a fixed, but random UUID in the default
 	network config file when installing it
diff --git a/libvirt.spec.in b/libvirt.spec.in
index 813938e872..8123e886e4 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -74,6 +74,8 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/*.a
 install -d -m 0755 $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/
 install -d -m 0755 $RPM_BUILD_ROOT%{_localstatedir}/run/libvirt/
+# Strip auto-generated UUID - we need it generated per-install
+sed -i -e "/<uuid>/d" $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/default.xml
 %find_lang %{name}
 
 %clean
@@ -82,6 +84,10 @@ rm -fr %{buildroot}
 %post
 /sbin/ldconfig
 /sbin/chkconfig --add libvirtd
+if [ $1 = 1 ]; then
+    UUID=`/usr/bin/uuidgen`
+    sed -i -e "s,</name>,</name>\n  <uuid>$UUID</uuid>," %{_sysconfdir}/libvirt/qemu/networks/default.xml
+fi
 
 %preun
 if [ $1 = 0 ]; then
@@ -99,13 +105,13 @@ fi
 %doc %{_mandir}/man1/virsh.1*
 %{_bindir}/virsh
 %{_libdir}/lib*.so.*
-%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
+%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/
+%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/
+%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/
+%config %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/default.xml
+%config %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml
 %{_sysconfdir}/rc.d/init.d/libvirtd
-%{_localstatedir}/run/libvirt/
+%dir %{_localstatedir}/run/libvirt/
 %attr(4755, root, root) %{_libexecdir}/libvirt_proxy
 %attr(0755, root, root) %{_sbindir}/libvirt_qemud
 %doc docs/libvirt.rng