Skip to content

Commit

Permalink
setup-rwdev.sh: Only check first 1 GiB for zeros
Browse files Browse the repository at this point in the history
As described in QubesOS/qubes-issues#3758, a VM may fail to start
if the volume is large. This because the whole volume is read to
ensure it's empty (=all zeros).

This changes limits the check to the first 1 GiB of the private
volume. As additional safety, a scan with blkid is done.

Fixes QubesOS/qubes-issues#3758
  • Loading branch information
pgerber committed Jul 3, 2018
1 parent 7d783b3 commit 8ff9cbe
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions init/setup-rwdev.sh
Expand Up @@ -3,13 +3,17 @@
set -e

dev=/dev/xvdb
max_size=1073741824 # check at most 1 GiB

if [ -e "$dev" ] ; then
# The private /dev/xvdb device is present.

# check if private.img (xvdb) is empty - all zeros
private_size_512=$(blockdev --getsz "$dev")
if head -c $(( private_size_512 * 512 )) /dev/zero | diff "$dev" - >/dev/null; then
private_size=$(( $(blockdev --getsz "$dev") * 512))
if [ $private_size -gt $max_size ]; then
private_size=$max_size
fi
if cmp --bytes $private_size "$dev" /dev/zero >/dev/null && { blkid -p "$dev" >/dev/null; [ $? -eq 2 ]; }; then
# the device is empty, create filesystem
echo "Virgin boot of the VM: creating private.img filesystem on $dev" >&2
if ! content=$(mkfs.ext4 -m 0 -q "$dev" 2>&1) ; then
Expand Down

0 comments on commit 8ff9cbe

Please sign in to comment.