Skip to content

Commit f225b4c

Browse files
committed
fixup! feat(extensions): add netboot extension for full TFTP+NFS boot
1 parent 5296c16 commit f225b4c

1 file changed

Lines changed: 5 additions & 1 deletion

File tree

extensions/netboot/netboot.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,9 @@ function extension_prepare_config__netboot_defaults_and_validate() {
4848
fi
4949
declare -g NETBOOT_HOSTNAME="${NETBOOT_HOSTNAME:-}"
5050
declare -g NETBOOT_CLIENT_MAC="${NETBOOT_CLIENT_MAC:-}"
51+
# Declared unconditionally so later `[[ -n "${NETBOOT_CLIENT_MAC_NORMALIZED}" ]]`
52+
# checks remain safe under `set -u` when no MAC is configured.
53+
declare -g NETBOOT_CLIENT_MAC_NORMALIZED=""
5154
declare -g NETBOOT_TFTP_PREFIX="${NETBOOT_TFTP_PREFIX:-armbian/${LINUXFAMILY}/${BOARD}/${BRANCH}-${RELEASE}}"
5255

5356
if [[ -n "${NETBOOT_HOSTNAME}" ]]; then
@@ -60,7 +63,7 @@ function extension_prepare_config__netboot_defaults_and_validate() {
6063
fi
6164

6265
if [[ -n "${NETBOOT_CLIENT_MAC}" ]]; then
63-
declare -g NETBOOT_CLIENT_MAC_NORMALIZED="${NETBOOT_CLIENT_MAC//:/-}"
66+
NETBOOT_CLIENT_MAC_NORMALIZED="${NETBOOT_CLIENT_MAC//:/-}"
6467
NETBOOT_CLIENT_MAC_NORMALIZED="${NETBOOT_CLIENT_MAC_NORMALIZED,,}"
6568
if [[ ! "${NETBOOT_CLIENT_MAC_NORMALIZED}" =~ ^[0-9a-f]{2}-[0-9a-f]{2}-[0-9a-f]{2}-[0-9a-f]{2}-[0-9a-f]{2}-[0-9a-f]{2}$ ]]; then
6669
exit_with_error "${EXTENSION}: NETBOOT_CLIENT_MAC must look like aa:bb:cc:dd:ee:ff (got '${NETBOOT_CLIENT_MAC}')"
@@ -84,6 +87,7 @@ function extension_prepare_config__netboot_defaults_and_validate() {
8487

8588
# Ensure NFS-root client support is built into the kernel.
8689
function custom_kernel_config__netboot_enable_nfs_root() {
90+
[[ "${ROOTFS_TYPE}" == "nfs-root" ]] || return 0
8791
opts_y+=("ROOT_NFS" "NFS_FS" "NFS_V3" "IP_PNP" "IP_PNP_DHCP")
8892
}
8993

0 commit comments

Comments
 (0)