root
/
linglong
mirror of https://github.com/linuxdeepin/linglong
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix: ensure bundle directory is clean 

Containers may fail to start if the bundle directory contains residual
files or conflicts from previous run.

Signed-off-by: reddevillg <reddevillg@gmail.com>
This commit is contained in:
reddevillg 2025-05-28 18:08:47 +08:00 committed by Comix
parent 5916132cbf
commit 6e99856fd4
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libs/linglong/src/linglong/runtime/container_builder.h
View File

@ -38,8 +38,8 @@ inline std::string genContainerID(const package::Reference &ref) noexcept
.toStdString();
}
// getBundleDir 用于获取容器的运行目录
inline utils::error::Result<std::filesystem::path> getBundleDir(const std::string &containerID)
// Used to obtain a clean container bundle directory.
inline utils::error::Result<std::filesystem::path> makeBundleDir(const std::string &containerID)
{
LINGLONG_TRACE("get bundle dir");
@ -48,6 +48,14 @@ inline utils::error::Result<std::filesystem::path> getBundleDir(const std::strin
auto bundle = runtimeDir / "linglong" / containerID;
std::error_code ec;
if (std::filesystem::exists(bundle, ec)) {
std::filesystem::remove_all(bundle, ec);
if (ec) {
qWarning() << QString("failed to remove bundle directory %1: %2")
.arg(bundle.c_str(), ec.message().c_str());
}
}
if (!std::filesystem::create_directories(bundle, ec) && ec) {
return LINGLONG_ERR(QString("failed to create bundle directory %1: %2")
.arg(bundle.c_str(), ec.message().c_str()));

2
libs/linglong/src/linglong/runtime/run_context.cpp
View File

@ -409,7 +409,7 @@ RunContext::fillContextCfg(linglong::generator::ContainerCfgBuilder &builder)
return LINGLONG_ERR("run context doesn't resolved");
}
auto bundleDir = runtime::getBundleDir(containerID);
auto bundleDir = runtime::makeBundleDir(containerID);
if (!bundleDir) {
return LINGLONG_ERR("failed to get bundle dir of " + QString::fromStdString(containerID));
}