From 6ec19178e90e69c44c7a7c22416cb728e93c485f Mon Sep 17 00:00:00 2001 From: melpon Date: Mon, 21 Oct 2024 07:28:12 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=E3=83=AD=E3=82=B0=E3=83=AC=E3=83=99?= =?UTF-8?q?=E3=83=AB=E3=82=92=E4=B8=8A=E3=81=92=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cattleshed/src/cattleshed_server.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cattleshed/src/cattleshed_server.h b/cattleshed/src/cattleshed_server.h index 0278ba3..3dae963 100644 --- a/cattleshed/src/cattleshed_server.h +++ b/cattleshed/src/cattleshed_server.h @@ -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)); From 498abfc22418ac7dd07c30d8fe92e2c3906b7e7e Mon Sep 17 00:00:00 2001 From: melpon Date: Mon, 21 Oct 2024 07:29:44 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=E3=81=93=E3=81=A3=E3=81=A1=E3=81=AE?= =?UTF-8?q?=E3=83=AC=E3=83=99=E3=83=AB=E3=82=82=E4=B8=8A=E3=81=92=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cattleshed/src/cattleshed_server.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cattleshed/src/cattleshed_server.h b/cattleshed/src/cattleshed_server.h index 3dae963..b1fbb03 100644 --- 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(std::move(c.pid)); pipe_stdout_ = std::make_shared( *ioc_, c.fd_stdout.get()); From 47408bb47af92b933f5144b7f670434b8d6a1c7f Mon Sep 17 00:00:00 2001 From: melpon Date: Mon, 21 Oct 2024 07:38:59 +0900 Subject: [PATCH 3/3] =?UTF-8?q?lib32=20=E3=82=92=E6=B6=88=E3=81=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cattleshed/cattleshed.conf.in | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/cattleshed/cattleshed.conf.in b/cattleshed/cattleshed.conf.in index 5f2381d..5554979 100644 --- 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",