diff options
| author | Patrick Williams <patrick@stwcx.xyz> | 2022-10-08 04:38:09 +0300 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2022-10-10 18:31:20 +0300 |
| commit | 563c33f89514b4f614abeaad692bc4e15ceb7135 (patch) | |
| tree | 627b94511da3f5c89c5a67b2f08ec5c1008cc353 /meta-facebook | |
| parent | f5ea9eb09e77c984f0c51151b0011cc3c595c63b (diff) | |
| download | openbmc-563c33f89514b4f614abeaad692bc4e15ceb7135.tar.xz | |
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
Diffstat (limited to 'meta-facebook')
| -rw-r--r-- | meta-facebook/recipes-core/base-files/base-files_%.bbappend | 2 | ||||
| -rw-r--r-- | meta-facebook/recipes-fb/emmc-init/files/emmc-init.service | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/meta-facebook/recipes-core/base-files/base-files_%.bbappend b/meta-facebook/recipes-core/base-files/base-files_%.bbappend index 3b94c70e32..b757af63f4 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 @@ do_install:append:mf-fb-secondary-emmc() { 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 1a5ddcf417..f093f3d073 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 |