summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Stultz <john.stultz@linaro.org>2018-06-20 16:42:53 -0700
committerJohn Stultz <john.stultz@linaro.org>2018-06-22 14:28:19 -0700
commit531fb4c307e7b5f5791ee4a60487c20c18cebcfc (patch)
tree59dc5582ed07a48c0e06f4a1eebb6227b5c9035d
parentd4414cf278b807592cda035172b056ee0354e3ee (diff)
downloadhikey-531fb4c307e7b5f5791ee4a60487c20c18cebcfc.tar.gz
hikey/hikey960: Fix fstab pathandroid-p-preview-4
When we moved the fstab files over, we probably shouldn't have copied them to /vendor/etc/init/ and instead used /vendor/etc/. Thus this patch corrects this. Change-Id: I2143fb6596d50289701158b58c91dfb440943231 Reported-by: Mark Salyzyn <salyzyn@android.com> Signed-off-by: John Stultz <john.stultz@linaro.org>
-rw-r--r--hikey/device-hikey.mk2
-rw-r--r--hikey960/device-hikey960.mk2
-rw-r--r--init.common.rc2
3 files changed, 3 insertions, 3 deletions
diff --git a/hikey/device-hikey.mk b/hikey/device-hikey.mk
index 5e15cd54..f04561d0 100644
--- a/hikey/device-hikey.mk
+++ b/hikey/device-hikey.mk
@@ -16,7 +16,7 @@
PRODUCT_COPY_FILES += $(TARGET_PREBUILT_KERNEL):kernel \
$(TARGET_PREBUILT_DTB):hi6220-hikey.dtb \
- $(LOCAL_PATH)/$(TARGET_FSTAB):$(TARGET_COPY_OUT_VENDOR)/etc/init/fstab.hikey \
+ $(LOCAL_PATH)/$(TARGET_FSTAB):$(TARGET_COPY_OUT_VENDOR)/etc/fstab.hikey \
device/linaro/hikey/init.common.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.hikey.rc \
device/linaro/hikey/init.hikey.power.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.hikey.power.rc \
device/linaro/hikey/init.common.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.hikey.usb.rc \
diff --git a/hikey960/device-hikey960.mk b/hikey960/device-hikey960.mk
index 30c1b0d5..d59b3f3d 100644
--- a/hikey960/device-hikey960.mk
+++ b/hikey960/device-hikey960.mk
@@ -17,7 +17,7 @@
PRODUCT_COPY_FILES += $(TARGET_PREBUILT_KERNEL):kernel \
$(TARGET_PREBUILT_DTB):hi3660-hikey960.dtb
-PRODUCT_COPY_FILES += $(LOCAL_PATH)/fstab.hikey960:$(TARGET_COPY_OUT_VENDOR)/etc/init/fstab.hikey960 \
+PRODUCT_COPY_FILES += $(LOCAL_PATH)/fstab.hikey960:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.hikey960 \
device/linaro/hikey/init.common.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.hikey960.rc \
device/linaro/hikey/init.hikey960.power.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.hikey960.power.rc \
device/linaro/hikey/init.common.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.hikey960.usb.rc \
diff --git a/init.common.rc b/init.common.rc
index 63eaa9c5..8d229216 100644
--- a/init.common.rc
+++ b/init.common.rc
@@ -27,7 +27,7 @@ on init
start watchdogd
on fs
- mount_all /vendor/etc/init/fstab.${ro.hardware}
+ mount_all /vendor/etc/fstab.${ro.hardware}
setprop ro.crypto.fuse_sdcard false
on post-fs