Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

netboot package: use ISO_NAME-netboot.tar as output name (without .iso) #210

Merged
merged 2 commits into from
Dec 18, 2024
Merged

netboot package: use ISO_NAME-netboot.tar as output name (without .iso) #210

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b27b742
netboot package: use ISO_NAME-netboot.tar as output name (without .iso)
zeha Dec 15, 2024
ca4f25a
grml-live: avoid double / in NETBOOT and REPORTS
zeha Dec 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions grml-live
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,8 +480,8 @@ fi
[ -n "$CHROOT_OUTPUT" ] || CHROOT_OUTPUT="$OUTPUT/grml_chroot"
[ -n "$ISO_OUTPUT" ] || ISO_OUTPUT="$OUTPUT/grml_isos"
[ -n "$LOG_OUTPUT" ] || LOG_OUTPUT="$OUTPUT/grml_logs"
[ -n "$REPORTS" ] || REPORTS="${LOG_OUTPUT}/reports/"
[ -n "$NETBOOT" ] || NETBOOT="${OUTPUT}/netboot/"
[ -n "$REPORTS" ] || REPORTS="${LOG_OUTPUT}/reports"
[ -n "$NETBOOT" ] || NETBOOT="${OUTPUT}/netboot"
# }}}

# some misc checks before executing FAI {{{
Expand Down Expand Up @@ -1724,7 +1724,10 @@ fi

# netboot package {{{
create_netbootpackage() {
local OUTPUT_FILE="${NETBOOT}/grml_netboot_package_${GRML_NAME}_${VERSION}.tar"
local OUTPUT_NAME
local OUTPUT_FILE
OUTPUT_NAME=$(basename "${ISO_NAME}" .iso)-netboot
OUTPUT_FILE="${NETBOOT}/${OUTPUT_NAME}.tar"

if [ -f "${OUTPUT_FILE}" ] && [ -z "$UPDATE" ] && [ -z "$BUILD_ONLY" ] && [ -z "$BUILD_DIRTY" ] ; then
log "Skipping stage 'netboot' as $OUTPUT_FILE exists already."
Expand All @@ -1739,7 +1742,7 @@ create_netbootpackage() {
mkdir -p "$NETBOOT"

local OUTPUTDIR="${NETBOOT}/build_tmp"
local WORKING_DIR="${OUTPUTDIR}/grml_netboot_package_${GRML_NAME}_${VERSION}/tftpboot/"
local WORKING_DIR="${OUTPUTDIR}/${OUTPUT_NAME}/tftpboot/"

mkdir -p "$WORKING_DIR"

Expand Down Expand Up @@ -1843,7 +1846,7 @@ create_netbootpackage() {
fi
fi # amd64 or arm64

if tar -C "$OUTPUTDIR" -cf "${OUTPUT_FILE}" "grml_netboot_package_${GRML_NAME}_${VERSION}" ; then
if tar -C "$OUTPUTDIR" -cf "${OUTPUT_FILE}" "${OUTPUT_NAME}" ; then
(
# shellcheck disable=SC2164 # We just wrote there. If it disappeared, too bad.
cd "$(dirname "${OUTPUT_FILE}")"
Expand Down
Loading