diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2011-08-04 08:32:49 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2011-08-04 08:32:49 +0000 |
| commit | b566a70afbc033caae65f41deeffa8a150e61a32 (patch) | |
| tree | bbeee840fd1ccf24718b51822415a0f7cf303211 | |
| parent | 510621e468a5c3e5118a1a2907a9fbed41373116 (diff) | |
| download | aports-b566a70afbc033caae65f41deeffa8a150e61a32.tar.bz2 aports-b566a70afbc033caae65f41deeffa8a150e61a32.tar.xz | |
main/openrc: slightly better patch for openrc
Keeps the original "quiet" behaviour.
| -rw-r--r-- | main/openrc/0001-sysctl-Use-dev-null-instead-of-q.patch | 29 | ||||
| -rw-r--r-- | main/openrc/APKBUILD | 6 | ||||
| -rw-r--r-- | main/openrc/sysctl-flags.patch | 14 |
3 files changed, 32 insertions, 17 deletions
diff --git a/main/openrc/0001-sysctl-Use-dev-null-instead-of-q.patch b/main/openrc/0001-sysctl-Use-dev-null-instead-of-q.patch new file mode 100644 index 000000000..5f92c755a --- /dev/null +++ b/main/openrc/0001-sysctl-Use-dev-null-instead-of-q.patch @@ -0,0 +1,29 @@ +From 73559a25e0fb484fc3ba42f1796b9b2b46128714 Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Thu, 4 Aug 2011 06:35:44 +0000 +Subject: [PATCH] sysctl: Use /dev/null instead of -q + +Busybox sysctl has no -q option so use /dev/null instead. +--- + init.d/sysctl.Linux.in | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/init.d/sysctl.Linux.in b/init.d/sysctl.Linux.in +index 71932fe..9449c5c 100644 +--- a/init.d/sysctl.Linux.in ++++ b/init.d/sysctl.Linux.in +@@ -18,9 +18,9 @@ start() + for conf in /etc/sysctl.d/*.conf /etc/sysctl.conf; do + if [ -r "$conf" ]; then + vebegin "applying $conf" +- if ! err=$(sysctl -q -p "$conf" 2>&1) ; then ++ if ! err=$(sysctl -p "$conf" 2>&1 >/dev/null) ; then + errs="${errs} ${err}" +- sysctl -q -e -p "${conf}" ++ sysctl -e -p "${conf}" >/dev/null + fi + veend $? || retval=1 + fi +-- +1.7.6 + diff --git a/main/openrc/APKBUILD b/main/openrc/APKBUILD index 83394f476..ea51db3ae 100644 --- a/main/openrc/APKBUILD +++ b/main/openrc/APKBUILD @@ -2,7 +2,7 @@ pkgname=openrc pkgver=0.8.3 _ver=${pkgver/_git*/} -pkgrel=1 +pkgrel=2 pkgdesc="OpenRC manages the services, startup and shutdown of a host" url="http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git" arch="all" @@ -15,9 +15,9 @@ source="http://distfiles.gentoo.org/distfiles/$pkgname-$_ver.tar.bz2 0001-Force-root-be-rw-before-localmount.patch 0001-fsck-add-C0-and-T-options-unless-fsck-is-busybox.patch + 0001-sysctl-Use-dev-null-instead-of-q.patch remove-rc_sys-warning.patch hwclock-hctosys.patch - sysctl-flags.patch hostname.initd hwdrivers.initd @@ -68,9 +68,9 @@ md5sums="c2c964d29e91a32dec4df75cd6d79102 openrc-0.8.3.tar.bz2 8c2c1c2ee0509b63966b7187a2079f4b openrc-0.4.3-mkmntdirs.patch 4fd036ff07ed9ad7fb76af6a3ffc0695 0001-Force-root-be-rw-before-localmount.patch fb8baeaf32f4d53491312675f28a9939 0001-fsck-add-C0-and-T-options-unless-fsck-is-busybox.patch +bc4f9ccd4036f9c458b89afe877fa8c2 0001-sysctl-Use-dev-null-instead-of-q.patch 2a1749ee829877d80c3696eade59be8a remove-rc_sys-warning.patch 95927c85beb1476bda46ab8933c5e780 hwclock-hctosys.patch -516a8ee0d6f5bf3ccdabd6c7d85e6292 sysctl-flags.patch c32e15b0858eef708497e7ee6355a055 hostname.initd b1e64885f301166df30be3e3cf5338ff hwdrivers.initd 33ca3e558c42cdd17adccbc7807298f7 keymaps.initd diff --git a/main/openrc/sysctl-flags.patch b/main/openrc/sysctl-flags.patch deleted file mode 100644 index 664d6502c..000000000 --- a/main/openrc/sysctl-flags.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- openrc-0.8.3/init.d/sysctl.Linux.in.orig -+++ openrc-0.8.3/init.d/sysctl.Linux.in -@@ -18,9 +18,9 @@ - for conf in /etc/sysctl.d/*.conf /etc/sysctl.conf; do - if [ -r "$conf" ]; then - vebegin "applying $conf" -- if ! err=$(sysctl -q -p "$conf" 2>&1) ; then -+ if ! err=$(sysctl -p "$conf" 2>&1) ; then - errs="${errs} ${err}" -- sysctl -q -e -p "${conf}" -+ sysctl -e -p "${conf}" - fi - veend $? || retval=1 - fi |