Skip to content

Commit

Permalink
Merge pull request #103 from h4xhor/AUSTA-318
Browse files Browse the repository at this point in the history
AUSTA-318: Bug in step "Overwrite BOOT.WIM with BOOT_CLEANED.WIM on Windows Worker"
  • Loading branch information
jarrodchesney authored Nov 24, 2023
2 parents da6479a + acf647f commit 17acbe8
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 16 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2005,7 +2005,7 @@ <h4 id="mountuefibootwimonwindowsworker">
<div class="row">
<div class="description col px-0">
<p>
<p>In the <code>C:\attuneautomationworker\build-{newOsNode.fqn}</code> folder, mounts <code>".\WinPE_amd64\sources\boot.wim</code> to <code>WinPE_BootImageDir</code> using <code>Dism</code> on Windows Worker.</p>
<p>In the <code>C:\attuneautomationworker\build-{newOsNode.fqn}</code> folder, mounts <code>".\WinPE_amd64\media\sources\boot.wim</code> to <code>WinPE_BootImageDir</code> using <code>Dism</code> on Windows Worker.</p>
</p>
</div>
</div>
Expand Down Expand Up @@ -2451,7 +2451,7 @@ <h4 id="wimlibcompressbootwimonwindowsworker">
<p>A compressed version of <code>BOOT.WIM</code> is generated called <code>BOOT_CLEANED.WIM</code>.</p>
<p>Relative to the <code>C:\attuneautomationworker\build-{newOsNode.fqn}</code> folder:
1. For BIOS boots compresses <code>.\winpe_staging\SOURCES\BOOT.WIM</code> to <code>.\winpe_staging\SOURCES\BOOT_CLEANED.WIM</code>.
2. For UEFI boots compresses <code>.\WinPE_amd64\sources\boot.wim</code> to <code>.\WinPE_amd64\sources\boot_cleaned.wim</code>.</p>
2. For UEFI boots compresses <code>.\WinPE_amd64\media\sources\boot.wim</code> to <code>.\WinPE_amd64\sources\boot_cleaned.wim</code>.</p>
</p>
</div>
</div>
Expand Down Expand Up @@ -2489,8 +2489,8 @@ <h4 id="wimlibcompressbootwimonwindowsworker">
$SourceImageFile = &quot;.\winpe_staging\SOURCES\BOOT.WIM&quot;
$DestinationImageFile = &quot;.\winpe_staging\SOURCES\BOOT_CLEANED.WIM&quot;
} elseif (${{kickstartedBootLoaderIsUefi}}) {
$SourceImageFile = &quot;.\WinPE_amd64\sources\boot.wim&quot;
$DestinationImageFile = &quot;.\WinPE_amd64\sources\boot_cleaned.wim&quot;
$SourceImageFile = &quot;.\WinPE_amd64\media\sources\boot.wim&quot;
$DestinationImageFile = &quot;.\WinPE_amd64\media\sources\boot_cleaned.wim&quot;
} else {
Write-Host &quot;Unknown boot method&quot;
exit 1
Expand Down Expand Up @@ -2564,7 +2564,7 @@ <h4 id="overwritebootwimwithbootcleanedwimonwindowsworker">
if ( ${{isWin10Bios}} -Or ${{isWinServerBios}} ) {
$WINPE_STAGING_SOURCES_DIR=&quot;$ISO_BUILD\build-{newOsNode.fqn}\winpe_staging\SOURCES&quot;
} elseif (${{kickstartedBootLoaderIsUefi}}) {
$WINPE_STAGING_SOURCES_DIR=&quot;$ISO_BUILD\build-{newOsNode.fqn}\WinPE_amd64\sources&quot;
$WINPE_STAGING_SOURCES_DIR=&quot;$ISO_BUILD\build-{newOsNode.fqn}\WinPE_amd64\media\sources&quot;
} else {
Write-Host &quot;Unknown boot method&quot;
exit 1
Expand Down Expand Up @@ -2837,13 +2837,10 @@ <h4 id="createuefibootwinpeisofromwinpeamd64onwindowsworker">
<pre>
<code class="language-sql py-0">
if {kickstartedBootLoaderIsUefi}==true (
echo b

call &quot;C:\Program Files (x86)\Windows Kits\10\Assessment and Deployment Kit\Deployment Tools\DandISetEnv.bat&quot; dir
dir

echo c

cd C:\attuneautomationworker\build-{newOsNode.fqn}
dir

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
if {kickstartedBootLoaderIsUefi}==true (
echo b

call "C:\Program Files (x86)\Windows Kits\10\Assessment and Deployment Kit\Deployment Tools\DandISetEnv.bat" dir
dir

echo c

cd C:\attuneautomationworker\build-{newOsNode.fqn}
dir

Expand Down
2 changes: 1 addition & 1 deletion steps/mountuefibootwimonwindowsworker/README.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
In the `C:\attuneautomationworker\build-{newOsNode.fqn}` folder, mounts `".\WinPE_amd64\sources\boot.wim` to `WinPE_BootImageDir` using `Dism` on Windows Worker.
In the `C:\attuneautomationworker\build-{newOsNode.fqn}` folder, mounts `".\WinPE_amd64\media\sources\boot.wim` to `WinPE_BootImageDir` using `Dism` on Windows Worker.
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ $ISO_BUILD="C:\attuneautomationworker"
if ( ${{isWin10Bios}} -Or ${{isWinServerBios}} ) {
$WINPE_STAGING_SOURCES_DIR="$ISO_BUILD\build-{newOsNode.fqn}\winpe_staging\SOURCES"
} elseif (${{kickstartedBootLoaderIsUefi}}) {
$WINPE_STAGING_SOURCES_DIR="$ISO_BUILD\build-{newOsNode.fqn}\WinPE_amd64\sources"
$WINPE_STAGING_SOURCES_DIR="$ISO_BUILD\build-{newOsNode.fqn}\WinPE_amd64\media\sources"
} else {
Write-Host "Unknown boot method"
exit 1
Expand Down
2 changes: 1 addition & 1 deletion steps/wimlibcompressbootwimonwindowsworker/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ A compressed version of `BOOT.WIM` is generated called `BOOT_CLEANED.WIM`.

Relative to the `C:\attuneautomationworker\build-{newOsNode.fqn}` folder:
1. For BIOS boots compresses `.\winpe_staging\SOURCES\BOOT.WIM` to `.\winpe_staging\SOURCES\BOOT_CLEANED.WIM`.
2. For UEFI boots compresses `.\WinPE_amd64\sources\boot.wim` to `.\WinPE_amd64\sources\boot_cleaned.wim`.
2. For UEFI boots compresses `.\WinPE_amd64\media\sources\boot.wim` to `.\WinPE_amd64\sources\boot_cleaned.wim`.
4 changes: 2 additions & 2 deletions steps/wimlibcompressbootwimonwindowsworker/script.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ if ( ${{isWin10Bios}} -Or ${{isWinServerBios}} ) {
$SourceImageFile = ".\winpe_staging\SOURCES\BOOT.WIM"
$DestinationImageFile = ".\winpe_staging\SOURCES\BOOT_CLEANED.WIM"
} elseif (${{kickstartedBootLoaderIsUefi}}) {
$SourceImageFile = ".\WinPE_amd64\sources\boot.wim"
$DestinationImageFile = ".\WinPE_amd64\sources\boot_cleaned.wim"
$SourceImageFile = ".\WinPE_amd64\media\sources\boot.wim"
$DestinationImageFile = ".\WinPE_amd64\media\sources\boot_cleaned.wim"
} else {
Write-Host "Unknown boot method"
exit 1
Expand Down

0 comments on commit 17acbe8

Please sign in to comment.