Add swap to dom0 and the iovm

diff --git a/target/generic/target_xenclient_installer_skeleton/install/stages/Trash-and-install b/target/generic/target_xenclient_installer_skeleton/install/stages/Trash-and-install
index 8acc9f5a290b3ed1ef252d747bc730fa85ecb671..bfcb91189488ca0c55b189293e2d179765fcc2f1 100755 (executable)
--- a/target/generic/target_xenclient_installer_skeleton/install/stages/Trash-and-install
+++ b/target/generic/target_xenclient_installer_skeleton/install/stages/Trash-and-install
@@ -43,6 +43,7 @@ mk_xc_lvm()
     do_cmd vgcreate xenclient "${PARTITION_DEV}" || return 1
     do_cmd lvcreate --name config   --size  12M /dev/xenclient || return 1
     do_cmd lvcreate --name root     --size 250M /dev/xenclient || return 1
+    do_cmd lvcreate --name swap     --size 256M /dev/xenclient || return 1
     do_cmd lvcreate --name "$(basename ${OLD_ROOT_DEV})" --size 250M /dev/xenclient || return 1
     do_cmd lvcreate --name storage -l +90%FREE  /dev/xenclient || return 1
 
@@ -100,7 +101,7 @@ install_dom0()
 {
     DOM0_ROOTFS="$1"
     ROOTFS_TYPE="$2"
-    DISK_DEV="$3"
+    D || return 1ISK_DEV="$3"
     XC_PARTITION="${DISK_DEV}1"
     GRUB_ACTIVE_PARTITION="hd0,1"
 
@@ -108,6 +109,8 @@ install_dom0()
     PERCENT="$(( PERCENT + 10 ))"
     mk_xc_lvm "${XC_PARTITION}" >&2 || return 1
 
+    mkswap "/dev/xenclient/swap" >&2 || return 1
+
     mixedgauge "Writing primary filesystem..." "${PERCENT}"
     PERCENT="$(( PERCENT + 10 ))"
     write_dom0_rootfs "${DOM0_ROOTFS}" "${ROOTFS_TYPE}" "/dev/xenclient/root" >&2 || return 1

diff --git a/target/generic/target_xenclient_installer_skeleton/install/stages/functions b/target/generic/target_xenclient_installer_skeleton/install/stages/functions
index 8a2e6c571457cbc2e3eee2c59f74470125e1bcde..ef0c23d60cb691f48a44a040756166d2ce33d2ef 100644 (file)
--- a/target/generic/target_xenclient_installer_skeleton/install/stages/functions
+++ b/target/generic/target_xenclient_installer_skeleton/install/stages/functions
@@ -367,6 +367,7 @@ install_iovm_rootfs()
     IOVM_FS="$1"
     PACKAGE_TYPE="$2"
     IOVM_DISK_SIZE_IN_MB="500"
+    IOVM_SWAP_SIZE_IN_MB="256"
 
     [ "x${PACKAGE_TYPE}" = "xext2bz2" ] || [ "x${PACKAGE_TYPE}" = "xext3gz" ] || return 1
 
@@ -413,6 +414,11 @@ install_iovm_rootfs()
     cp -f "${IOVM_MOUNT}/boot/vmlinuz" "${IOVM_DIR}"               || iovm_unwind || return 1
     sync
 
+    IOVM_SWAP_VHD="/mnt/xenclient/storage/iovm/iovm-swap.vhd"
+    td-util create vhd "${IOVM_SWAP_SIZE_IN_MB}" "${IOVM_SWAP_VHD}"|| iovm_unwind || return 1
+    IOVM_SWAP_DISK=$(tapdisk2 -n "vhd:${IOVM_SWAP_VHD}")
+    do_cmd mkswap "${IOVM_SWAP_DISK}" >&2                          || iovm_unwind || return 1
+
     iovm_unwind
     return 0
 }