summaryrefslogtreecommitdiff
path: root/src/partition
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2017-12-28 00:51:19 +0100
committerLennart Poettering <lennart@poettering.net>2018-01-04 13:27:27 +0100
commit7d4904fe7a14852c1469a55ec1dfdf747d829cb1 (patch)
tree0436ef0382c15c9e020ec110dde9d79c44342517 /src/partition
parentb6e1fff13dbfc1623de41b78bc525f410fb59b91 (diff)
downloadsystemd-7d4904fe7a14852c1469a55ec1dfdf747d829cb1.tar.gz
systemd-7d4904fe7a14852c1469a55ec1dfdf747d829cb1.tar.bz2
systemd-7d4904fe7a14852c1469a55ec1dfdf747d829cb1.zip
process-util: rework wait_for_terminate_and_warn() to take a flags parameter
This renames wait_for_terminate_and_warn() to wait_for_terminate_and_check(), and adds a flags parameter, that controls how much to log: there's one flag that means we log about abnormal stuff, and another one that controls whether we log about non-zero exit codes. Finally, there's a shortcut flag value for logging in both cases, as that's what we usually use. All callers are accordingly updated. At three occasions duplicate logging is removed, i.e. where the old function was called but logged in the caller, too.
Diffstat (limited to 'src/partition')
-rw-r--r--src/partition/makefs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/partition/makefs.c b/src/partition/makefs.c
index df932fd35a..2ed31ac7ab 100644
--- a/src/partition/makefs.c
+++ b/src/partition/makefs.c
@@ -55,7 +55,7 @@ static int makefs(const char *type, const char *device) {
_exit(EXIT_FAILURE);
}
- return wait_for_terminate_and_warn(mkfs, pid, true);
+ return wait_for_terminate_and_check(mkfs, pid, WAIT_LOG);
}
int main(int argc, char *argv[]) {