Skip to content

Conversation

KatsuhiroWatanabe
Copy link
Contributor

@KatsuhiroWatanabe KatsuhiroWatanabe commented Jun 12, 2025

Summary (Revised on 9/15/2025)

This pull request consolidates previous commits and introduces a comprehensive revision to improve clarity and maintainability.
Rather than adding a new feature, this proposal aims to preserve the current functionality of OSD while improving its customizability for enterprise IT teams.

It introduces support for using custom offline catalog files in OSD deployments, along with enhancements to post-network initialization and module update control.

These changes provide greater flexibility for enterprise IT teams to customize the OSD environment.
At the same time, when automatic module updates are suppressed, IT teams must take responsibility for maintaining catalog files manually.


Background

These patches are designed for scenarios involving Start-OSDCloudGUI.

The OSD module published to the PowerShell Gallery is automatically updated up to four times a day, including refreshed OS and DriverPack catalog files (JSON/XML) stored in the cache folder. Because these catalogs are bundled with the module, running Import-Module -Force by default updates both the PowerShell scripts and the catalog files.

This automation makes it difficult for enterprise IT teams to customize and test the OSD module, as any local modifications are overwritten by the latest version from the PowerShell Gallery.

To address this, the update introduces mechanisms to override default catalogs and suppress automatic module updates.


Key Enhancements

1. Offline Catalog Override

Affected files:

  • Get-OSDCloudDriverPacks.ps1
  • Get-OSDCloudOperatingSystems.ps1
  • Get-OSDCloudOperatingSystemsIndexMap.ps1
  • Get-OSDCloudOperatingSystemsIndexes.ps1

When the USB\OSDCloud\Catalogs folder is present, these patched scripts prioritize user-defined catalog files over the default cache.


2. URL Validation via curl

Affected file:

  • Save-WebFile.ps1

To ensure reliability, a validation step checks the accessibility of URLs in custom catalogs using curl. This helps prevent deployment failures due to outdated or unreachable resources.


3. Post-Network Script Execution & Suppression of Auto Module Update

Affected files:

  • Initialize-OSDCloudStartnet.ps1

  • OSDCloudTemplate.ps1

  • A custom PowerShell script can now be executed after a network connection is established (Wi-Fi or Ethernet).

  • The script location is defined via a new template variable pointing to OSDCloud\Config\StartNet2.

  • Automatic module updates can be disabled by setting "OSDAutoUpdate": false in OSDCloud\Config\Initialize-OSDCloudStartnet.json.

These features allow enterprise IT teams to maintain control over catalog sources and deployment behavior.


4. Non-Intrusive Design

All enhancements are opt-in. Default behavior remains unchanged unless the relevant folders or configuration files are explicitly provided, ensuring full backward compatibility.


Integration Notes

