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 more calls to grab_file

This commit is contained in:
Steve McIntyre 2014-04-08 18:15:22 +01:00
parent c73d70af87
commit 95c1e6241f
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/boot/wheezy/boot-x86
View File

@ -85,12 +85,14 @@ for image in $BOOT_IMAGES; do
dir=$(dirname $image) dir=$(dirname $image)
mkdir -p $dir mkdir -p $dir
if [ -n "$LOCAL" -a -f "${LOCALDEBS:-$MIRROR}/dists/$DI_DIST/local/installer-$ARCH/current/images/$image" ]; then if [ -n "$LOCAL" -a -f "${LOCALDEBS:-$MIRROR}/dists/$DI_DIST/local/installer-$ARCH/current/images/$image" ]; then
grab_file "${LOCALDEBS:-$MIRROR}/dists/$DI_DIST/local/installer-$ARCH/current/images/$image"
cp "${LOCALDEBS:-$MIRROR}/dists/$DI_DIST/local/installer-$ARCH/current/images/$image" "$image" cp "${LOCALDEBS:-$MIRROR}/dists/$DI_DIST/local/installer-$ARCH/current/images/$image" "$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-$ARCH/current/images" DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images"
fi fi
# echo "Copying images from $DI_DIR" # echo "Copying images from $DI_DIR"
grab_file "$DI_DIR/$image"
cp "$DI_DIR/$image" "$image" cp "$DI_DIR/$image" "$image"
else else
wget "$DI_WWW_HOME/$image" -O "$image" wget "$DI_WWW_HOME/$image" -O "$image"
@ -104,11 +106,13 @@ for image in $DISK_IMAGES $EXTRA_DISK_IMAGES; do
dir=$(dirname $image) dir=$(dirname $image)
mkdir -p $dir mkdir -p $dir
if [ -n "$LOCAL" -a -f "${LOCALDEBS:-$MIRROR}/dists/$DI_DIST/local/installer-$ARCH/current/images/$image" ]; then if [ -n "$LOCAL" -a -f "${LOCALDEBS:-$MIRROR}/dists/$DI_DIST/local/installer-$ARCH/current/images/$image" ]; then
grab_file "${LOCALDEBS:-$MIRROR}/dists/$DI_DIST/local/installer-$ARCH/current/images/$image"
cp "${LOCALDEBS:-$MIRROR}/dists/$DI_DIST/local/installer-$ARCH/current/images/$image" "$image" cp "${LOCALDEBS:-$MIRROR}/dists/$DI_DIST/local/installer-$ARCH/current/images/$image" "$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-$ARCH/current/images" DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images"
fi fi
grab_file "$DI_DIR/$image"
cp "$DI_DIR/$image" "$image" || true cp "$DI_DIR/$image" "$image" || true
else else
wget "$DI_WWW_HOME/$image" -O "$image" || rm -f "$image" wget "$DI_WWW_HOME/$image" -O "$image" || rm -f "$image"
@ -123,10 +127,16 @@ if [ "$NN" = "1" ]; then
if [ -e "$disk" ]; then if [ -e "$disk" ]; then
dir=$(dirname $disk) dir=$(dirname $disk)
mkdir -p $CDDIR/$INSTALLDIR/$dir mkdir -p $CDDIR/$INSTALLDIR/$dir
grab_file $disk
cp -lf $disk $CDDIR/$INSTALLDIR/$dir cp -lf $disk $CDDIR/$INSTALLDIR/$dir
fi fi
done done
grab_file indices/md5sums.gz
if [ -e $MIRROR/indices/md5sums.gz ] ; then
zcat $MIRROR/indices/md5sums.gz | awk '/ tools/ {print $2}' | xargs grab_file
fi
if [ -e "$MIRROR/tools" ] && \ if [ -e "$MIRROR/tools" ] && \
[ ! -e $CDDIR/tools ] && \ [ ! -e $CDDIR/tools ] && \
[ "$OMIT_DOC_TOOLS" != "1" ] ; then [ "$OMIT_DOC_TOOLS" != "1" ] ; then
@ -148,6 +158,7 @@ extra_image () {
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"
fi fi
grab_file "$DI_DIR/cdrom/$image"
cp "$DI_DIR/cdrom/$image" $CDDIR/$INSTALLDIR/"$image" cp "$DI_DIR/cdrom/$image" $CDDIR/$INSTALLDIR/"$image"
else else
wget "$DI_WWW_HOME/cdrom/$image" -O $CDDIR/$INSTALLDIR/"$image" wget "$DI_WWW_HOME/cdrom/$image" -O $CDDIR/$INSTALLDIR/"$image"
@ -196,6 +207,7 @@ if [ -z "$SYSLINUXDEB" ]; then
echo "ERROR: syslinux package is required" >&2 echo "ERROR: syslinux package is required" >&2
exit 1 exit 1
fi fi
grab_file $SYSLINUXDEB
(dpkg --fsys-tarfile "$MIRROR/$SYSLINUXDEB" | \ (dpkg --fsys-tarfile "$MIRROR/$SYSLINUXDEB" | \
tar xf - -C $CDDIR/../syslinux ./usr/lib) tar xf - -C $CDDIR/../syslinux ./usr/lib)

2
tools/wheezy/installtools.sh
View File

@ -28,6 +28,8 @@ if [ "$OMIT_MANUAL" != 1 ]; then
INSTALLGUIDE=$(zcat $MIRROR/dists/$CODENAME/main/binary-$ARCH//Packages.gz | \ INSTALLGUIDE=$(zcat $MIRROR/dists/$CODENAME/main/binary-$ARCH//Packages.gz | \
sed -n "s/Filename: \(pool\/main\/i\/installation-guide\/installation-guide-$ARCH.*deb\)$/\1/p") sed -n "s/Filename: \(pool\/main\/i\/installation-guide\/installation-guide-$ARCH.*deb\)$/\1/p")
grab_file $INSTALLGUIDE
if [ -f "$MIRROR/$INSTALLGUIDE" ]; then if [ -f "$MIRROR/$INSTALLGUIDE" ]; then
rm -rf $MANTDIR rm -rf $MANTDIR
# Extract documentation from package # Extract documentation from package