From dcb691439b832faa7c3a252e7810116bc114c20e Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Thu, 7 May 2015 13:30:43 +0200
Subject: Select the first available block device by default.

---
 include/partition.sh             |  2 +-
 src/fripost-partman-udeb/base.sh | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/include/partition.sh b/include/partition.sh
index eed6db9..4eedcc3 100755
--- a/include/partition.sh
+++ b/include/partition.sh
@@ -24,7 +24,7 @@ set -ue
 . /lib/fripost-partman/base.sh
 
 # Configuration for a single disk
-device=/dev/sda
+device=$(fripost_list_devices | head -1)
 raidLevel=
 
 # Configuration for a RAID array
diff --git a/src/fripost-partman-udeb/base.sh b/src/fripost-partman-udeb/base.sh
index 163134f..23fcdeb 100644
--- a/src/fripost-partman-udeb/base.sh
+++ b/src/fripost-partman-udeb/base.sh
@@ -601,6 +601,18 @@ getIPv4() {
 
 
 
+##############################################################################
+# List all block devices that are not mounted on /cdrom
+#
+fripost_list_devices() {
+    local cdrom=$( sed -rn '\#^(\S+) /cdrom\s.*# {s//\1/p; q}' /proc/mounts )
+    [ "$cdrom" ] || fatal "Error: Is /cdrom a mountpoint?"
+
+    find /dev -type b | grep -v '[0-9]$' | grep -vFx "$cdrom"
+}
+
+
+
 ##############################################################################
 # Remove a partition from a device
 #
-- 
cgit v1.2.3