commit 16822519f6c887ad2e6327cb915e2d34a8c6a0c9
author Alex Van Damme <atv@google.com> Wed Jan 23 13:34:01 2019 -0800
committer Alex Van Damme <atv@google.com> Wed Jan 23 21:41:58 2019 +0000
tree c057f29ed480b45f66cb39252795871cc41f0584
parent bedfff64be2a6da38cc950b73a0235aeccd9388c

Inject fstab during multistrap

Change-Id: I6d056dae87ffd8cda4f7c66e9dc27986455c1852

multistrap.mk

diff --git a/multistrap.mk b/multistrap.mk
index df2a72c..aa1d608 100644
--- a/multistrap.mk
+++ b/multistrap.mk
@@ -23,7 +23,7 @@
 
 multistrap: $(PRODUCT_OUT)/multistrap/rootfs_$(USERSPACE_ARCH).img $(PRODUCT_OUT)/multistrap/boot_$(USERSPACE_ARCH).img
 
-$(PRODUCT_OUT)/multistrap/rootfs_$(USERSPACE_ARCH).img: $(PRODUCT_OUT)/multistrap/boot_$(USERSPACE_ARCH).img $(HOST_OUT)/bin/img2simg
+$(PRODUCT_OUT)/multistrap/rootfs_$(USERSPACE_ARCH).img: $(PRODUCT_OUT)/multistrap/boot_$(USERSPACE_ARCH).img $(HOST_OUT)/bin/img2simg $(ROOTDIR)/board/fstab.emmc
 	fallocate -l $(ROOTFS_SIZE_MB)M $@.wip
 	mkfs.ext4 -F -j $@.wip
 	mkfs.ext2 -F $(PRODUCT_OUT)/multistrap/boot_$(USERSPACE_ARCH).img
@@ -43,6 +43,7 @@
 	sudo cp /usr/bin/qemu-$(QEMU_ARCH)-static $(MULTISTRAP_WORK_DIR)/usr/bin
 	sudo chroot $(MULTISTRAP_WORK_DIR) /var/lib/dpkg/info/dash.preinst install
 	sudo DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true LC_ALL=C LANGUAGE=C LANG=C chroot $(MULTISTRAP_WORK_DIR) dpkg --configure -a
+	sudo cp $(ROOTDIR)/board/fstab.emmc $(MULTISTRAP_WORK_DIR)/etc/fstab
 	sudo rm -f $(MULTISTRAP_WORK_DIR)/usr/bin/qemu-$(QEMU_ARCH)-static
 
 	sudo umount -R $(MULTISTRAP_WORK_DIR)