diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2016-06-13 13:16:33 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2016-06-13 13:16:33 +0000 |
| commit | e51520b853330cf6dff8db68c4a6e455367cd6c1 (patch) | |
| tree | f366ffe47fac7bd9359202d73952c0792ea108ca /main/alpine-conf | |
| parent | 6ff0d7a602686d7b807bfabb409993314e6acda1 (diff) | |
| download | aports-e51520b853330cf6dff8db68c4a6e455367cd6c1.tar.bz2 aports-e51520b853330cf6dff8db68c4a6e455367cd6c1.tar.xz | |
main/alpine-conf: fix openrc warning
Diffstat (limited to 'main/alpine-conf')
| -rw-r--r-- | main/alpine-conf/0001-setup-alpine-fix-openrc-warning.patch | 36 | ||||
| -rw-r--r-- | main/alpine-conf/APKBUILD | 12 |
2 files changed, 44 insertions, 4 deletions
diff --git a/main/alpine-conf/0001-setup-alpine-fix-openrc-warning.patch b/main/alpine-conf/0001-setup-alpine-fix-openrc-warning.patch new file mode 100644 index 0000000000..1ec1453934 --- /dev/null +++ b/main/alpine-conf/0001-setup-alpine-fix-openrc-warning.patch @@ -0,0 +1,36 @@ +From b709cfbbbf86ecfa74a674349ed0f9b5c04cbd46 Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Mon, 13 Jun 2016 12:23:54 +0000 +Subject: [PATCH] setup-alpine: fix openrc warning + +--- + setup-alpine.in | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/setup-alpine.in b/setup-alpine.in +index 050016c..c120c99 100644 +--- a/setup-alpine.in ++++ b/setup-alpine.in +@@ -48,7 +48,7 @@ while getopts "af:c:hq" opt ; do + done + shift `expr $OPTIND - 1` + +-rc_sys=$(rc --sys) ++rc_sys=$(openrc --sys) + # mount xenfs so we can detect xen dom0 + if [ "$rc_sys" = "XENU" ] && ! grep -q '^xenfs' /proc/mounts; then + modprobe xenfs +@@ -156,8 +156,8 @@ done + /etc/init.d/hostname --quiet restart + + # start up the services +-rc boot +-rc default ++openrc boot ++openrc default + + # update /etc/hosts - after we have got dhcp address + # Get default fully qualified domain name from *first* domain +-- +2.8.4 + diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD index 619467e4b9..d49366f870 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=1 +pkgrel=2 pkgdesc="Alpine configuration management scripts" url=http://git.alpinelinux.org/cgit/$pkgname arch="all" @@ -9,6 +9,7 @@ license="MIT" 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 " _builddir="$srcdir"/$pkgname-$pkgver @@ -26,8 +27,11 @@ package() { } md5sums="4bea789ad26d94e9df8684fa8f01cbee alpine-conf-3.4.0.tar.xz -aee178615c62bd51a468415b20ade309 0001-setup-disk-don-t-install-syslinux-for-data-only.patch" +aee178615c62bd51a468415b20ade309 0001-setup-disk-don-t-install-syslinux-for-data-only.patch +393cb82aac7004fb887cb84ea0a1cae6 0001-setup-alpine-fix-openrc-warning.patch" sha256sums="4f66c10aa7834f60ce5697487d6d8c47780bc954aa443976d957b4e8bbbfa61e alpine-conf-3.4.0.tar.xz -23c0e2c18cbb1c374d966cdf645ed74ea9ba59e7f1b98fe0e9696d79dfeb2d2f 0001-setup-disk-don-t-install-syslinux-for-data-only.patch" +23c0e2c18cbb1c374d966cdf645ed74ea9ba59e7f1b98fe0e9696d79dfeb2d2f 0001-setup-disk-don-t-install-syslinux-for-data-only.patch +52e62958a4ddd5828387003a497a0bc1fb93e3b9fbf14c78be30fcb50d704c3e 0001-setup-alpine-fix-openrc-warning.patch" sha512sums="c652dfc0660f7483a10342cd2f374ec60b4329448476fad5bc93b5b31501529e08062d25248b5f4792643252b18cacb430273c08a3e0b7b901104f414733cb75 alpine-conf-3.4.0.tar.xz -408d6590030432c5173266db6038471f697578091954a2accc2f4778fad3b56484eb7caf40d566f1fb7a8a6db1f57a35ac4c0f5faec53604fb2852aa2dd13497 0001-setup-disk-don-t-install-syslinux-for-data-only.patch" +408d6590030432c5173266db6038471f697578091954a2accc2f4778fad3b56484eb7caf40d566f1fb7a8a6db1f57a35ac4c0f5faec53604fb2852aa2dd13497 0001-setup-disk-don-t-install-syslinux-for-data-only.patch +76129a435374a490480b5686d7577e19a9d3b088091104c30efe1aae3ff57b38c592fe11c9a6feaa66c9c9fab5ec7fa89f94e44810150e87b42c8594eea9e5d0 0001-setup-alpine-fix-openrc-warning.patch" |