Improve update_issue() function in common script

* Allow to customise pi-gen script name and repository in the generated issue file
* Preserve compatibility with existing function calls
pull/255/head
Hugo Hromic 2019-02-15 15:25:59 +00:00 committed by XECDesign
parent 3b90b7ffed
commit 9e6af47045
2 changed files with 4 additions and 1 deletions

View File

@ -137,6 +137,9 @@ do
esac esac
done done
export PI_GEN=${PI_GEN:-pi-gen}
export PI_GEN_REPO=${PI_GEN_REPO:-https://github.com/RPi-Distro/pi-gen}
if [ -z "${IMG_NAME}" ]; then if [ -z "${IMG_NAME}" ]; then
echo "IMG_NAME not set" 1>&2 echo "IMG_NAME not set" 1>&2
exit 1 exit 1

View File

@ -96,7 +96,7 @@ export -f on_chroot
update_issue() { update_issue() {
local GIT_HASH local GIT_HASH
GIT_HASH=$(git rev-parse HEAD) GIT_HASH=$(git rev-parse HEAD)
echo -e "Raspberry Pi reference ${IMG_DATE}\nGenerated using pi-gen, https://github.com/RPi-Distro/pi-gen, ${GIT_HASH}, ${1}" > "${ROOTFS_DIR}/etc/rpi-issue" echo -e "Raspberry Pi reference ${IMG_DATE}\nGenerated using ${PI_GEN}, ${PI_GEN_REPO}, ${GIT_HASH}, ${1}" > "${ROOTFS_DIR}/etc/rpi-issue"
} }
export -f update_issue export -f update_issue