1 files changed, 29 insertions, 27 deletions
diff --git a/core/scripts/setup-virtual.sh b/core/scripts/setup-virtual.sh
index 2b27a9f..3583bb6 100644
--- a/core/scripts/setup-virtual.sh
+++ b/core/scripts/setup-virtual.sh
@@ -20,45 +20,51 @@ ConfirmOrExit ()
 }
 
 DEV_NAME=${1}
+IMG=${2}.qcow2
+SIZE=${3}
 CHROOT="/mnt"
 DEV="/dev/${DEV_NAME}"
 
+echo "/srv/qemu/img/${IMG}"
+echo "${SIZE}"
 echo "DEV_NAME=${DEV_NAME}"
 echo "DEV=${DEV}"
 echo "CHROOT=${CHROOT}"
 
 ConfirmOrExit
 
+#qemu-img create -f qcow2 example.qcow2 20G
+qemu-img create -f qcow2 /srv/qemu/img/${IMG} ${SIZE}
+qemu-nbd -c ${DEV} /srv/qemu/img/${IMG}
+
 parted --script ${DEV} \
-        mklabel gpt \
-        unit mib \
-        mkpart primary 1 3 \
-        set 1 bios_grub on \
-        name 1 grub \
-        mkpart ESP fat32 3 59 \
-        set 2 boot on \
-        name 2 efi \
-        mkpart primary ext4 103 200 \
-        name 3 boot \
-        mkpart primary linux-swap 200 456 \
-        name 4 swap \
-        mkpart primary ext4 456 3700 \
-        name 5 root \
-        mkpart primary ext4 3700 4000 \
-        name 6 var \
-        mkpart primary ext4 4000 100% \
-        name 7 home
+    mklabel gpt \
+    unit mib \
+    mkpart primary 2 4 \
+    name 1 grub \
+    mkpart ESP fat32 4 128 \
+    name 2 efi \
+    mkpart primary ext4 128 1128 \
+    name 3 boot \
+    mkpart primary ext4 1128 12128 \
+    name 4 root \
+    mkpart primary ext4 12128 14128 \
+    name 5 var \
+    mkpart primary ext4 14128 100% \
+    name 6 lvm \
+    set 1 bios_grub on \
+    set 2 boot on \
+    set 6 lvm on
 
 kpartx -a -s -l -u ${DEV}
 
 mkfs.fat -F 32  /dev/mapper/${DEV_NAME}p2
 mkfs.ext4       /dev/mapper/${DEV_NAME}p3
-mkswap          /dev/mapper/${DEV_NAME}p4
+mkfs.ext4       /dev/mapper/${DEV_NAME}p4
 mkfs.ext4       /dev/mapper/${DEV_NAME}p5
-mkfs.ext4       /dev/mapper/${DEV_NAME}p6
-mkfs.ext4       /dev/mapper/${DEV_NAME}p7
+pvcreate	/dev/mapper/${DEV_NAME}p6
 
-mount /dev/mapper/${DEV_NAME}p5 $CHROOT
+mount /dev/mapper/${DEV_NAME}p4 $CHROOT
 mkdir -p $CHROOT/proc
 mkdir -p $CHROOT/sys
 mkdir -p $CHROOT/dev
@@ -69,8 +75,4 @@ mount /dev/mapper/${DEV_NAME}p3 $CHROOT/boot
 mkdir -p $CHROOT/boot/efi
 mount /dev/mapper/${DEV_NAME}p2 $CHROOT/boot/efi
 mkdir -p $CHROOT/var
-mount /dev/mapper/${DEV_NAME}p6 $CHROOT/var
-mkdir -p $CHROOT/home
-mount /dev/mapper/${DEV_NAME}p7 $CHROOT/home
-
-
+mount /dev/mapper/${DEV_NAME}p5 $CHROOT/var