diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2016-06-13 13:42:00 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2016-06-13 13:42:00 +0000 |
| commit | cffed188deeaab6395053d91ca464ce1495b9569 (patch) | |
| tree | 8aebdcae8fc515b50e65d668d3b5af09e7e8bf76 /main/alpine-conf | |
| parent | e51520b853330cf6dff8db68c4a6e455367cd6c1 (diff) | |
| download | aports-cffed188deeaab6395053d91ca464ce1495b9569.tar.bz2 aports-cffed188deeaab6395053d91ca464ce1495b9569.tar.xz | |
main/alpine-conf: setup-disk: only restart syslog if its running
ref #5719
Diffstat (limited to 'main/alpine-conf')
| -rw-r--r-- | main/alpine-conf/0001-setup-disk-only-restart-syslog-if-its-already-runnin.patch | 26 | ||||
| -rw-r--r-- | main/alpine-conf/APKBUILD | 12 |
2 files changed, 34 insertions, 4 deletions
diff --git a/main/alpine-conf/0001-setup-disk-only-restart-syslog-if-its-already-runnin.patch b/main/alpine-conf/0001-setup-disk-only-restart-syslog-if-its-already-runnin.patch new file mode 100644 index 0000000000..412a3a1728 --- /dev/null +++ b/main/alpine-conf/0001-setup-disk-only-restart-syslog-if-its-already-runnin.patch @@ -0,0 +1,26 @@ +From cf023ac1ffecfdcc1997ee7b8e57cacdde62870e Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Mon, 13 Jun 2016 13:34:02 +0000 +Subject: [PATCH] setup-disk: only restart syslog if its already running + +ref #5719 +--- + setup-disk.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup-disk.in b/setup-disk.in +index 0df6d96..3ab35cd 100644 +--- a/setup-disk.in ++++ b/setup-disk.in +@@ -661,7 +661,7 @@ setup_var() { + mv /.var/* /var/ + rmdir /.var + +- /etc/init.d/syslog --quiet restart ++ service syslog --quiet condrestart + setup_mdadm_conf + } + +-- +2.8.4 + diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD index d49366f870..53441df136 100644 --- a/main/alpine-conf/APKBUILD +++ b/main/alpine-conf/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=alpine-conf pkgver=3.4.0 -pkgrel=2 +pkgrel=3 pkgdesc="Alpine configuration management scripts" url=http://git.alpinelinux.org/cgit/$pkgname arch="all" @@ -10,6 +10,7 @@ depends="openrc>0.13" source="http://dev.alpinelinux.org/archive/alpine-conf/alpine-conf-$pkgver.tar.xz 0001-setup-disk-don-t-install-syslinux-for-data-only.patch 0001-setup-alpine-fix-openrc-warning.patch + 0001-setup-disk-only-restart-syslog-if-its-already-runnin.patch " _builddir="$srcdir"/$pkgname-$pkgver @@ -28,10 +29,13 @@ package() { md5sums="4bea789ad26d94e9df8684fa8f01cbee alpine-conf-3.4.0.tar.xz aee178615c62bd51a468415b20ade309 0001-setup-disk-don-t-install-syslinux-for-data-only.patch -393cb82aac7004fb887cb84ea0a1cae6 0001-setup-alpine-fix-openrc-warning.patch" +393cb82aac7004fb887cb84ea0a1cae6 0001-setup-alpine-fix-openrc-warning.patch +b3d2c995c98c287522d8ea2b304bd920 0001-setup-disk-only-restart-syslog-if-its-already-runnin.patch" sha256sums="4f66c10aa7834f60ce5697487d6d8c47780bc954aa443976d957b4e8bbbfa61e alpine-conf-3.4.0.tar.xz 23c0e2c18cbb1c374d966cdf645ed74ea9ba59e7f1b98fe0e9696d79dfeb2d2f 0001-setup-disk-don-t-install-syslinux-for-data-only.patch -52e62958a4ddd5828387003a497a0bc1fb93e3b9fbf14c78be30fcb50d704c3e 0001-setup-alpine-fix-openrc-warning.patch" +52e62958a4ddd5828387003a497a0bc1fb93e3b9fbf14c78be30fcb50d704c3e 0001-setup-alpine-fix-openrc-warning.patch +8c42769e7644981b635496b8f5e8f217cb95a2a9b8798d3ead65ac88581b7d8e 0001-setup-disk-only-restart-syslog-if-its-already-runnin.patch" sha512sums="c652dfc0660f7483a10342cd2f374ec60b4329448476fad5bc93b5b31501529e08062d25248b5f4792643252b18cacb430273c08a3e0b7b901104f414733cb75 alpine-conf-3.4.0.tar.xz 408d6590030432c5173266db6038471f697578091954a2accc2f4778fad3b56484eb7caf40d566f1fb7a8a6db1f57a35ac4c0f5faec53604fb2852aa2dd13497 0001-setup-disk-don-t-install-syslinux-for-data-only.patch -76129a435374a490480b5686d7577e19a9d3b088091104c30efe1aae3ff57b38c592fe11c9a6feaa66c9c9fab5ec7fa89f94e44810150e87b42c8594eea9e5d0 0001-setup-alpine-fix-openrc-warning.patch" +76129a435374a490480b5686d7577e19a9d3b088091104c30efe1aae3ff57b38c592fe11c9a6feaa66c9c9fab5ec7fa89f94e44810150e87b42c8594eea9e5d0 0001-setup-alpine-fix-openrc-warning.patch +d5867474db27b5da460902f6affb21cdbc626b702b1f6c222aa1c3b3e42bc1a1341cc3b5824fc2966ab6b10630363ed808e0043fbbb02bca2264658f8207ae06 0001-setup-disk-only-restart-syslog-if-its-already-runnin.patch" |