Merge remote-tracking branch 'origin/pr/41'

* origin/pr/41:
  align volatile swap partition to 1Mb instead of 512b

Fixes QubesOS/qubes-issues#5151
This commit is contained in:
Marek Marczykowski-Górecki 2019-08-02 18:30:06 +02:00
commit 61931747a8
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724

View File

@ -53,7 +53,7 @@ if [ `cat /sys/class/block/$ROOT_DEV/ro` = 1 ] ; then
die "volatile.img smaller than 1GB, cannot continue"
fi
/sbin/sfdisk -q --unit S /dev/xvdc >/dev/null <<EOF
1,$SWAP_SIZE,S
2048,$SWAP_SIZE,S
,,L
EOF
if [ $? -ne 0 ]; then
@ -72,7 +72,7 @@ else
echo "Qubes: Doing R/W setup for TemplateVM..."
while ! [ -e /dev/xvdc ]; do sleep 0.1; done
/sbin/sfdisk -q --unit S /dev/xvdc >/dev/null <<EOF
1,$SWAP_SIZE,S
2048,$SWAP_SIZE,S
EOF
if [ $? -ne 0 ]; then
die "Qubes: failed to setup partitions on volatile device"