From 8180e36ca78b08eb9d8dcca07bf495a616afca9f Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Wed, 9 Mar 2011 18:12:51 +0000
Subject: main/openrc: add e2fsck specific options to fsck unless busybox

---
 ...d-C0-and-T-options-unless-fsck-is-busybox.patch | 38 ++++++++++++++++++++++
 main/openrc/APKBUILD                               |  6 ++--
 main/openrc/remove-e2fsck-specific-options.patch   | 10 ------
 3 files changed, 41 insertions(+), 13 deletions(-)
 create mode 100644 main/openrc/0001-fsck-add-C0-and-T-options-unless-fsck-is-busybox.patch
 delete mode 100644 main/openrc/remove-e2fsck-specific-options.patch

diff --git a/main/openrc/0001-fsck-add-C0-and-T-options-unless-fsck-is-busybox.patch b/main/openrc/0001-fsck-add-C0-and-T-options-unless-fsck-is-busybox.patch
new file mode 100644
index 0000000000..86676e5ad7
--- /dev/null
+++ b/main/openrc/0001-fsck-add-C0-and-T-options-unless-fsck-is-busybox.patch
@@ -0,0 +1,38 @@
+From d1cb63729cb64cd3aebb14f00eaa8f03b90a57fe Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Wed, 9 Mar 2011 18:07:39 +0000
+Subject: [PATCH] fsck: add -C0 and -T options unless fsck is busybox
+
+---
+ init.d/fsck.in |    8 +++++++-
+ 1 files changed, 7 insertions(+), 1 deletions(-)
+
+diff --git a/init.d/fsck.in b/init.d/fsck.in
+index de44ea8..3b55fbd 100644
+--- a/init.d/fsck.in
++++ b/init.d/fsck.in
+@@ -30,6 +30,10 @@ _forcefsck()
+ 	[ -e /forcefsck ] || get_bootparam forcefsck
+ }
+ 
++_fsck_is_busybox() {
++	[ -L /sbin/fsck ] && [ "$(readlink -f /sbin/fsck)" = "/bin/busybox" ]
++}
++
+ start()
+ {
+ 	local fsck_opts= p= check_extra=
+@@ -60,7 +64,9 @@ start()
+ 	done
+ 
+ 	if [ "$RC_UNAME" = Linux ]; then
+-		fsck_opts="$fsck_opts -C0 -T"
++		if ! _fsck_is_busybox; then
++			fsck_opts="$fsck_opts -C0 -T"
++		fi
+ 		if [ -z "$fsck_passno" ]; then
+ 			fsck_args=${fsck_args--A -p}
+ 			if echo 2>/dev/null >/.test.$$; then
+-- 
+1.7.4.1
+
diff --git a/main/openrc/APKBUILD b/main/openrc/APKBUILD
index 9de5590bb0..fbdf9de2e5 100644
--- a/main/openrc/APKBUILD
+++ b/main/openrc/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=openrc
 pkgver=0.7.0_git20110222
 _ver=${pkgver/_git*/}
-pkgrel=0
+pkgrel=1
 pkgdesc="OpenRC manages the services, startup and shutdown of a host"
 url="http://roy.marples.name/openrc"
 arch="all"
@@ -16,7 +16,7 @@ source="http://distfiles.gentoo.org/distfiles/$pkgname-$_ver.tar.bz2
 	openrc-0.4.3-mkmntdirs.patch
 
 	0001-Force-root-be-rw-before-localmount.patch
-	remove-e2fsck-specific-options.patch
+	0001-fsck-add-C0-and-T-options-unless-fsck-is-busybox.patch
 
 	hostname.initd
 	hwdrivers.initd
@@ -69,7 +69,7 @@ md5sums="80efd9dd83d4713ddfb7e41a6433cc9c  openrc-0.7.0.tar.bz2
 c3dfd1a0ee9e88a0d491d815ca634bda  0001-Use-rc_sys_v1-when-rc_sys-variable-is-defined-but-em.patch
 8c2c1c2ee0509b63966b7187a2079f4b  openrc-0.4.3-mkmntdirs.patch
 4fd036ff07ed9ad7fb76af6a3ffc0695  0001-Force-root-be-rw-before-localmount.patch
-4ca3731b566c004a3848c54515df8d17  remove-e2fsck-specific-options.patch
+fb8baeaf32f4d53491312675f28a9939  0001-fsck-add-C0-and-T-options-unless-fsck-is-busybox.patch
 c32e15b0858eef708497e7ee6355a055  hostname.initd
 b1e64885f301166df30be3e3cf5338ff  hwdrivers.initd
 33ca3e558c42cdd17adccbc7807298f7  keymaps.initd
diff --git a/main/openrc/remove-e2fsck-specific-options.patch b/main/openrc/remove-e2fsck-specific-options.patch
deleted file mode 100644
index 45dcadd2ee..0000000000
--- a/main/openrc/remove-e2fsck-specific-options.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- openrc-0.6.1.orig/init.d/fsck.in
-+++ openrc-0.6.1/init.d/fsck.in
-@@ -60,7 +60,6 @@
- 	done
- 
- 	if [ "$RC_UNAME" = Linux ]; then
--		fsck_opts="$fsck_opts -C0 -T"
- 		if [ -z "$fsck_passno" ]; then
- 			fsck_args=${fsck_args--A -p}
- 			if echo 2>/dev/null >/.test.$$; then
-- 
cgit v1.2.3