Merge d3653b1b30 into 333534096e

agent/windows-setup-agent/SetupWizard.cs

@@ -219,6 +219,7 @@ namespace Icinga
 			args += " --trustedcert \"" + _TrustedFile + "\"";
 			args += " --cn \"" + txtInstanceName.Text.Trim() + "\"";
 			args += " --zone \"" + txtInstanceName.Text.Trim() + "\"";
+			args += " --parent_zone \"" + txtParentZone.Text.Trim() + "\"";
 
 			foreach (ListViewItem lvi in lvwGlobalZones.Items) {
 				args += " --global_zones " + lvi.SubItems[0].Text.Trim();
@@ -318,6 +319,12 @@ namespace Icinga
 					return;
 				}
 
+				if (txtParentZone.Text.Length == 0)
+				{
+					Warning("Please specify the parent zone.");
+					return;
+				}
+
 				if (lvwEndpoints.Items.Count == 0) {
 					Warning("You need to add at least one master/satellite endpoint.");
 					return;