vh/HackBGRT
1
0
Fork 0
mirror of https://github.com/Metabolix/HackBGRT.git synced 2025-12-06 17:15:42 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Allow overriding ESP path

Browse Source
This commit is contained in:
Lauri Kenttä
2025-03-21 19:33:31 +02:00
parent be62caa400
commit 785307c0e2
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@@ -53,6 +53,7 @@ The *shim* boot loader is maintained by Red Hat, Inc, and the included signed co
* `uninstall` – disable and remove completely. * `uninstall` – disable and remove completely.
* `show-boot-log` – show the debug log collected during boot (if `log=1` is set in `config.txt`). * `show-boot-log` – show the debug log collected during boot (if `log=1` is set in `config.txt`).
* `arch=...` – force architecture. * `arch=...` – force architecture.
* `esp=...` – force EFI System Partition path.
* `dry-run` – skip actual changes. * `dry-run` – skip actual changes.
* For example, run `setup.exe batch install allow-secure-boot enable-overwrite` to copy files and overwrite the MS boot loader regardless of Secure Boot status. * For example, run `setup.exe batch install allow-secure-boot enable-overwrite` to copy files and overwrite the MS boot loader regardless of Secure Boot status.

11
src/Setup.cs
View File

@@ -106,6 +106,9 @@ public class Setup {
/** @var Dry run? */ /** @var Dry run? */
protected bool DryRun; protected bool DryRun;
/** @var User-defined ESP path */
protected string UserEspPath;
/** @var Run in batch mode? */ /** @var Run in batch mode? */
protected bool Batch; protected bool Batch;
@@ -289,6 +292,11 @@ public class Setup {
if (DryRun) { if (DryRun) {
Directory.CreateDirectory(Path.Combine("dry-run", "EFI")); Directory.CreateDirectory(Path.Combine("dry-run", "EFI"));
Esp.TryPath("dry-run", false); Esp.TryPath("dry-run", false);
} else if (UserEspPath != null) {
WriteLine($"Using user-defined ESP path: {UserEspPath}");
if (!Esp.TryPath(UserEspPath, false)) {
throw new SetupException("The ESP path doesn't look like an EFI System Partition.");
}
} }
if (Esp.Location == null && !Esp.Find() && !Esp.Mount() && !Batch) { if (Esp.Location == null && !Esp.Find() && !Esp.Mount() && !Batch) {
WriteLine("EFI System Partition was not found."); WriteLine("EFI System Partition was not found.");
@@ -1045,7 +1053,7 @@ public class Setup {
AllowSecureBoot = args.Contains("allow-secure-boot"); AllowSecureBoot = args.Contains("allow-secure-boot");
AllowBitLocker = args.Contains("allow-bitlocker"); AllowBitLocker = args.Contains("allow-bitlocker");
SkipShim = args.Contains("skip-shim"); SkipShim = args.Contains("skip-shim");
ForwardArguments = String.Join(" ", args.Where(s => ForwardableArguments.Contains(s) || s.StartsWith("arch="))); ForwardArguments = String.Join(" ", args.Where(s => ForwardableArguments.Contains(s) || s.StartsWith("arch=") || s.StartsWith("esp=")));
try { try {
if (!(Directory.Exists("efi") || Directory.Exists("efi-signed")) || !File.Exists("config.txt")) { if (!(Directory.Exists("efi") || Directory.Exists("efi-signed")) || !File.Exists("config.txt")) {
WriteLine("This setup program is not in the correct directory!"); WriteLine("This setup program is not in the correct directory!");
@@ -1053,6 +1061,7 @@ public class Setup {
return 1; return 1;
} }
SetArch(args.Where(s => s.StartsWith("arch=")).Select(s => s.Substring(5)).LastOrDefault()); SetArch(args.Where(s => s.StartsWith("arch=")).Select(s => s.Substring(5)).LastOrDefault());
UserEspPath = args.Where(s => s.StartsWith("esp=")).Select(s => s.Substring(4)).LastOrDefault();
if (args.Contains("is-elevated") && !HasPrivileges() && !DryRun) { if (args.Contains("is-elevated") && !HasPrivileges() && !DryRun) {
WriteLine("This installer needs to be run as administrator!"); WriteLine("This installer needs to be run as administrator!");
return 1; return 1;