mount: also relabel pre-mounted API dirs

[elogind.git] / src / util.c

diff --git a/src/util.c b/src/util.c
index 5e101e44178fcee9a73d1e080562bf257ef454a0..2a5f3074b650f0cf538256c4eb10e9b11f924637 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -3582,7 +3582,6 @@ char *normalize_env_assignment(const char *s) {
         free(p);
 
         if (!value) {
-                free(p);
                 free(name);
                 return NULL;
         }
@@ -4189,7 +4188,7 @@ bool nulstr_contains(const char*nulstr, const char *needle) {
 }
 
 bool plymouth_running(void) {
-        return access("/run/initramfs/plymouth", F_OK) >= 0;
+        return access("/run/plymouth/pid", F_OK) >= 0;
 }
 
 static const char *const ioprio_class_table[] = {
@@ -4212,7 +4211,7 @@ static const char *const sigchld_code_table[] = {
 
 DEFINE_STRING_TABLE_LOOKUP(sigchld_code, int);
 
-static const char *const log_facility_table[LOG_NFACILITIES] = {
+static const char *const log_facility_unshifted_table[LOG_NFACILITIES] = {
         [LOG_FAC(LOG_KERN)] = "kern",
         [LOG_FAC(LOG_USER)] = "user",
         [LOG_FAC(LOG_MAIL)] = "mail",
@@ -4235,7 +4234,7 @@ static const char *const log_facility_table[LOG_NFACILITIES] = {
         [LOG_FAC(LOG_LOCAL7)] = "local7"
 };
 
-DEFINE_STRING_TABLE_LOOKUP(log_facility, int);
+DEFINE_STRING_TABLE_LOOKUP(log_facility_unshifted, int);
 
 static const char *const log_level_table[] = {
         [LOG_EMERG] = "emerg",