Skip to content

Commit

Permalink
build-driver: ship ipxe + memtest86+; grml-live: fix NO_ADDONS autode…
Browse files Browse the repository at this point in the history
…tection

On arm64 we ended up with the following addon behavior:

  [*] Installing boot addons.
  [x] Missing addon file: "ipxe.lkrn"
  [x] Missing addon file: "ipxe.efi"
  [x] Missing addon file: "memtest86+.bin"
  [x] Missing addon file: bsd4grml

And on amd64 we  ended up with the following addon behavior:

  [*] Installing boot addons.
  [x] Missing addon file: "ipxe.lkrn"
  [x] Missing addon file: "ipxe.efi"
  [x] Missing addon file: "memtest86+x64.efi"
  [x] Missing addon file: "memtest86+x64.bin"
  [x] Missing addon file: "memtest86+.bin"
  [x] Missing addon file: bsd4grml

Now by not using the NO_ADDONS autodetection and shipping ipxe on amd64
+ arm64 and memtest86+ on amd64 only (it's not available for arm64), we
get the expected behavior, as in:

On arm64:

  [*] Installing boot addons.
  [x] Missing addon file: "memtest86+.bin"
  [x] Missing addon file: bsd4grml

On amd64:

  [*] Installing boot addons.
  [x] Missing addon file: bsd4grml

Fixes commit a2a16ec
Related to #161
and #128
  • Loading branch information
mika committed Dec 18, 2024
1 parent 379f167 commit 83ec4f9
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 2 additions & 0 deletions build-driver/build.py
Original file line number Diff line number Diff line change
Expand Up @@ -315,8 +315,10 @@ def install_debian_dependencies():
debootstrap ,
dosfstools ,
fai-client (>= 3.4.0) ,
ipxe ,
isolinux (>= 3:6.03+dfsg-5+deb8u1~) ,
jo ,
memtest86+ [amd64] ,
mksh ,
mmdebstrap ,
moreutils ,
Expand Down
3 changes: 1 addition & 2 deletions grml-live
Original file line number Diff line number Diff line change
Expand Up @@ -524,8 +524,7 @@ fi

# Automatically enable NO_ADDONS=1 if addons are not present {{{
if [ -z "${NO_ADDONS:-}" ] && [ ! -r "$TEMPLATE_DIRECTORY"/boot/addons ] ; then
ewarn "Boot addons not found, setting NO_ADDONS=1. (Consider installing package grml-live-addons)" ; eend 0
NO_ADDONS=1
ewarn "Boot addons not found, (Consider installing package grml-live-addons)" ; eend 0
fi
# }}}

Expand Down

0 comments on commit 83ec4f9

Please sign in to comment.