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

Indent cleanup

This commit is contained in:
Steve McIntyre 2015-02-03 02:15:20 +00:00
parent 6ada498416
commit a46cc618f8
1 changed files with 89 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -238,7 +238,6 @@ EOF
@exit @exit
EOF EOF
fi fi
rm -f boot$N/isolinux/isolinux.cfg.with*
# Common mkisofs options when creating CDs # Common mkisofs options when creating CDs
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J -joliet-long" add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J -joliet-long"
@ -283,7 +282,6 @@ if [ "$BOOT_BIOS" = 1 ] ; then
cp -f $CDDIR/../syslinux/usr/lib/syslinux/modules/bios/ldlinux.c32 boot$N/isolinux/ cp -f $CDDIR/../syslinux/usr/lib/syslinux/modules/bios/ldlinux.c32 boot$N/isolinux/
cp -f $CDDIR/../syslinux/usr/lib/syslinux/modules/bios/libcom32.c32 boot$N/isolinux/ cp -f $CDDIR/../syslinux/usr/lib/syslinux/modules/bios/libcom32.c32 boot$N/isolinux/
cp -f $CDDIR/../syslinux/usr/lib/syslinux/modules/bios/libutil.c32 boot$N/isolinux/ cp -f $CDDIR/../syslinux/usr/lib/syslinux/modules/bios/libutil.c32 boot$N/isolinux/
fi
# If we don't have grub stuff from d-i, tell xorriso to add a # If we don't have grub stuff from d-i, tell xorriso to add a
# partition offset for the isohybrid code # partition offset for the isohybrid code
@ -339,13 +337,14 @@ if variant_enabled "xen" ; then
extra_image xen/vmlinuz "../vmlinuz ../gtk/vmlinuz" extra_image xen/vmlinuz "../vmlinuz ../gtk/vmlinuz"
extra_image xen/initrd.gz "../initrd.gz ../gtk/initrd.gz" extra_image xen/initrd.gz "../initrd.gz ../gtk/initrd.gz"
extra_image xen/debian.cfg || extra_image xen/xm-debian.cfg extra_image xen/debian.cfg || extra_image xen/xm-debian.cfg
fi
if [ -z "$MULTIARCH" ]; then if [ -z "$MULTIARCH" ]; then
# Set up isolinux dir for only the current arch # Set up isolinux dir for only the current arch
grep -lr '%install%' boot$N/isolinux/* | xargs -r sed -i "s|%install%|$INSTALLDIR|" grep -lr '%install%' boot$N/isolinux/* | xargs -r sed -i "s|%install%|$INSTALLDIR|"
# Remove the amd*.cfg files to avoid them being loaded on a # Remove the amd*.cfg files to avoid them being loaded on a disc
# disc that does not have both amd64 and i386 dirs. # that does not have both amd64 and i386 dirs.
find boot$N/isolinux/ -name "amd*.cfg" -delete find boot$N/isolinux/ -name "amd*.cfg" -delete
else else
# Set up isolinux dir for multi-arch # Set up isolinux dir for multi-arch