1 files changed, 4 insertions, 1 deletions

diff --git a/meta/recipes-core/udev/udev-extraconf/mount.sh b/meta/recipes-core/udev/udev-extraconf/mount.sh
index 40910be8bd..c4695ee27d 100644
--- a/meta/recipes-core/udev/udev-extraconf/mount.sh
+++ b/meta/recipes-core/udev/udev-extraconf/mount.sh
@@ -126,7 +126,10 @@ automount() {
                 rm_dir "$MOUNT_BASE/$name"
         else
                 logger "mount.sh/automount" "Auto-mount of [$MOUNT_BASE/$name] successful"
-                touch "/tmp/.automount-$name"
+                # The actual device might not be present in the remove event so blkid cannot
+                # be used to calculate what name was generated here. Simply save the mount
+                # name in our tmp file.
+                echo "$name" > "/tmp/.automount-$name"
         fi
 }