← Back to branch summary

~tsimonq2/debian-cd/lubuntu-cosmic-changes

« back to all changes in this revision

Viewing changes to tools/boot/etch/boot-sparc

  • Committer: Colin Watson
  • Date: 2005-11-06 15:24:28 UTC
  • mfrom: (unknown (missing))
  • Revision ID: Arch-1:colin.watson@canonical.com--2005%debian-cd--ubuntu--0--patch-208
merge from upstream up to patch-781
Patches applied:

 * debian-cd@arch.ubuntu.com/debian-cd--MAIN--0--patch-779
   Add some amd64 patches from Goswin that fix boot-amd64 ...

 * debian-cd@arch.ubuntu.com/debian-cd--MAIN--0--patch-780
   Port to etch previous changes I commited for sarge.

 * debian-cd@arch.ubuntu.com/debian-cd--MAIN--0--patch-781
   Couple of small fixes for joeyh's and my latest commits.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tools/boot/etch/boot-sparc
12
12
CDDIR=$2
13
13
if [ "$DI_WWW_HOME" = "default" ];then
14
14
   DI_WWW_HOME="http://people.debian.org/~stappers/d-i/images/daily/cdrom"
 
15
   if [ -n "$DI_DIR" ];then
 
16
      DI_DIR="$DI_DIR/~${DI_WWW_HOME#*~}"
 
17
      DI_WWW_HOME=""                     
 
18
   fi
15
19
fi
16
20
if [ ! "$DI_DIST" ]; then
17
21
   DI_DIST="$DI_CODENAME"
52
56
# uncompress it before hand.
53
57
 
54
58
if [ ! "$DI_WWW_HOME" ];then
55
 
        DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images/cdrom"
 
59
        if [ ! "$DI_DIR" ];then
 
60
           DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images/cdrom"
 
61
        fi
56
62
else
57
63
        DI_DIR="."
58
64
        wget "$DI_WWW_HOME" -O di.dir