X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fmount-setup.c;h=d740d4f3570bedd34a7deea0dc636bdb2e54e3c0;hp=09ee07f820d887464b969b29d675b3a904e6d02c;hb=14f3c8252b4dd73bff778b5af9f872e929bd566c;hpb=34df5a34e1d0ac4bba453fb5f52f18a2f5f260f9 diff --git a/src/mount-setup.c b/src/mount-setup.c index 09ee07f82..d740d4f35 100644 --- a/src/mount-setup.c +++ b/src/mount-setup.c @@ -242,7 +242,7 @@ int mount_setup(void) { * appropriate labels, after mounting. The other virtual API * file systems do not need. */ - if (unlink("/dev/.systemd/relabel-devtmpfs") >= 0) + if (unlink("/dev/.systemd-relabel-devtmpfs") >= 0) nftw("/dev", nftw_cb, 64, FTW_MOUNT|FTW_PHYS); /* Create a few default symlinks, which are normally created @@ -252,5 +252,9 @@ int mount_setup(void) { NULSTR_FOREACH_PAIR(j, k, symlinks) symlink_and_label(j, k); + /* Create a few directories we always want around */ + mkdir("/dev/.run/systemd", 0755); + mkdir("/dev/.run/systemd/ask-password", 0755); + return mount_cgroup_controllers(); }