From: Daniel P. Berrange <berrange@redhat.com>
Date: Tue, 1 Nov 2011 12:29:25 +0000 (+0000)
Subject: Correctly handle '*' in /etc/filesystems
X-Git-Tag: v0.9.7~38
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a02f57faa9a7be0e7d1506a12d8778e52877cf39;p=thirdparty%2Flibvirt.git

Correctly handle '*' in /etc/filesystems

The /etc/filesystems file can contain a '*' on the last line to
indicate that /proc/filessystems should be tried next. We have
a check that this '*' only occurs on the last line. Unfortunately
when we then start reading /proc/filesystems, we mistakenly think
we've seen '*' in /proc/filesystems and fail

* src/lxc/lxc_container.c: Skip '*' validation when we're reading
  /proc/filesystems
---

diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c
index 7a3589b5f8..63284e52f5 100644
--- a/src/lxc/lxc_container.c
+++ b/src/lxc/lxc_container.c
@@ -700,7 +700,7 @@ retry:
         /*
          * /etc/filesystems is only allowed to contain '*' on the last line
          */
-        if (gotStar) {
+        if (gotStar && !tryProc) {
             lxcError(VIR_ERR_INTERNAL_ERROR,
                      _("%s has unexpected '*' before last line"),
                      fslist);