Merge branch 'develop'

melpon · Oct 20, 2024 · 25415ed · 25415ed
2 parents 211a782 + 47408bb
commit 25415ed
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/cattleshed/cattleshed.conf.in b/cattleshed/cattleshed.conf.in
@@ -23,7 +23,7 @@
     "@CATTLESHED_BINDIR@/cattlegrid",
     "--uids=10000:1000000000",
     "--rootdir=./jail",
-    "--mount=/bin,/etc,/lib,/lib32,/lib64,/usr/bin,/usr/lib,/usr/lib32,/usr/include,/opt/wandbox,/usr/share",
+    "--mount=/bin,/etc,/lib,/lib64,/usr/bin,/usr/lib,/usr/include,/opt/wandbox,/usr/share",
     "--rwmount=/tmp=./jail/tmp,/home/jail=./store",
     "--devices=/dev/null,/dev/zero,/dev/full,/dev/random,/dev/urandom",
     "--chdir=/home/jail",
@@ -52,7 +52,7 @@
     "@CATTLESHED_BINDIR@/cattlegrid",
     "--uids=10000:1000000000",
     "--rootdir=./jail",
-    "--mount=/bin,/etc,/lib,/lib32,/lib64,/usr/bin,/usr/lib,/usr/lib32,/usr/include,/opt/wandbox,/usr/share",
+    "--mount=/bin,/etc,/lib,/lib64,/usr/bin,/usr/lib,/usr/include,/opt/wandbox,/usr/share",
     "--rwmount=/tmp=./jail/tmp,/home/jail=./store",
     "--devices=/dev/null,/dev/zero,/dev/full,/dev/random,/dev/urandom",
     "--chdir=/home/jail",
@@ -80,7 +80,7 @@
     "@CATTLESHED_BINDIR@/cattlegrid",
     "--uids=10000:1000000000",
     "--rootdir=./jail",
-    "--mount=/bin,/etc,/lib,/lib32,/lib64,/usr/bin,/usr/lib,/usr/lib32,/usr/include,/opt/wandbox,/usr/share",
+    "--mount=/bin,/etc,/lib,/lib64,/usr/bin,/usr/lib,/usr/include,/opt/wandbox,/usr/share",
     "--rwmount=/tmp=./jail/tmp,/home/jail=./store",
     "--devices=/dev/null,/dev/zero,/dev/full,/dev/random,/dev/urandom",
     "--chdir=/home/jail",
@@ -108,7 +108,7 @@
     "@CATTLESHED_BINDIR@/cattlegrid",
     "--uids=10000:1000000000",
     "--rootdir=./jail",
-    "--mount=/bin,/etc,/lib,/lib32,/lib64,/usr/bin,/usr/lib,/usr/lib32,/usr/include,/opt/wandbox,/usr/share",
+    "--mount=/bin,/etc,/lib,/lib64,/usr/bin,/usr/lib,/usr/include,/opt/wandbox,/usr/share",
     "--rwmount=/tmp=./jail/tmp,/home/jail=./store",
     "--devices=/dev/null,/dev/zero,/dev/full,/dev/random,/dev/urandom",
     "--chdir=/home/jail",
@@ -136,7 +136,7 @@
     "@CATTLESHED_BINDIR@/cattlegrid",
     "--uids=10000:1000000000",
     "--rootdir=./jail",
-    "--mount=/bin,/etc,/lib,/lib32,/lib64,/usr/bin,/usr/lib,/usr/lib32,/usr/include,/opt/wandbox,/usr/share",
+    "--mount=/bin,/etc,/lib,/lib64,/usr/bin,/usr/lib,/usr/include,/opt/wandbox,/usr/share",
     "--rwmount=/tmp=./jail/tmp,/home/jail=./store",
     "--devices=/dev/null,/dev/zero,/dev/full,/dev/random,/dev/urandom",
     "--chdir=/home/jail",
@@ -166,7 +166,7 @@
     "@CATTLESHED_BINDIR@/cattlegrid",
     "--uids=10000:1000000000",
     "--rootdir=./jail",
-    "--mount=/bin,/etc,/lib,/lib32,/lib64,/usr/bin,/usr/lib,/usr/lib32,/usr/include,/opt/wandbox,/usr/share",
+    "--mount=/bin,/etc,/lib,/lib64,/usr/bin,/usr/lib,/usr/include,/opt/wandbox,/usr/share",
     "--rwmount=/home/jail=./store",
     "--devices=/dev/null,/dev/zero,/dev/full,/dev/random,/dev/urandom",
     "--chdir=/home/jail",
@@ -195,7 +195,7 @@
     "@CATTLESHED_BINDIR@/cattlegrid",
     "--uids=10000:1000000000",
     "--rootdir=./jail",
-    "--mount=/bin,/etc,/lib,/lib32,/lib64,/usr/bin,/usr/lib,/usr/lib32,/usr/include,/usr/share",
+    "--mount=/bin,/etc,/lib,/lib64,/usr/bin,/usr/lib,/usr/include,/usr/share",
     "--rwmount=/tmp=./jail/tmp,/home/jail=./store",
     "--devices=/dev/null,/dev/zero,/dev/full,/dev/random,/dev/urandom",
     "--chdir=/home/jail",

diff --git a/cattleshed/src/cattleshed_server.h b/cattleshed/src/cattleshed_server.h
@@ -74,8 +74,8 @@ class GetVersionHandler
       {
         auto c = wandbox::piped_spawn(wandbox::opendir("/"),
                                       current_.version_command);
-        SPDLOG_DEBUG("[0x{}] run [{}]", (void*)this,
-                     boost::algorithm::join(current_.version_command, " "));
+        SPDLOG_INFO("[0x{}] run [{}]", (void*)this,
+                    boost::algorithm::join(current_.version_command, " "));
         child_ = std::make_shared<wandbox::unique_child_pid>(std::move(c.pid));
         pipe_stdout_ = std::make_shared<boost::asio::posix::stream_descriptor>(
             *ioc_, c.fd_stdout.get());
@@ -141,7 +141,7 @@ class GetVersionHandler
         return;
       }
 
-      SPDLOG_DEBUG("[0x{}] add version: {} {}", (void*)this, current_.name,
+      SPDLOG_INFO("[0x{}] add version: {} {}", (void*)this, current_.name,
                    ver);
       versions_.push_back(std::make_pair(current_.name, ver));