[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [PATCH 3/3] Correctly handle '*' in /etc/filesystems



From: "Daniel P. Berrange" <berrange redhat com>

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
---
 src/lxc/lxc_container.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c
index 7a3589b..63284e5 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);
-- 
1.7.6.4


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]