From 916ecda319bd9292c5372ec0447269f62ccddd97 Mon Sep 17 00:00:00 2001 From: Paul Crowley Date: Mon, 28 Oct 2019 15:55:03 +0100 Subject: [PATCH] init: Make encryption action an argument to mkdir FscryptSetDirectoryPolicy no longer tries to infer the action from the filename. Well mostly; it still assumes top-level directories in /data should be encrypted unless the mkdir arguments say otherwise, but it warns. Bug: 26641735 Test: boot, check log messages Change-Id: Id6d2cea7fb856f17323897d85cf6190c981b443c --- prebuilt/common/etc/init/lineage-ssh.rc | 2 +- prebuilt/common/etc/init/lineage-updates.rc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/prebuilt/common/etc/init/lineage-ssh.rc b/prebuilt/common/etc/init/lineage-ssh.rc index edf38638..f3613c34 100644 --- a/prebuilt/common/etc/init/lineage-ssh.rc +++ b/prebuilt/common/etc/init/lineage-ssh.rc @@ -1,3 +1,3 @@ on post-fs-data - mkdir /data/ssh 0750 root shell + mkdir /data/ssh 0750 root shell encryption=Require mkdir /data/ssh/empty 0600 root shell diff --git a/prebuilt/common/etc/init/lineage-updates.rc b/prebuilt/common/etc/init/lineage-updates.rc index 3a9b4813..f1bed8d3 100644 --- a/prebuilt/common/etc/init/lineage-updates.rc +++ b/prebuilt/common/etc/init/lineage-updates.rc @@ -1,4 +1,4 @@ on post-fs-data # Create an additional OTA package directory that unlike /data/ota_package # will not be touched by GmsCore. - mkdir /data/lineageos_updates 0770 system cache + mkdir /data/lineageos_updates 0770 system cache encryption=Require