From 8311e1263d5dfe81ced6e8799db05e8dc0057b0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Fri, 13 Nov 2015 14:42:51 +0100 Subject: [PATCH] initramfs: fix swap size It should be 1GB, not 1MB... QubesOS/qubes-issues#1354 --- dracut/full-dmroot/qubes_cow_setup.sh | 2 +- dracut/simple/init.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dracut/full-dmroot/qubes_cow_setup.sh b/dracut/full-dmroot/qubes_cow_setup.sh index 697f604..78d3c2b 100644 --- a/dracut/full-dmroot/qubes_cow_setup.sh +++ b/dracut/full-dmroot/qubes_cow_setup.sh @@ -62,7 +62,7 @@ if [ `cat /sys/block/xvda/ro` = 1 ] ; then while ! [ -e /dev/xvdc ]; do sleep 0.1; done VOLATILE_SIZE=$(sfdisk -s /dev/xvdc) ROOT_SIZE=$(sfdisk -s /dev/xvda) # kbytes - SWAP_SIZE=1024 # kbytes + SWAP_SIZE=$(( 1024 * 1024 )) # kbytes if [ $VOLATILE_SIZE -lt $(($ROOT_SIZE + $SWAP_SIZE)) ]; then ROOT_SIZE=$(($VOLATILE_SIZE - $SWAP_SIZE)) fi diff --git a/dracut/simple/init.sh b/dracut/simple/init.sh index adc525c..201b7e4 100644 --- a/dracut/simple/init.sh +++ b/dracut/simple/init.sh @@ -21,7 +21,7 @@ if [ `cat /sys/block/xvda/ro` = 1 ] ; then while ! [ -e /dev/xvdc ]; do sleep 0.1; done VOLATILE_SIZE=$(sfdisk -s /dev/xvdc) ROOT_SIZE=$(sfdisk -s /dev/xvda) # kbytes - SWAP_SIZE=1024 # kbytes + SWAP_SIZE=$(( 1024 * 1024 )) # kbytes if [ $VOLATILE_SIZE -lt $(($ROOT_SIZE + $SWAP_SIZE)) ]; then ROOT_SIZE=$(($VOLATILE_SIZE - $SWAP_SIZE)) fi