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

bpfloader: start netbpfload after bpfloader am: c76a0dca67 am: 2fd19d3f6f am: 2e91202d7f

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

Change-Id: I316ce5e3d81c9682c2bdf7525506def2e9e0a9ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Maciej Żenczykowski 2023-10-10 19:37:54 +00:00 committed by Automerger Merge Worker
commit 88c426e5d4
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
bpfloader/Android.bp
View file

@ -51,7 +51,8 @@ cc_binary {
init_rc: ["bpfloader.rc"], init_rc: ["bpfloader.rc"],
required: [ required: [
"timeInState.o" "netbpfload",
"timeInState.o",
], ],
product_variables: { product_variables: {

12
bpfloader/bpfloader.rc
View file

@ -16,6 +16,7 @@
# #
on load_bpf_programs on load_bpf_programs
exec_start bpfloader exec_start bpfloader
exec_start netbpfload
service bpfloader /system/bin/bpfloader service bpfloader /system/bin/bpfloader
capabilities CHOWN SYS_ADMIN capabilities CHOWN SYS_ADMIN
@ -82,3 +83,14 @@ service bpfloader /system/bin/bpfloader
reboot_on_failure reboot,bpfloader-failed reboot_on_failure reboot,bpfloader-failed
# we're not really updatable, but want to be able to load bpf programs shipped in apexes # we're not really updatable, but want to be able to load bpf programs shipped in apexes
updatable updatable
# Note: comments for 'bpfloader' from up above also apply here.
# Use: adb logcat -s 'NetBpfLoad:*' 'NetBpfLoader:*'
service netbpfload /system/bin/netbpfload
capabilities CHOWN SYS_ADMIN NET_ADMIN
group root network_stack net_admin net_bw_acct net_bw_stats net_raw system
user root
rlimit memlock 1073741824 1073741824
oneshot
reboot_on_failure reboot,netbpfload-failed
updatable