diff --git a/install.uefi b/install.uefi
index 7d82897..23fb190 100644
--- a/install.uefi
+++ b/install.uefi
@@ -98,12 +98,17 @@ UUID_ESP=""
 UUID_ROOT=""
 UUID_USR=""
 
+# Anzahl der Partitionen ermitteln
+DRIVE_NAME=${DRIVE//\/dev\/}
+declare -i NUMBER_OF_PARTITIONS;
+NUMBER_OF_PARTITIONS=$(lsblk | grep -c "${DRIVE_NAME}")
+
 NOCASEMATCH_UNSET=$(shopt -u | grep -c nocasematch)
 if [[ $NOCASEMATCH_UNSET ]]; then
   shopt -s nocasematch
 fi
 
-for i in {1..9}; do
+until ${NUMBER_OF_PARTITIONS}; do
   OUTPUT=$(sgdisk -i "${i}" "${DRIVE}")
   PARTITION_EXISTS=$(echo "${OUTPUT}" | grep -c "GUID")
   if [[ "${PARTITION_EXISTS}" != "0" ]]; then
@@ -119,6 +124,7 @@ for i in {1..9}; do
   else
     echo "no partition found"
   fi
+  NUMBER_OF_PARTITIONS="${NUMBER_OF_PARTITIONS}-1"
 done
 
 if [[ $NOCASEMATCH_UNSET ]]; then