picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

libudev-monitor: rename udev_has_devtmpfs() and move it to mount-util.c 

As the function itself is quite generic.
This commit is contained in:
Yu Watanabe 2018-08-13 17:59:44 +09:00
parent 3d01fa902c
commit be1791ad6a
3 changed files with 39 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/basic/mount-util.c
View File

@ -951,3 +951,39 @@ int mount_option_mangle(
return 0;
}
int dev_is_devtmpfs(void) {
_cleanup_fclose_ FILE *proc_self_mountinfo = NULL;
char line[LINE_MAX], *e;
int mount_id, r;
r = path_get_mnt_id("/dev", &mount_id);
if (r < 0)
return r;
proc_self_mountinfo = fopen("/proc/self/mountinfo", "re");
if (!proc_self_mountinfo)
return -errno;
(void) __fsetlocking(proc_self_mountinfo, FSETLOCKING_BYCALLER);
FOREACH_LINE(line, proc_self_mountinfo, return -errno) {
int mid;
if (sscanf(line, "%i", &mid) != 1)
continue;
if (mid != mount_id)
continue;
e = strstr(line, " - ");
if (!e)
continue;
/* accept any name that starts with the currently expected type */
if (startswith(e + 3, "devtmpfs"))
return true;
}
return false;
}

2
src/basic/mount-util.h
View File

@ -54,3 +54,5 @@ int mount_option_mangle(
unsigned long mount_flags,
unsigned long *ret_mount_flags,
char **ret_remaining_options);
int dev_is_devtmpfs(void);

42
src/libudev/libudev-monitor.c
View File

@ -94,46 +94,6 @@ static struct udev_monitor *udev_monitor_new(struct udev *udev) {
return udev_monitor;
}
/* we consider udev running when /dev is on devtmpfs */
static bool udev_has_devtmpfs(struct udev *udev) {
_cleanup_fclose_ FILE *f = NULL;
char line[LINE_MAX], *e;
int mount_id, r;
r = path_get_mnt_id("/dev", &mount_id);
if (r < 0) {
if (r != -EOPNOTSUPP)
log_debug_errno(r, "name_to_handle_at on /dev: %m");
return false;
}
f = fopen("/proc/self/mountinfo", "re");
if (!f)
return false;
FOREACH_LINE(line, f, return false) {
int mid;
if (sscanf(line, "%i", &mid) != 1)
continue;
if (mid != mount_id)
continue;
e = strstr(line, " - ");
if (!e)
continue;
/* accept any name that starts with the currently expected type */
if (startswith(e + 3, "devtmpfs"))
return true;
}
return false;
}
static void monitor_set_nl_address(struct udev_monitor *udev_monitor) {
union sockaddr_union snl;
socklen_t addrlen;
@ -169,7 +129,7 @@ struct udev_monitor *udev_monitor_new_from_netlink_fd(struct udev *udev, const c
* We do not set a netlink multicast group here, so the socket
* will not receive any messages.
*/
if (access("/run/udev/control", F_OK) < 0 && !udev_has_devtmpfs(udev)) {
if (access("/run/udev/control", F_OK) < 0 && dev_is_devtmpfs() <= 0) {
log_debug("the udev service seems not to be active, disable the monitor");
group = UDEV_MONITOR_NONE;
} else