From b3c92db1937fc56a6cd20be60d15bc5d603849bf Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 11 Nov 2013 16:19:32 +0100
Subject: [rootfs-stage32] Don't check /dev/sd? when fdisk returns nothing, as
 it won't be there

---
 .../rootfs-stage32/data/opt/openslx/scripts/systemd-setup_partitions  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'remote')

diff --git a/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_partitions b/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_partitions
index d8a016ab..666b8a69 100755
--- a/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_partitions
+++ b/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_partitions
@@ -95,8 +95,8 @@ fdisk -l | sed -n "/^\/dev\//p" > "/etc/disk.partition"
 # apparently then it can still happen that we run too soon. This should
 # be removed once someone figures out what fdisk really needs to work
 # properly.
-if [ ! -s "/etc/disk.partition" -a -n "$(ls /dev/sd?)" ]; then
-	sleep 2
+if [ ! -s "/etc/disk.partition" ]; then
+	sleep 3
 	echo "Retrying fdisk"
 	fdisk -l | sed -n "/^\/dev\//p" > "/etc/disk.partition"
 fi
-- 
cgit v1.2.3-55-g7522