From 8e2a1e17a9405e370ed6ae86a6d4a7e898f37e83 Mon Sep 17 00:00:00 2001 From: Pedro Wood Date: Wed, 31 Jan 2018 12:17:42 -0300 Subject: [PATCH 1/9] try to reread partition --- .../single-vm/extensions/linux/format-disk.sh | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 virtual-machines/single-vm/extensions/linux/format-disk.sh diff --git a/virtual-machines/single-vm/extensions/linux/format-disk.sh b/virtual-machines/single-vm/extensions/linux/format-disk.sh new file mode 100644 index 000000000..b43b99847 --- /dev/null +++ b/virtual-machines/single-vm/extensions/linux/format-disk.sh @@ -0,0 +1,20 @@ +# +# format-disk.sh +# +#!/bin/bash + +partprobe +# Format and mount drive +( +echo o +echo n +echo p +echo 1 +echo +echo +echo w +)|fdisk /dev/$1 +partprobe +mkfs -t ext3 /dev/$11 +mkdir /data$2 +mount /dev/$11 /data$2 \ No newline at end of file From 01a67c1d81988166e83b18e3216342337afe66e8 Mon Sep 17 00:00:00 2001 From: Pedro Wood Date: Thu, 1 Feb 2018 09:28:47 -0300 Subject: [PATCH 2/9] test without params --- .../extensions/linux/format-disk.1.sh | 20 +++++++++++++++++++ .../single-vm/extensions/linux/format-disk.sh | 8 ++++---- .../single-vm/extensions/linux/single-vm.sh | 4 ++-- .../parameters/linux/single-vm-v2.json | 6 +++--- 4 files changed, 29 insertions(+), 9 deletions(-) create mode 100644 virtual-machines/single-vm/extensions/linux/format-disk.1.sh diff --git a/virtual-machines/single-vm/extensions/linux/format-disk.1.sh b/virtual-machines/single-vm/extensions/linux/format-disk.1.sh new file mode 100644 index 000000000..ea6f2ef33 --- /dev/null +++ b/virtual-machines/single-vm/extensions/linux/format-disk.1.sh @@ -0,0 +1,20 @@ +# +# format-disk.sh +# +#!/bin/bash + +partprobe +# Format and mount drive +( +echo o +echo n +echo p +echo 1 +echo +echo +echo w +)|fdisk /dev/sdd +partprobe +mkfs -t ext3 /dev/sdd1 +mkdir /data2 +mount /dev/sdd1 /data2 \ No newline at end of file diff --git a/virtual-machines/single-vm/extensions/linux/format-disk.sh b/virtual-machines/single-vm/extensions/linux/format-disk.sh index b43b99847..14073f1d8 100644 --- a/virtual-machines/single-vm/extensions/linux/format-disk.sh +++ b/virtual-machines/single-vm/extensions/linux/format-disk.sh @@ -13,8 +13,8 @@ echo 1 echo echo echo w -)|fdisk /dev/$1 +)|fdisk /dev/sdc partprobe -mkfs -t ext3 /dev/$11 -mkdir /data$2 -mount /dev/$11 /data$2 \ No newline at end of file +mkfs -t ext3 /dev/sdc1 +mkdir /data1 +mount /dev/sdc1 /data1 \ No newline at end of file diff --git a/virtual-machines/single-vm/extensions/linux/single-vm.sh b/virtual-machines/single-vm/extensions/linux/single-vm.sh index 6cfcc6e34..74009eece 100644 --- a/virtual-machines/single-vm/extensions/linux/single-vm.sh +++ b/virtual-machines/single-vm/extensions/linux/single-vm.sh @@ -3,5 +3,5 @@ # #!/bin/bash sh install-apache.sh -sh format-disk.sh sdc 1 -sh format-disk.sh sdd 2 \ No newline at end of file +sh format-disk.sh +sh format-disk.1.sh \ No newline at end of file diff --git a/virtual-machines/single-vm/parameters/linux/single-vm-v2.json b/virtual-machines/single-vm/parameters/linux/single-vm-v2.json index f112bdd9b..f38c81d21 100644 --- a/virtual-machines/single-vm/parameters/linux/single-vm-v2.json +++ b/virtual-machines/single-vm/parameters/linux/single-vm-v2.json @@ -52,8 +52,8 @@ "namePrefix": "ra-single-linux", "computerNamePrefix": "web", "size": "Standard_DS1_v2", - "adminUsername": "", - "sshPublicKey":"", + "adminUsername": "testUser", + "adminPassword": "sdf45F$TGRD", "virtualNetwork": { "name": "ra-single-linux-vm-vnet" }, @@ -85,7 +85,7 @@ "autoUpgradeMinorVersion": true, "settings": { "fileUris": [ - "https://raw.githubusercontent.com/mspnp/reference-architectures/master/scripts/linux/format-disk.sh", + "https://raw.githubusercontent.com/woodp/reference-architectures/woodp/single-vm-linux/virtual-machines/single-vm/extensions/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" ] From 5795c2aaa6be315e7d65684a6a6e551c75cce4a5 Mon Sep 17 00:00:00 2001 From: Pedro Wood Date: Thu, 1 Feb 2018 10:52:42 -0300 Subject: [PATCH 3/9] test with sfdisk --- .../single-vm/extensions/linux/format-disk.1.sh | 10 +--------- .../single-vm/extensions/linux/format-disk.sh | 10 +--------- .../single-vm/parameters/linux/single-vm-v2.json | 1 + 3 files changed, 3 insertions(+), 18 deletions(-) diff --git a/virtual-machines/single-vm/extensions/linux/format-disk.1.sh b/virtual-machines/single-vm/extensions/linux/format-disk.1.sh index ea6f2ef33..bec81a897 100644 --- a/virtual-machines/single-vm/extensions/linux/format-disk.1.sh +++ b/virtual-machines/single-vm/extensions/linux/format-disk.1.sh @@ -5,15 +5,7 @@ partprobe # Format and mount drive -( -echo o -echo n -echo p -echo 1 -echo -echo -echo w -)|fdisk /dev/sdd +echo ';' | sfdisk /dev/sdd partprobe mkfs -t ext3 /dev/sdd1 mkdir /data2 diff --git a/virtual-machines/single-vm/extensions/linux/format-disk.sh b/virtual-machines/single-vm/extensions/linux/format-disk.sh index 14073f1d8..e0a6710c9 100644 --- a/virtual-machines/single-vm/extensions/linux/format-disk.sh +++ b/virtual-machines/single-vm/extensions/linux/format-disk.sh @@ -5,15 +5,7 @@ partprobe # Format and mount drive -( -echo o -echo n -echo p -echo 1 -echo -echo -echo w -)|fdisk /dev/sdc +echo ';' | sfdisk /dev/sdc partprobe mkfs -t ext3 /dev/sdc1 mkdir /data1 diff --git a/virtual-machines/single-vm/parameters/linux/single-vm-v2.json b/virtual-machines/single-vm/parameters/linux/single-vm-v2.json index f38c81d21..3491d7daa 100644 --- a/virtual-machines/single-vm/parameters/linux/single-vm-v2.json +++ b/virtual-machines/single-vm/parameters/linux/single-vm-v2.json @@ -86,6 +86,7 @@ "settings": { "fileUris": [ "https://raw.githubusercontent.com/woodp/reference-architectures/woodp/single-vm-linux/virtual-machines/single-vm/extensions/linux/format-disk.sh", + "https://raw.githubusercontent.com/woodp/reference-architectures/woodp/single-vm-linux/virtual-machines/single-vm/extensions/linux/format-disk.1.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" ] From 93dd84c06645d099d3199e913badcf64dc948d80 Mon Sep 17 00:00:00 2001 From: Pedro Wood Date: Thu, 1 Feb 2018 10:54:49 -0300 Subject: [PATCH 4/9] test with sfdisk --- virtual-machines/single-vm/extensions/linux/format-disk.1.sh | 2 +- virtual-machines/single-vm/extensions/linux/format-disk.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/virtual-machines/single-vm/extensions/linux/format-disk.1.sh b/virtual-machines/single-vm/extensions/linux/format-disk.1.sh index bec81a897..722372a29 100644 --- a/virtual-machines/single-vm/extensions/linux/format-disk.1.sh +++ b/virtual-machines/single-vm/extensions/linux/format-disk.1.sh @@ -8,5 +8,5 @@ partprobe echo ';' | sfdisk /dev/sdd partprobe mkfs -t ext3 /dev/sdd1 -mkdir /data2 +mkdir -p /data2 mount /dev/sdd1 /data2 \ No newline at end of file diff --git a/virtual-machines/single-vm/extensions/linux/format-disk.sh b/virtual-machines/single-vm/extensions/linux/format-disk.sh index e0a6710c9..6f45155b1 100644 --- a/virtual-machines/single-vm/extensions/linux/format-disk.sh +++ b/virtual-machines/single-vm/extensions/linux/format-disk.sh @@ -8,5 +8,5 @@ partprobe echo ';' | sfdisk /dev/sdc partprobe mkfs -t ext3 /dev/sdc1 -mkdir /data1 +mkdir -p /data1 mount /dev/sdc1 /data1 \ No newline at end of file From aebf6951a5d111277d74bee4e13bb94664897167 Mon Sep 17 00:00:00 2001 From: Pedro Wood Date: Thu, 1 Feb 2018 11:26:01 -0300 Subject: [PATCH 5/9] check if already mounted + noreread --- .../single-vm/extensions/linux/format-disk.1.sh | 8 ++++++-- .../single-vm/extensions/linux/format-disk.sh | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/virtual-machines/single-vm/extensions/linux/format-disk.1.sh b/virtual-machines/single-vm/extensions/linux/format-disk.1.sh index 722372a29..aaf06f380 100644 --- a/virtual-machines/single-vm/extensions/linux/format-disk.1.sh +++ b/virtual-machines/single-vm/extensions/linux/format-disk.1.sh @@ -7,6 +7,10 @@ partprobe # Format and mount drive echo ';' | sfdisk /dev/sdd partprobe -mkfs -t ext3 /dev/sdd1 +mkfs -t ext3 /dev/sdd1 --no-reread mkdir -p /data2 -mount /dev/sdd1 /data2 \ No newline at end of file +if grep -qs '/data2' /proc/mounts; then + echo "already mounted." +else + mount /dev/sdc1 /data1 +fi \ No newline at end of file diff --git a/virtual-machines/single-vm/extensions/linux/format-disk.sh b/virtual-machines/single-vm/extensions/linux/format-disk.sh index 6f45155b1..483e4e62a 100644 --- a/virtual-machines/single-vm/extensions/linux/format-disk.sh +++ b/virtual-machines/single-vm/extensions/linux/format-disk.sh @@ -7,6 +7,10 @@ partprobe # Format and mount drive echo ';' | sfdisk /dev/sdc partprobe -mkfs -t ext3 /dev/sdc1 +mkfs -t ext3 /dev/sdc1 --no-reread mkdir -p /data1 -mount /dev/sdc1 /data1 \ No newline at end of file +if grep -qs '/mnt/foo' /proc/mounts; then + echo "already mounted." +else + mount /dev/sdc1 /data1 +fi \ No newline at end of file From 66054e359d9aecbc67004544600996aceefa23b0 Mon Sep 17 00:00:00 2001 From: Pedro Wood Date: Thu, 1 Feb 2018 12:35:15 -0300 Subject: [PATCH 6/9] check if already mounted + noreread --- virtual-machines/single-vm/extensions/linux/format-disk.1.sh | 2 +- virtual-machines/single-vm/extensions/linux/format-disk.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/virtual-machines/single-vm/extensions/linux/format-disk.1.sh b/virtual-machines/single-vm/extensions/linux/format-disk.1.sh index aaf06f380..2d9e6bf8e 100644 --- a/virtual-machines/single-vm/extensions/linux/format-disk.1.sh +++ b/virtual-machines/single-vm/extensions/linux/format-disk.1.sh @@ -7,7 +7,7 @@ partprobe # Format and mount drive echo ';' | sfdisk /dev/sdd partprobe -mkfs -t ext3 /dev/sdd1 --no-reread +mkfs -t ext3 /dev/sdd1 mkdir -p /data2 if grep -qs '/data2' /proc/mounts; then echo "already mounted." diff --git a/virtual-machines/single-vm/extensions/linux/format-disk.sh b/virtual-machines/single-vm/extensions/linux/format-disk.sh index 483e4e62a..df0b2ea13 100644 --- a/virtual-machines/single-vm/extensions/linux/format-disk.sh +++ b/virtual-machines/single-vm/extensions/linux/format-disk.sh @@ -7,9 +7,9 @@ partprobe # Format and mount drive echo ';' | sfdisk /dev/sdc partprobe -mkfs -t ext3 /dev/sdc1 --no-reread +mkfs -t ext3 /dev/sdc1 mkdir -p /data1 -if grep -qs '/mnt/foo' /proc/mounts; then +if grep -qs '/data1' /proc/mounts; then echo "already mounted." else mount /dev/sdc1 /data1 From a57b74111f8b44f0a942711fc88cc021b16c9235 Mon Sep 17 00:00:00 2001 From: Pedro Wood Date: Thu, 1 Feb 2018 13:58:09 -0300 Subject: [PATCH 7/9] merged to single script --- .../single-vm/extensions/linux/single-vm.sh | 26 +++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/virtual-machines/single-vm/extensions/linux/single-vm.sh b/virtual-machines/single-vm/extensions/linux/single-vm.sh index 74009eece..f33252143 100644 --- 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 -sh format-disk.1.sh \ No newline at end of file + +# 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 \ No newline at end of file From 27f79b2df615245e85147ff42f4676207c67e684 Mon Sep 17 00:00:00 2001 From: Pedro Wood Date: Thu, 1 Feb 2018 14:22:18 -0300 Subject: [PATCH 8/9] merged to single script --- .../single-vm/extensions/linux/format-disk.1.sh | 16 ---------------- .../single-vm/extensions/linux/format-disk.sh | 16 ---------------- .../single-vm/parameters/linux/single-vm-v2.json | 2 -- 3 files changed, 34 deletions(-) delete mode 100644 virtual-machines/single-vm/extensions/linux/format-disk.1.sh delete mode 100644 virtual-machines/single-vm/extensions/linux/format-disk.sh diff --git a/virtual-machines/single-vm/extensions/linux/format-disk.1.sh b/virtual-machines/single-vm/extensions/linux/format-disk.1.sh deleted file mode 100644 index 2d9e6bf8e..000000000 --- a/virtual-machines/single-vm/extensions/linux/format-disk.1.sh +++ /dev/null @@ -1,16 +0,0 @@ -# -# format-disk.sh -# -#!/bin/bash - -partprobe -# Format and mount drive -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 \ No newline at end of file diff --git a/virtual-machines/single-vm/extensions/linux/format-disk.sh b/virtual-machines/single-vm/extensions/linux/format-disk.sh deleted file mode 100644 index df0b2ea13..000000000 --- a/virtual-machines/single-vm/extensions/linux/format-disk.sh +++ /dev/null @@ -1,16 +0,0 @@ -# -# format-disk.sh -# -#!/bin/bash - -partprobe -# Format and mount drive -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 \ No newline at end of file diff --git a/virtual-machines/single-vm/parameters/linux/single-vm-v2.json b/virtual-machines/single-vm/parameters/linux/single-vm-v2.json index 3491d7daa..64c8e80d7 100644 --- a/virtual-machines/single-vm/parameters/linux/single-vm-v2.json +++ b/virtual-machines/single-vm/parameters/linux/single-vm-v2.json @@ -85,8 +85,6 @@ "autoUpgradeMinorVersion": true, "settings": { "fileUris": [ - "https://raw.githubusercontent.com/woodp/reference-architectures/woodp/single-vm-linux/virtual-machines/single-vm/extensions/linux/format-disk.sh", - "https://raw.githubusercontent.com/woodp/reference-architectures/woodp/single-vm-linux/virtual-machines/single-vm/extensions/linux/format-disk.1.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" ] From 6e51bd8fc3d3d0fcf5e1b01f00ba1299e8413212 Mon Sep 17 00:00:00 2001 From: Pedro Wood Date: Thu, 1 Feb 2018 14:24:23 -0300 Subject: [PATCH 9/9] minor --- virtual-machines/single-vm/parameters/linux/single-vm-v2.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/virtual-machines/single-vm/parameters/linux/single-vm-v2.json b/virtual-machines/single-vm/parameters/linux/single-vm-v2.json index 64c8e80d7..eb5e3561f 100644 --- a/virtual-machines/single-vm/parameters/linux/single-vm-v2.json +++ b/virtual-machines/single-vm/parameters/linux/single-vm-v2.json @@ -52,8 +52,8 @@ "namePrefix": "ra-single-linux", "computerNamePrefix": "web", "size": "Standard_DS1_v2", - "adminUsername": "testUser", - "adminPassword": "sdf45F$TGRD", + "adminUsername": "", + "sshPublicKey": "", "virtualNetwork": { "name": "ra-single-linux-vm-vnet" },