Fix jigdofilelist when unstable is not available.

Allow disks-alpha/current not to be a symlink.
This commit is contained in:
Santiago Garcia Mantinan 2002-03-13 22:40:14 +00:00
parent b044bdcf6d
commit dcf92f2ded
2 changed files with 6 additions and 2 deletions

View File

@ -729,7 +729,7 @@ $(SDIR)/CD1/dists/$(CODENAME)-secured:
# this list when really necessary (saves many minutes per run).
# Don't depend on anything else as this will not work as intended, so
# make $(TDIR) ourselves just to be sure.
$(TDIR)/jigdofilelist: $(MIRROR)/dists/unstable/main/binary-i386/Packages.gz
$(TDIR)/jigdofilelist: $(MIRROR)/dists/$(CODENAME)/main/binary-$(ARCH)/Packages.gz
@echo "Generating file list for jigdo (if requested) ..."
$(Q)set -e; \
if [ "$(DOJIGDO)" != 0 ]; then \

View File

@ -20,7 +20,11 @@ fi
# isomarkboot can't resolve symlinks within the ISO image, so we do it
# manually.
BOOTVER=`readlink $CDROOT/dists/$CODENAME/main/disks-alpha/current`
if [ -L $CDROOT/dists/$CODENAME/main/disks-alpha/current ];then
BOOTVER=`readlink $CDROOT/dists/$CODENAME/main/disks-alpha/current`
else
BOOTVER=current
fi
BOOTDISKS=dists/$CODENAME/main/disks-alpha/$BOOTVER
isomarkboot $CDIMAGE $BOOTDISKS/bootlx $BOOTDISKS/images-1.44/root.bin