diff --git a/entry.sh b/entry.sh
index ae9efb9..82fdb1e 100755
--- a/entry.sh
+++ b/entry.sh
@@ -53,12 +53,17 @@ function first_stage(){
 	pvcreate /dev/mapper/cryptlvm
 	vgcreate vg0 /dev/mapper/cryptlvm
 	
-	echo lvcreate /dev/vg0 --name=root --size=100G
-	lvcreate /dev/vg0 --name=root --size=100G
+	LVM_SIZE=$(dev_size /dev/mapper/cryptlvm)
+	
+	SWAP_SIZE=$(($(mem_size)/1024/1024/1024))
+	ROOT_SIZE=$(($LVM_SIZE/1024/1024/1024-SWAP_SIZE))
+	
+	echo lvcreate /dev/vg0 --name=root --size=${ROOT_SIZE}G
+	lvcreate /dev/vg0 --name=root --size=${ROOT_SIZE}G
 	yes | mkfs.btrfs /dev/vg0/root
 	
-	echo lvcreate /dev/vg0 --name=swap --size=8G
-	lvcreate /dev/vg0 --name=swap --size=8G
+	echo lvcreate /dev/vg0 --name=swap --size=${SWAP_SIZE}G
+	lvcreate /dev/vg0 --name=swap --size=${SWAP_SIZE}G
 	mkswap /dev/vg0/swap
 	swapon /dev/vg0/swap