rpms/vhostmd/F-11 sources, 1.2, 1.3 vhostmd.conf, 1.1, 1.2 vhostmd.init, 1.1, 1.2 vhostmd.spec, 1.1, 1.2 vhostmd.sysconfig, 1.1, 1.2 0001-Further-changes-to-avoid-using-xenstore.patch, 1.1, NONE
Richard W.M. Jones
rjones at fedoraproject.org
Thu Oct 15 17:53:57 UTC 2009
- Previous message (by thread): rpms/vhostmd/F-12 sources, 1.2, 1.3 vhostmd.conf, 1.1, 1.2 vhostmd.init, 1.1, 1.2 vhostmd.spec, 1.1, 1.2 vhostmd.sysconfig, 1.1, 1.2 0001-Further-changes-to-avoid-using-xenstore.patch, 1.1, NONE
- Next message (by thread): rpms/vhostmd/EL-5 sources, 1.2, 1.3 vhostmd.conf, 1.1, 1.2 vhostmd.init, 1.1, 1.2 vhostmd.spec, 1.1, 1.2 vhostmd.sysconfig, 1.1, 1.2 0001-Further-changes-to-avoid-using-xenstore.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rjones
Update of /cvs/pkgs/rpms/vhostmd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29133
Modified Files:
sources vhostmd.conf vhostmd.init vhostmd.spec
vhostmd.sysconfig
Removed Files:
0001-Further-changes-to-avoid-using-xenstore.patch
Log Message:
* Thu Oct 15 2009 Richard W.M. Jones <rjones at redhat.com> - 0.4-0.2.gitea2f772d
- New upstream based on git ea2f772d.
- Update the configuration file based on upstream changes to how virsh
has to be run.
- vhostmd should run non-root as user 'vhostmd'.
- Allow libvirt URI to be configured.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vhostmd/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources 13 Oct 2009 17:57:10 -0000 1.2
+++ sources 15 Oct 2009 17:53:56 -0000 1.3
@@ -1 +1 @@
-3e96ae064b7accaea68160d48379c92f vhostmd-0.4.tar.bz2
+e241097003a7a8eb1898fcc152581596 vhostmd-0.4.tar.bz2
Index: vhostmd.conf
===================================================================
RCS file: /cvs/pkgs/rpms/vhostmd/F-11/vhostmd.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- vhostmd.conf 13 Oct 2009 17:57:10 -0000 1.1
+++ vhostmd.conf 15 Oct 2009 17:53:57 -0000 1.2
@@ -43,19 +43,19 @@ within the vm element.
</metric>
<metric type="string" context="host">
<name>VirtualizationProductInfo</name>
- <action>virsh version | grep API | gawk -F': ' '{print $2}'</action>
+ <action>virsh -r CONNECT version | grep API | gawk -F': ' '{print $2}'</action>
</metric>
<metric type="uint32" context="host">
<name>TotalPhyCPUs</name>
- <action>virsh nodeinfo | grep 'CPU(s):' | gawk -F': +' '{print $2}'</action>
+ <action>virsh -r CONNECT nodeinfo | grep 'CPU(s):' | gawk -F': +' '{print $2}'</action>
</metric>
<metric type="uint32" context="host">
<name>NumCPUs</name>
- <action>virsh nodeinfo | grep 'CPU(s):' | gawk -F': +' '{print $2}'</action>
+ <action>virsh -r CONNECT nodeinfo | grep 'CPU(s):' | gawk -F': +' '{print $2}'</action>
</metric>
<metric type="uint64" context="host">
<name>TotalPhyMem</name>
- <action>virsh nodeinfo | grep 'Memory size:' | gawk -F' +' '{print $3}'</action>
+ <action>virsh -r CONNECT nodeinfo | grep 'Memory size:' | gawk -F' +' '{print $3}'</action>
</metric>
<metric type="uint64" context="host">
<name>UsedMem</name>
@@ -81,12 +81,12 @@ within the vm element.
</metric>
<!--<metric type="real64" context="host">
<name>TotalCPUTime</name>
- <action>virsh dominfo 0 | sed 's/: */:/' | \
+ <action>virsh -r CONNECT dominfo 0 | sed 's/: */:/' | \
gawk -F: '/CPU time/ {print $2;}'</action>
</metric>-->
<metric type="real64" context="vm">
<name>TotalCPUTime</name>
- <action>virsh dominfo NAME | sed 's/: */:/' | \
+ <action>virsh -r CONNECT dominfo NAME | sed 's/: */:/' | \
gawk -F: '/CPU time/ {print $2;}'</action>
</metric>
</metrics>
Index: vhostmd.init
===================================================================
RCS file: /cvs/pkgs/rpms/vhostmd/F-11/vhostmd.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- vhostmd.init 13 Oct 2009 17:57:10 -0000 1.1
+++ vhostmd.init 15 Oct 2009 17:53:57 -0000 1.2
@@ -30,6 +30,12 @@ fi
if [ -n "$VHOSTMD_CONFIG" ]; then
ARGS="$ARGS --config $VHOSTMD_CONFIG"
fi
+if [ -n "$VHOSTMD_USER" ]; then
+ ARGS="$ARGS --user $VHOSTMD_USER"
+fi
+if [ -n "$VHOSTMD_URI" ]; then
+ ARGS="$ARGS --connect $VHOSTMD_URI"
+fi
lockfile=/var/lock/subsys/$prog
Index: vhostmd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vhostmd/F-11/vhostmd.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- vhostmd.spec 13 Oct 2009 17:57:10 -0000 1.1
+++ vhostmd.spec 15 Oct 2009 17:53:57 -0000 1.2
@@ -8,7 +8,7 @@
Summary: Virtualization host metrics daemon
Name: vhostmd
Version: 0.4
-Release: 0.1.git326f0012172%{?dist}
+Release: 0.2.gitea2f772d%{?dist}
License: GPLv2+
Group: System Environment/Daemons
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -16,24 +16,18 @@ BuildRoot: %{_tmppath}/%{name}-%{ver
URL: http://gitorious.org/vhostmd
# Upstream tarball hosting is screwed at the moment. This release is
-# a pre-release of 0.4, based on git 326f00121729760c0236ef1b56b905f85470c740
-# with 'make dist' done by the packager.
+# a pre-release of 0.4, based on the git commit names in the Release
+# tag above, with 'make dist' done by the packager.
Source0: vhostmd-%{version}.tar.bz2
Source1: vhostmd.init
Source2: vhostmd.sysconfig
Source3: vhostmd.conf
-# Fix --without-xenstore option. Patch posted upstream on 2009-10-13.
-Patch0: 0001-Further-changes-to-avoid-using-xenstore.patch
-
BuildRequires: chrpath
BuildRequires: pkgconfig
BuildRequires: libxml2-devel
BuildRequires: libvirt-devel
-# Used when we are patching autotools configuration.
-BuildRequires: automake, autoconf, libtool
-
%if %{have_xen}
BuildRequires: xen-devel
%endif
@@ -42,6 +36,7 @@ Requires(post): chkconfig
Requires(preun): chkconfig
Requires(preun): initscripts
Requires(postun): initscripts
+Requires(pre): shadow-utils
%description
@@ -74,9 +69,6 @@ Header and libraries necessary for metri
%prep
%setup -q
-%patch0 -p1
-./autogen.sh
-
%build
%configure \
@@ -144,6 +136,14 @@ fi
%postun -n vm-dump-metrics -p /sbin/ldconfig
+%pre
+getent group vhostmd >/dev/null || groupadd -r vhostmd
+getent passwd vhostmd >/dev/null || \
+useradd -r -g vhostmd -d %{_datadir}/vhostmd -s /sbin/nologin \
+-c "Virtual Host Metrics Daemon" vhostmd
+exit 0
+
+
%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README
@@ -183,6 +183,13 @@ fi
%changelog
+* Thu Oct 15 2009 Richard W.M. Jones <rjones at redhat.com> - 0.4-0.2.gitea2f772d
+- New upstream based on git ea2f772d.
+- Update the configuration file based on upstream changes to how virsh
+ has to be run.
+- vhostmd should run non-root as user 'vhostmd'.
+- Allow libvirt URI to be configured.
+
* Tue Oct 13 2009 Richard W.M. Jones <rjones at redhat.com> - 0.4-0.1.git326f0012172
- Move to pre-release of 0.4, self-built tarball.
- Disable xenstore on non-x86 platforms.
Index: vhostmd.sysconfig
===================================================================
RCS file: /cvs/pkgs/rpms/vhostmd/F-11/vhostmd.sysconfig,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- vhostmd.sysconfig 13 Oct 2009 17:57:10 -0000 1.1
+++ vhostmd.sysconfig 15 Oct 2009 17:53:57 -0000 1.2
@@ -3,3 +3,9 @@
# Override the default configuration file path.
#VHOSTMD_CONFIG=/path/to/vhostmd.conf
+
+# Set the user that the daemon runs as after dropping root privs.
+VHOSTMD_USER=vhostmd
+
+# Set the libvirt URI.
+VHOSTMD_URI=qemu:///system
--- 0001-Further-changes-to-avoid-using-xenstore.patch DELETED ---
- Previous message (by thread): rpms/vhostmd/F-12 sources, 1.2, 1.3 vhostmd.conf, 1.1, 1.2 vhostmd.init, 1.1, 1.2 vhostmd.spec, 1.1, 1.2 vhostmd.sysconfig, 1.1, 1.2 0001-Further-changes-to-avoid-using-xenstore.patch, 1.1, NONE
- Next message (by thread): rpms/vhostmd/EL-5 sources, 1.2, 1.3 vhostmd.conf, 1.1, 1.2 vhostmd.init, 1.1, 1.2 vhostmd.spec, 1.1, 1.2 vhostmd.sysconfig, 1.1, 1.2 0001-Further-changes-to-avoid-using-xenstore.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list