manager: fix taint check for /usr
This commit is contained in:
parent
ea87ca5a9e
commit
72bc8d0056
4
TODO
4
TODO
|
@ -27,10 +27,10 @@ F15:
|
||||||
|
|
||||||
* LOG_DAEMON/LOG_USER für kmsg messages schreiben
|
* LOG_DAEMON/LOG_USER für kmsg messages schreiben
|
||||||
|
|
||||||
* fix /usr taint
|
|
||||||
|
|
||||||
* disable /dev/console status messages after plymouth went down
|
* disable /dev/console status messages after plymouth went down
|
||||||
|
|
||||||
|
* quotacheck pulled in too often
|
||||||
|
|
||||||
Features:
|
Features:
|
||||||
|
|
||||||
* when key file cannot be found, read it from kbd in cryptsetup
|
* 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(i);
|
||||||
assert(property);
|
assert(property);
|
||||||
|
|
||||||
if (dir_is_empty("/usr") > 0)
|
if (m->taint_usr)
|
||||||
e = stpcpy(e, "usr-separate-fs");
|
e = stpcpy(e, "usr-separate-fs");
|
||||||
|
|
||||||
if (readlink_malloc("/etc/mtab", &p) < 0) {
|
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");
|
log_error("Failed to connect to audit log: %m");
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
m->taint_usr = dir_is_empty("/usr") > 0;
|
||||||
|
|
||||||
*_m = m;
|
*_m = m;
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
|
|
|
@ -211,6 +211,8 @@ struct Manager {
|
||||||
bool dispatching_run_queue:1;
|
bool dispatching_run_queue:1;
|
||||||
bool dispatching_dbus_queue:1;
|
bool dispatching_dbus_queue:1;
|
||||||
|
|
||||||
|
bool taint_usr:1;
|
||||||
|
|
||||||
bool show_status;
|
bool show_status;
|
||||||
bool confirm_spawn;
|
bool confirm_spawn;
|
||||||
#ifdef HAVE_SYSV_COMPAT
|
#ifdef HAVE_SYSV_COMPAT
|
||||||
|
|
Loading…
Reference in a new issue