Peppermint
/
debian-cd-clone
mirror of https://salsa.debian.org/images-team/debian-cd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

boot-x86: Stop global replace on $ARCH

This commit is contained in:
g0tmi1k 2024-03-04 12:24:44 +00:00 committed by Steve McIntyre
parent 7531d32437
commit 0224aa50f4
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/boot/bookworm/boot-x86
View File

@ -116,10 +116,10 @@ for image in $BOOT_IMAGES; do
cp "${LOCALDEBS:-$MIRROR}/dists/$DI_DIST/local/installer-$THIS_ARCH/current/images/$image_in" "$image" cp "${LOCALDEBS:-$MIRROR}/dists/$DI_DIST/local/installer-$THIS_ARCH/current/images/$image_in" "$image"
elif [ ! "$DI_WWW_HOME" ];then elif [ ! "$DI_WWW_HOME" ];then
if [ ! "$DI_DIR" ];then if [ ! "$DI_DIR" ];then
DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$THIS_ARCH/current/images" DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-%ARCH%/current/images"
fi fi
DI_DIR_i386=$(echo $DI_DIR | sed 's/amd64/i386/g') DI_DIR_i386=$(echo $DI_DIR | sed 's/%ARCH%/i386/g')
DI_DIR_amd64=$(echo $DI_DIR | sed 's/i386/amd64/g') DI_DIR_amd64=$(echo $DI_DIR | sed 's/%ARCH%/amd64/g')
THIS_DI_DIR=DI_DIR_${THIS_ARCH} THIS_DI_DIR=DI_DIR_${THIS_ARCH}
cp "${!THIS_DI_DIR}/$image_in" "$image" cp "${!THIS_DI_DIR}/$image_in" "$image"
else else

6
tools/boot/trixie/boot-x86
View File

@ -116,10 +116,10 @@ for image in $BOOT_IMAGES; do
cp "${LOCALDEBS:-$MIRROR}/dists/$DI_DIST/local/installer-$THIS_ARCH/current/images/$image_in" "$image" cp "${LOCALDEBS:-$MIRROR}/dists/$DI_DIST/local/installer-$THIS_ARCH/current/images/$image_in" "$image"
elif [ ! "$DI_WWW_HOME" ];then elif [ ! "$DI_WWW_HOME" ];then
if [ ! "$DI_DIR" ];then if [ ! "$DI_DIR" ];then
DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$THIS_ARCH/current/images" DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-%ARCH%/current/images"
fi fi
DI_DIR_i386=$(echo $DI_DIR | sed 's/amd64/i386/g') DI_DIR_i386=$(echo $DI_DIR | sed 's/%ARCH%/i386/g')
DI_DIR_amd64=$(echo $DI_DIR | sed 's/i386/amd64/g') DI_DIR_amd64=$(echo $DI_DIR | sed 's/%ARCH%/amd64/g')
THIS_DI_DIR=DI_DIR_${THIS_ARCH} THIS_DI_DIR=DI_DIR_${THIS_ARCH}
cp "${!THIS_DI_DIR}/$image_in" "$image" cp "${!THIS_DI_DIR}/$image_in" "$image"
else else