[ovirt-node] ovirt-node 2.0.1 release

Mon Aug 1 16:19:54 UTC 2011

commit e0e1b45d1b7f737e022c88fca9cff2ce5a2c68d1
Author: Alan Pevec <apevec at redhat.com>
Date:   Mon Aug 1 18:19:20 2011 +0200

    ovirt-node 2.0.1 release

 .gitignore      |    1 +
 ovirt-node.spec |   58 +++++++++++++++++++++++++++++++++++++++++++++++++++---
 sources         |    2 +-
 3 files changed, 56 insertions(+), 5 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index f548b35..b65a40e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /ovirt-node-2.0.0.tar.gz
+/ovirt-node-2.0.1.tar.gz
diff --git a/ovirt-node.spec b/ovirt-node.spec
index 7b288d5..cae2734 100644
--- a/ovirt-node.spec
+++ b/ovirt-node.spec
@@ -1,11 +1,12 @@
 %global product_family oVirt Node
+%global product_release %{version} (0)
 %global mgmt_scripts_dir %{_sysconfdir}/node.d
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 
 Summary:        The %{product_family} daemons/scripts
 Name:           ovirt-node
-Version:        2.0.0
+Version:        2.0.1
 Release:        1%{?dist}%{?extra_release}
 Source0:        %{name}-%{version}.tar.gz
 License:        GPLv2+
@@ -25,7 +26,7 @@ Requires:       glusterfs-client >= 2.0.1
 Requires:       anyterm
 Requires:       python-IPy
 %endif
-Requires:       libvirt >= 0.6.3
+Requires:       libvirt >= 0.9.2
 Requires:       augeas >= 0.3.5
 Requires:       udev >= 147-2.34
 Requires:       wget
@@ -48,6 +49,12 @@ Requires:       python-gudev
 Requires:       PyPAM
 Requires:       ethtool
 Requires:       cracklib-python
+Requires:       dracut
+%if 0%{?rhel}
+# for applying patches in %post
+Requires:       patch
+%endif
+Requires:       system-release
 
 BuildArch:      noarch
 
@@ -75,7 +82,7 @@ however on a development machine to help to build the image.
 
 %build
 aclocal && autoheader && automake --add-missing && autoconf
-%configure
+%configure --without-image-minimizer
 make
 
 %install
@@ -90,6 +97,7 @@ make install DESTDIR=%{buildroot}
 %{__install} -d -m0755 %{buildroot}%{mgmt_scripts_dir}
 %{__install} -d -m0755 %{buildroot}%{_sysconfdir}/cron.d
 %{__install} -d -m0755 %{buildroot}%{_sysconfdir}/logrotate.d
+%{__install} -d -m0755 %{buildroot}%{_sysconfdir}/dracut.conf.d
 
 %{__install} -p -m0755 scripts/node-config %{buildroot}%{_sysconfdir}/sysconfig
 
@@ -101,6 +109,12 @@ make install DESTDIR=%{buildroot}
 
 %{__install} -p -m0644 logrotate/ovirt-logrotate %{buildroot}%{_sysconfdir}/cron.d
 %{__install} -p -m0644 logrotate/ovirt-logrotate.conf %{buildroot}%{_sysconfdir}/logrotate.d/ovirt-node
+# configure libvirtd upstart job
+%{__install} -d -m0755 %{buildroot}%{_sysconfdir}/init
+%{__install} -p -m0644 libvirtd.upstart %{buildroot}%{_sysconfdir}/init/libvirtd.conf
+# load vlan module
+%{__install} -d -m0755 %{buildroot}%{_sysconfdir}/sysconfig/modules
+%{__install} -p -m0755 vlan.modules %{buildroot}%{_sysconfdir}/sysconfig/modules
 
 #dracut module for disk cleanup
 %{__install} -d -m0755 %{buildroot}%{_datadir}/dracut/modules.d/91ovirtnode
@@ -108,6 +122,12 @@ make install DESTDIR=%{buildroot}
 %{__install} -p -m0755 dracut/install %{buildroot}%{_datadir}/dracut/modules.d/91ovirtnode
 %{__install} -p -m0755 scripts/ovirt-boot-functions %{buildroot}%{_datadir}/dracut/modules.d/91ovirtnode
 %{__install} -p -m0755 dracut/ovirt-cleanup.sh %{buildroot}%{_datadir}/dracut/modules.d/91ovirtnode