This PR includes cherry-picked changes from [PR #288](https://github.comintegration with existing startup logic.


Revision History

Date Description
2025-07-21 cherry-picked feature/InintStartNet2 (PR:#288), for integration
2025-09-15 revised with consolidated commits and full rewrite of PR description

@skyblaster
Copy link
Contributor

skyblaster commented Jun 25, 2025

This looks excellent, and since you're only excluding C: from the search path, it should work with network boot scenarios where no USB drive is present (ie. embedded in the boot.wim at X:\OSDCloud\Catalogs).

I would love to be able to define custom paths such as the following, and then leverage the "not yet implemented" cache host variable (see #272), which looks like something we could do with this patch:
"Url": "{HOSTNAME}/OSDCloud/OS/24H2-latest.wim"

@KatsuhiroWatanabe
Copy link
Contributor Author

Thank you for the feedback!

Originally, since the current OSD reloads catalog files from the cache under the module path, we wanted an option to use only company-validated catalogs (Drivers and ESDs) stored in a different location, rather than relying solely on the default module path.

While the OSD module regularly updates cached catalog files via GitHub Actions—allowing us to always use the latest versions—there is currently no way to specify and use a particular version of a catalog file.

That’s why I proposed this pull request: to optionally allow importing catalog files from drives (excluding C:) under the \OSDCloud\Catalogs path.

As you pointed out, this also enables scenarios where the catalog is embedded in the boot.wim (e.g., at X:\OSDCloud\Catalogs) or stored on USB devices. The object list will be generated from the last successfully loaded catalog file, so you can take advantage of this behavior if it fits your use case.

Our ultimate goal is to host validated catalog files either on USB or online, and always use the latest version from those sources.

I’m also planning to propose another pull request to:
Add an option to disable automatic updates of the OSD module (to prevent overwriting custom code), and
Support optional PowerShell script execution after network connection (e.g., to download company-maintained catalogs from the internet).

We don’t necessarily expect this pull request to be merged as-is, since we are already operating with a patched custom version internally. However, we would greatly appreciate it if equivalent functionality could be considered for inclusion in the official OSD module.

@KatsuhiroWatanabe KatsuhiroWatanabe force-pushed the feature/support_offline_catalog branch from d408f92 to 60c1fb6 Compare July 4, 2025 00:06
@KatsuhiroWatanabe KatsuhiroWatanabe force-pushed the feature/support_offline_catalog branch from 60c1fb6 to 1f090f0 Compare July 16, 2025 06:39
@KatsuhiroWatanabe KatsuhiroWatanabe changed the title Pull Request (Reposted) : Add Support for Offline Catalog Files in OSD Software (Feature/support offline catalog) Reposted : Add Support for Offline Catalog Files in OSD (Feature/support_offline_catalog) Jul 16, 2025
@skyblaster
Copy link
Contributor

skyblaster commented Jul 19, 2025

Hi @KatsuhiroWatanabe, do you happen to have an example user defined OS catalog you could share?
Have you tested it with the new GUI in OSD.Workspace invoked by Start-OSDCloudWorkflow or only with Start-OSDCloudGUI?

EDIT: Sorry for the dumb question. I see this PR is geared towards OSDCloud v1.
The new functions appear to be Get-OSDCatalogOperatingSystems and Get-OSDCatalogDriverPacks

@KatsuhiroWatanabe
Copy link
Contributor Author

Hi @skyblaster,

Thanks for your comment!

Yes, I can share an example of a user-defined OS catalog. It's a very simple one — just a modified version of the original JSON (cache\archive-cloudoperatingsystems\cache\archive-cloudoperatingsystems) with updated values for the OS download URL and SHA1 hash. Since it's quite straightforward, I didn’t include it here, but I’d be happy to upload it if needed.
(In our case, we had to patch the ja-jp.esd, so we tweaked the JSON and uploaded the patched ESD to our Azure Blob. At this moment, the issue is resolved by using Config/Scripts/Startup/Shutdown scripts.)

Also, the catalog should work with both ESD and WIM files. If the image contains only a single edition, OSD defaults to using Index=1, so there's no need to specify the index manually in that case.

As you mentioned, this PR is specifically for OSDCloud v1, and it's designed to work with Start-OSDCloudGUI.

Thanks for pointing out the new GUI in OSD.Workspace invoked via Start-OSDCloudWorkflow — this is new to me, and I’ll definitely look into it further.

Appreciate your feedback as always!

@KatsuhiroWatanabe
Copy link
Contributor Author

KatsuhiroWatanabe commented Jul 21, 2025

Update: Integrated Enhancements from feature/InintStartNet2 (PR:#288)

This PR now includes additional enhancements originally proposed in feature/InintStartNet2 (PR:#288), cherry-picked for integration:

  • Post-Network Script Execution: Enables execution of a custom script after network initialization.
  • Optional Suppression of Module Auto-Update: Prevents automatic updates of OSD modules when explicitly disabled via configuration.

These additions complement the offline catalog support introduced in this PR, enabling more deterministic and customizable OSDCloud initialization workflows—especially in offline or controlled environments.

By integrating both, we provide a more complete solution for environments requiring strict control over OSD behavior.

Note: feature/InintStartNet2 remains unchanged and will be reviewed separately. This integration is intended to accelerate adoption of both features in scenarios where they are used together.

@KatsuhiroWatanabe
Copy link
Contributor Author

Hi @OSDeploy,

Following up on this PR (originally submitted as #278, which was later replaced) and also #288, which builds on this one. I understand things can get busy, so I just wanted to check in and see if there's anything I can do to assist with the review process.

I've been continuously rebasing this branch onto the latest master to keep it up to date and mergeable, using --force-with-lease to maintain a clean and consistent history. Please let me know if any further changes are needed.

Just to clarify — this PR does not alter existing behavior unless the new functionality is explicitly enabled through additional configuration. It should be safe to merge without impacting current users, and I hope it can be considered for inclusion.

Appreciate all your work on the project!

@KatsuhiroWatanabe KatsuhiroWatanabe force-pushed the feature/support_offline_catalog branch from f809af0 to 5190ff1 Compare August 4, 2025 03:08
@KatsuhiroWatanabe
Copy link
Contributor Author

Hi @OSDeploy,

I've been continuously rebasing this branch onto the latest master to keep it up to date and mergeable. Please let me know if any further changes are needed.

@KatsuhiroWatanabe KatsuhiroWatanabe force-pushed the feature/support_offline_catalog branch from 5190ff1 to 0f89962 Compare August 15, 2025 08:18
@KatsuhiroWatanabe
Copy link
Contributor Author

Hi @OSDeploy,

I've been continuously rebasing this branch onto the latest master to keep it up to date and mergeable. Please let me know if any further changes are needed.

@KatsuhiroWatanabe KatsuhiroWatanabe force-pushed the feature/support_offline_catalog branch from 0f89962 to a0d1f92 Compare September 8, 2025 05:10
@KatsuhiroWatanabe
Copy link
Contributor Author

Hi @OSDeploy,

I've been continuously rebasing this branch onto the latest master to keep it up to date and mergeable. Please let me know if any further changes are needed.

@KatsuhiroWatanabe KatsuhiroWatanabe force-pushed the feature/support_offline_catalog branch from a0d1f92 to 36cd6d8 Compare September 15, 2025 00:59
@KatsuhiroWatanabe
Copy link
Contributor Author

I've been continuously rebasing this branch onto the latest master to keep it up to date and mergeable. Please let me know if any further changes are needed.

…tion, and improve download reliability

- Add support for importing offline OS catalogs in
  - Get-OSDCloudOperatingSystems.ps1
  - Get-OSDCloudOperatingSystemsIndexMap.ps1
  - Get-OSDCloudOperatingSystemsIndexes.ps1
- Add offline driver catalog support in OSDCloud.DriverPack.ps1
- Add post-network script execution and optional supression of module auto-update in
  - Initialize-OSDCloudStartNet.ps1
  - OSDCloudTemplate.ps1
- Improve Save-WebFile.ps1 by checking HTTP headers before download
@KatsuhiroWatanabe KatsuhiroWatanabe force-pushed the feature/support_offline_catalog branch from 36cd6d8 to a254275 Compare September 15, 2025 03:22
@KatsuhiroWatanabe
Copy link
Contributor Author

KatsuhiroWatanabe commented Sep 15, 2025

Hi @OSDeploy,
To simplify the commit history and make the PR easier to review, I’ve squashed the commits into a single one and force-pushed the branch using --force-with-lease. The PR remains unchanged in terms of functionality.
In addition, I’ve completely revised the PR description to reflect the consolidated changes and clarify the purpose and scope of this update.
Please take a moment to review the updated description when convenient.

@KatsuhiroWatanabe
Copy link
Contributor Author

KatsuhiroWatanabe commented Sep 17, 2025

I have reopened this pull request as I mistakenly closed PR #284 instead of PR #288.
While @OSDeploy has indicated that this feature may not be adopted, I’ve decided to keep this pull request open for potential future consideration.
This request is not intended to add a new feature, but rather to preserve the current functionality of OSD while improving its customizability for users.
I hope this proposal can be reconsidered as a way to offer more flexibility without disrupting the existing behavior.

@KatsuhiroWatanabe KatsuhiroWatanabe changed the title Reposted : Add Support for Offline Catalog Files in OSD (Feature/support_offline_catalog) Suggestion: Decoupling OSD from Auto-Updating Modules to Enhance Customization Sep 17, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants