emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mdev: if /sys/class/block exists, don't scan /sys/block

Browse Source
This commit is contained in:
Denis Vlasenko 2009-02-13 00:02:54 +00:00
parent a0ab943492
commit d63cd1bf1c
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
util-linux/mdev.c
View File

@ -420,10 +420,17 @@ int mdev_main(int argc UNUSED_PARAM, char **argv)
* /sys/block/loop* (for example) are symlinks to dirs, * /sys/block/loop* (for example) are symlinks to dirs,
* not real directories. * not real directories.
* (kernel's CONFIG_SYSFS_DEPRECATED makes them real dirs, * (kernel's CONFIG_SYSFS_DEPRECATED makes them real dirs,
* but we can't enforce that on users) */ * but we can't enforce that on users)
*/
if (access("/sys/class/block", F_OK) != 0) {
/* Scan obsolete /sys/block only if /sys/class/block
* doesn't exist. Otherwise we'll have dupes.
*/
recursive_action("/sys/block", recursive_action("/sys/block",
ACTION_RECURSE | ACTION_FOLLOWLINKS | ACTION_QUIET, ACTION_RECURSE | ACTION_FOLLOWLINKS,
// not needed now? | ACTION_QUIET
fileAction, dirAction, temp, 0); fileAction, dirAction, temp, 0);
}
recursive_action("/sys/class", recursive_action("/sys/class",
ACTION_RECURSE | ACTION_FOLLOWLINKS, ACTION_RECURSE | ACTION_FOLLOWLINKS,
fileAction, dirAction, temp, 0); fileAction, dirAction, temp, 0);