From 3f384a25fad7e19f7235060ac074580e9c618730 Mon Sep 17 00:00:00 2001 From: Hridya Valsaraju Date: Tue, 13 Apr 2021 14:27:16 -0700 Subject: [PATCH] Move debugfs mount/unmount to init-debug.rc Debugfs cannot be mounted in userbuilds since Android R. Since init only mounts/unmounts debugfs during boot for debug builds, move it to init-debug.rc. Bug: 184381659 Test: build/boot Change-Id: Ib51e82b99ec1eb95a2647c91855f6d4d1585040a --- rootdir/init-debug.rc | 7 +++++++ rootdir/init.rc | 7 ------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/rootdir/init-debug.rc b/rootdir/init-debug.rc index 435d4cb25..cac88fd3f 100644 --- a/rootdir/init-debug.rc +++ b/rootdir/init-debug.rc @@ -6,3 +6,10 @@ on property:persist.mmc.max_write_speed=* on property:persist.mmc.cache_size=* write /sys/block/mmcblk0/cache_size ${persist.mmc.cache_size} + +on early-init && property:ro.product.enforce_debugfs_restrictions=true + mount debugfs debugfs /sys/kernel/debug + chmod 0755 /sys/kernel/debug + +on property:sys.boot_completed=1 && property:ro.product.enforce_debugfs_restrictions=true + umount /sys/kernel/debug diff --git a/rootdir/init.rc b/rootdir/init.rc index 5a9cc993b..5fbdcd6df 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -985,9 +985,6 @@ on boot && property:ro.config.low_ram=true write /proc/sys/vm/dirty_expire_centisecs 200 write /proc/sys/vm/dirty_background_ratio 5 -on property:sys.boot_completed=1 && property:ro.product.enforce_debugfs_restrictions=true - umount /sys/kernel/debug - on boot # basic network init ifup lo @@ -1263,10 +1260,6 @@ on userspace-reboot-resume on property:sys.boot_completed=1 && property:sys.init.userspace_reboot.in_progress=1 setprop sys.init.userspace_reboot.in_progress "" -on early-init && property:ro.product.enforce_debugfs_restrictions=true - mount debugfs debugfs /sys/kernel/debug - chmod 0755 /sys/kernel/debug - # Migrate tasks again in case kernel threads are created during boot on property:sys.boot_completed=1 copy_per_line /dev/cpuctl/tasks /dev/cpuctl/system/tasks