From: rmccabe@sourceware.org <rmccabe@sourceware.org>
To: cluster-devel.redhat.com
Subject: [Cluster-devel] conga ./ricci.spec.in.in make/version.in ricci ...
Date: 30 Jul 2008 17:00:14 -0000 [thread overview]
Message-ID: <20080730170014.2585.qmail@sourceware.org> (raw)
CVSROOT: /cvs/cluster
Module name: conga
Changes by: rmccabe at sourceware.org 2008-07-30 17:00:10
Modified files:
. : ricci.spec.in.in
make : version.in
ricci/modules/virt: Virt.cpp
ricci/ricci : DBusController.cpp
ricci/ricci/d-bus: ricci.oddjob.conf
Log message:
Install ricci-libvirt oddjob policy
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci.spec.in.in.diff?cvsroot=cluster&r1=1.11&r2=1.12
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/make/version.in.diff?cvsroot=cluster&r1=1.38&r2=1.39
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/virt/Virt.cpp.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/ricci/DBusController.cpp.diff?cvsroot=cluster&r1=1.19&r2=1.20
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/ricci/d-bus/ricci.oddjob.conf.diff?cvsroot=cluster&r1=1.2&r2=1.3
--- conga/ricci.spec.in.in 2008/06/06 16:41:52 1.11
+++ conga/ricci.spec.in.in 2008/07/30 17:00:08 1.12
@@ -12,7 +12,7 @@
Version: @@VERS@@
Release: @@REL@@%{?dist}
License: GPLv2
-URL: http://sources.redhat.com/cluster/
+URL: http://sources.redhat.com/cluster/conga/
Group: System Environment/Base
Summary: Remote Management System - Managed Station
Summary: Remote Cluster and Storage Management System
@@ -95,6 +95,11 @@
%config(noreplace) %{_sysconfdir}/dbus-1/system.d/ricci-modlog.systembus.conf
%{_libexecdir}/ricci-modlog
+# modvirt
+%config(noreplace) %{_sysconfdir}/oddjobd.conf.d/ricci-modvirt.oddjob.conf
+%config(noreplace) %{_sysconfdir}/dbus-1/system.d/ricci-modvirt.systembus.conf
+ %{_libexecdir}/ricci-modvirt
+
%pre -n ricci
getent group ricci >/dev/null || groupadd -r ricci
getent passwd ricci >/dev/null || useradd -r -g ricci -d /var/lib/ricci -s /sbin/nologin -c "ricci daemon user" ricci
--- conga/make/version.in 2008/06/02 15:14:03 1.38
+++ conga/make/version.in 2008/07/30 17:00:09 1.39
@@ -1,2 +1,2 @@
VERSION=0.13.0
-RELEASE=4
+RELEASE=5
--- conga/ricci/modules/virt/Virt.cpp 2008/07/29 19:47:06 1.2
+++ conga/ricci/modules/virt/Virt.cpp 2008/07/30 17:00:09 1.3
@@ -23,7 +23,7 @@
#include <sys/stat.h>
#include <string.h>
#include <errno.h>
-#if VIRT_SUPPORT == 1
+#if defined(VIRT_SUPPORT) && if VIRT_SUPPORT == 1
#include <libvirt/libvirt.h>
#endif
@@ -55,7 +55,7 @@
return false;
}
-#if VIRT_SUPPORT == 1
+#if defined(VIRT_SUPPORT) && if VIRT_SUPPORT == 1
map<String, String> Virt::get_vm_list(const String &hvURI) {
std::map<String, String> vm_list;
--- conga/ricci/ricci/DBusController.cpp 2008/07/29 19:47:06 1.19
+++ conga/ricci/ricci/DBusController.cpp 2008/07/30 17:00:10 1.20
@@ -69,13 +69,7 @@
MutexLocker lock(_dbus_mutex);
if (--_object_counter == 0) {
-#if (DBUS_MAJOR_VERSION == 1) || (DBUS_MAJOR_VERSION == 0 && DBUS_MINOR_VERSION >= 90)
dbus_connection_close(_dbus_conn);
-#elif DBUS_MAJOR_VERSION == 0 && DBUS_MINOR_VERSION < 90
- dbus_connection_disconnect(_dbus_conn);
-#else
-# error "unrecognized major DBUS number"
-#endif
dbus_connection_unref(_dbus_conn);
_dbus_conn = NULL;
}
@@ -113,13 +107,7 @@
String msg_clean(remove_chars(message, '\n'));
const char *msg_clean_c_str = msg_clean.c_str();
const void *message_dbus_ready = NULL;
-#if (DBUS_MAJOR_VERSION == 1) || (DBUS_MAJOR_VERSION == 0 && DBUS_MINOR_VERSION >= 60)
message_dbus_ready = &msg_clean_c_str;
-#elif DBUS_MAJOR_VERSION == 0 && DBUS_MINOR_VERSION < 60
- message_dbus_ready = msg_clean_c_str;
-#else
-# error "unrecognized major DBUS number"
-#endif
if (!dbus_message_append_args(msg,
DBUS_TYPE_STRING,
--- conga/ricci/ricci/d-bus/ricci.oddjob.conf 2008/07/29 19:47:06 1.2
+++ conga/ricci/ricci/d-bus/ricci.oddjob.conf 2008/07/30 17:00:10 1.3
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<oddjobconfig>
- <service name="com.redhat.ricci">
+ <service name="com.redhat.ricci">
<object name="/com/redhat/ricci">
<interface name="com.redhat.ricci">
<method name="modrpm_rw">
@@ -21,16 +21,16 @@
<method name="modvirt_rw">
<allow user="ricci"/>
</method>
- <method name="reboot">
+ <method name="reboot">
<helper exec="/sbin/reboot"
arguments="0"
prepend_user_name="no"
argument_passing_method="cmdline"
/>
- <allow user="root"/>
- <allow user="ricci"/>
- </method>
+ <allow user="root"/>
+ <allow user="ricci"/>
+ </method>
</interface>
</object>
- </service>
+ </service>
</oddjobconfig>
reply other threads:[~2008-07-30 17:00 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080730170014.2585.qmail@sourceware.org \
--to=rmccabe@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.