commit 994b8175bebf97912a9930ec5c6121793c766c1a
author Cody Schuffelen <schuffelen@google.com> Thu Jul 18 18:24:16 2019 -0700
committer Jorge E. Moreira <jemoreira@google.com> Tue Jul 23 11:47:39 2019 -0700
tree 2286744b68b01958baafec6024595b2e4e19719f
parent 709fa0a0e4e15b59b2189abc9724f486a50a6e62

Fix non-dynamic fstab name.

This would use the wrong fstab in a composite disk build.

Bug: 137886561
Test: TH
Change-Id: Ib18e935de2d225b54d10f39e9b74ac7df5895a90

shared/config/init.common.rc

diff --git a/shared/config/init.common.rc b/shared/config/init.common.rc
index 135adc8..f5cbb2b 100644
--- a/shared/config/init.common.rc
+++ b/shared/config/init.common.rc
@@ -87,7 +87,7 @@
 # persist.sys.zram_enabled becomes true after boot,
 # we don't want to run swapon_all at that time.
 on sys-boot-completed-set && property:persist.sys.zram_enabled=1
-    swapon_all /vendor/etc/fstab.${ro.hardware}
+    swapon_all /vendor/etc/${ro.boot.fstab_name}.${ro.hardware}
 
 
 service socket_vsock_proxy /vendor/bin/socket_vsock_proxy -tcp_port=5555 -vsock_port=6520