Commit 72bc8d00 authored by Lennart Poettering's avatar Lennart Poettering

manager: fix taint check for /usr

parent ea87ca5a
......@@ -27,10 +27,10 @@ F15:
* LOG_DAEMON/LOG_USER für kmsg messages schreiben
* fix /usr taint
* disable /dev/console status messages after plymouth went down
* quotacheck pulled in too often
Features:
* when key file cannot be found, read it from kbd in cryptsetup
......
......@@ -223,7 +223,7 @@ static int bus_manager_append_tainted(Manager *m, DBusMessageIter *i, const char
assert(i);
assert(property);
if (dir_is_empty("/usr") > 0)
if (m->taint_usr)
e = stpcpy(e, "usr-separate-fs");
if (readlink_malloc("/etc/mtab", &p) < 0) {
......
......@@ -278,6 +278,8 @@ int manager_new(ManagerRunningAs running_as, Manager **_m) {
log_error("Failed to connect to audit log: %m");
#endif
m->taint_usr = dir_is_empty("/usr") > 0;
*_m = m;
return 0;
......
......@@ -211,6 +211,8 @@ struct Manager {
bool dispatching_run_queue:1;
bool dispatching_dbus_queue:1;
bool taint_usr:1;
bool show_status;
bool confirm_spawn;
#ifdef HAVE_SYSV_COMPAT
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment