diff --git a/ironic_python_agent/extensions/image.py b/ironic_python_agent/extensions/image.py
index c78b6ce4c..c482b69ca 100644
--- a/ironic_python_agent/extensions/image.py
+++ b/ironic_python_agent/extensions/image.py
@@ -593,7 +593,7 @@ def _install_grub2(device, root_uuid, efi_system_part_uuid=None,
                           'ramdisk was unable to complete the setup. '
                           'falling back to bootloader installation from'
                           'deployed image.')
-                if not os.path.ismount(root_partition):
+                if not os.path.ismount(path):
                     LOG.debug('Re-mounting the root partition.')
                     utils.execute('mount', root_partition, path)
 
diff --git a/releasenotes/notes/fix-local-boot-for-partition-images-755f570dc0982868.yaml b/releasenotes/notes/fix-local-boot-for-partition-images-755f570dc0982868.yaml
new file mode 100644
index 000000000..3340e0f82
--- /dev/null
+++ b/releasenotes/notes/fix-local-boot-for-partition-images-755f570dc0982868.yaml
@@ -0,0 +1,7 @@
+---
+fixes:
+  - |
+    IPA now properly checks if the root partition is already mounted.
+    See `Story 2008631
+    <https://storyboard.openstack.org/#!/story/2008631>`_
+    for details.