diff --git a/usr/bin/arch-create-system b/usr/bin/arch-create-system
index 4603689..d26bbf6 100755
--- a/usr/bin/arch-create-system
+++ b/usr/bin/arch-create-system
@@ -1041,9 +1041,15 @@ prepare_network_units () {
 }
 
 prepare_target_disks () {
-    create_disk ${disk_dev_root} $disk_label_root $label_prefix 2
-    create_disk ${disk_dev_machines} $disk_label_machines $label_prefix
+    if [ ${#disk_dev_root} -gt 1 ]; then
+	create_disk ${disk_dev_root} $disk_label_root $label_prefix 2
+    fi
+    if [ ${#disk_dev_machines} -gt 1 ]; then
+	create_disk ${disk_dev_machines} $disk_label_machines $label_prefix
+    fi
+    if [ ${#disk_dev_data} -gt 1 ]; then
     create_disk ${disk_dev_data} $disk_label_data $label_prefix
+    fi
 }
 
 prepare_target_filesystems () {