diff options
| author | Carlo Landmeter <clandmeter@alpinelinux.org> | 2018-11-28 21:59:19 +0000 |
|---|---|---|
| committer | Carlo Landmeter <clandmeter@alpinelinux.org> | 2018-11-28 21:59:19 +0000 |
| commit | 683d663398a7823f6e76dd5efb11fece27c1f0ca (patch) | |
| tree | 5475aa2a22cdb51c0018c377b0f6514d7ce10154 /main/openrc | |
| parent | 2014641094ea8829723ad8e144a975a417024137 (diff) | |
| download | aports-683d663398a7823f6e76dd5efb11fece27c1f0ca.tar.bz2 aports-683d663398a7823f6e76dd5efb11fece27c1f0ca.tar.xz | |
/main/openrc: fix interupt warning
Diffstat (limited to 'main/openrc')
| -rw-r--r-- | main/openrc/APKBUILD | 4 | ||||
| -rw-r--r-- | main/openrc/do-not-complain-if-interrupted-by-a-signal.patch | 45 |
2 files changed, 48 insertions, 1 deletions
diff --git a/main/openrc/APKBUILD b/main/openrc/APKBUILD index a021b4307f..d2af400a7c 100644 --- a/main/openrc/APKBUILD +++ b/main/openrc/APKBUILD @@ -2,7 +2,7 @@ pkgname=openrc pkgver=0.39.2 _ver=${pkgver/_git*/} -pkgrel=0 +pkgrel=1 pkgdesc="OpenRC manages the services, startup and shutdown of a host" url="https://gitweb.gentoo.org/proj/openrc.git" arch="all" @@ -20,6 +20,7 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/OpenRC/openrc/archive/$pkgve 0007-make-consolefont-service-compatible-with-busyboxs-se.patch 0001-fsck-don-t-add-C0-to-busybox-fsck.patch 0008-fix-undeclared-UT_LINESIZE.patch + do-not-complain-if-interrupted-by-a-signal.patch openrc.logrotate hostname.initd @@ -90,6 +91,7 @@ d54630d40a2d6b10a325cb012d4efcda997a60c008ca953ce5d60059d3f267308a59dabddf93a5fc 234c4f3cf39df3350dbea25c00b8d584794b28194f44c726767a6a16d91a26fee1b5d2dd16635f19803fc015b4e9d99c52b23128e6b815938b88365feba8cf59 0007-make-consolefont-service-compatible-with-busyboxs-se.patch dbe3f170440f0f357f31ac4d49c56a9a7ec22172df2701bf4a0afdee22aedda1f88b9fa5ffdbe19a5eea3c764ad0e4c802e19b95b7082a72d423d46d30c18edd 0001-fsck-don-t-add-C0-to-busybox-fsck.patch e56ea82dbf8bf6b4cff4fa48db8e4f06589094ba99aad930fc498e2fe235db6ce2afe96e2bc047dd9066a4057d4e3691f8d0148ad5fed5d8191c0e2415a48f69 0008-fix-undeclared-UT_LINESIZE.patch +25a32c87a7e95e3c891156855b3c501cd529bb39810b362204cf187c2a4230b51cc9b6d96d0750ca4ef454fd7ef0bb01533e059ef35ab27939aafc4da551a6f5 do-not-complain-if-interrupted-by-a-signal.patch 12bb6354e808fbf47bbab963de55ee7901738b4a912659982c57ef2777fff9a670e867fcb8ec316a76b151032c92dc89a950d7d1d835ef53f753a8f3b41d2cec openrc.logrotate 99b542c0903ad6874b8c308b2e0660a4fe2ff9db962dfec65325cd12c368873a2ae800d5e6d42dc4deff775e1d5c0068869eb72581f7ab16e88d5738afe1d3dd hostname.initd c06eac7264f6cc6888563feeae5ca745aae538323077903de1b19102e4f16baa34c18b8c27af5dd5423e7670834e2261e9aa55f2b1ec8d8fdc2be105fe894d55 hwdrivers.initd diff --git a/main/openrc/do-not-complain-if-interrupted-by-a-signal.patch b/main/openrc/do-not-complain-if-interrupted-by-a-signal.patch new file mode 100644 index 0000000000..1d1a329c37 --- /dev/null +++ b/main/openrc/do-not-complain-if-interrupted-by-a-signal.patch @@ -0,0 +1,45 @@ +From 2504a2c25bc0587b36d81a2d85c203b20e2d40cf Mon Sep 17 00:00:00 2001 +From: William Hubbs <w.d.hubbs@gmail.com> +Date: Wed, 14 Nov 2018 17:44:03 -0600 +Subject: [PATCH] Do not complain if interrupted by a signal + +In start-stop-daemon and rc-schedules, we were printing out a warning if +the nanosleep call was interrupted by a signal, but we did not treat +this as an error situation other than displaying the message, so there +is no need for the message. +--- + src/rc/rc-schedules.c | 5 +---- + src/rc/start-stop-daemon.c | 4 +--- + 2 files changed, 2 insertions(+), 7 deletions(-) + +diff --git a/src/rc/rc-schedules.c b/src/rc/rc-schedules.c +index f7ef20fb..84c7ea18 100644 +--- a/src/rc/rc-schedules.c ++++ b/src/rc/rc-schedules.c +@@ -376,10 +376,7 @@ int run_stop_schedule(const char *applet, + printf("\n"); + progressed = false; + } +- if (errno == EINTR) +- eerror("%s: caught an" +- " interrupt", applet); +- else { ++ if (errno != EINTR) { + eerror("%s: nanosleep: %s", + applet, strerror(errno)); + return 0; +diff --git a/src/rc/start-stop-daemon.c b/src/rc/start-stop-daemon.c +index 33f886c4..a96b29f0 100644 +--- a/src/rc/start-stop-daemon.c ++++ b/src/rc/start-stop-daemon.c +@@ -996,9 +996,7 @@ int main(int argc, char **argv) + ts.tv_sec = start_wait / 1000; + ts.tv_nsec = (start_wait % 1000) * ONE_MS; + if (nanosleep(&ts, NULL) == -1) { +- if (errno == EINTR) +- eerror("%s: caught an interrupt", applet); +- else { ++ if (errno != EINTR) { + eerror("%s: nanosleep: %s", + applet, strerror(errno)); + return 0; |