From 022623e2c97b2e484c05bcd03a7d07f8d0affda6 Mon Sep 17 00:00:00 2001
From: Adam Boardman <adamboardman@gmail.com>
Date: Mon, 12 Jun 2023 12:41:52 +0100
Subject: [PATCH] Fixing some missing groups

---
 lib/systemd/system/android-mount.service | 3 +--
 lib/udev/rules.d/65-android.rules        | 8 ++++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/lib/systemd/system/android-mount.service b/lib/systemd/system/android-mount.service
index da09435..2ea1b0c 100644
--- a/lib/systemd/system/android-mount.service
+++ b/lib/systemd/system/android-mount.service
@@ -1,8 +1,7 @@
 [Unit]
 Description=mount android parts
-After=systemd-udev-settle.service local-fs.target
+After=systemd-remount-fs.service local-fs.target
 Before=lxc-android.service
-Wants=systemd-udev-settle.service
 
 [Service]
 Type=oneshot
diff --git a/lib/udev/rules.d/65-android.rules b/lib/udev/rules.d/65-android.rules
index ab03297..aac0bd5 100644
--- a/lib/udev/rules.d/65-android.rules
+++ b/lib/udev/rules.d/65-android.rules
@@ -6,7 +6,7 @@ ACTION=="add", KERNEL=="log_radio", SYMLINK+="alog/radio"
 ACTION=="add", KERNEL=="log_events", SYMLINK+="alog/events"
 
 # system devices
-ACTION=="add", KERNEL=="binder", MODE="0666"
+#in device specific rules file ACTION=="add", KERNEL=="binder", MODE="0666"
 
 # graphics devices
 SUBSYSTEM=="graphics", KERNEL=="*", SYMLINK+="graphics/%k"
@@ -15,12 +15,12 @@ SUBSYSTEM=="graphics", KERNEL=="*", SYMLINK+="graphics/%k"
 ACTION=="add", KERNEL=="event[0-9]*", GROUP="aid_input", MODE="0660"
 
 # misc devices
-ACTION=="add", KERNEL=="alarm", OWNER="system", GROUP="users", MODE="0660"
-ACTION=="add", KERNEL=="uhid", OWNER="system", GROUP="system", MODE="0660"
+ACTION=="add", KERNEL=="alarm", OWNER="aid_system", GROUP="users", MODE="0660"
+ACTION=="add", KERNEL=="uhid", OWNER="aid_system", GROUP="aid_system", MODE="0660"
 ACTION=="add", KERNEL=="mtp_usb", OWNER="root", GROUP="plugdev", MODE="0660"
 
 # memory
-ACTION=="add", KERNEL=="ashmem", OWNER="system", GROUP="system", MODE="0666"
+ACTION=="add", KERNEL=="ashmem", OWNER="aid_system", GROUP="aid_system", MODE="0666"
 
 # rfkill
 ACTION=="add", KERNEL=="rfkill", GROUP="aid_input", MODE="0660"