tequilaOS/platform_system_bpf
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "reverse bpfloader vs netbpfload order" into main am: 04229c8453 am: 026704ae9c

Browse source 
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2794731

Change-Id: I2370a5f33c4d28d005826da8c0aeb73b787c3a48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Maciej Żenczykowski 2023-10-21 02:36:20 +00:00 committed by Automerger Merge Worker
commit a7de4e1f05
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
bpfloader/BpfLoader.cpp
View file

@ -227,5 +227,10 @@ int main(int argc, char** argv) {
}
}
if (android::base::SetProperty("bpf.progs_loaded", "1") == false) {
ALOGE("Failed to set bpf.progs_loaded property");
return 1;
}
return 0;
}

2
bpfloader/bpfloader.rc
View file

@ -15,8 +15,8 @@
# considered to have booted successfully.
#
on load_bpf_programs
exec_start bpfloader
exec_start netbpfload
exec_start bpfloader
service bpfloader /system/bin/bpfloader
capabilities CHOWN SYS_ADMIN