Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ec2445d0 authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge "Explicit init .rc user." am: f0578771 am: f90cb631 am: 0ca68a5b 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2530202



Change-Id: I86b206cc28c154239244301341c20bfafa17a77e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8a4f63d2 0ca68a5b

init/test_upgrade_mte/mte_upgrade_test.rc

+2 −0
Original line number Original line Diff line number Diff line
@@ -16,9 +16,11 @@ service mte_upgrade_test_helper /system/bin/mte_upgrade_test_helper ${sys.mte_cr 
  class late_start

  class late_start

  disabled

  disabled

  seclabel u:r:su:s0

  seclabel u:r:su:s0

  user root





service mte_upgrade_test_helper_overridden /system/bin/mte_upgrade_test_helper ${sys.mte_crash_test_uuid}

service mte_upgrade_test_helper_overridden /system/bin/mte_upgrade_test_helper ${sys.mte_crash_test_uuid}

  class late_start

  class late_start

  disabled

  disabled

  seclabel u:r:su:s0

  seclabel u:r:su:s0

  user root

  setenv BIONIC_MEMTAG_UPGRADE_SECS 0
 
  setenv BIONIC_MEMTAG_UPGRADE_SECS 0

rootdir/init.rc

+5 −1
Original line number Original line Diff line number Diff line
@@ -495,25 +495,28 @@ service boringssl_self_test32 /system/bin/boringssl_self_test32 
    stdio_to_kmsg

    stdio_to_kmsg

    # Explicitly specify that boringssl_self_test32 doesn't require any capabilities

    # Explicitly specify that boringssl_self_test32 doesn't require any capabilities

    capabilities

    capabilities

    user nobody





service boringssl_self_test64 /system/bin/boringssl_self_test64

service boringssl_self_test64 /system/bin/boringssl_self_test64

    reboot_on_failure reboot,boringssl-self-check-failed

    reboot_on_failure reboot,boringssl-self-check-failed

    stdio_to_kmsg

    stdio_to_kmsg

    # Explicitly specify that boringssl_self_test64 doesn't require any capabilities

    # Explicitly specify that boringssl_self_test64 doesn't require any capabilities

    capabilities

    capabilities

    user nobody





service boringssl_self_test_apex32 /apex/com.android.conscrypt/bin/boringssl_self_test32

service boringssl_self_test_apex32 /apex/com.android.conscrypt/bin/boringssl_self_test32

    reboot_on_failure reboot,boringssl-self-check-failed

    reboot_on_failure reboot,boringssl-self-check-failed

    stdio_to_kmsg

    stdio_to_kmsg

    # Explicitly specify that boringssl_self_test_apex32 doesn't require any capabilities

    # Explicitly specify that boringssl_self_test_apex32 doesn't require any capabilities

    capabilities

    capabilities

    user nobody





service boringssl_self_test_apex64 /apex/com.android.conscrypt/bin/boringssl_self_test64

service boringssl_self_test_apex64 /apex/com.android.conscrypt/bin/boringssl_self_test64

    reboot_on_failure reboot,boringssl-self-check-failed

    reboot_on_failure reboot,boringssl-self-check-failed

    stdio_to_kmsg

    stdio_to_kmsg

    # Explicitly specify that boringssl_self_test_apex64 doesn't require any capabilities

    # Explicitly specify that boringssl_self_test_apex64 doesn't require any capabilities

    capabilities

    capabilities



    user nobody





# Healthd can trigger a full boot from charger mode by signaling this

# Healthd can trigger a full boot from charger mode by signaling this

# property when the power button is held.

# property when the power button is held.
@@ -1280,6 +1283,7 @@ service ueventd /system/bin/ueventd 
    class core

    class core

    critical

    critical

    seclabel u:r:ueventd:s0

    seclabel u:r:ueventd:s0

    user root

    shutdown critical

    shutdown critical





service console /system/bin/sh

service console /system/bin/sh