Commit Graph

634 Commits

Author SHA1 Message Date
Steve McIntyre 9223ab7dbb Tweak the mtools fix again for x86 2016-05-10 10:17:19 +01:00
Steve McIntyre 7776250163 Properly fix the mtools problem 2016-05-10 10:00:27 +01:00
Steve McIntyre b41ebd8607 Add workaround for dosfstools issue (#823881) 2016-05-10 01:26:05 +01:00
Steve McIntyre cc4732add9 Also fix size calculation for EFI image for arm64 2016-05-10 01:22:45 +01:00
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 c949504c2e Updates for hppa from Helge Deller
Previous changes enabled gzip compressed Linux kernels, but not 100%
sure that it works on all systems. Disable this compression for now.

Switch hppa to use xorriso by default instead of mkisofs. Xorriso
supports kernel command lines to be up to 1023 bytes, better than
mkisofs. mkisofs only supports the older palo version 4 header format
which can hold only 127 characters which might be too small.
2016-04-19 22:37:38 +01:00
Steve McIntyre 604432183b Minor updates to hurd boot. Closes: #818176
Patch from Samuel Thibault
2016-03-28 23:37:01 +01:00
Steve McIntyre bf2c252d98 s/http/https/ again 2016-01-14 22:08:15 +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
John Paul Adrian Glaubitz e756612a6d Clone and adopt boot loader script from sparc for sparc64.
Signed-off-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
2016-01-03 00:06:47 +00:00
Steve McIntyre b7938695a1 Cope with changes in the isolinux menus added for auto CPU detection
Previously, this code was being confused by the re-use/overloading of
existing keywords in the ifcpu64.c module and not producing any menu
entries. Now, explicitly parse the new options and pick out just the
64-bit menus as they're a strict superset of the menus in isolinux.

This may enable some more issues, e.g. people trying to load a 64-bit
kernel on a 32-bit system, but until we get some auto-detection of CPU
in grub there's not much we can do about that. Let's get *something*
working at least.
2015-11-26 00:02:55 +00:00
Steve McIntyre 9d3c82d14d List the number of grub boot entries added, as extra debug 2015-11-25 23:49:19 +00:00
Steve McIntyre ea15ee5e4e Add +x on boot-s390x after changes 2015-11-24 16:57:55 +00:00
Steve McIntyre 476838aaff Add +x on boot-s390x after changes 2015-11-13 17:07:21 +00:00
Philipp Kern 35bbcda84e Load the s390x initrd at 0x01000000 when using the ins loader.
Currently the ins loader (mostly HMC loading into an LPAR) only
supports kernels up to 8 MiB. The jessie kernel has 11 MiB, which
does not fit and hence gets its tail overwritten by the initrd
(root.bin) loaded at this address. This change bumps the load
address to 16 MiB, which should allow for some more growth of
the kernel.

Signed-off-by: Philipp Kern <pkern@debian.org>
2015-11-13 00:21:34 +00:00
Philipp Kern 479c17d917 Drop the d390oco* files.
Object code only modules date back to 2.2 and 2.4 kernel times, when
IBM did not release the source to certain kernel modules. Since many
years everything needed to boot and run the machine is actually
open source. It also got broken due to the kernel growing larger and
adding the oco.bin would overwrite parts of the kernel.

It's safe to say that nobody is actually using this.
2015-11-13 00:21:19 +00:00
Philipp Kern 59d91ccf0b Drop the remaining s390 bits from stretch and jessie.
Signed-off-by: Philipp Kern <pkern@debian.org>
2015-11-12 12:01:29 +00:00
Steve McIntyre 4816b4e0af parse_isolinux: Support grub menuentry shortcuts for UEFI boot menus.
Closes: #798908
2015-10-01 18:39:57 +01:00
Steve McIntyre c8730bbda5 Remove old obsolete pre-d-i function install_language and all callers 2015-09-11 18:29:47 +01:00
Steve McIntyre fab83506a0 We don't have bootable mips CDs any more
So copy other kernel and initramfs options onto CD#1 so that end users
might actually be able to boot *something* by hand.
2015-09-11 18:26:35 +01:00
Steve McIntyre 950d33ecc2 Add kernels and other bits to armel/armhf images
Even if they won't boot directly from CD/DVD, make it easy for people
using our images by giving them all the bits they'll need to get them
booting somehow.
2015-08-27 14:27:49 +01:00
Didier Raboud 3e2382d4ad Fix booting from help files and isolinux.cfg overwriting 2015-08-21 15:11:54 +02:00
Didier Raboud 5a613731da Add management of arch detection from d-i in isolinux 2015-08-18 23:43:33 +01:00
Steve McIntyre 4dd0f528fc Swap amd64 and i386 in multi-arch config; amd64 is now the default
This copes with the similar change in d-i
2015-05-13 01:38:21 +01:00
Steve McIntyre cb53d1e807 Fix handling of LOGOPNG when we've got "doppelgangers"
When we've got multiple copies of the same initramfs hard-linked
together, gzip gets unhappy when we start modifying things
later. Explicitly break the links to fix that.
2015-05-11 12:07:18 +01:00
Steve McIntyre 1228b3724a Make 'sid' use stretch data etc. 2015-04-28 13:30:35 +01:00
Steve McIntyre ae3d40e866 Start stretch development 2015-04-27 17:14:26 +01:00
Steve McIntyre 0ad2c2dbdb Fix up the partitioning for arm64 images so USB will work again
This code was using "-efi-boot-part", which works fine for booting but
creates images that d-i can't use: only the full disk or the ESP
partition would contain working filesystems, and d-i doesn't like that.

Instead, switch to appending the ESP as an extra partition on the end
of the image. This will take a small amount of extra space, but will
at least work reliably!
2015-04-16 15:24:01 +01:00
Helge Deller 39bdaf29b2 alpha: fix unpacking aboot-base, copy versioned vmlinuz file correctly. 2015-02-28 22:59:01 +01: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 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
Steve McIntyre ea5ff2d358 Remove now-redundant add_grub_entry function 2013-03-24 20:13:25 +00:00
Steve McIntyre a63e6a8de1 Don't use DISKTYPE, revert to CDROM for media type 2013-03-07 07:47:29 +00:00
Steve McIntyre f41da39ead Add missing 'fi' 2013-03-07 07:45:28 +00:00
Steve McIntyre e0ac5cf3cf Tweak layout of code 2013-03-07 07:33:58 +00:00
Steve McIntyre 075a74d33a Add missing 'cache' command 2013-03-07 07:29:59 +00:00
Steve McIntyre 38ec979060 * Add extra text to boot messages on powerpc to tell people about how to
select a different desktop. Thanks to Rick Thomas for the
    text. Tweaked slightly to list the default on the current disc too.
2013-03-07 07:21:09 +00:00
Steve McIntyre 82f8590462 Work out the default desktop for generic/all discs 2013-03-07 06:47:49 +00:00
Steve McIntyre 7ef1b0a5c8 * Update boot-mipsel and boot-hppa to use the which_deb script for
better safety when extracting boot loader files.
  * Update all the relevant boot-* scripts to do the right thing when
    extracting packages and sources, depending on
    $ARCHIVE_EXTRACTED_SOURCES as above
2013-03-07 06:34:07 +00:00
Raphaël Hertzog 4d8f781235 Update logic protecting lookup of syslinux's source in tools/boot/wheezy/boot-x86
Steve pointed out that this lookup is only here so that helper scripts
can grab those sources and make them available in a public location
such as http://cdimage.debian.org/cdimage/cd-sources/. The sources are
not embedded in the generated ISO and are thus not strictly needed
for building the ISO image.

This should happen even when we're not building source ISOs but it's
not needed if we don't have any similar policy in place. Thus CONF.sh
is now leaving $ARCHIVE_EXTRACTED_SOURCES unset by default and the
source will only be looked up if that value is set.
2013-03-01 13:22:22 +00:00
Raphaël Hertzog d79ac8335d Update tools/boot/wheezy/boot-x86 to not look for syslinux's source
package if we're not including sources.
2013-03-01 08:50:34 +00:00
Steve McIntyre bd8597feaa Deal with syslinux version 5.x needing to install more files for
bootable x86 media. Thanks to Daniel Baumann for the path.
Closes: #699884
2013-02-12 13:43:29 +00:00
Steve McIntyre 5d2db49de9 Depending on the version of xorriso we have, use different EFI command line options 2013-01-15 01:51:51 +00:00
Steve McIntyre f299e200d7 only add a partition offset if we don't have grub files 2013-01-15 01:32:39 +00:00
Steve McIntyre 5cb7afe1f2 add code to grab the version of xorriso 2013-01-15 01:14:22 +00:00
Steve McIntyre 75053f33dc shuffle code a little 2013-01-15 01:09:52 +00:00
Steve McIntyre fdc90e1e3a Switch boot-x86 to always depend on xorriso now 2013-01-15 01:05:18 +00:00
Steve McIntyre d51ba39a32 Also print out any trailing kernel entries 2012-12-29 03:52:48 +00:00
Steve McIntyre 17f65ab8e2 Provide a better set of boot menus when booting via EFI. Previously
had a limited set of hard-coded menu entries - this was buggy and
didn't take into account all the possible boot variations. Now parse
the isolinux menus already provided in the d-i build and generate
equivalent grub menus, complete with themes for a reasonable layout
with graphics and titles.
2012-12-10 01:12:44 +00:00
Steve McIntyre 7072e8b02c Add /sbin and /usr/sbin to PATH, needed for mkfs.msdos and maybe other tools 2012-09-26 09:45:05 +00:00