joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "change 'for-system' owner from root to clat" into main am: 1569bc4cbe

Browse source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3543533

Change-Id: Ib0ad3a878b60019b1e3817c3622248d316e807f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Maciej Żenczykowski 2025-03-17 20:15:16 -07:00 • committed by Automerger Merge Worker
commit 1c017cea9e
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Tethering/apex/canned_fs_config
View file

@ -1,3 +1,3 @@
/bin/for-system 0 1000 0750
/bin/for-system 1029 1000 0750
/bin/for-system/clatd 1029 1029 06755
/bin/netbpfload 0 0 0750

2
service/jni/com_android_server_connectivity_ClatCoordinator.cpp
View file

@ -104,7 +104,7 @@ static void verifyClatPerms() {
// First verify the clatd directory and binary,
// since this is built into the apex file system image,
// failures here are 99% likely to be build problems.
V(kClatdDir, S_IFDIR|0750, ROOT, SYSTEM, "system_file", DIR);
V(kClatdDir, S_IFDIR|0750, CLAT, SYSTEM, "system_file", DIR);
V(kClatdBin, S_IFREG|S_ISUID|S_ISGID|0755, CLAT, CLAT, "clatd_exec", BIN);
// Move on to verifying that the bpf programs and maps are as expected.