Skip to content

Commit a39a260

Browse files
committed
add systemd-boot-efi to runner
1 parent 12ab6d0 commit a39a260

4 files changed

Lines changed: 3 additions & 6 deletions

File tree

.github/workflows/build-elxr12-immutable.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
- name: Install system deps
4545
run: |
4646
sudo apt-get update
47-
sudo apt-get install -y qemu-system-x86 ovmf tree jq systemd-ukify mmdebstrap systemd-boot
47+
sudo apt-get install -y qemu-system-x86 ovmf tree jq systemd-ukify mmdebstrap systemd-boot systemd-boot-efi
4848
4949
- name: Set up Go
5050
uses: actions/setup-go@v5

.github/workflows/build-elxr12-raw.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
- name: Install system deps
4646
run: |
4747
sudo apt-get update
48-
sudo apt-get install -y qemu-system-x86 ovmf tree jq systemd-ukify mmdebstrap systemd-boot
48+
sudo apt-get install -y qemu-system-x86 ovmf tree jq systemd-ukify mmdebstrap systemd-boot systemd-boot-efi
4949
5050
- name: Set up Go
5151
uses: actions/setup-go@v5

internal/chroot/chrootenv.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -533,9 +533,7 @@ func (chrootEnv *ChrootEnv) AptInstallPackage(packageName, installRoot string, r
533533
"DEBCONF_NOWARNINGS=yes",
534534
}
535535

536-
output, err := shell.ExecCmdWithStream(installCmd, true, installRoot, envVars)
537-
if err != nil {
538-
log.Errorf("Failed to install package %s. Command output: %s", packageName, output)
536+
if _, err := shell.ExecCmdWithStream(installCmd, true, installRoot, envVars); err != nil {
539537
return fmt.Errorf("failed to install package %s: %w", packageName, err)
540538
}
541539

internal/image/imageos/imageos.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -572,7 +572,6 @@ func (imageOs *ImageOs) installImagePkgs(installRoot string, template *config.Im
572572
log.Debugf("Expected error: The EFI variable shouldn't be accessed in chroot.")
573573
} else {
574574
log.Errorf("Failed to install package %s: %v", pkg, err)
575-
log.Errorf("Package installation output: %s", output)
576575
return fmt.Errorf("failed to install package %s: %w", pkg, err)
577576
}
578577
}

0 commit comments

Comments
 (0)