Mirror/aports
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2025-07-13 19:29:53 +03:00
Code Issues Wiki Activity

scripts/mkimg.base.sh: truncate long volid

Browse source 
volid can not be longer than 32 chars, and we hit this limit with _rc1
loongach64. Solve this by drop the _rc* suffix and add a safe guard that
truncates the volid if it ever trips over.

ref: https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/76266
This commit is contained in:
Natanael Copa 2024-12-02 11:13:07 +01:00
parent 51e9b661e4
commit a486316db8
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
scripts/mkimg.base.sh
View file

@ -237,6 +237,7 @@ create_image_iso() {
local ISO="${OUTDIR}/${output_filename}" local ISO="${OUTDIR}/${output_filename}"
local _isolinux local _isolinux
local _efiboot local _efiboot
local _volid=$(printf "%s" "alpine-${profile_abbrev:-$PROFILE} ${RELEASE%_rc*} $ARCH" | cut -c1-32)
if [ -e "${DESTDIR}/boot/syslinux/isolinux.bin" ]; then if [ -e "${DESTDIR}/boot/syslinux/isolinux.bin" ]; then
# isolinux enabled # isolinux enabled
@ -280,7 +281,7 @@ create_image_iso() {
grub-mkrescue --output ${ISO} ${DESTDIR} -follow-links \ grub-mkrescue --output ${ISO} ${DESTDIR} -follow-links \
--directory="$WORKDIR"/usr/lib/grub/powerpc-ieee1275 \ --directory="$WORKDIR"/usr/lib/grub/powerpc-ieee1275 \
-sysid LINUX \ -sysid LINUX \
-volid "alpine-${profile_abbrev:-$PROFILE} $RELEASE $ARCH" -volid "$_volid"
else else
if [ "$ARCH" = s390x ]; then if [ "$ARCH" = s390x ]; then
printf %s "$initfs_cmdline $kernel_cmdline " > ${WORKDIR}/parmfile printf %s "$initfs_cmdline $kernel_cmdline " > ${WORKDIR}/parmfile
@ -299,7 +300,7 @@ create_image_iso() {
-joliet \ -joliet \
-rational-rock \ -rational-rock \
-sysid LINUX \ -sysid LINUX \
-volid "alpine-${profile_abbrev:-$PROFILE} $RELEASE $ARCH" \ -volid "$_volid" \
$_isolinux \ $_isolinux \
$_efiboot \ $_efiboot \
-follow-links \ -follow-links \