summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Rettberg2013-11-11 16:19:32 +0100
committerSimon Rettberg2013-11-11 16:19:32 +0100
commitb3c92db1937fc56a6cd20be60d15bc5d603849bf (patch)
treefda1f3c24ad6f83e4543a15bf10fd2b7605a9bb1
parent[rootfs-stage31] revert: etc/shadow not there yet in (diff)
downloadtm-scripts-b3c92db1937fc56a6cd20be60d15bc5d603849bf.tar.gz
tm-scripts-b3c92db1937fc56a6cd20be60d15bc5d603849bf.tar.xz
tm-scripts-b3c92db1937fc56a6cd20be60d15bc5d603849bf.zip
[rootfs-stage32] Don't check /dev/sd? when fdisk returns nothing, as it won't be there
-rwxr-xr-xremote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_partitions4
1 files changed, 2 insertions, 2 deletions
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