Skip to content

Return a Result<void> from WriteFsConfig #2242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Databean merged 1 commit into from
Mar 10, 2026
Merged

Return a Result<void> from WriteFsConfig #2242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -600,6 +600,7 @@ cf_cc_library(
"//cuttlefish/host/libs/config:config_utils",
"//cuttlefish/host/libs/config:known_paths",
"//cuttlefish/io:shared_fd",
"//cuttlefish/posix:strerror",
"//cuttlefish/result",
"//libbase",
"@abseil-cpp//absl/log",
Expand Down
23 changes: 9 additions & 14 deletions base/cvd/cuttlefish/host/commands/assemble_cvd/vendor_dlkm_utils.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
#include "cuttlefish/host/libs/config/config_utils.h"
#include "cuttlefish/host/libs/config/known_paths.h"
#include "cuttlefish/io/shared_fd.h"
#include "cuttlefish/posix/strerror.h"

namespace cuttlefish {

Expand Down Expand Up @@ -81,20 +82,16 @@ bool WriteLinesToFile(const Container& lines, const std::string& path) {
}

// Generate a filesystem_config.txt for all files in |fs_root|
Result<bool> WriteFsConfig(const std::string& output_path,
Result<void> WriteFsConfig(const std::string& output_path,
const std::string& fs_root,
const std::string& mount_point) {
android::base::unique_fd fd(open(
output_path.c_str(), O_WRONLY | O_CREAT | O_TRUNC | O_CLOEXEC, 0644));
if (!fd.ok()) {
PLOG(ERROR) << "Failed to open " << output_path;
return false;
}
if (!android::base::WriteStringToFd(
" 0 0 755 selabel=u:object_r:rootfs:s0 capabilities=0x0\n", fd)) {
PLOG(ERROR) << "Failed to write to " << output_path;
return false;
}
CF_EXPECTF(fd.ok(), "Couldn't open '{}': '{}'", output_path, StrError(errno));
static constexpr std::string_view kBeginning =
" 0 0 755 selabel=u:object_r:rootfs:s0 capabilities=0x0\n";
CF_EXPECTF(android::base::WriteStringToFd(kBeginning, fd),
"Failed to write to '{}'", output_path);
auto res = WalkDirectory(fs_root, [&fd, &output_path, &mount_point,
&fs_root](const std::string& file_path) {
const auto filename = file_path.substr(
Expand All @@ -110,10 +107,8 @@ Result<bool> WriteFsConfig(const std::string& output_path,
}
return true;
});
if (!res.ok()) {
return false;
}
return true;
CF_EXPECT(std::move(res));
return {};
}

std::vector<std::string> GetRamdiskModules(
Expand Down
Loading