AuxXxilium/eudev
1
0
Fork 0
mirror of https://github.com/AuxXxilium/eudev.git synced 2024-12-28 06:35:34 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

dev-setup: make NULL as parameter for dev_setup() equivalent to ""

Browse Source
This commit is contained in:
Lennart Poettering 2012-08-21 17:23:03 +02:00
parent 4fc9982cb0
commit 01ed0e2307
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/mount-setup.c
View File

@ -398,7 +398,7 @@ int mount_setup(bool loaded_policy) {
/* Create a few default symlinks, which are normally created
* by udevd, but some scripts might need them before we start
* udevd. */
dev_setup("");
dev_setup(NULL);
/* Mark the root directory as shared in regards to mount
* propagation. The kernel defaults to "private", but we think

19
src/shared/dev-setup.c
View File

@ -50,7 +50,7 @@ static int symlink_and_label(const char *old_path, const char *new_path) {
return r;
}
void dev_setup(const char *pathprefix) {
void dev_setup(const char *prefix) {
const char *j, *k;
static const char symlinks[] =
@ -61,15 +61,18 @@ void dev_setup(const char *pathprefix) {
"/proc/self/fd/2\0" "/dev/stderr\0";
NULSTR_FOREACH_PAIR(j, k, symlinks) {
char *linkname;
if (asprintf(&linkname, "%s/%s", pathprefix, k) < 0) {
log_oom();
break;
}
if (prefix) {
char *linkname;
symlink_and_label(j, linkname);
if (asprintf(&linkname, "%s/%s", prefix, k) < 0) {
log_oom();
break;
}
free(linkname);
symlink_and_label(j, linkname);
free(linkname);
} else
symlink_and_label(j, k);
}
}

2
src/udev/udevd.c
View File

@ -1155,7 +1155,7 @@ int main(int argc, char *argv[])
mkdir("/run/udev", 0755);
dev_setup("");
dev_setup(NULL);
static_dev_create_from_modules(udev);
/* before opening new files, make sure std{in,out,err} fds are in a sane state */