summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/systemd/systemd/0001-do-not-disable-buffer-in-writing-files.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-core/systemd/systemd/0001-do-not-disable-buffer-in-writing-files.patch')
-rw-r--r--meta/recipes-core/systemd/systemd/0001-do-not-disable-buffer-in-writing-files.patch208
1 files changed, 62 insertions, 146 deletions
diff --git a/meta/recipes-core/systemd/systemd/0001-do-not-disable-buffer-in-writing-files.patch b/meta/recipes-core/systemd/systemd/0001-do-not-disable-buffer-in-writing-files.patch
index a6857b1f47..68ca604d6d 100644
--- a/meta/recipes-core/systemd/systemd/0001-do-not-disable-buffer-in-writing-files.patch
+++ b/meta/recipes-core/systemd/systemd/0001-do-not-disable-buffer-in-writing-files.patch
@@ -14,6 +14,8 @@ This is specific to musl.
14Upstream-Status: Inappropriate [musl] 14Upstream-Status: Inappropriate [musl]
15 15
16Signed-off-by: Chen Qi <Qi.Chen@windriver.com> 16Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
17[Rebased for v242]
18Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
17--- 19---
18 src/basic/cgroup-util.c | 14 +++++++------- 20 src/basic/cgroup-util.c | 14 +++++++-------
19 src/basic/procfs-util.c | 4 ++-- 21 src/basic/procfs-util.c | 4 ++--
@@ -25,21 +27,20 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
25 src/hibernate-resume/hibernate-resume.c | 2 +- 27 src/hibernate-resume/hibernate-resume.c | 2 +-
26 src/libsystemd/sd-device/sd-device.c | 2 +- 28 src/libsystemd/sd-device/sd-device.c | 2 +-
27 src/login/logind-dbus.c | 2 +- 29 src/login/logind-dbus.c | 2 +-
28 src/network/networkd-ipv6-proxy-ndp.c | 2 +-
29 src/network/networkd-link.c | 18 +++++++++---------
30 src/nspawn/nspawn-cgroup.c | 2 +- 30 src/nspawn/nspawn-cgroup.c | 2 +-
31 src/nspawn/nspawn.c | 6 +++--- 31 src/nspawn/nspawn.c | 6 +++---
32 src/shared/sysctl-util.c | 2 +-
32 src/sleep/sleep.c | 12 ++++++------ 33 src/sleep/sleep.c | 12 ++++++------
33 src/udev/udevadm-trigger.c | 2 +- 34 src/udev/udevadm-trigger.c | 2 +-
34 src/udev/udevd.c | 6 +++--- 35 src/udev/udevd.c | 6 +++---
35 src/vconsole/vconsole-setup.c | 2 +- 36 src/vconsole/vconsole-setup.c | 2 +-
36 18 files changed, 48 insertions(+), 48 deletions(-) 37 17 files changed, 39 insertions(+), 39 deletions(-)
37 38
38diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c 39diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c
39index 8ce7ccb..b633226 100644 40index fc28109..44fe985 100644
40--- a/src/basic/cgroup-util.c 41--- a/src/basic/cgroup-util.c
41+++ b/src/basic/cgroup-util.c 42+++ b/src/basic/cgroup-util.c
42@@ -818,7 +818,7 @@ int cg_attach(const char *controller, const char *path, pid_t pid) { 43@@ -822,7 +822,7 @@ int cg_attach(const char *controller, const char *path, pid_t pid) {
43 44
44 xsprintf(c, PID_FMT "\n", pid); 45 xsprintf(c, PID_FMT "\n", pid);
45 46
@@ -48,7 +49,7 @@ index 8ce7ccb..b633226 100644
48 if (r < 0) 49 if (r < 0)
49 return r; 50 return r;
50 51
51@@ -1100,7 +1100,7 @@ int cg_install_release_agent(const char *controller, const char *agent) { 52@@ -1104,7 +1104,7 @@ int cg_install_release_agent(const char *controller, const char *agent) {
52 53
53 sc = strstrip(contents); 54 sc = strstrip(contents);
54 if (isempty(sc)) { 55 if (isempty(sc)) {
@@ -57,7 +58,7 @@ index 8ce7ccb..b633226 100644
57 if (r < 0) 58 if (r < 0)
58 return r; 59 return r;
59 } else if (!path_equal(sc, agent)) 60 } else if (!path_equal(sc, agent))
60@@ -1118,7 +1118,7 @@ int cg_install_release_agent(const char *controller, const char *agent) { 61@@ -1122,7 +1122,7 @@ int cg_install_release_agent(const char *controller, const char *agent) {
61 62
62 sc = strstrip(contents); 63 sc = strstrip(contents);
63 if (streq(sc, "0")) { 64 if (streq(sc, "0")) {
@@ -66,7 +67,7 @@ index 8ce7ccb..b633226 100644
66 if (r < 0) 67 if (r < 0)
67 return r; 68 return r;
68 69
69@@ -1145,7 +1145,7 @@ int cg_uninstall_release_agent(const char *controller) { 70@@ -1149,7 +1149,7 @@ int cg_uninstall_release_agent(const char *controller) {
70 if (r < 0) 71 if (r < 0)
71 return r; 72 return r;
72 73
@@ -75,7 +76,7 @@ index 8ce7ccb..b633226 100644
75 if (r < 0) 76 if (r < 0)
76 return r; 77 return r;
77 78
78@@ -1155,7 +1155,7 @@ int cg_uninstall_release_agent(const char *controller) { 79@@ -1159,7 +1159,7 @@ int cg_uninstall_release_agent(const char *controller) {
79 if (r < 0) 80 if (r < 0)
80 return r; 81 return r;
81 82
@@ -84,7 +85,7 @@ index 8ce7ccb..b633226 100644
84 if (r < 0) 85 if (r < 0)
85 return r; 86 return r;
86 87
87@@ -2012,7 +2012,7 @@ int cg_set_attribute(const char *controller, const char *path, const char *attri 88@@ -2016,7 +2016,7 @@ int cg_set_attribute(const char *controller, const char *path, const char *attri
88 if (r < 0) 89 if (r < 0)
89 return r; 90 return r;
90 91
@@ -93,7 +94,7 @@ index 8ce7ccb..b633226 100644
93 } 94 }
94 95
95 int cg_get_attribute(const char *controller, const char *path, const char *attribute, char **ret) { 96 int cg_get_attribute(const char *controller, const char *path, const char *attribute, char **ret) {
96@@ -2660,7 +2660,7 @@ int cg_enable_everywhere( 97@@ -2664,7 +2664,7 @@ int cg_enable_everywhere(
97 return log_debug_errno(errno, "Failed to open cgroup.subtree_control file of %s: %m", p); 98 return log_debug_errno(errno, "Failed to open cgroup.subtree_control file of %s: %m", p);
98 } 99 }
99 100
@@ -103,10 +104,10 @@ index 8ce7ccb..b633226 100644
103 log_debug_errno(r, "Failed to %s controller %s for %s (%s): %m", 104 log_debug_errno(r, "Failed to %s controller %s for %s (%s): %m",
104 FLAGS_SET(mask, bit) ? "enable" : "disable", n, p, fs); 105 FLAGS_SET(mask, bit) ? "enable" : "disable", n, p, fs);
105diff --git a/src/basic/procfs-util.c b/src/basic/procfs-util.c 106diff --git a/src/basic/procfs-util.c b/src/basic/procfs-util.c
106index 42ce53d..5751253 100644 107index 7aaf95b..25fc3de 100644
107--- a/src/basic/procfs-util.c 108--- a/src/basic/procfs-util.c
108+++ b/src/basic/procfs-util.c 109+++ b/src/basic/procfs-util.c
109@@ -86,13 +86,13 @@ int procfs_tasks_set_limit(uint64_t limit) { 110@@ -85,13 +85,13 @@ int procfs_tasks_set_limit(uint64_t limit) {
110 * decrease it, as threads-max is the much more relevant sysctl. */ 111 * decrease it, as threads-max is the much more relevant sysctl. */
111 if (limit > pid_max-1) { 112 if (limit > pid_max-1) {
112 sprintf(buffer, "%" PRIu64, limit+1); /* Add one, since PID 0 is not a valid PID */ 113 sprintf(buffer, "%" PRIu64, limit+1); /* Add one, since PID 0 is not a valid PID */
@@ -136,10 +137,10 @@ index 123d00e..e7ea78f 100644
136 return r; 137 return r;
137 138
138diff --git a/src/basic/util.c b/src/basic/util.c 139diff --git a/src/basic/util.c b/src/basic/util.c
139index e577c93..3c64f91 100644 140index 93d610b..97dca64 100644
140--- a/src/basic/util.c 141--- a/src/basic/util.c
141+++ b/src/basic/util.c 142+++ b/src/basic/util.c
142@@ -631,7 +631,7 @@ void disable_coredumps(void) { 143@@ -294,7 +294,7 @@ void disable_coredumps(void) {
143 if (detect_container() > 0) 144 if (detect_container() > 0)
144 return; 145 return;
145 146
@@ -149,10 +150,10 @@ index e577c93..3c64f91 100644
149 log_debug_errno(r, "Failed to turn off coredumps, ignoring: %m"); 150 log_debug_errno(r, "Failed to turn off coredumps, ignoring: %m");
150 } 151 }
151diff --git a/src/binfmt/binfmt.c b/src/binfmt/binfmt.c 152diff --git a/src/binfmt/binfmt.c b/src/binfmt/binfmt.c
152index af31f09..eec5738 100644 153index 66e2f01..5daa43b 100644
153--- a/src/binfmt/binfmt.c 154--- a/src/binfmt/binfmt.c
154+++ b/src/binfmt/binfmt.c 155+++ b/src/binfmt/binfmt.c
155@@ -47,7 +47,7 @@ static int delete_rule(const char *rule) { 156@@ -48,7 +48,7 @@ static int delete_rule(const char *rule) {
156 if (!fn) 157 if (!fn)
157 return log_oom(); 158 return log_oom();
158 159
@@ -161,7 +162,7 @@ index af31f09..eec5738 100644
161 } 162 }
162 163
163 static int apply_rule(const char *rule) { 164 static int apply_rule(const char *rule) {
164@@ -55,7 +55,7 @@ static int apply_rule(const char *rule) { 165@@ -56,7 +56,7 @@ static int apply_rule(const char *rule) {
165 166
166 (void) delete_rule(rule); 167 (void) delete_rule(rule);
167 168
@@ -170,7 +171,7 @@ index af31f09..eec5738 100644
170 if (r < 0) 171 if (r < 0)
171 return log_error_errno(r, "Failed to add binary format: %m"); 172 return log_error_errno(r, "Failed to add binary format: %m");
172 173
173@@ -212,7 +212,7 @@ static int run(int argc, char *argv[]) { 174@@ -213,7 +213,7 @@ static int run(int argc, char *argv[]) {
174 } 175 }
175 176
176 /* Flush out all rules */ 177 /* Flush out all rules */
@@ -180,10 +181,10 @@ index af31f09..eec5738 100644
180 STRV_FOREACH(f, files) { 181 STRV_FOREACH(f, files) {
181 k = apply_file(*f, true); 182 k = apply_file(*f, true);
182diff --git a/src/core/main.c b/src/core/main.c 183diff --git a/src/core/main.c b/src/core/main.c
183index 561f956..db6f113 100644 184index 46db471..726ccaf 100644
184--- a/src/core/main.c 185--- a/src/core/main.c
185+++ b/src/core/main.c 186+++ b/src/core/main.c
186@@ -1468,7 +1468,7 @@ static int bump_unix_max_dgram_qlen(void) { 187@@ -1469,7 +1469,7 @@ static int bump_unix_max_dgram_qlen(void) {
187 if (v >= DEFAULT_UNIX_MAX_DGRAM_QLEN) 188 if (v >= DEFAULT_UNIX_MAX_DGRAM_QLEN)
188 return 0; 189 return 0;
189 190
@@ -192,7 +193,7 @@ index 561f956..db6f113 100644
192 if (r < 0) 193 if (r < 0)
193 return log_full_errno(IN_SET(r, -EROFS, -EPERM, -EACCES) ? LOG_DEBUG : LOG_WARNING, r, 194 return log_full_errno(IN_SET(r, -EROFS, -EPERM, -EACCES) ? LOG_DEBUG : LOG_WARNING, r,
194 "Failed to bump AF_UNIX datagram queue length, ignoring: %m"); 195 "Failed to bump AF_UNIX datagram queue length, ignoring: %m");
195@@ -1683,7 +1683,7 @@ static void initialize_core_pattern(bool skip_setup) { 196@@ -1684,7 +1684,7 @@ static void initialize_core_pattern(bool skip_setup) {
196 if (getpid_cached() != 1) 197 if (getpid_cached() != 1)
197 return; 198 return;
198 199
@@ -202,10 +203,10 @@ index 561f956..db6f113 100644
202 log_warning_errno(r, "Failed to write '%s' to /proc/sys/kernel/core_pattern, ignoring: %m", arg_early_core_pattern); 203 log_warning_errno(r, "Failed to write '%s' to /proc/sys/kernel/core_pattern, ignoring: %m", arg_early_core_pattern);
203 } 204 }
204diff --git a/src/core/smack-setup.c b/src/core/smack-setup.c 205diff --git a/src/core/smack-setup.c b/src/core/smack-setup.c
205index 49b37ae..c96eedc 100644 206index cd7fb01..077e861 100644
206--- a/src/core/smack-setup.c 207--- a/src/core/smack-setup.c
207+++ b/src/core/smack-setup.c 208+++ b/src/core/smack-setup.c
208@@ -350,17 +350,17 @@ int mac_smack_setup(bool *loaded_policy) { 209@@ -351,17 +351,17 @@ int mac_smack_setup(bool *loaded_policy) {
209 } 210 }
210 211
211 #ifdef SMACK_RUN_LABEL 212 #ifdef SMACK_RUN_LABEL
@@ -241,10 +242,10 @@ index 17e7cd1..87a7667 100644
241 log_error_errno(r, "Failed to write '%s' to /sys/power/resume: %m", major_minor); 242 log_error_errno(r, "Failed to write '%s' to /sys/power/resume: %m", major_minor);
242 return EXIT_FAILURE; 243 return EXIT_FAILURE;
243diff --git a/src/libsystemd/sd-device/sd-device.c b/src/libsystemd/sd-device/sd-device.c 244diff --git a/src/libsystemd/sd-device/sd-device.c b/src/libsystemd/sd-device/sd-device.c
244index 2a69f2e..9d55340 100644 245index c2315c0..00f81b4 100644
245--- a/src/libsystemd/sd-device/sd-device.c 246--- a/src/libsystemd/sd-device/sd-device.c
246+++ b/src/libsystemd/sd-device/sd-device.c 247+++ b/src/libsystemd/sd-device/sd-device.c
247@@ -1836,7 +1836,7 @@ _public_ int sd_device_set_sysattr_value(sd_device *device, const char *sysattr, 248@@ -1852,7 +1852,7 @@ _public_ int sd_device_set_sysattr_value(sd_device *device, const char *sysattr,
248 if (!value) 249 if (!value)
249 return -ENOMEM; 250 return -ENOMEM;
250 251
@@ -254,10 +255,10 @@ index 2a69f2e..9d55340 100644
254 if (r == -ELOOP) 255 if (r == -ELOOP)
255 return -EINVAL; 256 return -EINVAL;
256diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c 257diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
257index 8ab498f..d27ef9c 100644 258index 2cebcce..7111fc1 100644
258--- a/src/login/logind-dbus.c 259--- a/src/login/logind-dbus.c
259+++ b/src/login/logind-dbus.c 260+++ b/src/login/logind-dbus.c
260@@ -1231,7 +1231,7 @@ static int trigger_device(Manager *m, sd_device *d) { 261@@ -1285,7 +1285,7 @@ static int trigger_device(Manager *m, sd_device *d) {
261 if (!t) 262 if (!t)
262 return -ENOMEM; 263 return -ENOMEM;
263 264
@@ -266,109 +267,11 @@ index 8ab498f..d27ef9c 100644
266 } 267 }
267 268
268 return 0; 269 return 0;
269diff --git a/src/network/networkd-ipv6-proxy-ndp.c b/src/network/networkd-ipv6-proxy-ndp.c
270index f594b27..c283cc3 100644
271--- a/src/network/networkd-ipv6-proxy-ndp.c
272+++ b/src/network/networkd-ipv6-proxy-ndp.c
273@@ -43,7 +43,7 @@ static int ipv6_proxy_ndp_set(Link *link) {
274 v = ipv6_proxy_ndp_is_needed(link);
275 p = strjoina("/proc/sys/net/ipv6/conf/", link->ifname, "/proxy_ndp");
276
277- r = write_string_file(p, one_zero(v), WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_DISABLE_BUFFER);
278+ r = write_string_file(p, one_zero(v), WRITE_STRING_FILE_VERIFY_ON_FAILURE | 0);
279 if (r < 0)
280 log_link_warning_errno(link, r, "Cannot configure proxy NDP for interface: %m");
281
282diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
283index 22392d7..e0ed551 100644
284--- a/src/network/networkd-link.c
285+++ b/src/network/networkd-link.c
286@@ -274,7 +274,7 @@ static int link_enable_ipv6(Link *link) {
287
288 p = strjoina("/proc/sys/net/ipv6/conf/", link->ifname, "/disable_ipv6");
289
290- r = write_string_file(p, one_zero(disabled), WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_DISABLE_BUFFER);
291+ r = write_string_file(p, one_zero(disabled), WRITE_STRING_FILE_VERIFY_ON_FAILURE | 0);
292 if (r < 0)
293 log_link_warning_errno(link, r, "Cannot %s IPv6 for interface %s: %m",
294 enable_disable(!disabled), link->ifname);
295@@ -1272,7 +1272,7 @@ static int link_set_proxy_arp(Link *link) {
296
297 p = strjoina("/proc/sys/net/ipv4/conf/", link->ifname, "/proxy_arp");
298
299- r = write_string_file(p, one_zero(link->network->proxy_arp), WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_DISABLE_BUFFER);
300+ r = write_string_file(p, one_zero(link->network->proxy_arp), WRITE_STRING_FILE_VERIFY_ON_FAILURE | 0);
301 if (r < 0)
302 log_link_warning_errno(link, r, "Cannot configure proxy ARP for interface: %m");
303
304@@ -2541,7 +2541,7 @@ static int link_set_ipv4_forward(Link *link) {
305 * primarily to keep IPv4 and IPv6 packet forwarding behaviour
306 * somewhat in sync (see below). */
307
308- r = write_string_file("/proc/sys/net/ipv4/ip_forward", "1", WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_DISABLE_BUFFER);
309+ r = write_string_file("/proc/sys/net/ipv4/ip_forward", "1", WRITE_STRING_FILE_VERIFY_ON_FAILURE | 0);
310 if (r < 0)
311 log_link_warning_errno(link, r, "Cannot turn on IPv4 packet forwarding, ignoring: %m");
312
313@@ -2563,7 +2563,7 @@ static int link_set_ipv6_forward(Link *link) {
314 * same behaviour there and also propagate the setting from
315 * one to all, to keep things simple (see above). */
316
317- r = write_string_file("/proc/sys/net/ipv6/conf/all/forwarding", "1", WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_DISABLE_BUFFER);
318+ r = write_string_file("/proc/sys/net/ipv6/conf/all/forwarding", "1", WRITE_STRING_FILE_VERIFY_ON_FAILURE | 0);
319 if (r < 0)
320 log_link_warning_errno(link, r, "Cannot configure IPv6 packet forwarding, ignoring: %m");
321
322@@ -2583,7 +2583,7 @@ static int link_set_ipv6_privacy_extensions(Link *link) {
323 p = strjoina("/proc/sys/net/ipv6/conf/", link->ifname, "/use_tempaddr");
324 xsprintf(buf, "%u", (unsigned) link->network->ipv6_privacy_extensions);
325
326- r = write_string_file(p, buf, WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_DISABLE_BUFFER);
327+ r = write_string_file(p, buf, WRITE_STRING_FILE_VERIFY_ON_FAILURE | 0);
328 if (r < 0)
329 log_link_warning_errno(link, r, "Cannot configure IPv6 privacy extension for interface: %m");
330
331@@ -2607,7 +2607,7 @@ static int link_set_ipv6_accept_ra(Link *link) {
332 p = strjoina("/proc/sys/net/ipv6/conf/", link->ifname, "/accept_ra");
333
334 /* We handle router advertisements ourselves, tell the kernel to GTFO */
335- r = write_string_file(p, "0", WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_DISABLE_BUFFER);
336+ r = write_string_file(p, "0", WRITE_STRING_FILE_VERIFY_ON_FAILURE | 0);
337 if (r < 0)
338 log_link_warning_errno(link, r, "Cannot disable kernel IPv6 accept_ra for interface: %m");
339
340@@ -2635,7 +2635,7 @@ static int link_set_ipv6_dad_transmits(Link *link) {
341 p = strjoina("/proc/sys/net/ipv6/conf/", link->ifname, "/dad_transmits");
342 xsprintf(buf, "%i", link->network->ipv6_dad_transmits);
343
344- r = write_string_file(p, buf, WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_DISABLE_BUFFER);
345+ r = write_string_file(p, buf, WRITE_STRING_FILE_VERIFY_ON_FAILURE | 0);
346 if (r < 0)
347 log_link_warning_errno(link, r, "Cannot set IPv6 dad transmits for interface: %m");
348
349@@ -2663,7 +2663,7 @@ static int link_set_ipv6_hop_limit(Link *link) {
350 p = strjoina("/proc/sys/net/ipv6/conf/", link->ifname, "/hop_limit");
351 xsprintf(buf, "%i", link->network->ipv6_hop_limit);
352
353- r = write_string_file(p, buf, WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_DISABLE_BUFFER);
354+ r = write_string_file(p, buf, WRITE_STRING_FILE_VERIFY_ON_FAILURE | 0);
355 if (r < 0)
356 log_link_warning_errno(link, r, "Cannot set IPv6 hop limit for interface: %m");
357
358@@ -2689,7 +2689,7 @@ static int link_set_ipv6_mtu(Link *link) {
359
360 xsprintf(buf, "%" PRIu32, link->network->ipv6_mtu);
361
362- r = write_string_file(p, buf, WRITE_STRING_FILE_DISABLE_BUFFER);
363+ r = write_string_file(p, buf, 0);
364 if (r < 0)
365 log_link_warning_errno(link, r, "Cannot set IPv6 MTU for interface: %m");
366
367diff --git a/src/nspawn/nspawn-cgroup.c b/src/nspawn/nspawn-cgroup.c 270diff --git a/src/nspawn/nspawn-cgroup.c b/src/nspawn/nspawn-cgroup.c
368index 97fa092..b841f51 100644 271index 168125d..dd0ab79 100644
369--- a/src/nspawn/nspawn-cgroup.c 272--- a/src/nspawn/nspawn-cgroup.c
370+++ b/src/nspawn/nspawn-cgroup.c 273+++ b/src/nspawn/nspawn-cgroup.c
371@@ -123,7 +123,7 @@ int sync_cgroup(pid_t pid, CGroupUnified unified_requested, uid_t uid_shift) { 274@@ -124,7 +124,7 @@ int sync_cgroup(pid_t pid, CGroupUnified unified_requested, uid_t uid_shift) {
372 (void) mkdir_parents(fn, 0755); 275 (void) mkdir_parents(fn, 0755);
373 276
374 sprintf(pid_string, PID_FMT, pid); 277 sprintf(pid_string, PID_FMT, pid);
@@ -378,10 +281,10 @@ index 97fa092..b841f51 100644
378 log_error_errno(r, "Failed to move process: %m"); 281 log_error_errno(r, "Failed to move process: %m");
379 goto finish; 282 goto finish;
380diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c 283diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
381index e0c2d71..213790c 100644 284index 3b0ecb1..a1b5240 100644
382--- a/src/nspawn/nspawn.c 285--- a/src/nspawn/nspawn.c
383+++ b/src/nspawn/nspawn.c 286+++ b/src/nspawn/nspawn.c
384@@ -2117,7 +2117,7 @@ static int reset_audit_loginuid(void) { 287@@ -2341,7 +2341,7 @@ static int reset_audit_loginuid(void) {
385 if (streq(p, "4294967295")) 288 if (streq(p, "4294967295"))
386 return 0; 289 return 0;
387 290
@@ -390,7 +293,7 @@ index e0c2d71..213790c 100644
390 if (r < 0) { 293 if (r < 0) {
391 log_error_errno(r, 294 log_error_errno(r,
392 "Failed to reset audit login UID. This probably means that your kernel is too\n" 295 "Failed to reset audit login UID. This probably means that your kernel is too\n"
393@@ -3195,13 +3195,13 @@ static int setup_uid_map(pid_t pid) { 296@@ -3531,13 +3531,13 @@ static int setup_uid_map(pid_t pid) {
394 297
395 xsprintf(uid_map, "/proc/" PID_FMT "/uid_map", pid); 298 xsprintf(uid_map, "/proc/" PID_FMT "/uid_map", pid);
396 xsprintf(line, UID_FMT " " UID_FMT " " UID_FMT "\n", 0, arg_uid_shift, arg_uid_range); 299 xsprintf(line, UID_FMT " " UID_FMT " " UID_FMT "\n", 0, arg_uid_shift, arg_uid_range);
@@ -406,11 +309,24 @@ index e0c2d71..213790c 100644
406 if (r < 0) 309 if (r < 0)
407 return log_error_errno(r, "Failed to write GID map: %m"); 310 return log_error_errno(r, "Failed to write GID map: %m");
408 311
312diff --git a/src/shared/sysctl-util.c b/src/shared/sysctl-util.c
313index 9be4055..f935cde 100644
314--- a/src/shared/sysctl-util.c
315+++ b/src/shared/sysctl-util.c
316@@ -73,7 +73,7 @@ int sysctl_write_ip_property(int af, const char *ifname, const char *property, c
317
318 log_debug("Setting '%s' to '%s'", p, value);
319
320- return write_string_file(p, value, WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_DISABLE_BUFFER);
321+ return write_string_file(p, value, WRITE_STRING_FILE_VERIFY_ON_FAILURE | 0);
322 }
323
324 int sysctl_read(const char *property, char **content) {
409diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c 325diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c
410index 5b7984a..bf818aa 100644 326index 11aabaf..6aa5d37 100644
411--- a/src/sleep/sleep.c 327--- a/src/sleep/sleep.c
412+++ b/src/sleep/sleep.c 328+++ b/src/sleep/sleep.c
413@@ -43,7 +43,7 @@ static int write_hibernate_location_info(void) { 329@@ -48,7 +48,7 @@ static int write_hibernate_location_info(void) {
414 330
415 /* if it's a swap partition, we just write the disk to /sys/power/resume */ 331 /* if it's a swap partition, we just write the disk to /sys/power/resume */
416 if (streq(type, "partition")) { 332 if (streq(type, "partition")) {
@@ -419,7 +335,7 @@ index 5b7984a..bf818aa 100644
419 if (r < 0) 335 if (r < 0)
420 return log_debug_errno(r, "Faileed to write partitoin device to /sys/power/resume: %m"); 336 return log_debug_errno(r, "Faileed to write partitoin device to /sys/power/resume: %m");
421 337
422@@ -79,12 +79,12 @@ static int write_hibernate_location_info(void) { 338@@ -84,12 +84,12 @@ static int write_hibernate_location_info(void) {
423 339
424 offset = fiemap->fm_extents[0].fe_physical / page_size(); 340 offset = fiemap->fm_extents[0].fe_physical / page_size();
425 xsprintf(offset_str, "%" PRIu64, offset); 341 xsprintf(offset_str, "%" PRIu64, offset);
@@ -434,7 +350,7 @@ index 5b7984a..bf818aa 100644
434 if (r < 0) 350 if (r < 0)
435 return log_debug_errno(r, "Failed to write device '%s': %m", device_str); 351 return log_debug_errno(r, "Failed to write device '%s': %m", device_str);
436 352
437@@ -98,7 +98,7 @@ static int write_mode(char **modes) { 353@@ -103,7 +103,7 @@ static int write_mode(char **modes) {
438 STRV_FOREACH(mode, modes) { 354 STRV_FOREACH(mode, modes) {
439 int k; 355 int k;
440 356
@@ -443,7 +359,7 @@ index 5b7984a..bf818aa 100644
443 if (k >= 0) 359 if (k >= 0)
444 return 0; 360 return 0;
445 361
446@@ -117,7 +117,7 @@ static int write_state(FILE **f, char **states) { 362@@ -122,7 +122,7 @@ static int write_state(FILE **f, char **states) {
447 STRV_FOREACH(state, states) { 363 STRV_FOREACH(state, states) {
448 int k; 364 int k;
449 365
@@ -452,7 +368,7 @@ index 5b7984a..bf818aa 100644
452 if (k >= 0) 368 if (k >= 0)
453 return 0; 369 return 0;
454 log_debug_errno(k, "Failed to write '%s' to /sys/power/state: %m", *state); 370 log_debug_errno(k, "Failed to write '%s' to /sys/power/state: %m", *state);
455@@ -212,7 +212,7 @@ static int rtc_write_wake_alarm(uint64_t sec) { 371@@ -217,7 +217,7 @@ static int rtc_write_wake_alarm(uint64_t sec) {
456 372
457 xsprintf(buf, "%" PRIu64, sec); 373 xsprintf(buf, "%" PRIu64, sec);
458 374
@@ -462,10 +378,10 @@ index 5b7984a..bf818aa 100644
462 return log_error_errno(r, "Failed to write '%s' to /sys/class/rtc/rtc0/wakealarm: %m", buf); 378 return log_error_errno(r, "Failed to write '%s' to /sys/class/rtc/rtc0/wakealarm: %m", buf);
463 379
464diff --git a/src/udev/udevadm-trigger.c b/src/udev/udevadm-trigger.c 380diff --git a/src/udev/udevadm-trigger.c b/src/udev/udevadm-trigger.c
465index 9532946..2e576bb 100644 381index b7dafb7..bab4907 100644
466--- a/src/udev/udevadm-trigger.c 382--- a/src/udev/udevadm-trigger.c
467+++ b/src/udev/udevadm-trigger.c 383+++ b/src/udev/udevadm-trigger.c
468@@ -42,7 +42,7 @@ static int exec_list(sd_device_enumerator *e, const char *action, Set *settle_se 384@@ -43,7 +43,7 @@ static int exec_list(sd_device_enumerator *e, const char *action, Set *settle_se
469 if (!filename) 385 if (!filename)
470 return log_oom(); 386 return log_oom();
471 387
@@ -475,10 +391,10 @@ index 9532946..2e576bb 100644
475 log_debug_errno(r, "Failed to write '%s' to '%s', ignoring: %m", action, filename); 391 log_debug_errno(r, "Failed to write '%s' to '%s', ignoring: %m", action, filename);
476 continue; 392 continue;
477diff --git a/src/udev/udevd.c b/src/udev/udevd.c 393diff --git a/src/udev/udevd.c b/src/udev/udevd.c
478index 0303f36..687d009 100644 394index 140ec35..33063a9 100644
479--- a/src/udev/udevd.c 395--- a/src/udev/udevd.c
480+++ b/src/udev/udevd.c 396+++ b/src/udev/udevd.c
481@@ -1218,7 +1218,7 @@ static int synthesize_change(sd_device *dev) { 397@@ -1185,7 +1185,7 @@ static int synthesize_change(sd_device *dev) {
482 */ 398 */
483 log_debug("Device '%s' is closed, synthesising 'change'", devname); 399 log_debug("Device '%s' is closed, synthesising 'change'", devname);
484 strscpyl(filename, sizeof(filename), syspath, "/uevent", NULL); 400 strscpyl(filename, sizeof(filename), syspath, "/uevent", NULL);
@@ -487,7 +403,7 @@ index 0303f36..687d009 100644
487 403
488 FOREACH_DEVICE(e, d) { 404 FOREACH_DEVICE(e, d) {
489 const char *t, *n, *s; 405 const char *t, *n, *s;
490@@ -1233,7 +1233,7 @@ static int synthesize_change(sd_device *dev) { 406@@ -1200,7 +1200,7 @@ static int synthesize_change(sd_device *dev) {
491 407
492 log_debug("Device '%s' is closed, synthesising partition '%s' 'change'", devname, n); 408 log_debug("Device '%s' is closed, synthesising partition '%s' 'change'", devname, n);
493 strscpyl(filename, sizeof(filename), s, "/uevent", NULL); 409 strscpyl(filename, sizeof(filename), s, "/uevent", NULL);
@@ -496,7 +412,7 @@ index 0303f36..687d009 100644
496 } 412 }
497 413
498 return 0; 414 return 0;
499@@ -1241,7 +1241,7 @@ static int synthesize_change(sd_device *dev) { 415@@ -1208,7 +1208,7 @@ static int synthesize_change(sd_device *dev) {
500 416
501 log_debug("Device %s is closed, synthesising 'change'", devname); 417 log_debug("Device %s is closed, synthesising 'change'", devname);
502 strscpyl(filename, sizeof(filename), syspath, "/uevent", NULL); 418 strscpyl(filename, sizeof(filename), syspath, "/uevent", NULL);
@@ -506,10 +422,10 @@ index 0303f36..687d009 100644
506 return 0; 422 return 0;
507 } 423 }
508diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c 424diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c
509index ebdeba3..aa879e6 100644 425index 67dc2e4..01b83d0 100644
510--- a/src/vconsole/vconsole-setup.c 426--- a/src/vconsole/vconsole-setup.c
511+++ b/src/vconsole/vconsole-setup.c 427+++ b/src/vconsole/vconsole-setup.c
512@@ -114,7 +114,7 @@ static int toggle_utf8(const char *name, int fd, bool utf8) { 428@@ -116,7 +116,7 @@ static int toggle_utf8(const char *name, int fd, bool utf8) {
513 static int toggle_utf8_sysfs(bool utf8) { 429 static int toggle_utf8_sysfs(bool utf8) {
514 int r; 430 int r;
515 431
@@ -519,5 +435,5 @@ index ebdeba3..aa879e6 100644
519 return log_warning_errno(r, "Failed to %s sysfs UTF-8 flag: %m", enable_disable(utf8)); 435 return log_warning_errno(r, "Failed to %s sysfs UTF-8 flag: %m", enable_disable(utf8));
520 436
521-- 437--
5222.7.4 4382.11.0
523 439
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-27 03:35:57 +0000