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

Tweak definitions for daily image locations so that the push_di_to_cdbuild script can find them

This commit is contained in:
cd-builder user 2010-08-20 15:52:56 +00:00
parent 2ce129a6ae
commit c67c31fc03
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tools/boot/squeeze/boot-kfreebsd
View File

@ -16,12 +16,16 @@ N=$1
CDDIR=$2 CDDIR=$2
BOOTDIR= BOOTDIR=
if [ "$DI_WWW_HOME" = "default" ];then if [ "$DI_WWW_HOME" = "default" ];then
DI_WWW_HOME="http://d-i.debian.org/daily-images/$ARCH/daily" if [ "$ARCH" = kfreebsd-i386 ]; then
if [ -n "$DI_DIR" ];then DI_WWW_HOME="http://d-i.debian.org/daily-images/kfreebsd-i386/daily"
DI_DIR="$DI_DIR/${DI_WWW_HOME#*http://}" else
DI_WWW_HOME="" DI_WWW_HOME="http://d-i.debian.org/daily-images/kfreebsd-amd64/daily"
echo "Using images from $DI_DIR" fi
fi if [ -n "$DI_DIR" ];then
DI_DIR="$DI_DIR/${DI_WWW_HOME#*http://}"
DI_WWW_HOME=""
echo "Using images from $DI_DIR"
fi
fi fi
if [ ! "$DI_DIST" ]; then if [ ! "$DI_DIST" ]; then
DI_DIST="$DI_CODENAME" DI_DIST="$DI_CODENAME"

7
tools/boot/squeeze/boot-x86
View File

@ -235,8 +235,11 @@ if [ "$THISTYPE" = "isolinux" ]; then
# Not everything in the tarball is isolinux stuff # Not everything in the tarball is isolinux stuff
if [ -e boot$N/isolinux/win32-loader.ini ] ; then if [ -e boot$N/isolinux/win32-loader.ini ] ; then
mv boot$N/isolinux/g2ldr* boot$N/isolinux/setup.exe \ for file in boot$N/isolinux/g2ldr* boot$N/isolinux/setup.exe boot$N/isolinux/win32-loader.ini; do
boot$N/isolinux/win32-loader.ini boot$N/ if [ -e $file ] ; then
mv -v $file boot$N/
fi
done
fi fi
if [ -e boot$N/isolinux/f3.txt.withgtk ]; then if [ -e boot$N/isolinux/f3.txt.withgtk ]; then