[libvirt] [PATCH] Don't let daemon-conf test fail when auditing is disabled
--- tests/daemon-conf | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/tests/daemon-conf b/tests/daemon-conf index 0e756d4..921e589 100755 --- a/tests/daemon-conf +++ b/tests/daemon-conf @@ -86,6 +86,10 @@ fi # Replace the invalid host_uuid with one that is valid: sed 's/^\(host_uuid =.*\)0"$/\11"/' tmp.conf > k; mv k tmp.conf +# Relax audit_level from 2 to 1, otherwise libvirtd will report an error +# when auditing is disabled on the host or during compilation +sed 's/^\(audit_level =.*\)2$/\1 1/' tmp.conf > k; mv k tmp.conf + $abs_top_builddir/daemon/libvirtd --pid-file=pid-file --config=tmp.conf \ > log 2>&1 & pid=$! sleep $sleep_secs -- 1.7.0.4
On 10/19/2010 12:34 PM, Matthias Bolte wrote:
--- tests/daemon-conf | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/tests/daemon-conf b/tests/daemon-conf index 0e756d4..921e589 100755 --- a/tests/daemon-conf +++ b/tests/daemon-conf @@ -86,6 +86,10 @@ fi # Replace the invalid host_uuid with one that is valid: sed 's/^\(host_uuid =.*\)0"$/\11"/' tmp.conf> k; mv k tmp.conf
+# Relax audit_level from 2 to 1, otherwise libvirtd will report an error +# when auditing is disabled on the host or during compilation +sed 's/^\(audit_level =.*\)2$/\1 1/' tmp.conf> k; mv k tmp.conf
ACK. But should we be combining those sed/mv sequences into a single run, to cut down on the number of processes being run? -- Eric Blake eblake@redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org
2010/10/19 Eric Blake <eblake@redhat.com>:
On 10/19/2010 12:34 PM, Matthias Bolte wrote:
--- tests/daemon-conf | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/tests/daemon-conf b/tests/daemon-conf index 0e756d4..921e589 100755 --- a/tests/daemon-conf +++ b/tests/daemon-conf @@ -86,6 +86,10 @@ fi # Replace the invalid host_uuid with one that is valid: sed 's/^\(host_uuid =.*\)0"$/\11"/' tmp.conf> k; mv k tmp.conf
+# Relax audit_level from 2 to 1, otherwise libvirtd will report an error +# when auditing is disabled on the host or during compilation +sed 's/^\(audit_level =.*\)2$/\1 1/' tmp.conf> k; mv k tmp.conf
ACK.
But should we be combining those sed/mv sequences into a single run, to cut down on the number of processes being run?
Here's v2 that does this. Matthias
On 10/20/2010 03:41 AM, Matthias Bolte wrote:
2010/10/19 Eric Blake<eblake@redhat.com>:
On 10/19/2010 12:34 PM, Matthias Bolte wrote:
--- tests/daemon-conf | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/tests/daemon-conf b/tests/daemon-conf index 0e756d4..921e589 100755 --- a/tests/daemon-conf +++ b/tests/daemon-conf @@ -86,6 +86,10 @@ fi # Replace the invalid host_uuid with one that is valid: sed 's/^\(host_uuid =.*\)0"$/\11"/' tmp.conf> k; mv k tmp.conf
+# Relax audit_level from 2 to 1, otherwise libvirtd will report an error +# when auditing is disabled on the host or during compilation +sed 's/^\(audit_level =.*\)2$/\1 1/' tmp.conf> k; mv k tmp.conf
ACK.
But should we be combining those sed/mv sequences into a single run, to cut down on the number of processes being run?
Here's v2 that does this.
ACK. -- Eric Blake eblake@redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org
2010/10/20 Eric Blake <eblake@redhat.com>:
On 10/20/2010 03:41 AM, Matthias Bolte wrote:
2010/10/19 Eric Blake<eblake@redhat.com>:
On 10/19/2010 12:34 PM, Matthias Bolte wrote:
--- tests/daemon-conf | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/tests/daemon-conf b/tests/daemon-conf index 0e756d4..921e589 100755 --- a/tests/daemon-conf +++ b/tests/daemon-conf @@ -86,6 +86,10 @@ fi # Replace the invalid host_uuid with one that is valid: sed 's/^\(host_uuid =.*\)0"$/\11"/' tmp.conf> k; mv k tmp.conf
+# Relax audit_level from 2 to 1, otherwise libvirtd will report an error +# when auditing is disabled on the host or during compilation +sed 's/^\(audit_level =.*\)2$/\1 1/' tmp.conf> k; mv k tmp.conf
ACK.
But should we be combining those sed/mv sequences into a single run, to cut down on the number of processes being run?
Here's v2 that does this.
ACK.
Thanks, pushed. Matthias
participants (2)
-
Eric Blake -
Matthias Bolte