From e3ff42862056d3e7ac45a9a03ac7d062b3165360 Mon Sep 17 00:00:00 2001 From: Manuel Thalmann Date: Fri, 14 Jul 2023 09:24:13 +0200 Subject: [PATCH] Allow driver installation during setup --- profiles/DerGeret/Windows/Restore.ps1 | 1 + scripts/Windows/OS/Install.ps1 | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/profiles/DerGeret/Windows/Restore.ps1 b/profiles/DerGeret/Windows/Restore.ps1 index f6d9c202..f9fa93aa 100644 --- a/profiles/DerGeret/Windows/Restore.ps1 +++ b/profiles/DerGeret/Windows/Restore.ps1 @@ -1,4 +1,5 @@ #!/bin/pwsh +. "$PSScriptRoot/Drivers.ps1"; . "$PSScriptRoot/../../../scripts/Windows/Scripts/Prerequisites.ps1"; . "$PSScriptRoot/../../../scripts/Windows/Scripts/Context.ps1"; diff --git a/scripts/Windows/OS/Install.ps1 b/scripts/Windows/OS/Install.ps1 index fb43bb93..8eddadec 100644 --- a/scripts/Windows/OS/Install.ps1 +++ b/scripts/Windows/OS/Install.ps1 @@ -1,5 +1,6 @@ #!/bin/pwsh . "$PSScriptRoot/../Scripts/Context.ps1"; +. "$PSScriptRoot/Drivers.ps1"; . "$PSScriptRoot/Manage.ps1"; . "$PSScriptRoot/Upgrade.ps1"; . "$PSScriptRoot/User.ps1"; @@ -9,6 +10,21 @@ function Invoke-WindowsInstallation([Context] $context) Write-Host "Starting Installation and Restoration of Windows"; . "$PSScriptRoot/../../../scripts/Windows/Scripts/Prerequisites.ps1"; Update-WindowsInstallation $context; + + + if (-not $context.Get("DriversInstalled")) { + Write-Host "Installing Drivers"; + Write-Information "Looking for driver installation function"; + + if ((Get-Command Install-Drivers -ErrorAction SilentlyContinue)) { + Write-Information "Driver installation function was found. Starting installation"; + Install-Drivers $context; + } + + Write-Information "Finished installing drivers"; + $context.Set("DriversInstalled", 1); + } + New-PersonalUser $context; Restore-WindowsInstallation $context; }