From fd34e44fce2b0f2be1a8307fd5c5967a3d1c2527 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Thu, 11 Oct 2012 14:12:35 +0000
Subject: main/openrc: busybox swapon has no -e option

we remove it for now
---
 main/openrc/APKBUILD            |  4 +++-
 main/openrc/swap-ifexists.patch | 13 +++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 main/openrc/swap-ifexists.patch

(limited to 'main/openrc')

diff --git a/main/openrc/APKBUILD b/main/openrc/APKBUILD
index e63cf0767..e86e880d7 100644
--- a/main/openrc/APKBUILD
+++ b/main/openrc/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=openrc
 pkgver=0.10.5
 _ver=${pkgver/_git*/}
-pkgrel=0
+pkgrel=1
 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,6 +15,7 @@ source="http://distfiles.gentoo.org/distfiles/$pkgname-$_ver.tar.bz2
 
 	0001-Force-root-be-rw-before-localmount.patch
 	swap-umount-tmpfs.patch
+	swap-ifexists.patch
 
 	hostname.initd
 	hwdrivers.initd
@@ -65,6 +66,7 @@ md5sums="720341f7be2ec2f118a792e29e030e2d  openrc-0.10.5.tar.bz2
 8c2c1c2ee0509b63966b7187a2079f4b  openrc-0.4.3-mkmntdirs.patch
 4fd036ff07ed9ad7fb76af6a3ffc0695  0001-Force-root-be-rw-before-localmount.patch
 c2af5e52da614a6cef02d1e4d537e360  swap-umount-tmpfs.patch
+1c426b84d13a725ad493647b5253f239  swap-ifexists.patch
 c32e15b0858eef708497e7ee6355a055  hostname.initd
 78e9f0df010ac8095c5e76a91a1d3b12  hwdrivers.initd
 33ca3e558c42cdd17adccbc7807298f7  keymaps.initd
diff --git a/main/openrc/swap-ifexists.patch b/main/openrc/swap-ifexists.patch
new file mode 100644
index 000000000..65ab2978c
--- /dev/null
+++ b/main/openrc/swap-ifexists.patch
@@ -0,0 +1,13 @@
+diff --git a/init.d/swap.in b/init.d/swap.in
+index 9e8ddbd..2bf5614 100644
+--- a/init.d/swap.in
++++ b/init.d/swap.in
+@@ -12,7 +12,7 @@ start()
+ {
+ 	ebegin "Activating swap devices"
+ 	case "$RC_UNAME" in
+-		Linux)		swapon -a -e >/dev/null;;
++		Linux)		swapon -a >/dev/null;;
+ 		NetBSD|OpenBSD) swapctl -A -t noblk >/dev/null;;
+ 		*)		swapon -a >/dev/null;;
+ 	esac
-- 
cgit v1.2.3