chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
util: make touched files non-writable by default
[elogind.git]
/
src
/
mount-setup.c
diff --git
a/src/mount-setup.c
b/src/mount-setup.c
index f08eeb162ead98886f0d3a7093a36b6d52f7fa53..d740d4f3570bedd34a7deea0dc636bdb2e54e3c0 100644
(file)
--- a/
src/mount-setup.c
+++ b/
src/mount-setup.c
@@
-228,8
+228,7
@@
int mount_setup(void) {
"/proc/self/fd\0" "/dev/fd\0"
"/proc/self/fd/0\0" "/dev/stdin\0"
"/proc/self/fd/1\0" "/dev/stdout\0"
"/proc/self/fd\0" "/dev/fd\0"
"/proc/self/fd/0\0" "/dev/stdin\0"
"/proc/self/fd/1\0" "/dev/stdout\0"
- "/proc/self/fd/2\0" "/dev/stderr\0"
- "\0";
+ "/proc/self/fd/2\0" "/dev/stderr\0";
int r;
unsigned i;
int r;
unsigned i;
@@
-243,7
+242,7
@@
int mount_setup(void) {
* appropriate labels, after mounting. The other virtual API
* file systems do not need. */
* 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
nftw("/dev", nftw_cb, 64, FTW_MOUNT|FTW_PHYS);
/* Create a few default symlinks, which are normally created
@@
-253,5
+252,9
@@
int mount_setup(void) {
NULSTR_FOREACH_PAIR(j, k, symlinks)
symlink_and_label(j, k);
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();
}
return mount_cgroup_controllers();
}