merge core scripts and qemu revision

4 files changed, 74 insertions, 69 deletions

diff --git a/core/scripts/install-core.sh b/core/scripts/install-core.sh
index d4d6983..d889c8b 100644
--- a/core/scripts/install-core.sh
+++ b/core/scripts/install-core.sh
@@ -55,7 +55,8 @@ install_core() {
     while read line; do
         pkg=${PORT_PKG}/core/${line}
         echo "Installing ${pkg};\n"
-        ${CHROOT}/pkgadd -f -r ${CHROOT} ${pkg}
+        #${CHROOT}/pkgadd -f -r ${CHROOT} ${pkg}
+        pkgadd -f -r ${CHROOT} ${pkg}
     done < ${CORE_LS}
 
     rm ${CHROOT}/pkgadd
@@ -67,7 +68,7 @@ install_core() {
 
 install_packages() {
     echo "Installing $CHROOT/media/crux/opt/fakeroot"
-    $CHROOT/usr/bin/pkgadd -f -r $CHROOT $CHROOT/media/crux/opt/fakeroot#*
+    $CHROOT/usr/bin/pkgadd -f -r $CHROOT ${CHROOT}/media/crux/opt/fakeroot#*
     echo "Installing $CHROOT/media/crux/opt/dbus"
     $CHROOT/usr/bin/pkgadd -f -r $CHROOT $CHROOT/media/crux/opt/dbus#*
     echo "Installing $CHROOT/media/crux/opt/expat"
diff --git a/core/scripts/setup-iso.sh b/core/scripts/setup-iso.sh
index ddad787..ebcd043 100644
--- a/core/scripts/setup-iso.sh
+++ b/core/scripts/setup-iso.sh
@@ -2,6 +2,7 @@
 
 # location of iso and md5 file
 ISO_DIR="/usr/ports/iso"
+MOUNT_POINT="/mnt/media"
 
 ISO_FILE="${ISO_DIR}/crux-3.4.iso"
 MD5_FILE="${ISO_DIR}/crux-3.4.md5"
@@ -70,7 +71,7 @@ mount_iso() {
 
     modprobe isofs
     modprobe loop
-    mount -o loop $ISO_FILE /media
+    mount -o loop $ISO_FILE $MOUNT_POINT
 }
 
 print_data() {
@@ -80,6 +81,7 @@ print_data() {
     echo "md5 file: ${MD5_FILE}"
     echo "iso url: ${ISO_URL}"
     echo "md5 url: ${MD5_URL}"
+    echo "mount point: ${MOUNT_POINT}"
 }
 
 print_help() {
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
diff --git a/tools/qemu.html b/tools/qemu.html
index a6621a1..ede94ed 100644
--- a/tools/qemu.html
+++ b/tools/qemu.html
@@ -43,7 +43,7 @@
         this describes how to create a qcow2 type;</p>
 
         <pre>
-        $ qemu-img create -f qcow2 crux-img.qcow2 2000M
+        $ qemu-img create -f qcow2 crux-img.qcow2 15G
         </pre>
 
         <h3 id="mount">2.1. Mount images</h3>
@@ -63,25 +63,24 @@
         to use parted to create a gpt system table;</p>
 
         <pre>
-        parted --script ${DEV} \
-                mklabel gpt \
-                unit mib \
-                mkpart primary 2 4 \
-                set 1 bios_grub on \
-                name 1 grub \
-                mkpart ESP fat32 4 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
+	parted --script ${DEV} \
+	     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
         </pre>
 
         <pre>
@@ -91,30 +90,31 @@
         <p>Use /dev/mapper/$(name_of_device) to assign correct blocks;</p>
 
         <pre>
-        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}p5
-        mkfs.ext4       /dev/mapper/${DEV_NAME}p6
-        mkfs.ext4       /dev/mapper/${DEV_NAME}p7
+	mkfs.fat -F 32  /dev/mapper/${DEV_NAME}p2
+	mkfs.ext4       /dev/mapper/${DEV_NAME}p3
+	mkfs.ext4       /dev/mapper/${DEV_NAME}p4
+	mkfs.ext4       /dev/mapper/${DEV_NAME}p5
+	pvcreate        /dev/mapper/${DEV_NAME}p6
         </pre>
 
+	<p>Read <a href="lvm.html">lvm</a> documentation on how to setup
+	virtual group and logic volumes.</p>
+
         <p>Mount partition;</p>
 
         <pre>
-        mount /dev/mapper/${DEV_NAME}p5 $CHROOT
-        mkdir -p $CHROOT/proc
-        mkdir -p $CHROOT/sys
-        mkdir -p $CHROOT/dev
-
-        mkdir -p $CHROOT/boot
-        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}p4 $CHROOT
+	mkdir -p $CHROOT/proc
+	mkdir -p $CHROOT/sys
+	mkdir -p $CHROOT/dev
+	mkdir -p $CHROOT/media
+
+	mkdir -p $CHROOT/boot
+	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}p5 $CHROOT/var
         </pre>
 
         <p>Before disconnecting image, clean dev mappings;</p>