Replace hook with systemd mount unit

5 files changed, 17 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a3a9e7e79c64..3defba7845ec 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -20,8 +20,7 @@ pkgbase = linux-zen-anbox
 	source = zen-kernel::git+https://github.com/zen-kernel/zen-kernel?signed#tag=v5.8-zen1
 	source = config
 	source = sphinx-workaround.patch
-	source = init-hook-anbox
-	source = init-install-anbox
+	source = dev-binderfs.mount
 	source = linux-zen-anbox.install
 	validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
 	validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
@@ -29,8 +28,7 @@ pkgbase = linux-zen-anbox
 	sha256sums = SKIP
 	sha256sums = 3d34fc8d8f91207e2fef981954c7e2eea35a9ce454726b46684b46ef815344d1
 	sha256sums = 8cb21e0b3411327b627a9dd15b8eb773295a0d2782b1a41b2a8839d1b2f5778c
-	sha256sums = 020e26191a5e16ac2a8768055f2f88b8b47bf112713808b40c16e960aeea675a
-	sha256sums = 17388cc99581a3db9935a94a34c04acc32e234db6ec96b1992fcf886090a8075
+	sha256sums = a64e5a390b458fdaa373c7125a6732acd9b24b9e6596b8fcd865bf8656a059b5
 	sha256sums = 6a759fdca5cd5275334b05a62d699006a05d631e67a9902d9cb78a471b5ec246
 
 pkgname = linux-zen-anbox
diff --git a/PKGBUILD b/PKGBUILD
index ba61831abcc1..8528e00c13e2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -19,8 +19,7 @@ source=(
   "$_srcname::git+https://github.com/zen-kernel/zen-kernel?signed#tag=$_srctag"
   config         # the main kernel config file
   sphinx-workaround.patch
-  init-hook-anbox
-  init-install-anbox
+  dev-binderfs.mount
   linux-zen-anbox.install
 )
 validpgpkeys=(
@@ -31,8 +30,7 @@ validpgpkeys=(
 sha256sums=('SKIP'
             '3d34fc8d8f91207e2fef981954c7e2eea35a9ce454726b46684b46ef815344d1'
             '8cb21e0b3411327b627a9dd15b8eb773295a0d2782b1a41b2a8839d1b2f5778c'
-            '020e26191a5e16ac2a8768055f2f88b8b47bf112713808b40c16e960aeea675a'
-            '17388cc99581a3db9935a94a34c04acc32e234db6ec96b1992fcf886090a8075'
+            'a64e5a390b458fdaa373c7125a6732acd9b24b9e6596b8fcd865bf8656a059b5'
             '6a759fdca5cd5275334b05a62d699006a05d631e67a9902d9cb78a471b5ec246')
 install=$pkgbase.install
 export KBUILD_BUILD_HOST=archlinux
@@ -93,9 +91,8 @@ _package() {
   echo "Installing modules..."
   make INSTALL_MOD_PATH="$pkgdir/usr" INSTALL_MOD_STRIP=1 modules_install
 
-  echo "Installing anbox hook..."
-  install -Dm644 "$srcdir/init-install-anbox" "$pkgdir/usr/lib/initcpio/install/anbox"
-  install -Dm644 "$srcdir/init-hook-anbox" "$pkgdir/usr/lib/initcpio/hooks/anbox"
+  echo "Installing mount unit..."
+  install -Dm644 "$srcdir/dev-binderfs.mount" "$pkgdir/usr/lib/systemd/system/dev-binderfs.mount"
 
   # remove build and source links
   rm "$modulesdir"/{source,build}
diff --git a/dev-binderfs.mount b/dev-binderfs.mount
new file mode 100644
index 000000000000..90af54dbf172
--- /dev/null
+++ b/dev-binderfs.mount
@@ -0,0 +1,11 @@
+[Unit]
+Description=Android binderFS mount
+ConditionPathExists=/sys/module/binder
+
+[Mount]
+What=binder
+Where=/dev/binderfs
+Type=binder
+
+[Install]
+WantedBy=anbox-container-manager.service
diff --git a/init-hook-anbox b/init-hook-anbox
deleted file mode 100644
index 63f4d8f71825..000000000000
--- a/init-hook-anbox
+++ /dev/null
@@ -1,4 +0,0 @@
-run_hook(){
-        /usr/bin/mkdir -p /dev/binderfs
-	/usr/bin/mount -t binder binder /dev/binderfs
-}
diff --git a/init-install-anbox b/init-install-anbox
deleted file mode 100644
index e6be00093bd6..000000000000
--- a/init-install-anbox
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-build() {
-    add_runscript
-}
-
-help() {
-    cat <<HELPEOF
-This hook provides support for anbox memory needs. This hook
-is only needed for initramfs images which would run on an anbox
-compatible environment.
-HELPEOF
-}
-