Imported Upstream version 0.6.2+git20140204

[mirror_zfs-debian.git] / scripts / common.sh.in

diff --git a/scripts/common.sh.in b/scripts/common.sh.in
index 29b85d3e10e21c990999c5e5e81c40c3aa0e377a..3f63fc0534227e86ed9356b03ffe0195c3403c93 100644 (file)
--- a/scripts/common.sh.in
+++ b/scripts/common.sh.in
@@ -333,13 +333,14 @@ destroy_loop_devices() {
 }
 
 #
-# Create a device label.
+# Create a device label taking care to briefly wait if udev needs to settle.
 #
 label() {
        local DEVICE=$1
        local LABEL=$2
 
-       ${PARTED} ${DEVICE} --script -- mklabel ${LABEL} || return 1
+       wait_udev ${DEVICE} 30 || return 1
+       ${PARTED} ${DEVICE} --script -- mklabel ${LABEL} || return 2
 
        return 0
 }