chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
main: don't check if /usr really is a mount point, since it is fine if it is passed...
[elogind.git]
/
src
/
main.c
diff --git
a/src/main.c
b/src/main.c
index ef6e681771914183c4e2d5d792091646b7564d27..769fc6772cad56aae5809b50beb1144195ba1d26 100644
(file)
--- a/
src/main.c
+++ b/
src/main.c
@@
-41,6
+41,7
@@
#include "kmod-setup.h"
#include "locale-setup.h"
#include "selinux-setup.h"
#include "kmod-setup.h"
#include "locale-setup.h"
#include "selinux-setup.h"
+#include "machine-id-setup.h"
#include "load-fragment.h"
#include "fdset.h"
#include "special.h"
#include "load-fragment.h"
#include "fdset.h"
#include "special.h"
@@
-941,25
+942,13
@@
static void test_mtab(void) {
}
static void test_usr(void) {
}
static void test_usr(void) {
- bool separate = false;
/* Check that /usr is not a separate fs */
/* Check that /usr is not a separate fs */
- if (path_is_mount_point("/usr") > 0)
- 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)
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.");
+ 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[]) {
}
int main(int argc, char *argv[]) {
@@
-1043,7
+1032,7
@@
int main(int argc, char *argv[]) {
/* If Plymouth is being run make sure we show the status, so
* that there's something nice to see when people press Esc */
/* If Plymouth is being run make sure we show the status, so
* that there's something nice to see when people press Esc */
- if (access("/dev/.systemd/plymouth", F_OK) >= 0)
+ if (access("/dev/.
run/
systemd/plymouth", F_OK) >= 0)
arg_show_status = true;
if (arg_action == ACTION_HELP) {
arg_show_status = true;
if (arg_action == ACTION_HELP) {
@@
-1127,10
+1116,9
@@
int main(int argc, char *argv[]) {
kmod_setup();
hostname_setup();
kmod_setup();
hostname_setup();
+ machine_id_setup();
loopback_setup();
loopback_setup();
- mkdir_p("/dev/.systemd/ask-password/", 0755);
-
test_mtab();
test_usr();
}
test_mtab();
test_usr();
}