Skip to content

Try to execute FS check program from internal overlay #12

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

Draft
msvamp wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Try to execute FS check program from internal overlay #12

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
35 changes: 26 additions & 9 deletions block.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -758,7 +758,7 @@ static int print_block_info(struct probe_info *pr)
return 0;
}

static void check_filesystem(struct probe_info *pr)
static void check_filesystem(struct probe_info *pr, char *overlay)
{
pid_t pid;
struct stat statbuf;
Expand All @@ -767,27 +767,44 @@ static void check_filesystem(struct probe_info *pr)
const char *fatfsck = "/usr/sbin/fsck.fat";
const char *btrfsck = "/usr/bin/btrfsck";
const char *ntfsck = "/usr/bin/ntfsfix";
const char *ckfs;

@dangowrt dangowrt Jun 2, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why rename this variable?
Other than that it looks all reasonable to me.

@msvamp msvamp Jun 2, 2026

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey, thanks for reviewing!
I haven't exactly renamed the variable, ckfs still contains the path to the final fsck program, I just changed its type to char[64].

I would have to either change the variable here in lines L777-785 or use a different variable on L791-818, I chose the former approach.

const char *fsck;
char ckfs[64];
char ld_lib[32];

/* UBIFS does not need stuff like fsck */
if (!strncmp(pr->type, "ubifs", 5))
return;

if (!strncmp(pr->type, "vfat", 4)) {
ckfs = fatfsck;
fsck = fatfsck;
} else if (!strncmp(pr->type, "f2fs", 4)) {
ckfs = f2fsck;
fsck = f2fsck;
} else if (!strncmp(pr->type, "ext", 3)) {
ckfs = e2fsck;
fsck = e2fsck;
} else if (!strncmp(pr->type, "btrfs", 5)) {
ckfs = btrfsck;
fsck = btrfsck;
} else if (!strncmp(pr->type, "ntfs", 4)) {
ckfs = ntfsck;
fsck = ntfsck;
} else {
ULOG_ERR("check_filesystem: %s is not supported\n", pr->type);
return;
}

if (overlay) {
snprintf(ckfs, sizeof(ckfs), "%s/upper%s", overlay, fsck);
if (stat(ckfs, &statbuf) < 0) {
ULOG_WARN("check_filesystem: %s not found\n", ckfs);
strcpy(ckfs, fsck);
} else {
snprintf(ld_lib, sizeof(ld_lib), "%s/upper/usr/lib", overlay);
if (!stat(ld_lib, &statbuf) && S_ISDIR(statbuf.st_mode)) {
setenv("LD_LIBRARY_PATH", ld_lib, 1);
}
}
} else {
strcpy(ckfs, fsck);
}

if (stat(ckfs, &statbuf) < 0) {
ULOG_ERR("check_filesystem: %s not found\n", ckfs);
return;
Expand Down Expand Up @@ -1165,7 +1182,7 @@ static int mount_device(struct probe_info *pr, int type)
/* Mount the device */

if (check_fs)
check_filesystem(pr);
check_filesystem(pr, NULL);

mkdir_p(target, 0755);
if (!lstat(target, &st) && S_ISLNK(st.st_mode))
Expand Down Expand Up @@ -1608,7 +1625,7 @@ static int mount_extroot(char *cfg)
mkdir_p(path, 0755);

if (check_fs)
check_filesystem(pr);
check_filesystem(pr, cfg);

err = mount(pr->dev, path, pr->type, m->flags,
(m->options) ? (m->options) : (""));
Expand Down