meta-facebook: add emmc dependencies and timeout
Add dependencies so that the `emmc-init` service only runs if the
device is present. Add a timeout parameter to the fstab entry
for the device so that the timeout is a reasonably short amount,
since we expect the device to always be immediately available.
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I405a6773ff71f9eb047c4bb9d684fdd9b5d97948
diff --git a/meta-facebook/recipes-core/base-files/base-files_%.bbappend b/meta-facebook/recipes-core/base-files/base-files_%.bbappend
index 3b94c70..b757af6 100644
--- a/meta-facebook/recipes-core/base-files/base-files_%.bbappend
+++ b/meta-facebook/recipes-core/base-files/base-files_%.bbappend
@@ -3,6 +3,6 @@
install -m 0755 -d ${D}/mnt/data
# insert fstab entry for eMMC
- FSTAB_EMMC="/dev/mmcblk0 /mnt/data btrfs compress=zstd,discard,nofail 0 0"
+ FSTAB_EMMC="/dev/mmcblk0 /mnt/data btrfs compress=zstd,discard,nofail,x-systemd.device-timeout=10s 0 0"
echo "$FSTAB_EMMC" >> ${D}${sysconfdir}/fstab
}
diff --git a/meta-facebook/recipes-fb/emmc-init/files/emmc-init.service b/meta-facebook/recipes-fb/emmc-init/files/emmc-init.service
index 1a5ddcf..f093f3d 100644
--- a/meta-facebook/recipes-fb/emmc-init/files/emmc-init.service
+++ b/meta-facebook/recipes-fb/emmc-init/files/emmc-init.service
@@ -1,6 +1,8 @@
[Unit]
Description=eMMC initialize check
Before=mnt-data.mount
+Requires=dev-mmcblk0.device
+After=dev-mmcblk0.device
[Service]
ExecStart=/usr/libexec/emmc-init/emmc-init