meta-facebook: bletchley: switch the emmc mount to /mnt/emmc
Internal code has switched over to handle both `/mnt/emmc` or as a
fall-back `/mnt/data`. Move the eMMC mount location to `/mnt/emmc`
and remove the extra symlinks.
Tested: Observed on QEMU the desired mounts.
```
root@bletchley:~# mount | grep "on /mnt"
overlay on /mnt/data type overlay (rw,relatime,lowerdir=/mnt/data,upperdir=/run/mnt-persist/mnt/data-data,workdir=/run/mnt-persist/mnt/data-work,uuid=on)
/dev/mmcblk0 on /mnt/emmc type btrfs (rw,relatime,compress=zstd:3,ssd,discard,noacl,space_cache=v2,subvolid=5,subvol=/)
```
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I1bb20570d2296508247a3f1af63c1812801ea206
diff --git a/meta-facebook/recipes-core/base-files/base-files_%.bbappend b/meta-facebook/recipes-core/base-files/base-files_%.bbappend
index a1ff5d8..a642347 100644
--- a/meta-facebook/recipes-core/base-files/base-files_%.bbappend
+++ b/meta-facebook/recipes-core/base-files/base-files_%.bbappend
@@ -1,10 +1,8 @@
do_install:append:mf-fb-secondary-emmc() {
# create eMMC mount point
- install -m 0755 -d ${D}/mnt/data
- # Symlink to /mnt/emmc for transition.
- ln -s /mnt/data ${D}/mnt/emmc
+ install -m 0755 -d ${D}/mnt/emmc
# insert fstab entry for eMMC
- FSTAB_EMMC="/dev/mmcblk0 /mnt/data btrfs compress=zstd,discard,nofail,x-systemd.device-timeout=10s 0 0"
+ FSTAB_EMMC="/dev/mmcblk0 /mnt/emmc btrfs compress=zstd,discard,nofail,x-systemd.device-timeout=10s 0 0"
echo "$FSTAB_EMMC" >> ${D}${sysconfdir}/fstab
}