From 7f78b25a363df7d6fbe5582305e2bd68aa8dc915 Mon Sep 17 00:00:00 2001 From: Patrick Tjin Date: Mon, 31 Jul 2017 21:57:20 -0700 Subject: [PATCH] ramoops: remount pstore even if decryption fails Remount the pstore even if decryption fails so that if, by chance, something is there, we don't miss out on it. Bug: 37553996 Bug: 37554629 Change-Id: I0e4821f807aee2b46748e14ad38410bd147f5516 --- init.ramoops.sh | 8 +++++--- sepolicy/private/property_contexts | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/init.ramoops.sh b/init.ramoops.sh index 3457c219..4c57a1a1 100644 --- a/init.ramoops.sh +++ b/init.ramoops.sh @@ -4,13 +4,15 @@ ramoops -D if [ $? -eq 0 ]; then - # Pivot (and decrypt) and remount pstore + # Pivot (and decrypt) echo 1 > /sys/devices/virtual/ramoops/pstore/use_alt - setprop sys.ramoops.decrypted true else - setprop sys.ramoops.decrypted Error-$? + setprop sys.ramoops.decryption.error $? fi +# Trigger remount of pstore regardless of decryption state +setprop sys.ramoops.decrypted true + # Generate keys (if none exist), and load the keys to carveout if [[ $(getprop ro.hardware) == "walleye" ]]; then ramoops -g -l -c diff --git a/sepolicy/private/property_contexts b/sepolicy/private/property_contexts index 3a5384cc..8453a6c0 100644 --- a/sepolicy/private/property_contexts +++ b/sepolicy/private/property_contexts @@ -1 +1 @@ -sys.ramoops.decrypted u:object_r:ramoops_prop:s0 +sys.ramoops. u:object_r:ramoops_prop:s0