mirror of
https://github.com/home-assistant/operating-system.git
synced 2025-11-16 06:09:26 +00:00
a0871be6c0
* Update buildroot-patches for 2020.11-rc1 buildroot * Update buildroot to 2020.11-rc1 Signed-off-by: Stefan Agner <stefan@agner.ch> * Don't rely on sfdisk --list-free output The --list-free (-F) argument does not allow machine readable mode. And it seems that the output format changes over time (different spacing, using size postfixes instead of raw blocks). Use sfdisk json output and calculate free partition space ourselfs. This works for 2.35 and 2.36 and is more robust since we rely on output which is meant for scripts to parse. * Migrate defconfigs for Buildroot 2020.11-rc1 In particular, rename BR2_TARGET_UBOOT_BOOT_SCRIPT(_SOURCE) to BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT(_SOURCE). * Rebase/remove systemd patches for systemd 246 * Drop apparmor/libapparmor from buildroot-external * hassos-persists: use /run as directory for lockfiles The U-Boot tools use /var/lock by default which is not created any more by systemd by default (it is under tmpfiles legacy.conf, which we no longer install). * Disable systemd-update-done.service The service is not suited for pure read-only systems. In particular the service needs to be able to write a file in /etc and /var. Remove the service. Note: This is a static service and cannot be removed using systemd-preset. * Disable apparmor.service for now The service loads all default profiles. Some might actually cause problems. E.g. the profile for ping seems not to match our setup for /etc/resolv.conf: [85503.634653] audit: type=1400 audit(1605286002.684:236): apparmor="DENIED" operation="open" profile="ping" name="/run/resolv.conf" pid=27585 comm="ping" requested_mask="r" denied_mask="r" fsuid=0 ouid=0
53 lines
1.5 KiB
Diff
53 lines
1.5 KiB
Diff
From bd08e45d7b25f06da2fc6dc824146b471db5f1f4 Mon Sep 17 00:00:00 2001
|
|
From: Stefano Babic <sbabic@denx.de>
|
|
Date: Tue, 16 Jun 2020 10:29:55 +0200
|
|
Subject: [PATCH] Shellscript stops before completing
|
|
|
|
Commit 8fb94d7 reworks the way shell script are called, redirecting
|
|
stdout and stderr to SWUpdate. A shell script runs then in a child
|
|
process. Under some circumstances, SWUpdate closes the forked process
|
|
before the child process completes.
|
|
|
|
Be sure that the child process has terminated before to go on.
|
|
|
|
Signed-off-by: Stefano Babic <sbabic@denx.de>
|
|
Reported-by: Piotr Piwko <piotr.piwko@gmail.com>
|
|
Tested-by: Piotr Piwko <piotr.piwko@gmail.com>
|
|
Signed-off-by: Joris Offouga <offougajoris@gmail.com>
|
|
---
|
|
core/pctl.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/core/pctl.c b/core/pctl.c
|
|
index 8b1c667..01ad540 100644
|
|
--- a/core/pctl.c
|
|
+++ b/core/pctl.c
|
|
@@ -263,6 +263,7 @@ int run_system_cmd(const char *cmd)
|
|
}
|
|
} else {
|
|
int fds[2];
|
|
+ pid_t w;
|
|
|
|
close(stdoutpipe[PIPE_WRITE]);
|
|
close(stderrpipe[PIPE_WRITE]);
|
|
@@ -276,7 +277,6 @@ int run_system_cmd(const char *cmd)
|
|
* and from stderr (of the child process) as ERROR
|
|
*/
|
|
do {
|
|
- pid_t w;
|
|
int n1 = 0;
|
|
struct timeval tv;
|
|
fd_set readfds;
|
|
@@ -373,7 +373,7 @@ int run_system_cmd(const char *cmd)
|
|
}
|
|
}
|
|
} while (ret > 0 && n1 > 0);
|
|
- } while (!WIFEXITED(wstatus));
|
|
+ } while (w != process_id);
|
|
|
|
close(stdoutpipe[PIPE_READ]);
|
|
close(stderrpipe[PIPE_READ]);
|
|
--
|
|
2.25.1
|
|
|