From 76f04362b543ed74ecd3dab250ea769b144a7dbb Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Tue, 6 Aug 2019 00:35:12 +0000
Subject: user/dracut: Remove 98usrmount module

---
 user/dracut/APKBUILD | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'user')

diff --git a/user/dracut/APKBUILD b/user/dracut/APKBUILD
index 6be168f60..a4b386c68 100644
--- a/user/dracut/APKBUILD
+++ b/user/dracut/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=dracut
 pkgver=048
-pkgrel=2
+pkgrel=3
 pkgdesc="Event-driven initramfs infrastructure"
 url="https://dracut.wiki.kernel.org/"
 arch="all"
@@ -17,8 +17,13 @@ source="https://www.kernel.org/pub/linux/utils/boot/$pkgname/$pkgname-$pkgver.ta
 	mount-run-without-noexec.patch
 	"
 
+prepare() {
+	default_prepare
+	# Breaks separate /usr with OpenRC
+	rm -r "$builddir"/modules.d/98usrmount
+}
+
 build() {
-	cd "$builddir"
 	./configure \
 		--prefix=/usr \
 		--sysconfdir=/etc \
@@ -29,12 +34,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	for sysdmod in 00systemd 98dracut-systemd \
 	    01systemd-initrd 02systemd-networkd; do
-- 
cgit v1.2.3-70-g09d2