From 852771fbcfe63264a4b0f5bba9befbf2ea7101fc Mon Sep 17 00:00:00 2001
From: Stefan Agner <stefan@agner.ch>
Date: Fri, 31 Mar 2023 16:20:25 +0200
Subject: [PATCH] Ignore non-existing data disk (#4221)

---
 supervisor/api/os.py       | 2 +-
 supervisor/os/data_disk.py | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/supervisor/api/os.py b/supervisor/api/os.py
index 63bca2613..319911221 100644
--- a/supervisor/api/os.py
+++ b/supervisor/api/os.py
@@ -63,7 +63,7 @@ class APIOS(CoreSysAttributes):
             ATTR_UPDATE_AVAILABLE: self.sys_os.need_update,
             ATTR_BOARD: self.sys_os.board,
             ATTR_BOOT: self.sys_dbus.rauc.boot_slot,
-            ATTR_DATA_DISK: self.sys_os.datadisk.disk_used.id,
+            ATTR_DATA_DISK: self.sys_os.datadisk.disk_used_id,
         }
 
     @api_process
diff --git a/supervisor/os/data_disk.py b/supervisor/os/data_disk.py
index 66e433b4f..62e8d2e70 100644
--- a/supervisor/os/data_disk.py
+++ b/supervisor/os/data_disk.py
@@ -127,6 +127,12 @@ class DataDisk(CoreSysAttributes):
             device_object_path="",
         )
 
+    @property
+    def disk_used_id(self) -> str | None:
+        """Return current Disk id for data."""
+        disk_used = self.disk_used
+        return disk_used.id if disk_used else None
+
     @property
     def available_disks(self) -> list[Disk]:
         """Return a list of possible new disk locations.