Commit Graph

553 Commits

Author SHA1 Message Date
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 b228286310 Clean up arm64 boot stuff
Remove un-needed boot$N in the xorriso command line, we don't have
crappy BIOS lomitations.
Remove support for older xorriso versions.

Use new -efi-boot-part --efi-boot-image options to make an
isohybrid-style images with an explicit EFI partition. Will hopefully
make d-i happier with our images from USB.
2015-01-31 10:59:04 +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 cb1b553227 Show all possible kernels - needed for i386-efi 2015-01-11 00:36:59 +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 09363728c3 Fix logic for %install% editing 2014-11-05 14:18:53 +00:00
Steve McIntyre f256a86827 More fixups for arm64 CD builds
* Actually put the kernel and initramfs on the CD (doh!)
 * Replace the %install% variables with real paths
2014-11-05 13:58:04 +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
Steve McIntyre dceb0d9b67 Fix typos 2014-10-05 09:14:24 +01:00
Aurelien Jarno cd1f0736fd Enable CHRP partition table on ppc64el boot CD
The test is on a file, so it should use -f instead of -d.
2014-10-04 16:23:21 +01:00
Steve McIntyre 550a9a4edc Update header comments in boot-arm64 2014-10-04 16:21:51 +01:00
Steve McIntyre 775d4ecfe0 The d-i supplied grub.cfg has the correct entries in it already 2014-10-04 16:20:37 +01:00
Steve McIntyre 840d549c8c Tweak ppc64el boot stuff: depend on xorriso 2014-10-03 14:13:03 +01:00
Aurelien Jarno 77387b5419 Add initial support for ppc64el 2014-10-03 00:56:48 +01:00
Steve McIntyre adad6af07d Point back to central arm64 d-i bits 2014-09-27 14:22:10 +01:00
Steve McIntyre e94ad0c760 Add experimental support for arm64 booting via UEFI 2014-09-27 02:40:05 +01: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 049506d313 Add initial support for arm64
Non-booting yet, copying and extending armhf for now.
2014-09-21 17:57:59 +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 8d39e31372 Fix up Gnome CD set installing xfce; Closes: #756774 2014-08-07 01:57:28 +01:00
Steve McIntyre e4fdc94a23 Remove mention of delo.2nd from hppa boot script
Must have been a cut and paste error from a mips script. :-(
2014-05-30 12:08:51 +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 17af9c76a1 Update from kfreebsd-9 to kfreebsd-10 2014-05-12 15:45:39 +01:00
Steve McIntyre 7a819f9120 Remove typo from the xorriso_version code 2014-04-09 10:33:47 +01:00
Steve McIntyre c0813db7f7 Fixes for booting on hppa architecture. Closes: #743879 2014-04-08 18:44:36 +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 78b84f92a9 Make kfreebsd & hurd images usbkey-bootable. Closes: #739422
debian-installer now has extra steps to create a grub_embed file which
can be passed to xorriso's --embedded-boot option. Add corresponding
code in debian-cd to use it to make images USB bootable.

Patch from Samuel Thibault.
2014-02-19 00:03:19 +00:00
Steve McIntyre 57fe59f92f Add "UEFI" text to the UEFI installer menu title
to make it easier for end users to distinguish between UEFI and BIOS
boot.
2014-02-11 01:59:54 +00:00
Steve McIntyre 546559365e Fix syntax bug in try_di_image_cache()
Add warnings if download links we're using are insecure (i.e. not
https). May turn these into errors later...
2013-12-16 15:15:53 +00: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 bc4d87e06f Remove s390 from the arch lists
Remove s390 from the arch lists in various scripts, as it's going
away. Support remains if specifically configured yet.
2013-10-16 23:28:08 +01:00
Steve McIntyre 700eb1571f Remove mention/support of old kfreebsd 8 kernels - they are not
created any more, and this is causing build failures.
2013-09-30 14:52:52 +01:00
Steve McIntyre 86e670195c Remove mention/support of the s390(x) tape options
Not created by d-i any more, and this is causing build failures.
2013-06-24 11:48:57 +01: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
Steve McIntyre 15f47873b4 Cosmetic tweaks to menu output 2013-04-23 17:33:03 +00:00
Steve McIntyre 497a82d798 Allow for override of distro name etc. in grub.cfg for EFI boot too.
Closes: #705610
2013-04-19 15:01:01 +00:00
Steve McIntyre 708240f580 Add further support for missing win32-loader.ini. Closes: #705594 2013-04-19 14:52:21 +00:00