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

Trivial code consistency cleanups

This commit is contained in:
Steve McIntyre 2013-12-16 13:40:05 +00:00
parent 96563554ee
commit 3e0309bc85
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tools/boot/jessie/boot-arm
View File

@ -16,6 +16,9 @@ set -e
N=$1
CDDIR=$2
if [ "$DI_WWW_HOME" = "default" ];then
# Tempting as it might be to merge these two definitions using $ARCH,
# do *not* do that - these defs are parsed out by other scripts that
# won't cope with that
if [ "$ARCH" = armel ]; then
DI_WWW_HOME="http://d-i.debian.org/daily-images/armel/daily"
else

8
tools/boot/jessie/boot-s390-common
View File

@ -35,12 +35,12 @@ if [ "$DI_WWW_HOME" = "default" ];then
# Tempting as it might be to merge these two definitions using $ARCH,
# do *not* do that - these defs are parsed out by other scripts that
# won't cope with that
if [ "$ARCH" = s390x ]; then
DI_WWW_HOME="http://d-i.debian.org/daily-images/s390x/daily"
fi
if [ "$ARCH" = s390x ]; then
DI_WWW_HOME="http://d-i.debian.org/daily-images/s390x/daily"
fi
if [ -n "$DI_DIR" -a -e "$DI_DIR/~${DI_WWW_HOME#*~}" ] ; then
DI_DIR="$DI_DIR/${DI_WWW_HOME#*http://}"
DI_WWW_HOME=""
DI_WWW_HOME=""
fi
fi
if [ ! "$DI_DIST" ]; then

1
tools/boot/jessie/boot-x86
View File

@ -16,7 +16,6 @@ N=$1
CDDIR=$2
BOOTDIR=
if [ "$DI_WWW_HOME" = "default" ];then
# Tempting as it might be to merge these two definitions using $ARCH,
# do *not* do that - these defs are parsed out by other scripts that
# won't cope with that