Merge changes from topic "snapshotctl_cleanup" into rvc-dev
* changes:
libsnapshot: SnapshotMergeStats::Start/Finish
libsnapshot: Expose SnapshotMergeStats
libsnapshot: delete WaitForMerge.
libsnapshot: handle errors in RemoveAllUpdateState appropriately.
libsnapshot: remove snapshots properly after flashing
libsnapshot: RemoveUpdateState on rollback.
libsnapshot: NeedSnapshotsInFirstStageMount don't test for IsRecovery
Allow ProcessUpdateState to be paused.
libsnapshot: Re-expose InitiateMerge and ProcessUpdateState
libsnapshot: Add prolog to RemoveAllUpdateStates.
snapshotctl don't auto-merge.
snapshotctl: init reports merge statistics
libsnapshot/test: Re-enable the failing tests
diff --git a/rootdir/init.rc b/rootdir/init.rc
index ae9d695..c59f911 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -701,9 +701,7 @@
# A tmpfs directory, which will contain all apps CE DE data directory that
# bind mount from the original source.
- chown root root /data_mirror
- chmod 0700 /data_mirror
- mount tmpfs tmpfs /data_mirror mode=0700,uid=0,gid=1000 nodev noexec nosuid
+ mount tmpfs tmpfs /data_mirror nodev noexec nosuid mode=0700,uid=0,gid=1000
restorecon /data_mirror
mkdir /data_mirror/data_ce 0700 root root
mkdir /data_mirror/data_de 0700 root root