Merge pull request #111 from woodp/woodp/single-vm-linux

single vm linux - fix bash script
westerdaled · Feb 8, 2018 · 33634ae · 33634ae
2 parents 807bca5 + 6e51bd8
commit 33634ae
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 4 deletions.
diff --git a/virtual-machines/single-vm/extensions/linux/single-vm.sh b/virtual-machines/single-vm/extensions/linux/single-vm.sh
@@ -3,5 +3,27 @@
 #
 #!/bin/bash
 sh install-apache.sh
-sh format-disk.sh sdc 1
-sh format-disk.sh sdd 2
+
+# Format and mount drive 1
+partprobe
+echo ';' | sfdisk /dev/sdd
+partprobe
+mkfs -t ext3 /dev/sdd1
+mkdir -p /data2
+if grep -qs '/data2' /proc/mounts; then
+    echo "already mounted."
+else
+    mount /dev/sdc1 /data1
+fi
+
+# Format and mount drive 2
+partprobe
+echo ';' | sfdisk /dev/sdc
+partprobe
+mkfs -t ext3 /dev/sdc1
+mkdir -p /data1
+if grep -qs '/data1' /proc/mounts; then
+    echo "already mounted."
+else
+    mount /dev/sdc1 /data1
+fi
diff --git a/virtual-machines/single-vm/parameters/linux/single-vm-v2.json b/virtual-machines/single-vm/parameters/linux/single-vm-v2.json
@@ -53,7 +53,7 @@
             "computerNamePrefix": "web",
             "size": "Standard_DS1_v2",
             "adminUsername": "",
-            "sshPublicKey":"",
+            "sshPublicKey": "",
             "virtualNetwork": {
               "name": "ra-single-linux-vm-vnet"
             },
@@ -85,7 +85,6 @@
                   "autoUpgradeMinorVersion": true,
                   "settings": {
                     "fileUris": [
-                      "https://raw.githubusercontent.com/mspnp/reference-architectures/master/scripts/linux/format-disk.sh",
                       "https://raw.githubusercontent.com/mspnp/reference-architectures/master/scripts/linux/install-apache.sh",
                       "https://raw.githubusercontent.com/mspnp/reference-architectures/master/virtual-machines/single-vm/extensions/linux/single-vm.sh"
                     ]