From d38e1bb490d7cfbc2cb43a2a874aa1d5a1efeef5 Mon Sep 17 00:00:00 2001
From: Mathieu Parent <math.parent@gmail.com>
Date: Wed, 16 Jan 2013 18:16:12 +0100
Subject: [PATCH] Skip installer disk in get_auto_disks

Fixes "partman-auto: Do not automatically select the correct disk when using
isohybrid ISO on USB stick" (Closes: #607536)

Signed-off-by: Mathieu Parent <math.parent@gmail.com>
---
 lib/auto-shared.sh |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/auto-shared.sh b/lib/auto-shared.sh
index 3d9e66a..2b9c42a 100644
--- a/lib/auto-shared.sh
+++ b/lib/auto-shared.sh
@@ -219,6 +219,9 @@ get_auto_disks() {
 		# Skip software RAID (mdadm) devices (/dev/md/X and /dev/mdX)
 		$(echo "$device" | grep -Eq "/dev/md/?[0-9]*$") && continue
 
+		# Skip installer disk
+		$(mount | grep -qF "$device on /cdrom ") && continue
+
 		# Skip device mapper devices (/dev/mapper/),
 		# except for dmraid or multipath devices
 		if echo $device | grep -q "^/dev/mapper/"; then
-- 
1.7.10.4

