summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Stokes <alanstokes@google.com>2022-04-27 17:27:19 +0100
committerAlan Stokes <alanstokes@google.com>2022-04-28 10:57:36 +0100
commit34ee0c931cd3e738271407cf5038f8145d9d415d (patch)
treedec3021066c8a4b794dcf49444b509a7d40746a3
parent1a2dbd917e8b2f178915cd50c39fc670f9fca6d4 (diff)
downloadcore-34ee0c931cd3e738271407cf5038f8145d9d415d.tar.gz
Delete stale Virtualization image files
Delete all files and directories under /data/misc/virtualizationservice at boot. Originally they were owned by the virtualizationservice user; we now run as system, and don't have permission to remove them after boot. Bug: 230056726 Test: Create fake stale dir+file, see them deleted Ignore-AOSP-First: Needed in T, will CP to aosp Change-Id: I5ff7d055aeeb25ba7693e50876d6b8a830c4bf51
-rw-r--r--rootdir/init.rc10
1 files changed, 5 insertions, 5 deletions
diff --git a/rootdir/init.rc b/rootdir/init.rc
index aae28dc21..15b6c4d7b 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -828,11 +828,11 @@ on post-fs-data
# directory used for odsign metrics
mkdir /data/misc/odsign/metrics 0770 root system
- # Directory for VirtualizationService temporary image files. Always create
- # a fresh new empty directory to remove any stale files from the previous
- # boot.
- rmdir /data/misc/virtualizationservice
- mkdir /data/misc/virtualizationservice 0700 system system
+ # Directory for VirtualizationService temporary image files.
+ # Delete any stale files owned by the old virtualizationservice uid (b/230056726).
+ chmod 0770 /data/misc/virtualizationservice
+ exec - virtualizationservice system -- /bin/rm -rf /data/misc/virtualizationservice
+ mkdir /data/misc/virtualizationservice 0770 system system
mkdir /data/preloads 0775 system system encryption=None