chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mount-setup: don't complain if we try to fix the label of a dir beneath a mount but...
[elogind.git]
/
src
/
core
/
mount-setup.c
diff --git
a/src/core/mount-setup.c
b/src/core/mount-setup.c
index 52fe523674bdc055885f5699dd065f4a61ed7dbf..07794df049adb65da3c8fe6e8c7add99973ac408 100644
(file)
--- a/
src/core/mount-setup.c
+++ b/
src/core/mount-setup.c
@@
-30,6
+30,7
@@
#include <ftw.h>
#include "mount-setup.h"
#include <ftw.h>
#include "mount-setup.h"
+#include "dev-setup.h"
#include "log.h"
#include "macro.h"
#include "util.h"
#include "log.h"
#include "macro.h"
#include "util.h"
@@
-37,6
+38,8
@@
#include "set.h"
#include "strv.h"
#include "mkdir.h"
#include "set.h"
#include "strv.h"
#include "mkdir.h"
+#include "path-util.h"
+#include "missing.h"
#ifndef TTY_GID
#define TTY_GID 5
#ifndef TTY_GID
#define TTY_GID 5
@@
-71,11
+74,22
@@
static const MountPoint mount_table[] = {
/* These are API file systems that might be mounted by other software,
* we just list them here so that we know that we should ignore them */
/* These are API file systems that might be mounted by other software,
* we just list them here so that we know that we should ignore them */
-static const char * const ignore_paths[] = {
- "/sys/fs/selinux",
- "/selinux",
- "/proc/bus/usb"
-};
+static const char ignore_paths[] =
+ /* SELinux file systems */
+ "/sys/fs/selinux\0"
+ "/selinux\0"
+ /* Legacy cgroup mount points */
+ "/dev/cgroup\0"
+ "/cgroup\0"
+ /* Legacy kernel file system */
+ "/proc/bus/usb\0"
+ /* Container bind mounts */
+ "/proc/sys\0"
+ "/dev/console\0"
+ "/proc/kmsg\0"
+ "/etc/localtime\0"
+ "/etc/timezone\0"
+ "/etc/machine-id\0";
bool mount_point_is_api(const char *path) {
unsigned i;
bool mount_point_is_api(const char *path) {
unsigned i;
@@
-91,10
+105,10
@@
bool mount_point_is_api(const char *path) {
}
bool mount_point_ignore(const char *path) {
}
bool mount_point_ignore(const char *path) {
-
unsigned
i;
+
const char *
i;
-
for (i = 0; i < ELEMENTSOF(ignore_paths); i++
)
- if (path_equal(path, i
gnore_paths[i]
))
+
NULSTR_FOREACH(i, ignore_paths
)
+ if (path_equal(path, i))
return true;
return false;
return true;
return false;
@@
-107,7
+121,7
@@
static int mount_one(const MountPoint *p, bool relabel) {
/* Relabel first, just in case */
if (relabel)
/* Relabel first, just in case */
if (relabel)
- label_fix(p->where, true);
+ label_fix(p->where, true
, true
);
if ((r = path_is_mount_point(p->where, true)) < 0)
return r;
if ((r = path_is_mount_point(p->where, true)) < 0)
return r;
@@
-117,7
+131,7
@@
static int mount_one(const MountPoint *p, bool relabel) {
/* The access mode here doesn't really matter too much, since
* the mounted file system will take precedence anyway. */
/* The access mode here doesn't really matter too much, since
* the mounted file system will take precedence anyway. */
- mkdir_p(p->where, 0755);
+ mkdir_p
_label
(p->where, 0755);
log_debug("Mounting %s to %s of type %s with options %s.",
p->what,
log_debug("Mounting %s to %s of type %s with options %s.",
p->what,
@@
-130,13
+144,13
@@
static int mount_one(const MountPoint *p, bool relabel) {
p->type,
p->flags,
p->options) < 0) {
p->type,
p->flags,
p->options) < 0) {
- log_
error(
"Failed to mount %s: %s", p->where, strerror(errno));
+ log_
full(p->fatal ? LOG_ERR : LOG_DEBUG,
"Failed to mount %s: %s", p->where, strerror(errno));
return p->fatal ? -errno : 0;
}
/* Relabel again, since we now mounted something fresh here */
if (relabel)
return p->fatal ? -errno : 0;
}
/* Relabel again, since we now mounted something fresh here */
if (relabel)
- label_fix(p->where, false);
+ label_fix(p->where, false
, false
);
return 1;
}
return 1;
}
@@
-323,23
+337,6
@@
finish:
return r;
}
return r;
}
-static int symlink_and_label(const char *old_path, const char *new_path) {
- int r;
-
- assert(old_path);
- assert(new_path);
-
- if ((r = label_symlinkfile_set(new_path)) < 0)
- return r;
-
- if (symlink(old_path, new_path) < 0)
- r = -errno;
-
- label_file_clear();
-
- return r;
-}
-
static int nftw_cb(
const char *fpath,
const struct stat *sb,
static int nftw_cb(
const char *fpath,
const struct stat *sb,
@@
-350,7
+347,7
@@
static int nftw_cb(
if (_unlikely_(ftwbuf->level == 0))
return FTW_CONTINUE;
if (_unlikely_(ftwbuf->level == 0))
return FTW_CONTINUE;
- label_fix(fpath,
tru
e);
+ label_fix(fpath,
false, fals
e);
/* /run/initramfs is static data and big, no need to
* dynamically relabel its contents at boot... */
/* /run/initramfs is static data and big, no need to
* dynamically relabel its contents at boot... */
@@
-364,20
+361,13
@@
static int nftw_cb(
int mount_setup(bool loaded_policy) {
int mount_setup(bool loaded_policy) {
- static const char symlinks[] =
- "/proc/kcore\0" "/dev/core\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";
-
static const char relabel[] =
"/run/initramfs/root-fsck\0"
"/run/initramfs/shutdown\0";
int r;
unsigned i;
static const char relabel[] =
"/run/initramfs/root-fsck\0"
"/run/initramfs/shutdown\0";
int r;
unsigned i;
- const char *j
, *k
;
+ const char *j;
for (i = 0; i < ELEMENTSOF(mount_table); i ++) {
r = mount_one(mount_table + i, true);
for (i = 0; i < ELEMENTSOF(mount_table); i ++) {
r = mount_one(mount_table + i, true);
@@
-401,7
+391,7
@@
int mount_setup(bool loaded_policy) {
/* Explicitly relabel these */
NULSTR_FOREACH(j, relabel)
/* Explicitly relabel these */
NULSTR_FOREACH(j, relabel)
- label_fix(j, true);
+ label_fix(j, true
, false
);
after_relabel = now(CLOCK_MONOTONIC);
after_relabel = now(CLOCK_MONOTONIC);
@@
-412,12
+402,11
@@
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. */
/* Create a few default symlinks, which are normally created
* by udevd, but some scripts might need them before we start
* udevd. */
- NULSTR_FOREACH_PAIR(j, k, symlinks)
- symlink_and_label(j, k);
+ dev_setup();
/* Create a few directories we always want around */
/* Create a few directories we always want around */
-
label_mkdir
("/run/systemd", 0755);
-
label_mkdir
("/run/systemd/system", 0755);
+
mkdir_label
("/run/systemd", 0755);
+
mkdir_label
("/run/systemd/system", 0755);
return 0;
}
return 0;
}