Skip to content

coldplug: recreate device nodes before udevtrigger #53

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

Open
fwerkor wants to merge 1 commit into
base: main
Choose a base branch
from
Open

coldplug: recreate device nodes before udevtrigger #53

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
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ SET(SOURCES procd.c signal.c state.c hotplug-dispatch.c inittab.c rcS.c ubus.c
service/validate.c service/trigger.c service/watch.c service/vrf.c
utils/utils.c)
IF(NOT DISABLE_INIT)
SET(SOURCES ${SOURCES} watchdog.c plug/coldplug.c plug/hotplug.c)
SET(SOURCES ${SOURCES} watchdog.c plug/coldplug.c plug/hotplug.c initd/mkdev.c)
ENDIF()

FIND_LIBRARY(ubox NAMES ubox)
Expand Down
2 changes: 2 additions & 0 deletions plug/coldplug.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@

#include "hotplug.h"
#include "../container.h"
#include "../initd/init.h"

static struct uloop_process udevtrigger;

Expand All @@ -51,6 +52,7 @@ void procd_coldplug(void)
umount2("/dev/", MNT_DETACH);
mount("tmpfs", "/dev", "tmpfs", MS_NOATIME | MS_NOEXEC | MS_NOSUID, "mode=0755,size=512K");
mknod("/dev/null", S_IFCHR | 0666, makedev(1, 3));
mkdev("*", 0600);
mkdir("/dev/pts", 0755);
mount("devpts", "/dev/pts", "devpts", MS_NOATIME | MS_NOEXEC | MS_NOSUID, 0);
}
Expand Down
11 changes: 7 additions & 4 deletions plug/hotplug.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,18 +165,21 @@ static void handle_makedev(struct blob_attr *msg, struct blob_attr *data)

blobmsg_parse_array(mkdev_policy, 3, tb, blobmsg_data(data), blobmsg_data_len(data));
if (tb[0] && tb[1] && minor && major && subsystem) {
const char *target = blobmsg_get_string(tb[0]);
mode_t mode = strtoul(blobmsg_data(tb[1]), NULL, 8);
mode_t m = S_IFCHR;
char *d = strdup(blobmsg_get_string(tb[0]));
char *d = strdup(target);
int ret;

d = dirname(d);
mkdir_p(d, 0755);
free(d);

if (!strcmp(subsystem, "block"))
m = S_IFBLK;
mknod(blobmsg_get_string(tb[0]),
m | strtoul(blobmsg_data(tb[1]), NULL, 8),
makedev(atoi(major), atoi(minor)));
ret = mknod(target, m | mode, makedev(atoi(major), atoi(minor)));
if (!ret || errno == EEXIST)
chmod(target, mode);
if (tb[2])
chgrp_target(tb[2], tb[0]);
}
Expand Down