partition full volatile for non-COW setups too

(cherry picked from commit 699e10c057)
This commit is contained in:
xaki23 2019-09-24 22:40:10 +02:00 committed by Marek Marczykowski-Górecki
parent 484f67a618
commit ac13973ded
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
2 changed files with 8 additions and 6 deletions

View File

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

View File

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