patch sysvinit for arch linux

Signed-off-by: Mattias Andrée <maandree@operamail.com>

1 files changed, 13 insertions, 1 deletions

diff --git a/sysvinit/PKGBUILD b/sysvinit/PKGBUILD
index fb73f35..47161e1 100644
--- a/sysvinit/PKGBUILD
+++ b/sysvinit/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org>
 pkgname=sysvinit
 pkgver=2.88
-pkgrel=11
+pkgrel=12
 pkgdesc='Linux System V Init'
 url='http://savannah.nongnu.org/projects/sysvinit'
 arch=('i686' 'x86_64')
@@ -20,6 +20,18 @@ build()
     cd "$srcdir/$pkgname-${pkgver}dsf"
     patch -p1 -d "src" -i "$srcdir/0001-simplify-writelog.patch"
     patch -p1 -d "src" -i "$srcdir/0002-remove-ansi-escape-codes-from-log-file.patch"
+    
+    # Patch for Arch's Linux filesystem hierarchy
+    if [ "$(grep 'execv("/sbin/mount", args);' < src/killall5.c | wc -l)" = 1 ]; then
+        sed -i 's:execv("/bin/mount", args);::' src/killall5.c
+    fi
+    sed -i 's|/bin:/sbin:/usr/bin:/usr/sbin|/usr/bin|' src/initscript.sample src/init.h src/shutdown.c
+    sed -i 's|/sbin:/usr/sbin:/bin:/usr/bin|/usr/bin|' src/initscript.sample src/init.h src/shutdown.c
+    sed -i 's|/bin:/usr/bin:/sbin:/usr/sbin|/usr/bin|' src/initscript.sample src/init.h src/shutdown.c
+    sed -i 's:/sbin/:/bin/:g'    contrib/notify-pam-dead.patch man/*.{1,5,8} src/*.{c,h} src/initscript.sample
+    sed -i 's:/bin/:/usr/bin/:g' contrib/notify-pam-dead.patch man/*.{1,5,8} src/*.{c,h} src/initscript.sample
+    sed -i 's:/usr/usr/:/usr/:g' contrib/notify-pam-dead.patch man/*.{1,5,8} src/*.{c,h} src/initscript.sample
+    
     make
 }