X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=mount-setup.c;h=18d3911be45e9c8f7db174beccfaf6710b427691;hb=fd18e1f4bf40481570ec20f1261b111d15f6c923;hp=12605ebb4d158c9614be932f1b660b778c732ebb;hpb=055ba4d60e9539d5ec7cc66cc7a7ea3c0ce93679;p=elogind.git diff --git a/mount-setup.c b/mount-setup.c index 12605ebb4..18d3911be 100644 --- a/mount-setup.c +++ b/mount-setup.c @@ -39,12 +39,13 @@ enum { }; static const char *table[] = { - "proc", "/proc", "proc", "rw", - "sysfs", "/sys", "sysfs", "rw", - "devtmps", "/dev", "devtmpfs", "mode=755", - "tmpfs", "/dev/shm", "tmpfs", "mode=1777", - "devpts", "/dev/pts", "devpts", "rw", - "cgroup", "/cgroup/debug", "cgroup", "debug", + "proc", "/proc", "proc", NULL, + "sysfs", "/sys", "sysfs", NULL, + "devtmps", "/dev", "devtmpfs", "mode=755", + "tmpfs", "/dev/shm", "tmpfs", "mode=1777", + "devpts", "/dev/pts", "devpts", NULL, + "cgroup", "/cgroup/debug", "cgroup", "debug", + "debugfs", "/sys/kernel/debug", "debugfs", NULL, NULL }; @@ -85,6 +86,10 @@ static int mount_one(const char *t[]) { if (r > 0) return 0; + /* The access mode here doesn't really matter too much, since + * the mounted file system will take precedence anyway. */ + mkdir(t[MOUNT_WHERE], 0755); + log_debug("Mounting %s to %s of type %s with options %s.", t[MOUNT_WHAT], t[MOUNT_WHERE],