Moar disk.

diff --git a/hador20-1.sh b/hador20-1.sh
index 08fc9b4..0c79435 100644 (file)
--- a/hador20-1.sh
+++ b/hador20-1.sh
@@ -13,4 +13,5 @@ export SIZE_ROOTFS="300G"
 export SIZE_SWAP="0"
 export SIZE_MEM="61440"
 export SIZE_CPU="8"
-export DISKS="/dev/sda /dev/sdb /dev/sdc /dev/sdd /dev/sde /dev/sdf"
+export DISKS="/dev/sda /dev/sdb /dev/sdc /dev/sdd /dev/sde /dev/sdf /dev/sdg /dev/sdh /dev/sdk /dev/sdl /dev/sdm /dev/sdn"
+export DISK_SUBDIR="/virt-1"

diff --git a/hador20-2.sh b/hador20-2.sh
index e2ae5fb..7fd6cbf 100644 (file)
--- a/hador20-2.sh
+++ b/hador20-2.sh
@@ -14,3 +14,4 @@ export SIZE_SWAP="0"
 export SIZE_MEM="61440"
 export SIZE_CPU="8"
 export DISKS="/dev/sdg /dev/sdh /dev/sdk /dev/sdl /dev/sdm /dev/sdn"
+export DISK_SUBDIR="/virt-2"

diff --git a/hador21-1.sh b/hador21-1.sh
index 180b012..56823fa 100644 (file)
--- a/hador21-1.sh
+++ b/hador21-1.sh
@@ -13,4 +13,5 @@ export SIZE_ROOTFS="300G"
 export SIZE_SWAP="0"
 export SIZE_MEM="61440"
 export SIZE_CPU="8"
-export DISKS="/dev/sda /dev/sdb /dev/sdc /dev/sdd /dev/sde /dev/sdf"
+export DISKS="/dev/sda /dev/sdb /dev/sdc /dev/sdd /dev/sde /dev/sdf /dev/sdg /dev/sdh /dev/sdk /dev/sdl /dev/sdm /dev/sdn"
+export DISK_SUBDIR="/virt-1"

diff --git a/hador21-2.sh b/hador21-2.sh
index 089a8a5..4e4b1f0 100644 (file)
--- a/hador21-2.sh
+++ b/hador21-2.sh
@@ -14,3 +14,4 @@ export SIZE_SWAP="0"
 export SIZE_MEM="61440"
 export SIZE_CPU="8"
 export DISKS="/dev/sdg /dev/sdh /dev/sdk /dev/sdl /dev/sdm /dev/sdn"
+export DISK_SUBDIR="/virt-2"

diff --git a/hador22-1.sh b/hador22-1.sh
index b81f785..fa760a4 100644 (file)
--- a/hador22-1.sh
+++ b/hador22-1.sh
@@ -13,4 +13,5 @@ export SIZE_ROOTFS="300G"
 export SIZE_SWAP="0"
 export SIZE_MEM="61440"
 export SIZE_CPU="8"
-export DISKS="/dev/sda /dev/sdb /dev/sdc /dev/sdd /dev/sde /dev/sdf"
+export DISKS="/dev/sda /dev/sdb /dev/sdc /dev/sdd /dev/sde /dev/sdf /dev/sdg /dev/sdh /dev/sdk /dev/sdl /dev/sdm /dev/sdn"
+export DISK_SUBDIR="/virt-1"

diff --git a/hador22-2.sh b/hador22-2.sh
index f24646c..5be4ef9 100644 (file)
--- a/hador22-2.sh
+++ b/hador22-2.sh
@@ -14,3 +14,4 @@ export SIZE_SWAP="0"
 export SIZE_MEM="61440"
 export SIZE_CPU="8"
 export DISKS="/dev/sdg /dev/sdh /dev/sdk /dev/sdl /dev/sdm /dev/sdn"
+export DISK_SUBDIR="/virt-2"

diff --git a/hador23-1.sh b/hador23-1.sh
index 63779bd..6e99e13 100644 (file)
--- a/hador23-1.sh
+++ b/hador23-1.sh
@@ -13,4 +13,5 @@ export SIZE_ROOTFS="300G"
 export SIZE_SWAP="0"
 export SIZE_MEM="61440"
 export SIZE_CPU="8"
-export DISKS="/dev/sda /dev/sdb /dev/sdc /dev/sdd /dev/sde /dev/sdf"
+export DISKS="/dev/sda /dev/sdb /dev/sdc /dev/sdd /dev/sde /dev/sdf /dev/sdg /dev/sdh /dev/sdk /dev/sdl /dev/sdm /dev/sdn"
+export DISK_SUBDIR="/virt-1"

diff --git a/hador23-2.sh b/hador23-2.sh
index 43bf29a..74d9af1 100644 (file)
--- a/hador23-2.sh
+++ b/hador23-2.sh
@@ -14,3 +14,4 @@ export SIZE_SWAP="0"
 export SIZE_MEM="61440"
 export SIZE_CPU="8"
 export DISKS="/dev/sdg /dev/sdh /dev/sdk /dev/sdl /dev/sdm /dev/sdn"
+export DISK_SUBDIR="/virt-2"

diff --git a/hador24-1.sh b/hador24-1.sh
index 8bfdbbf..b764dc2 100644 (file)
--- a/hador24-1.sh
+++ b/hador24-1.sh
@@ -13,4 +13,5 @@ export SIZE_ROOTFS="300G"
 export SIZE_SWAP="0"
 export SIZE_MEM="61440"
 export SIZE_CPU="8"
-export DISKS="/dev/sda /dev/sdb /dev/sdc /dev/sdd /dev/sde /dev/sdf"
+export DISKS="/dev/sda /dev/sdb /dev/sdc /dev/sdd /dev/sde /dev/sdf /dev/sdg /dev/sdh /dev/sdk /dev/sdl /dev/sdm /dev/sdn"
+export DISK_SUBDIR="/virt-1"

diff --git a/hador24-2.sh b/hador24-2.sh
index 7ac41d9..697b244 100644 (file)
--- a/hador24-2.sh
+++ b/hador24-2.sh
@@ -14,3 +14,4 @@ export SIZE_SWAP="0"
 export SIZE_MEM="61440"
 export SIZE_CPU="8"
 export DISKS="/dev/sdg /dev/sdh /dev/sdk /dev/sdl /dev/sdm /dev/sdn"
+export DISK_SUBDIR="/virt-2"

diff --git a/lxc.sh b/lxc.sh
index cd34e43..dc1294e 100755 (executable)
--- a/lxc.sh
+++ b/lxc.sh
@@ -114,12 +114,17 @@ xml() {
                for d in ${DISKS}; do
                        XML_DISK="${XML_DISK}
         <filesystem type='mount' accessmode='passthrough'>
-          <source dir='/data/${src_i}'/>
+          <source dir='/data/${src_i}${DISK_SUBDIR}'/>
           <target dir='/data/${i}'/>
         </filesystem>"
                        i=$((i+1))
                        src_i=$((src_i+1))
                done
+               XML_DISK="${XML_DISK}
+        <filesystem type='mount' accessmode='passthrough'>
+          <source dir='/scratch${DISK_SUBDIR}'/>
+          <target dir='/scratch'/>
+        </filesystem>"
     fi
        if [ -n "${XENBR}" ]; then
                XML_NET="