Commit Graph

27 Commits

Author SHA1 Message Date
Philipp Hahn 1a15968a7a Fix size calculation for EFI image
CD creation fails with "disk full", because of rounding errors.

The minimum size of data-allocation is a 'cluster', which is a
power-of-two multiple of sectors.
mkfs.msdos chooses minimum FAT and cluster size for image: FAT12<16G
mkfs.msdos uses block-count where a block is 1024 B, but must be rounded
up to track_size with 32 sectors.

Round up each file to clusters before summing.
A sub-directory entry needs 1 cluster minimum.
2016-04-19 22:09:24 +00:00
Steve McIntyre c11d247540 Change wget usage to make option handling easier
Switch all usage to $WGET, then set WGET in CONF.sh
First usage is to add --ca-directory /etc/ssl/ca-debian/ so https
certificates work.
2016-01-03 12:54:46 +00:00
Steve McIntyre c8e1b1e51d Switch references to d-i.debian.org to use https instead of http.
Closes: #809698
2016-01-03 00:37:39 +00:00
Steve McIntyre e799e742c0 Improve autorun.inf, make sure the disc icon displays
Closes: #772691. Thanks to jnqnfe for initial patch, slightly tweaked.
2015-02-17 06:30:28 +00:00
Steve McIntyre a46cc618f8 Indent cleanup 2015-02-05 00:18:41 +00:00
Steve McIntyre 6ada498416 More consistent debug message 2015-02-05 00:18:41 +00:00
Steve McIntyre 218757dd6f Major refactor for better control of choice of EFI and BIOS boot
Split the code up and use BOOT_EFI and BOOT_BIOS to control which
goes where. We now support:

 * BOOT_BIOS=1 BOOT_EFI=0 for BIOS boot only via an ElTorito boot
   record (like debian-cd used to be before EFI support was added)

 * BOOT_BIOS=1 BOOT_EFI=2 for standard BIOS boot as
   primary ElTorito boot record and EFI as an alternate ElTorito boot
   record (common case, just like we've been doing for amd64 in
   debian-cd for a while)

 * BOOT_BIOS=0 and BOOT_EFI=1 for *only* EFI boot as the primary
   ElTorito boot record (new case, might be useful for some
   Macs *maybe*)

Set BOOT_METHODS in the debian-cd environment to determine which of
these cases is desired in a given build.

Also removed the support for the "old" syslinux packaging layout, it's
not been around for a while now.
2015-02-05 00:18:40 +00:00
Steve McIntyre 26015951f6 Remove isolinux message - no longer needed 2015-02-05 00:18:40 +00:00
Steve McIntyre d2b08bb059 Factor out the code for EFI boot slightly
Only use -eltorito-alt-boot when we need to
2015-02-05 00:18:40 +00:00
Steve McIntyre aff1c7700d If we're only doing EFI, copy the splash file from the BIOS boot dir 2015-02-05 00:18:40 +00:00
Steve McIntyre e4a3987cbe Remove old mentions of floppy in the code 2015-02-05 00:18:40 +00:00
Steve McIntyre fc10046fba Add extra options to control boot options on x86 CDs 2015-02-05 00:18:40 +00:00
Steve McIntyre e5e09cffd5 eplace %ARCH% with the arch name
Extra feature, helpful for testing multi-arch CD builds
2015-01-11 00:43:27 +00:00
Steve McIntyre 322339fb4d Force overwrite when creating efi.img boot files 2015-01-11 00:41:31 +00:00
Steve McIntyre a3c80cd032 Copy all boot files out of efi.img - added for i386-efi support 2015-01-11 00:40:15 +00:00
Steve McIntyre 2900545769 Change from -- to --- for kernel command line handling
Closes: #764676
2014-11-06 12:55:59 +00:00
Steve McIntyre 047b07e779 Do not look for isolinux/desktop/*cfg files
d-i has removed these files now, so don't look for them for kernel
params. Closes: #767223, #766411. Thanks to Prema and Vagrant for
(identical!) patches. :-)
2014-10-29 17:28:12 +00:00
Joey Hess b494adcb03 adapt desktop handling for tasksel/d-i changes
tasksel now allows selecting the desktop, and d-i has dropped the boot
menu desktop selection, so we no longer need to have desktop boot
menus on CDs.

CD images for specific desktops (xfce/kde/mate/etc) should still
override the default tasksel desktop.
2014-09-26 23:39:52 +01:00
Steve McIntyre 6d623c6b88 Another try to sort out desktop settings for the Gnome CD 2014-08-07 02:31:21 +01:00
Steve McIntyre e53f3e1ad6 Cope with changes from move to isolinux 6.x. Closes: #746746 2014-05-18 01:31:29 +01:00
Steve McIntyre 6b0e67d201 Factor out the xorriso version-checking code 2014-04-08 18:32:13 +01:00
Raphaël Hertzog 0cfa70e113 Fix code extracting the xorriso version
The code was assuming that the first line of output was something like
this (and this is the case of the cd builder machine that uses a custom
built xorriso):
> GNU xorriso 1.2.6 : RockRidge filesystem manipulator, libburnia project.

But the output of the version packaged in Debian does not have the GNU
string:
> xorriso 1.3.2 : RockRidge filesystem manipulator, libburnia project.

We fix this issue by extracting the version from the line starting with
"xorriso version" which does not have this discrepancy.
2014-03-27 15:55:36 +01:00
Steve McIntyre 835cbca01b Pull out some more common code into common.sh to simplify the various
boot-$arch scripts
2013-12-16 14:05:35 +00:00
Steve McIntyre 3e0309bc85 Trivial code consistency cleanups 2013-12-16 13:40:05 +00:00
Steve McIntyre 4907025c1f Don't assume loadlin.exe exists. Closes: #706156
When making a custom server netinstall ISO, it may be desired to not
have MS Windows files. Unfortunately there's currently no check for
loadlin.exe, so install.bat gets created regardless. Fix this.
2013-06-13 00:04:50 +01:00
Steve McIntyre f007eaed9d Build without isolinux/desktop. Closes: #706150
debian-cd currently expects there to always be isolinux/desktop/*
files and a dtmenu.cfg file, failing if they are missing. Make it so
debian-cd can cope whether those files are present or not.
2013-06-12 23:59:33 +01:00
Steve McIntyre 5f0cdbd1ee * Start jessie work; copy things from the wheezy config for now.
* Remove older squeeze, lenny, etch dirs
2013-05-06 22:26:50 +00:00