89fc4eb33e8365ef79eb95f2e5c4764a9cab9e10
[pti/rtp.git] / meta-stx / recipes-core / systemd / files / 0001-systemd-remove-the-log-about-var-run.patch
1 From f7c80240b43fbf79ccca366b512874c271771818 Mon Sep 17 00:00:00 2001
2 From: Jackie Huang <jackie.huang@windriver.com>
3 Date: Tue, 5 May 2020 16:00:34 +0800
4 Subject: [PATCH] systemd: remove the log about /var/run
5
6 Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
7 ---
8  src/core/dbus-service.c  | 3 ---
9  src/core/load-fragment.c | 2 --
10  src/tmpfiles/tmpfiles.c  | 2 --
11  3 files changed, 7 deletions(-)
12
13 diff --git a/src/core/dbus-service.c b/src/core/dbus-service.c
14 index 0eb336c..baf7343 100644
15 --- a/src/core/dbus-service.c
16 +++ b/src/core/dbus-service.c
17 @@ -341,9 +341,6 @@ static int bus_service_set_transient_property(
18                                  if (!z)
19                                          return log_oom();
20  
21 -                                if (!UNIT_WRITE_FLAGS_NOOP(flags))
22 -                                        log_unit_notice(u, "Transient unit's PIDFile= property references path below legacy directory /var/run, updating %s → %s; please update client accordingly.", n, z);
23 -
24                                  free_and_replace(n, z);
25                          }
26                  }
27 diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
28 index 537bca3..4ffac83 100644
29 --- a/src/core/load-fragment.c
30 +++ b/src/core/load-fragment.c
31 @@ -4286,8 +4286,6 @@ int config_parse_pid_file(
32                  if (!z)
33                          return log_oom();
34  
35 -                log_syntax(unit, LOG_NOTICE, filename, line, 0, "PIDFile= references path below legacy directory /var/run/, updating %s → %s; please update the unit file accordingly.", n, z);
36 -
37                  free_and_replace(*s, z);
38          } else
39                  free_and_replace(*s, n);
40 diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
41 index b66765b..bfce982 100644
42 --- a/src/tmpfiles/tmpfiles.c
43 +++ b/src/tmpfiles/tmpfiles.c
44 @@ -2479,8 +2479,6 @@ static int patch_var_run(const char *fname, unsigned line, char **path) {
45           * there's no immediate need for action by the user. However, in the interest of making things less confusing
46           * to the user, let's still inform the user that these snippets should really be updated. */
47  
48 -        log_notice("[%s:%u] Line references path below legacy directory /var/run/, updating %s → %s; please update the tmpfiles.d/ drop-in file accordingly.", fname, line, *path, n);
49 -
50          free_and_replace(*path, n);
51  
52          return 0;
53 -- 
54 2.7.4
55