Commit Graph

583 Commits

Author SHA1 Message Date
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
Steve McIntyre 579e443ca5 * Merge x86 EFI support from the EFI_support branch (Closes: #658352)
+ Pull in grub-efi for amd64 and i386
    + Lots of extra code in boot-x86:
      - pull grub EFI pieces out of the latest debian-cd_info.tar.gz
    	blobs in d-i, if they're there. If so, use them to make x86 images
	    bootable via EFI (both via CD and USB)
      - generate boot entries for grub on the fly; temporary code for now,
	    will switch to parsing the isolinux entries shortly instead.
      - depending more and more on xorriso rather than genisoimage...
2012-09-26 00:17:27 +00:00
Steve McIntyre f92b41bb54 BLS=4 for BIOS boot 2012-09-20 11:46:46 +00:00
Steve McIntyre c7a51f405f Move the mkisofs_opts calls until after we've copied the isolinux.bin file into place 2012-08-13 13:22:13 +00:00
Steve McIntyre a37770b429 Update the boot-load-size parameter for all ElTorito booting arches 2012-08-13 13:06:04 +00:00
Steve McIntyre 4d8a88e5da * Tweak boot-load-size for ia64 to make CDs boot again. Closes: #678883.
Thanks to Stephan Schreiber for the patch.
2012-08-07 20:48:16 +00:00
Steve McIntyre 747c65e354 * Tweak powerpc boot options, using 32/64 bit detection in yaboot at
boot time. Thanks to Milan Kupcevic for the patch. Closes: #678066
2012-08-04 17:47:47 +00:00
Steve McIntyre c92c20ad36 Add gtk initrd to hurd-i386 images. Closes: #635260
Thanks to Samuel Thibault for the patch.
2012-07-05 23:48:48 +00:00
Steve McIntyre 32a101d56c Add s390x as a known architecture, merging common s390/s390x boot
setup scripts.
2012-05-28 22:42:43 +00:00
Steve McIntyre 7f852be440 tweak exec bits 2012-03-16 15:00:50 +00:00
Steve McIntyre 730ee51310 Add armhf architecture 2012-03-16 14:43:18 +00:00
Steve McIntyre 93125afb4e fix up testing images where not all the file variants exist yet 2012-03-15 15:46:19 +00:00
Steve McIntyre f0ba77f6e9 Some of the images aren't in wheezy yet 2012-03-05 22:50:23 +00:00
Steve McIntyre 4241d811cb Add graphical installer image for kfreebsd-amd64. Closes: #651530 2012-03-03 22:50:10 +00:00
cd-builder user fb2524035f cope with the FreeBSD v9 images not being in the current squeeze release 2011-12-14 15:40:46 +00:00
Steve McIntyre 353bad5355 Add kfreebsd 9. Closes: #650926 2011-12-08 15:34:14 +00:00
Steve McIntyre 38da832619 Add an extra tweaked version of d390.ins for s390 booting. The
Hardware Management Console needs the file to be in the root
directory.
2011-11-30 17:49:48 +00:00
Steve McIntyre 35ce658443 * Remove lots of old stuff neither needed nor supported any more:
+ removed architectures: alpha arm hppa
  + removed releases: etch lenny
  + removed unversioned data/sparc and data/yaboot, versioned
    equivalents are in place already.
2011-11-14 15:25:07 +00:00
Raphaël Hertzog e79ecc1416 * Changes triggered by various lintian warnings:
+ Switch to “3.0 (native)” source format to get rid of .svn
    directories in the source package (when built from the svn checkout
    directly)
  + Support build-arch/build-indep targets in debian/rules.
  + Drop executable rights from tools/boot/wheezy/boot-hurd
    (and fix debian/rules to not re-add it).
  + Bump Standards-Version to 3.9.2 (no change required).
2011-11-06 13:34:06 +00:00
Steve McIntyre aee8d4a710 Fall back to old Xen config if needed 2011-08-18 20:18:15 +00:00
Steve McIntyre 4aed803ee3 Rename "xm-debian.cfg" to just "debian.cfg" for Xen config. 2011-08-16 10:58:43 +00:00
Steve McIntyre acc068350b update the URL for downloading armel d-i dailies 2011-05-10 22:26:58 +00:00
Steve McIntyre 5e429358cd update the URL for downloading i386 d-i dailies 2011-05-10 07:14:27 +00:00
Steve McIntyre ee04b44598 update the URL for downloading s390 d-i dailies 2011-04-25 18:34:57 +00:00
Steve McIntyre 9087898b11 Add support for hurd-i386. Closes: #619211 2011-03-30 10:29:44 +00:00
cd-builder user 192ab9e1e6 armel hasn't booted off CD in ages for us; comment out the DI_WWW_HOME
definition to stop the mirror script complaining.
2011-03-03 14:33:07 +00:00
Steve McIntyre 1250b9bca0 use the full correct path 2011-03-02 22:45:11 +00:00
Steve McIntyre 3df17fb170 Path to sparc daily builds has changed. 2011-03-02 22:33:47 +00:00
Steve McIntyre 5019f35713 Remove win32-loader standalone flavours from the tools/ directory on
x86. Closes: #612224
2011-02-22 20:52:44 +00:00
Steve McIntyre 6e44e0ff27 start wheezy development; svn cp squeeze wheezy and s/squeeze/wheezy/ 2011-02-07 22:30:21 +00:00
cd-builder user 58f17a7504 Remove directory name hack for xorriso, not needed for newer version 2010-12-26 19:24:30 +00:00
Steve McIntyre fc722916d0 * Add code to make isohybrid images for i386/amd64:
+ Makefile: Add support for overriding the MKISOFS and MKISOFS_OPTS
      variables on a per-arch basis
    + CONF.sh: add working examples for this
    + tools/boot/squeeze/boot-x86: if configured to use xorriso, add the
      extra command line options to add the isohybrid MBR. Also work
      around a difference in ISO directory naming between genisoimage and
      xorriso.
2010-12-24 23:28:44 +00:00
Steve McIntyre 4cea3e7385 Switch to --iso-level 4 for powerpc images to make them work better
with POWER machines. Thanks to Milan Kupcevic for the patch. Closes: #603536
2010-12-18 16:22:12 +00:00
Holger Levsen 400f356afa Start work on Debian Edu images. 2010-10-31 15:12:54 +00:00
Steve McIntyre 938be9c307 Support replacing the g-i image with ones own image. Closes: #601189 2010-10-26 18:33:22 +00:00
Steve McIntyre 4a56e9cf12 Finish refactoring, and make x86 CDs bootable again. Oops 2010-09-18 00:56:54 +00:00
Steve McIntyre a24fa2e1c5 More tweaks for the kFreeBSD boot code: move boot files into boot$N 2010-09-15 12:16:35 +00:00
Steve McIntyre 9fef487e9d * Fix support for alternative boot splash images. Thanks to Tony Awtrey
for the patch. Closes: #537368
2010-09-14 22:49:12 +00:00
Steve McIntyre 22bdd161f8 Remove old mention of different boot methods for CD1 and CD2; we've
not supported the alternative CD2 boot in *ages*.
2010-09-14 22:28:53 +00:00
Steve McIntyre 6752a1634a * Update loadlin kernel parameters to match d-i values. Thanks to Samuel
Thibault for the patch. Closes: #594267
2010-09-14 12:30:05 +00:00
cd-builder user 70f52017d3 Tweak definitions for kfreebsd daily image locations again 2010-08-20 15:58:15 +00:00
cd-builder user c67c31fc03 Tweak definitions for daily image locations so that the push_di_to_cdbuild script can find them 2010-08-20 15:52:56 +00:00
Steve McIntyre 771f754516 Add support for the kfreebsd ports. Closes: #593629 2010-08-20 15:04:23 +00:00
cd-builder user 5018528099 Fix for the doppelganger patch 2010-07-08 10:23:51 +00:00
Steve McIntyre b5ec72640c Patch from Ian Campbell <ijc@hellion.org.uk>:
Detect duplicates in the extra images used for installation

Several files included under install.{386,amd} are actually identical to
others. Rather than duplicating them attempt to detect this and hardlink
them.

Since images can be downloaded from the web at build time it is not
always possible to detect identical files by looking for the symlinks
created by the debian-installer build. Instead we pass a list of
potential "doppelgangers" to extra_image each of which is checked for
similarity to the new image.

I added gtk/vmlinuz (which is always the same as plain vmlinuz) which
although not necessary makes it more explicit which kernel goes with the
initrd at very little cost.

Hardlinks are used in preference to symlinks since these are expected to
work better with isolinux and the Xen tools.
2010-07-07 23:49:46 +00:00
cd-builder user 370193149e More changes needed for the netinst including firmware. Set up build "C" to work the same as build "2" in most respects. 2010-05-27 13:33:26 +00:00
Frans Pop d961fb7e0e s390: specify offset and size of the initrd for booting from CD
The old setup worked fine with an ext2 initrd but fails with an initramfs,
either because autodetection is different for initramfs or because of kernel
changes (I suspect the first).
This means that booting s390 from CD has not worked since sometime during the
Etch release cycle, even though support for booting from CD was only added
early in that cycle - ouch.

For booting with an initramfs initrd we apparently need to specify its
offset and size at specific memory locations.

Change is based on SuSE's CD boot. Many thanks to Adam Thornton, Mark Post
(of Novell) and Bastian Blank for providing the pointers to the missing bits.

This fixes booting from CD using the d390.ins file; tested in Hercules for
both Lenny (31-bit kernel) and Squeeze (64-bit kernel).
Booting from CD using the d390.tdf file may still be broken (if possible at
all) as I have no idea how to test that.
2009-10-11 18:12:06 +00:00
Raphaël Hertzog d12d861d0d Fix syntax errors in tools/boot/{lenny,squeeze}/boot-m68k (thanks to
lintian).
2009-09-17 14:16:21 +00:00
Raphaël Hertzog d8a3faa32f * Fallback looking for syslinux/silo/yaboot in $CODENAME when $DI_CODENAME
didn't gave any result. This is useful when using partial mirrors built by
  simple-cdd while trying to build a Debian CD using a newer d-i (in my case
  etch CD with lenny d-i).
* Use dpkg --fsys-tarfile instead of ar for extracting files from deb
  packages. The previous invocation could have failed for packages using
  something other than gzip compression.
2009-08-18 15:01:25 +00:00
Frans Pop fe2334131d Add a Xen variant on i386 and amd64
Patch from Ian Campbell.

i386 Xen guests require a PAE (686-bigmem) kernel in order to
run. Therefore this variant includes the relevant installer kernel and
ramdisk in install.386/xen as well as suitable kernel udebs and proper
debs for the installed system.

amd64 Xen has no similar requirement but we include the kernels under
install.amd/xen in order to have a consistent path under both
architectures.
2009-08-09 14:33:00 +00:00
Frans Pop e9c608e6b7 Add support for producing disks with (optional) extra variants
This patch from Ian Cambell adds the generic support code:
   * CONF.sh:		Add $(VARIANTS) configuration variable.
   * eash-build.sh:	Add command line parameter to enable variants.
   * Makefile:		Define VARIANT_xxx when preprocessing package list.
   * boot/?/common.sh:	Add a function for checking if a variant is enabled.
   * generate_di_list: 	Allow variant overrides in udeb exclusion list.

Variant support is documented in docs/README.variants

The intention is to use this support to add support for installing a
Xen guest from an ISO image.

The approach to use varriants was originally suggested by Frans Pop.
2009-08-09 14:32:55 +00:00
Frans Pop bee30ee646 boot-x86: move creation of install.bat out of extra_image
Patch from Ian Campbell.
2009-08-09 14:32:45 +00:00