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

boot-x86 gets sourced: remove shebang; improve whitespace consistency

This commit is contained in:
Frans Pop 2009-04-20 12:11:27 +00:00
parent 0bf1b210cd
commit d0bd2117be
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tools/boot/lenny/boot-x86
View File

@ -1,4 +1,4 @@
#!/bin/bash
# This script gets sourced from boot-i386 and boot-amd64.
#
# Do install stuff for x86, including making bootable CDs
# Works with debian-installer
@ -120,12 +120,12 @@ if [ "$NN" = "1" ]; then
fi
done
if [ -e "$MIRROR/tools" ] && \
[ ! -e $CDDIR/tools ] && \
[ "$OMIT_DOC_TOOLS" != "1" ] ; then
echo " Adding tools to CD1"
$BASEDIR/tools/add_files $CDDIR $MIRROR tools
fi
if [ -e "$MIRROR/tools" ] && \
[ ! -e $CDDIR/tools ] && \
[ "$OMIT_DOC_TOOLS" != "1" ] ; then
echo " Adding tools to CD1"
$BASEDIR/tools/add_files $CDDIR $MIRROR tools
fi
fi
extra_image () {
@ -175,8 +175,8 @@ if [ "$THISTYPE" = "isolinux" ]; then
(ar p "$MIRROR/${SYSLINUXDEB}" data.tar.gz | \
tar zxf - -C $CDDIR/../syslinux ./usr/lib)
echo $SYSLINUXDEB >> $CDDIR/../$N.pkgs_extracted
$BASEDIR/tools/which_deb $MIRROR $DI_CODENAME syslinux source >> $CDDIR/../$N.pkgs_extracted
echo $SYSLINUXDEB >> $CDDIR/../$N.pkgs_extracted
$BASEDIR/tools/which_deb $MIRROR $DI_CODENAME syslinux source >> $CDDIR/../$N.pkgs_extracted
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J -joliet-long"
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-cache-inodes"

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

@ -22,7 +22,7 @@ if [ "$DI_WWW_HOME" = "default" ];then
DI_WWW_HOME="http://d-i.debian.org/daily-images/amd64/daily"
fi
if [ -n "$DI_DIR" ];then
DI_DIR="$DI_DIR/${DI_WWW_HOME#*http://}"
DI_DIR="$DI_DIR/${DI_WWW_HOME#*http://}"
DI_WWW_HOME=""
echo "Using images from $DI_DIR"
fi
@ -175,8 +175,8 @@ if [ "$THISTYPE" = "isolinux" ]; then
(ar p "$MIRROR/${SYSLINUXDEB}" data.tar.gz | \
tar zxf - -C $CDDIR/../syslinux ./usr/lib)
echo $SYSLINUXDEB >> $CDDIR/../$N.pkgs_extracted
$BASEDIR/tools/which_deb $MIRROR $DI_CODENAME syslinux source >> $CDDIR/../$N.pkgs_extracted
echo $SYSLINUXDEB >> $CDDIR/../$N.pkgs_extracted
$BASEDIR/tools/which_deb $MIRROR $DI_CODENAME syslinux source >> $CDDIR/../$N.pkgs_extracted
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J -joliet-long"
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-cache-inodes"