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

Fix logic around grml_sources handling no longer being bind-mounted #229

Merged
merged 1 commit into from
Dec 19, 2024
Merged

Fix logic around grml_sources handling no longer being bind-mounted #229

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions grml-live
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -801,7 +801,8 @@ else
mount --bind "${MIRROR_DIRECTORY}" "${CHROOT_OUTPUT}/${MIRROR_DIRECTORY}"
fi

mkdir -p "${CHROOT_OUTPUT}/grml-live/grml_sources/"
mkdir -p "${OUTPUT}"/grml_sources "${CHROOT_OUTPUT}"/grml-live/
mv "${OUTPUT}"/grml_sources "${CHROOT_OUTPUT}"/grml-live/

log "Executed FAI command line:"
log "BUILD_ONLY=$BUILD_ONLY BOOTSTRAP_ONLY=$BOOTSTRAP_ONLY GRML_LIVE_CONFIG=$CONFIGDUMP WAYBACK_DATE=$WAYBACK_DATE fai $VERBOSE -C $GRML_FAI_CONFIG -s file:///$GRML_FAI_CONFIG/config -c$CLASSES -u $HOSTNAME $FAI_ACTION $CHROOT_OUTPUT $FAI_ARGS"
Expand All @@ -818,8 +819,8 @@ else
bailout 1
fi

mv "${CHROOT_OUTPUT}/grml-live/grml_sources/" "${OUTPUT}/"
rmdir "${CHROOT_OUTPUT}/grml-live"
mv "${CHROOT_OUTPUT}"/grml-live/grml_sources/ "${OUTPUT}"
rmdir "${CHROOT_OUTPUT}"/grml-live

# provide inform fai about the ISO we build, needs to be provided
# *after* FAI stage, otherwise FAI skips the debootstrap stage if
Expand Down
Loading