assert(_fds);
if ((r = manager_open_serialization(m, &f)) < 0) {
- log_error("Failed to create serialization faile: %s", strerror(-r));
+ log_error("Failed to create serialization file: %s", strerror(-r));
goto fail;
}
static void test_mtab(void) {
char *p;
+ /* Check that /etc/mtab is a symlink */
+
if (readlink_malloc("/etc/mtab", &p) >= 0) {
bool b;
return;
}
- log_error("/etc/mtab is not a symlink or not pointing to /proc/self/mounts. "
- "This is not supported anymore. "
- "Please make sure to replace this file by a symlink to avoid incorrect or misleading mount(8) output.");
+ log_warning("/etc/mtab is not a symlink or not pointing to /proc/self/mounts. "
+ "This is not supported anymore. "
+ "Please make sure to replace this file by a symlink to avoid incorrect or misleading mount(8) output.");
+}
+
+static void test_usr(void) {
+ struct stat a, b;
+ bool separate = false;
+
+ /* Check that /usr is not a separate fs */
+
+ if (lstat("/", &a) >= 0 && lstat("/usr", &b) >= 0)
+ if (a.st_dev != b.st_dev)
+ separate = true;
+
+ /* This check won't work usually during boot, since /usr is
+ * probably not mounted yet, hence let's add a second
+ * check. We just check whether /usr is an empty directory. */
+
+ if (dir_is_empty("/usr") > 0)
+ separate = true;
+
+ if (!separate)
+ return;
+
+ log_warning("/usr appears to be on a different file system than /. This is not supported anymore. "
+ "Some things will probably break (sometimes even silently) in mysterious ways. "
+ "Consult http://freedesktop.org/wiki/Software/systemd/separate-usr-is-broken for more information.");
}
int main(int argc, char *argv[]) {
char systemd[] = "systemd";
if (getpid() != 1 && strstr(program_invocation_short_name, "init")) {
- /* This is compatbility support for SysV, where
+ /* This is compatibility support for SysV, where
* calling init as a user is identical to telinit. */
errno = -ENOENT;
mkdir_p("/dev/.systemd/ask-password/", 0755);
test_mtab();
+ test_usr();
}
if ((r = manager_new(arg_running_as, &m)) < 0) {