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

Add debug output to help work out which images we're using 

Fix boot-amd64 to find the daily image files correctly
This commit is contained in:
Steve McIntyre 2006-07-03 14:39:16 +00:00
parent 22fbd311c0
commit c48ee7153e
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/boot/etch/boot-amd64
View File

@ -13,10 +13,14 @@ set -e
N=$1 N=$1
CDDIR=$2 CDDIR=$2
BOOTDIR= BOOTDIR=
echo "DI_WWW_HOME is $DI_WWW_HOME"
echo "DI_DIR is $DI_DIR"
if [ "$DI_WWW_HOME" = "default" ];then if [ "$DI_WWW_HOME" = "default" ];then
DI_WWW_HOME="http://people.debian.org/~kroeckx/d-i/images/daily" DI_WWW_HOME="http://people.debian.org/~kroeckx/d-i/images/daily"
if [ -n "$DI_DIR" ];then if [ -n "$DI_DIR" ];then
DI_DIR="$DI_DIR/${DI_WWW_HOME##*/}" DI_DIR="$DI_DIR/~${DI_WWW_HOME#*~}"
DI_WWW_HOME="" DI_WWW_HOME=""
echo "Using images from $DI_DIR" echo "Using images from $DI_DIR"
fi fi
@ -42,6 +46,7 @@ fi
BOOT_IMAGES="cdrom/initrd.gz cdrom/vmlinuz cdrom/debian-cd_info.tar.gz" BOOT_IMAGES="cdrom/initrd.gz cdrom/vmlinuz cdrom/debian-cd_info.tar.gz"
# Download boot images. # Download boot images.
for image in $BOOT_IMAGES; do for image in $BOOT_IMAGES; do
if [ ! -e "$image" ]; then if [ ! -e "$image" ]; then
@ -52,6 +57,7 @@ for image in $BOOT_IMAGES; do
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-$ARCH/current/images" DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images"
echo "Copying images from $DI_DIR"
fi fi
cp "$DI_DIR/$image" "$image" cp "$DI_DIR/$image" "$image"
else else

1
tools/boot/etch/boot-i386
View File

@ -67,6 +67,7 @@ for image in $BOOT_IMAGES; do
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-$ARCH/current/images" DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images"
echo "Copying images from $DI_DIR"
fi fi
cp "$DI_DIR/$image" "$image" cp "$DI_DIR/$image" "$image"
else else