You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by jb...@apache.org on 2018/11/23 05:33:49 UTC
[geode-native] branch develop updated (fa3fa86 -> e1745d6)
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/geode-native.git.
from fa3fa86 Revert "GEODE-3036: Fix Powershell XML code for drive letter configuration"
new f348adb Revert "Revert "GEODE-3036: Fix Powershell XML code for drive letter configuration""
new e1745d6 Revert "Revert "GEODE-3036: Make script safe to run multiple times""
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
packer/windows/setup-ec2config.ps1 | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
[geode-native] 01/02: Revert "Revert "GEODE-3036: Fix Powershell
XML code for drive letter configuration""
Posted by jb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode-native.git
commit f348adb3dcdfb0829772d73c016b3ee699b18f00
Author: Jacob Barrett <jb...@pivotal.io>
AuthorDate: Thu Nov 22 10:17:38 2018 -0800
Revert "Revert "GEODE-3036: Fix Powershell XML code for drive letter configuration""
This reverts commit fa3fa86dcb8688f39a5abe43cf01834c5f0e3f42.
---
packer/windows/setup-ec2config.ps1 | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/packer/windows/setup-ec2config.ps1 b/packer/windows/setup-ec2config.ps1
index 0851e64..7ce7cdb 100644
--- a/packer/windows/setup-ec2config.ps1
+++ b/packer/windows/setup-ec2config.ps1
@@ -21,6 +21,9 @@ $ec2config = [xml] (get-content 'C:\Program Files\Amazon\Ec2ConfigService\Settin
($ec2config.ec2configurationsettings.plugins.plugin | where {$_.name -eq "Ec2EventLog"}).state = "Enabled"
$ec2config.save("C:\Program Files\Amazon\Ec2ConfigService\Settings\config.xml")
$ec2DiskConfig = [xml] (get-content 'C:\Program Files\Amazon\Ec2ConfigService\Settings\DriveLetterConfig.xml')
-($ec2DiskConfig.DriveLetterMapping.Mapping.VolumeName).state = "Temporary Storage 0"
-($ec2DiskConfig.DriveLetterMapping.Mapping.DriveLetter).state = "D:"
+$mappingElement = $ec2DiskConfig.SelectNodes("DriveLetterMapping")[0].AppendChild($ec2DiskConfig.CreateElement("Mapping"))
+$volumeNameElement = $mappingElement.AppendChild($ec2DiskConfig.CreateElement("VolumeName"))
+$volumeName = $volumeNameElement.AppendChild($ec2DiskConfig.CreateTextNode("Temporary Storage 0"))
+$driveLetterElement = $mappingElement.AppendChild($ec2DiskConfig.CreateElement("DriveLetter"))
+$driveLetter = $driveLetterElement.AppendChild($ec2DiskConfig.CreateTextNode("D:"))
$ec2DiskConfig.save("C:\Program Files\Amazon\Ec2ConfigService\Settings\DriveLetterConfig.xml")
[geode-native] 02/02: Revert "Revert "GEODE-3036: Make script safe
to run multiple times""
Posted by jb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode-native.git
commit e1745d62ce7ca43f10d77244c6f3fa040538542e
Author: Jacob Barrett <jb...@pivotal.io>
AuthorDate: Thu Nov 22 21:32:47 2018 -0800
Revert "Revert "GEODE-3036: Make script safe to run multiple times""
This reverts commit 706417b6ee2ff26dece6f3f8e1d2cd6101314fde.
---
packer/windows/setup-ec2config.ps1 | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/packer/windows/setup-ec2config.ps1 b/packer/windows/setup-ec2config.ps1
index 7ce7cdb..028b31c 100644
--- a/packer/windows/setup-ec2config.ps1
+++ b/packer/windows/setup-ec2config.ps1
@@ -21,9 +21,12 @@ $ec2config = [xml] (get-content 'C:\Program Files\Amazon\Ec2ConfigService\Settin
($ec2config.ec2configurationsettings.plugins.plugin | where {$_.name -eq "Ec2EventLog"}).state = "Enabled"
$ec2config.save("C:\Program Files\Amazon\Ec2ConfigService\Settings\config.xml")
$ec2DiskConfig = [xml] (get-content 'C:\Program Files\Amazon\Ec2ConfigService\Settings\DriveLetterConfig.xml')
-$mappingElement = $ec2DiskConfig.SelectNodes("DriveLetterMapping")[0].AppendChild($ec2DiskConfig.CreateElement("Mapping"))
-$volumeNameElement = $mappingElement.AppendChild($ec2DiskConfig.CreateElement("VolumeName"))
-$volumeName = $volumeNameElement.AppendChild($ec2DiskConfig.CreateTextNode("Temporary Storage 0"))
-$driveLetterElement = $mappingElement.AppendChild($ec2DiskConfig.CreateElement("DriveLetter"))
-$driveLetter = $driveLetterElement.AppendChild($ec2DiskConfig.CreateTextNode("D:"))
-$ec2DiskConfig.save("C:\Program Files\Amazon\Ec2ConfigService\Settings\DriveLetterConfig.xml")
+$mappingElement = $ec2DiskConfig.SelectNodes("DriveLetterMapping")[0].Mapping;
+if (!$mappingElement) {
+ $mappingElement = $ec2DiskConfig.SelectNodes("DriveLetterMapping")[0].AppendChild($ec2DiskConfig.CreateElement("Mapping"))
+ $volumeNameElement = $mappingElement.AppendChild($ec2DiskConfig.CreateElement("VolumeName"))
+ $volumeName = $volumeNameElement.AppendChild($ec2DiskConfig.CreateTextNode("Temporary Storage 0"))
+ $driveLetterElement = $mappingElement.AppendChild($ec2DiskConfig.CreateElement("DriveLetter"))
+ $driveLetter = $driveLetterElement.AppendChild($ec2DiskConfig.CreateTextNode("D:"))
+ $ec2DiskConfig.save("C:\Program Files\Amazon\Ec2ConfigService\Settings\DriveLetterConfig.xml")
+}
\ No newline at end of file