diff options
Diffstat (limited to 'meta/recipes-core/systemd/systemd/0012-do-not-disable-buffer-in-writing-files.patch')
-rw-r--r-- | meta/recipes-core/systemd/systemd/0012-do-not-disable-buffer-in-writing-files.patch | 35 |
1 files changed, 16 insertions, 19 deletions
diff --git a/meta/recipes-core/systemd/systemd/0012-do-not-disable-buffer-in-writing-files.patch b/meta/recipes-core/systemd/systemd/0012-do-not-disable-buffer-in-writing-files.patch index 66be79077e..0fec84724d 100644 --- a/meta/recipes-core/systemd/systemd/0012-do-not-disable-buffer-in-writing-files.patch +++ b/meta/recipes-core/systemd/systemd/0012-do-not-disable-buffer-in-writing-files.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From e4885a8e60f883d9217e26e1db3754c2906aca31 Mon Sep 17 00:00:00 2001 | 1 | From 8464b845e6df1be303e09274c13e653072701671 Mon Sep 17 00:00:00 2001 |
2 | From: Chen Qi <Qi.Chen@windriver.com> | 2 | From: Chen Qi <Qi.Chen@windriver.com> |
3 | Date: Fri, 1 Mar 2019 15:22:15 +0800 | 3 | Date: Fri, 1 Mar 2019 15:22:15 +0800 |
4 | Subject: [PATCH 12/22] do not disable buffer in writing files | 4 | Subject: [PATCH] do not disable buffer in writing files |
5 | 5 | ||
6 | Do not disable buffer in writing files, otherwise we get | 6 | Do not disable buffer in writing files, otherwise we get |
7 | failure at boot for musl like below. | 7 | failure at boot for musl like below. |
@@ -201,7 +201,7 @@ index 61ac4df1a6..ea18970196 100644 | |||
201 | return r; | 201 | return r; |
202 | 202 | ||
203 | diff --git a/src/core/main.c b/src/core/main.c | 203 | diff --git a/src/core/main.c b/src/core/main.c |
204 | index 3f71cc0947..0e5aec3e9e 100644 | 204 | index 1c0030a75f..7108a87d46 100644 |
205 | --- a/src/core/main.c | 205 | --- a/src/core/main.c |
206 | +++ b/src/core/main.c | 206 | +++ b/src/core/main.c |
207 | @@ -1678,7 +1678,7 @@ static void initialize_core_pattern(bool skip_setup) { | 207 | @@ -1678,7 +1678,7 @@ static void initialize_core_pattern(bool skip_setup) { |
@@ -253,7 +253,7 @@ index 066483e342..5f92dd7064 100644 | |||
253 | log_warning_errno(r, "Failed to drop caches, ignoring: %m"); | 253 | log_warning_errno(r, "Failed to drop caches, ignoring: %m"); |
254 | else | 254 | else |
255 | diff --git a/src/libsystemd/sd-device/sd-device.c b/src/libsystemd/sd-device/sd-device.c | 255 | diff --git a/src/libsystemd/sd-device/sd-device.c b/src/libsystemd/sd-device/sd-device.c |
256 | index 2fbc619a34..09d9591e37 100644 | 256 | index 01e66b4658..f3ea82ca1b 100644 |
257 | --- a/src/libsystemd/sd-device/sd-device.c | 257 | --- a/src/libsystemd/sd-device/sd-device.c |
258 | +++ b/src/libsystemd/sd-device/sd-device.c | 258 | +++ b/src/libsystemd/sd-device/sd-device.c |
259 | @@ -2516,7 +2516,7 @@ _public_ int sd_device_set_sysattr_value(sd_device *device, const char *sysattr, | 259 | @@ -2516,7 +2516,7 @@ _public_ int sd_device_set_sysattr_value(sd_device *device, const char *sysattr, |
@@ -279,10 +279,10 @@ index a5002437c6..b12e6cd9c9 100644 | |||
279 | log_error_errno(r, "Failed to move process: %m"); | 279 | log_error_errno(r, "Failed to move process: %m"); |
280 | goto finish; | 280 | goto finish; |
281 | diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c | 281 | diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c |
282 | index 6ab604d3dc..bbec6b686c 100644 | 282 | index 0600f3e014..ea369c32b2 100644 |
283 | --- a/src/nspawn/nspawn.c | 283 | --- a/src/nspawn/nspawn.c |
284 | +++ b/src/nspawn/nspawn.c | 284 | +++ b/src/nspawn/nspawn.c |
285 | @@ -2688,7 +2688,7 @@ static int reset_audit_loginuid(void) { | 285 | @@ -2690,7 +2690,7 @@ static int reset_audit_loginuid(void) { |
286 | if (streq(p, "4294967295")) | 286 | if (streq(p, "4294967295")) |
287 | return 0; | 287 | return 0; |
288 | 288 | ||
@@ -291,7 +291,7 @@ index 6ab604d3dc..bbec6b686c 100644 | |||
291 | if (r < 0) { | 291 | if (r < 0) { |
292 | log_error_errno(r, | 292 | log_error_errno(r, |
293 | "Failed to reset audit login UID. This probably means that your kernel is too\n" | 293 | "Failed to reset audit login UID. This probably means that your kernel is too\n" |
294 | @@ -4141,7 +4141,7 @@ static int setup_uid_map( | 294 | @@ -4143,7 +4143,7 @@ static int setup_uid_map( |
295 | return log_oom(); | 295 | return log_oom(); |
296 | 296 | ||
297 | xsprintf(uid_map, "/proc/" PID_FMT "/uid_map", pid); | 297 | xsprintf(uid_map, "/proc/" PID_FMT "/uid_map", pid); |
@@ -300,7 +300,7 @@ index 6ab604d3dc..bbec6b686c 100644 | |||
300 | if (r < 0) | 300 | if (r < 0) |
301 | return log_error_errno(r, "Failed to write UID map: %m"); | 301 | return log_error_errno(r, "Failed to write UID map: %m"); |
302 | 302 | ||
303 | @@ -4151,7 +4151,7 @@ static int setup_uid_map( | 303 | @@ -4153,7 +4153,7 @@ static int setup_uid_map( |
304 | return log_oom(); | 304 | return log_oom(); |
305 | 305 | ||
306 | xsprintf(uid_map, "/proc/" PID_FMT "/gid_map", pid); | 306 | xsprintf(uid_map, "/proc/" PID_FMT "/gid_map", pid); |
@@ -367,10 +367,10 @@ index 805503f366..01a7ccb291 100644 | |||
367 | log_debug_errno(r, "Failed to turn off coredumps, ignoring: %m"); | 367 | log_debug_errno(r, "Failed to turn off coredumps, ignoring: %m"); |
368 | } | 368 | } |
369 | diff --git a/src/shared/hibernate-util.c b/src/shared/hibernate-util.c | 369 | diff --git a/src/shared/hibernate-util.c b/src/shared/hibernate-util.c |
370 | index 3eb13d48f6..d09b901be1 100644 | 370 | index c3991cfa4c..7d522d8d1f 100644 |
371 | --- a/src/shared/hibernate-util.c | 371 | --- a/src/shared/hibernate-util.c |
372 | +++ b/src/shared/hibernate-util.c | 372 | +++ b/src/shared/hibernate-util.c |
373 | @@ -481,7 +481,7 @@ int write_resume_config(dev_t devno, uint64_t offset, const char *device) { | 373 | @@ -501,7 +501,7 @@ int write_resume_config(dev_t devno, uint64_t offset, const char *device) { |
374 | 374 | ||
375 | /* We write the offset first since it's safer. Note that this file is only available in 4.17+, so | 375 | /* We write the offset first since it's safer. Note that this file is only available in 4.17+, so |
376 | * fail gracefully if it doesn't exist and we're only overwriting it with 0. */ | 376 | * fail gracefully if it doesn't exist and we're only overwriting it with 0. */ |
@@ -379,7 +379,7 @@ index 3eb13d48f6..d09b901be1 100644 | |||
379 | if (r == -ENOENT) { | 379 | if (r == -ENOENT) { |
380 | if (offset != 0) | 380 | if (offset != 0) |
381 | return log_error_errno(SYNTHETIC_ERRNO(EOPNOTSUPP), | 381 | return log_error_errno(SYNTHETIC_ERRNO(EOPNOTSUPP), |
382 | @@ -497,7 +497,7 @@ int write_resume_config(dev_t devno, uint64_t offset, const char *device) { | 382 | @@ -517,7 +517,7 @@ int write_resume_config(dev_t devno, uint64_t offset, const char *device) { |
383 | log_debug("Wrote resume_offset=%s for device '%s' to /sys/power/resume_offset.", | 383 | log_debug("Wrote resume_offset=%s for device '%s' to /sys/power/resume_offset.", |
384 | offset_str, device); | 384 | offset_str, device); |
385 | 385 | ||
@@ -402,7 +402,7 @@ index 1f88e724d0..feb18b320a 100644 | |||
402 | return r; | 402 | return r; |
403 | 403 | ||
404 | diff --git a/src/shared/watchdog.c b/src/shared/watchdog.c | 404 | diff --git a/src/shared/watchdog.c b/src/shared/watchdog.c |
405 | index 4c1a968718..6faf6806a5 100644 | 405 | index 99ccefb227..e4975018ab 100644 |
406 | --- a/src/shared/watchdog.c | 406 | --- a/src/shared/watchdog.c |
407 | +++ b/src/shared/watchdog.c | 407 | +++ b/src/shared/watchdog.c |
408 | @@ -93,7 +93,7 @@ static int set_pretimeout_governor(const char *governor) { | 408 | @@ -93,7 +93,7 @@ static int set_pretimeout_governor(const char *governor) { |
@@ -412,10 +412,10 @@ index 4c1a968718..6faf6806a5 100644 | |||
412 | - WRITE_STRING_FILE_DISABLE_BUFFER | WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_VERIFY_IGNORE_NEWLINE); | 412 | - WRITE_STRING_FILE_DISABLE_BUFFER | WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_VERIFY_IGNORE_NEWLINE); |
413 | + WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_VERIFY_IGNORE_NEWLINE); | 413 | + WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_VERIFY_IGNORE_NEWLINE); |
414 | if (r < 0) | 414 | if (r < 0) |
415 | return log_error_errno(r, "Failed to set pretimeout_governor to '%s': %m", governor); | 415 | return log_error_errno(r, "Failed to set watchdog pretimeout_governor to '%s': %m", governor); |
416 | 416 | ||
417 | diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c | 417 | diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c |
418 | index 21af3e9e52..6d4b84b5d5 100644 | 418 | index 21062b24e0..262dd71d72 100644 |
419 | --- a/src/sleep/sleep.c | 419 | --- a/src/sleep/sleep.c |
420 | +++ b/src/sleep/sleep.c | 420 | +++ b/src/sleep/sleep.c |
421 | @@ -137,7 +137,7 @@ static int write_state(int fd, char * const *states) { | 421 | @@ -137,7 +137,7 @@ static int write_state(int fd, char * const *states) { |
@@ -437,7 +437,7 @@ index 21af3e9e52..6d4b84b5d5 100644 | |||
437 | log_debug("Using sleep disk mode '%s'.", *mode); | 437 | log_debug("Using sleep disk mode '%s'.", *mode); |
438 | return 0; | 438 | return 0; |
439 | diff --git a/src/storagetm/storagetm.c b/src/storagetm/storagetm.c | 439 | diff --git a/src/storagetm/storagetm.c b/src/storagetm/storagetm.c |
440 | index ae63baaf79..82eeca479a 100644 | 440 | index 16d4fb07d4..aca7506463 100644 |
441 | --- a/src/storagetm/storagetm.c | 441 | --- a/src/storagetm/storagetm.c |
442 | +++ b/src/storagetm/storagetm.c | 442 | +++ b/src/storagetm/storagetm.c |
443 | @@ -186,7 +186,7 @@ static int nvme_subsystem_unlink(NvmeSubsystem *s) { | 443 | @@ -186,7 +186,7 @@ static int nvme_subsystem_unlink(NvmeSubsystem *s) { |
@@ -533,7 +533,7 @@ index ae63baaf79..82eeca479a 100644 | |||
533 | return log_error_errno(r, "Failed to set IP address on NVME port %" PRIu16 ": %m", portnr); | 533 | return log_error_errno(r, "Failed to set IP address on NVME port %" PRIu16 ": %m", portnr); |
534 | 534 | ||
535 | diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c | 535 | diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c |
536 | index febe345b4c..a90b610ba1 100644 | 536 | index e5b8df5c2d..63ca15628c 100644 |
537 | --- a/src/udev/udev-rules.c | 537 | --- a/src/udev/udev-rules.c |
538 | +++ b/src/udev/udev-rules.c | 538 | +++ b/src/udev/udev-rules.c |
539 | @@ -2711,7 +2711,6 @@ static int udev_rule_apply_token_to_event( | 539 | @@ -2711,7 +2711,6 @@ static int udev_rule_apply_token_to_event( |
@@ -557,6 +557,3 @@ index 4d82c65f0a..3a3d861b83 100644 | |||
557 | if (r < 0) | 557 | if (r < 0) |
558 | return log_warning_errno(r, "Failed to %s sysfs UTF-8 flag: %m", enable_disable(utf8)); | 558 | return log_warning_errno(r, "Failed to %s sysfs UTF-8 flag: %m", enable_disable(utf8)); |
559 | 559 | ||
560 | -- | ||
561 | 2.34.1 | ||
562 | |||