faerbit/archiso
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'nl6720/netboot-no-bootmodes'

Browse Source 
* nl6720/netboot-no-bootmodes:
  mkarchiso: do not require setting boot modes when building only netboot artifacts
This commit is contained in:
David Runge 2021-11-03 09:29:59 +01:00
commit 1c42553c35
No known key found for this signature in database
GPG Key ID: 7258734B41C31549
1 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
archiso/mkarchiso
View File

@ -132,7 +132,7 @@ _show_config() {
_msg_info " ISO volume label: ${iso_label}" _msg_info " ISO volume label: ${iso_label}"
_msg_info " ISO publisher: ${iso_publisher}" _msg_info " ISO publisher: ${iso_publisher}"
_msg_info " ISO application: ${iso_application}" _msg_info " ISO application: ${iso_application}"
_msg_info " Boot modes: ${bootmodes[*]}" _msg_info " Boot modes: ${bootmodes[*]:-None}"
_msg_info " Packages File: ${buildmode_packages}" _msg_info " Packages File: ${buildmode_packages}"
_msg_info " Packages: ${buildmode_pkg_list[*]}" _msg_info " Packages: ${buildmode_pkg_list[*]}"
} }
@ -804,6 +804,22 @@ _validate_common_requirements_buildmode_iso_netboot() {
_msg_error "Packages file '${packages}' does not exist." 0 _msg_error "Packages file '${packages}' does not exist." 0
fi fi
# Check if the specified airootfs_image_type is supported
if typeset -f "_mkairootfs_${airootfs_image_type}" &> /dev/null; then
if typeset -f "_validate_requirements_airootfs_image_type_${airootfs_image_type}" &> /dev/null; then
"_validate_requirements_airootfs_image_type_${airootfs_image_type}"
else
_msg_warning "Function '_validate_requirements_airootfs_image_type_${airootfs_image_type}' does not exist. Validating the requirements of '${airootfs_image_type}' airootfs image type will not be possible."
fi
else
(( validation_error=validation_error+1 ))
_msg_error "Unsupported image type: '${airootfs_image_type}'" 0
fi
}
_validate_requirements_buildmode_iso() {
_validate_common_requirements_buildmode_iso_netboot
_validate_common_requirements_buildmode_all
# Check if the specified bootmodes are supported # Check if the specified bootmodes are supported
if (( ${#bootmodes[@]} < 1 )); then if (( ${#bootmodes[@]} < 1 )); then
(( validation_error=validation_error+1 )) (( validation_error=validation_error+1 ))
@ -822,22 +838,6 @@ _validate_common_requirements_buildmode_iso_netboot() {
fi fi
done done
# Check if the specified airootfs_image_type is supported
if typeset -f "_mkairootfs_${airootfs_image_type}" &> /dev/null; then
if typeset -f "_validate_requirements_airootfs_image_type_${airootfs_image_type}" &> /dev/null; then
"_validate_requirements_airootfs_image_type_${airootfs_image_type}"
else
_msg_warning "Function '_validate_requirements_airootfs_image_type_${airootfs_image_type}' does not exist. Validating the requirements of '${airootfs_image_type}' airootfs image type will not be possible."
fi
else
(( validation_error=validation_error+1 ))
_msg_error "Unsupported image type: '${airootfs_image_type}'" 0
fi
}
_validate_requirements_buildmode_iso() {
_validate_common_requirements_buildmode_iso_netboot
_validate_common_requirements_buildmode_all
if ! command -v awk &> /dev/null; then if ! command -v awk &> /dev/null; then
(( validation_error=validation_error+1 )) (( validation_error=validation_error+1 ))
_msg_error "Validating build mode '${_buildmode}': awk is not available on this host. Install 'awk'!" 0 _msg_error "Validating build mode '${_buildmode}': awk is not available on this host. Install 'awk'!" 0
@ -1227,7 +1227,11 @@ _build_iso_base() {
_run_once _make_version _run_once _make_version
_run_once _make_customize_airootfs _run_once _make_customize_airootfs
_run_once _make_pkglist _run_once _make_pkglist
if [[ "${buildmode}" == 'netboot' ]]; then
_run_once _make_boot_on_iso9660
else
_make_bootmodes _make_bootmodes
fi
_run_once _cleanup_pacstrap_dir _run_once _cleanup_pacstrap_dir
_run_once _prepare_airootfs_image _run_once _prepare_airootfs_image
} }