Reverting to old VHD mount solution.

Author: MatthewMcGlynn

ComputeAdmin/AzureStack.ComputeAdmin.psm1

@@ -440,15 +440,12 @@ function New-Server2016VMImage {
                 }
                 Write-Verbose -Message "Preparing VHD"
 
-                Mount-DiskImage -ImagePath $VHDPath -Passthru
-                $disknum = (Get-DiskImage -ImagePath $VHDPath).Number
-                $VHDDriveLetter = (get-disk -number  $disknum| `
-                Initialize-Disk -PartitionStyle MBR -PassThru | `
-                New-Partition -UseMaximumSize -AssignDriveLetter:$False -IsActive:$true | `
-                Format-Volume -Confirm:$false -FileSystem NTFS -force | `
-                get-partition | `
-                Add-PartitionAccessPath -AssignDriveLetter -PassThru | `
-                get-volume).DriveLetter
+                $VHDMount = Mount-DiskImage -ImagePath $VHDPath -PassThru -ErrorAction Stop
+                $disk = $VHDMount | Get-DiskImage | Get-Disk -ErrorAction Stop
+                $disk | Initialize-Disk -PartitionStyle MBR -ErrorAction Stop
+                $partition = New-Partition -UseMaximumSize -Disknumber $disk.DiskNumber -IsActive:$True -AssignDriveLetter -ErrorAction Stop
+                $volume = Format-Volume -Partition $partition -FileSystem NTFS -confirm:$false -ErrorAction Stop
+                $VHDDriveLetter = $volume.DriveLetter
 
                 Write-Verbose -Message "VHD is mounted at drive letter: $VHDDriveLetter"
 
@@ -481,12 +478,8 @@ function New-Server2016VMImage {
             } catch {
                 Write-Error -ErrorRecord $_ -ErrorAction Stop
             } finally {
-                $retryAttempts = 0;
-                while ((Test-Path -Path "$VHDDriveLetter`:\") -and ($retryAttempts -lt 5)) {
-                    Write-Verbose -Message "Attempting to dismount the VHD..."
-                    Get-DiskImage -ImagePath $VHDPath | Dismount-DiskImage
-                    $retryAttempts = $retryAttempts+1;
-                    sleep 1
+                if ($VHDMount) {
+                    $VHDMount | Dismount-DiskImage
                 }
                 if ($IsoMount) {
                     $IsoMount | Dismount-DiskImage       

ComputeAdmin/README.md

@@ -20,7 +20,7 @@ Adding a VM Image requires that you obtain the GUID value of your Directory Tena
 $aadTenant = Get-AADTenantGUID -AADTenantName "<myaadtenant>.onmicrosoft.com" 
 ```
 
-Otherwise, it can be retrieved directly from your Azure Stack deployment. First, add your host to the list of TrustedHosts:
+Otherwise, it can be retrieved directly from your Azure Stack deployment. This method can also be used for AD FS. First, add your host to the list of TrustedHosts:
 ```powershell
 Set-Item wsman:\localhost\Client\TrustedHosts -Value "<Azure Stack host address>" -Concatenate
 ```
@@ -42,6 +42,8 @@ $ISOPath = "<Path to ISO>"
 New-Server2016VMImage -ISOPath $ISOPath -TenantId $aadTenant  
 ```
 
+This command may show a popup prompt that can be ignored without issue.
+
 To ensure that the Windows Server 2016 VM Image has the latest cumulative update, provide the -IncludeLatestCU parameter.
 
 Please note that to use this image for **installing additional Azure Stack services**, you will need to make use of the -Net35 parameter to install .NET Framework 3.5 into the image.