fi
if [ $ask -gt 0 ]; then
+ info "luksOpen $1 $2"
# flock against other interactive activities
{ flock -s 9;
/bin/plymouth ask-for-password \
# mark device as asked
>> /tmp/cryptroot-asked-$2
+udevsettle
+
unset LUKS
unset ask
unset luks
fi
if [ $ask -gt 0 ]; then
+ info "luksOpen $1 $2"
# flock against other interactive activities
{ flock -s 9;
echo -n "$1 is password protected "
- /sbin/cryptsetup luksOpen -T1 $1 $2
+ /sbin/cryptsetup luksOpen -T1 $1 $2
} 9>/.console.lock
fi
# mark device as asked
>> /tmp/cryptroot-asked-$2
+udevsettle
+
exit 0
if [ "${s##$r}" != "$s" ]; then
info "Activating $s"
dmraid -ay $s 2>&1 | vinfo
+ udevsettle
fi
done
done
else
# scan and activate all DM RAIDS
dmraid -ay 2>&1 | vinfo
+ udevsettle
fi
fi
printf '"a|^/dev/%s$|", ' $dev;
done;
echo '"r/.*/" ]';
- echo 'types = [ "blkext", 1024 ]'
+ echo 'types = [ "blkext", 1024 , "cciss0", 1024 ]'
echo '}';
} > /etc/lvm/lvm.conf
lvmwritten=1
lvm vgchange -ay $VGS 2>&1 | vinfo
[ "$lvmwritten" ] && rm -f /etc/lvm/lvm.conf
unset lvmwritten
+ udevsettle
fi
done < $file
return 1
}
+
+udevsettle() {
+ if [ $UDEVVERSION -ge 143 ]; then
+ udevadm settle --exit-if-exists=/initqueue/work --exit-if-exists=/dev/root
+ else
+ udevadm settle --timeout=30
+ fi
+}
# check if root can be mounted
[ -e /dev/root ] && break;
- if [ $UDEVVERSION -ge 143 ]; then
- udevadm settle --exit-if-exists=/initqueue/work --exit-if-exists=/dev/root
- else
- udevadm settle --timeout=30
- fi
+ udevsettle
# bail out, if we have mounted the root filesystem
[ -d "$NEWROOT/proc" ] && break;