+%{__install} -p -m0644 dracut/ovirt-dracut.conf %{buildroot}%{_sysconfdir}/dracut.conf.d
+%if 0%{?rhel}
+# dracut patches for rhel6
+%{__install} -p -m0644 dracut/dracut-3d88d27810acc7782618d67a03ff5c0e41494ca4.patch %{buildroot}%{app_root}
+%{__install} -p -m0644 dracut/dracut-93724aa28fc20c8b7f0167201d1759b7118ba890.patch %{buildroot}%{app_root}
+%endif
 
 # resolv.conf augeas lens
 %{__install} -d -m0755 %{buildroot}/usr/share/augeas/lenses
@@ -165,8 +185,19 @@ echo "# File where default configuration is kept" > %{buildroot}/%{_sysconfdir}/
 /sbin/chkconfig --add ovirt-post
 # workaround for imgcreate/live.py __copy_efi_files
 if [ ! -e /boot/grub/splash.xpm.gz ]; then
-  cp /usr/share/ovirt-node/grub-splash.xpm.gz /boot/grub/splash.xpm.gz
+  cp %{app_root}/grub-splash.xpm.gz /boot/grub/splash.xpm.gz
 fi
+%if 0%{?rhel}
+# apply dracut fixes not in rhel6
+# rhbz#683330
+# dracut.git commits rediffed for dracut-004-53.el6
+patch -d /usr/share/dracut/ -p0 < %{app_root}/dracut-3d88d27810acc7782618d67a03ff5c0e41494ca4.patch
+patch -d /usr/share/dracut/ -p0 < %{app_root}/dracut-93724aa28fc20c8b7f0167201d1759b7118ba890.patch
+%endif
+#use all hard-coded defaults for multipath
+> /etc/multipath.conf
+#release info for dracut to pick it up into initramfs
+echo "%{product_family} release %{product_release}" > /etc/system-release
 
 %preun
 if [ $1 = 0 ] ; then
@@ -201,11 +232,19 @@ fi
 %{_sysconfdir}/ovirt-config-boot.d
 %config(noreplace) %{_sysconfdir}/sysconfig/node-config
 
+%{_sysconfdir}/init/libvirtd.conf
+
+%{_sysconfdir}/sysconfig/modules/vlan.modules
+
 %doc COPYING
 # should be ifarch i386
 %{app_root}/grub-splash.xpm.gz
 # end i386 bits
 %{app_root}/syslinux-vesa-splash.jpg
+%if 0%{?rhel}
+%{app_root}/dracut-3d88d27810acc7782618d67a03ff5c0e41494ca4.patch
+%{app_root}/dracut-93724aa28fc20c8b7f0167201d1759b7118ba890.patch
+%endif
 
 %{_datadir}/augeas/lenses/build.aug
 %{_datadir}/augeas/lenses/resolv.aug
@@ -214,6 +253,7 @@ fi
 %{_datadir}/dracut/modules.d/91ovirtnode/install
 %{_datadir}/dracut/modules.d/91ovirtnode/ovirt-boot-functions
 %{_datadir}/dracut/modules.d/91ovirtnode/ovirt-cleanup.sh
+%{_sysconfdir}/dracut.conf.d/ovirt-dracut.conf
 %{_libexecdir}/ovirt-config-boot
 %{_libexecdir}/ovirt-config-boot-wrapper
 %{_libexecdir}/ovirt-config-hostname
@@ -250,6 +290,16 @@ fi
 %{_sysconfdir}/ovirt-early.d
 
 %changelog
+* Mon Aug 01 2011 Alan Pevec <apevec at redhat.com> 2.0.1-1
+- bugfixes
+- use GPT by default
+- add libvirt-cim
+- add adminpw command line option
+- install selected Matahari agents and the broker
+- make image minimization optional
+- add virt-manager-tui package
+- configure libvirtd upstart job
+
 * Mon Jun 20 2011 Alan Pevec <apevec at redhat.com> 2.0.0-1
 - split kickstarts per distro, currently ovirt15 and rhevh6
 - new installation and configuration text UI for standalone mode
diff --git a/sources b/sources
index b855a9d..b51d87e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8e9bf8022d65a82bc4509d6fff44ba3b  ovirt-node-2.0.0.tar.gz
+80ef8a7d253fca2cc2d206db2f523ccd  ovirt-node-2.0.1.tar.gz
