I've added an initrd-preseed udeb and a modified network-retriever and once this gets into the archive we will be able to make d-i images that download udebs from unstable, while still installing sarge. At least for now we can make the daily builds and all development builds be configured to do that, to avoid the current crop of kernel ABI madness. The way I have it set up, official d-i builds will be done without this setting, so will still download udebs from sarge. Attached is the patch to installer/, which I'll commit after the new udebs that it needs are in the archive. -- see shy jo
Index: build/config/common
===================================================================
--- build/config/common (revision 24457)
+++ build/config/common (working copy)
@@ -17,6 +17,12 @@
# or just something extra on a floppy.
#EXTRAFILES = /usr/bin/strace
+# This variable can be used to add a preseed file to the initrd itself.
+# It will be loaded by the initrd-preseed udeb.
+# Right now we want all d-i development and daily builds to use udebs from
+# unstable, so load the unstable.cfg.
+PRESEED ?= unstable.cfg
+
# The library reducer to use. Can be mklibs.sh or mklibs.py.
MKLIBS = mklibs
@@ -26,9 +32,8 @@
#MIRROR = http://www.us.debian.org/debian
# Define here if debian-installer should be built with modules from
-# stable, testing or unstable. Note that currently only unstable
-# contains installer modules
-SUITE = unstable
+# stable, testing or unstable.
+SUITE ?= unstable
# Options to pass to dpkg when it is unpacking the udebs to create the
# image. None should be needed, but --force-overwrite might need to be
Index: build/unstable.cfg
===================================================================
--- build/unstable.cfg (revision 0)
+++ build/unstable.cfg (revision 0)
@@ -0,0 +1,3 @@
+# Preseed file to make d-i download udebs from unstable, useful for daily
+# builds and development builds.
+d-i mirror/udeb/suite string unstable
Index: build/Makefile
===================================================================
--- build/Makefile (revision 24457)
+++ build/Makefile (working copy)
@@ -364,6 +364,11 @@
rmdir $(TREE)/boot/
endif
+ifdef PRESEED
+ # Copy in preseed file.
+ cp -a $(PRESEED) $(TREE)/preseed.cfg
+endif
+
ifdef EXTRAFILES
# Copy in any extra files.
set -e; \
Index: build/pkg-lists/cdrom-minimal/common
===================================================================
--- build/pkg-lists/cdrom-minimal/common (revision 24457)
+++ build/pkg-lists/cdrom-minimal/common (working copy)
@@ -17,6 +17,8 @@
cdebconf-priority
cdebconf-newt-udeb
usb-discover
+preseed-common
+initrd-preseed
file-preseed
# It is nice to have an editor, in case something goes wrong
Index: build/pkg-lists/netboot-minimal/common
===================================================================
--- build/pkg-lists/netboot-minimal/common (revision 24457)
+++ build/pkg-lists/netboot-minimal/common (working copy)
@@ -12,6 +12,8 @@
cdebconf-newt-udeb
rootskel-locale
di-utils-terminfo
+preseed-common
+initrd-preseed
network-preseed
# there's space for an editor
Index: build/pkg-lists/access/common
===================================================================
--- build/pkg-lists/access/common (revision 24457)
+++ build/pkg-lists/access/common (working copy)
@@ -24,3 +24,6 @@
# used by netcfg
libiw27-udeb
+
+preseed-common
+initrd-preseed
Index: build/pkg-lists/nativehd/common
===================================================================
--- build/pkg-lists/nativehd/common (revision 24457)
+++ build/pkg-lists/nativehd/common (working copy)
@@ -26,3 +26,6 @@
libiw27-udeb
libfribidi0-udeb
+
+preseed-common
+initrd-preseed
Index: build/pkg-lists/cdrom/common
===================================================================
--- build/pkg-lists/cdrom/common (revision 24457)
+++ build/pkg-lists/cdrom/common (working copy)
@@ -17,6 +17,8 @@
cdebconf-priority
cdebconf-newt-udeb
usb-discover
+preseed-common
+initrd-preseed
file-preseed
# It is nice to have an editor, in case something goes wrong
Index: build/pkg-lists/monolithic/common
===================================================================
--- build/pkg-lists/monolithic/common (revision 24457)
+++ build/pkg-lists/monolithic/common (working copy)
@@ -38,5 +38,7 @@
# used by base-installer
debootstrap-udeb
+preseed-common
+initrd-preseed
file-preseed
libfribidi0-udeb
Index: build/pkg-lists/hd-media/common
===================================================================
--- build/pkg-lists/hd-media/common (revision 24457)
+++ build/pkg-lists/hd-media/common (working copy)
@@ -11,6 +11,8 @@
di-utils-terminfo
cdebconf-newt-udeb
nano-udeb
+preseed-common
+initrd-preseed
file-preseed
# include support for usb, including usb storage
Index: build/pkg-lists/floppy/common
===================================================================
--- build/pkg-lists/floppy/common (revision 24457)
+++ build/pkg-lists/floppy/common (working copy)
@@ -24,3 +24,5 @@
load-floppy
floppy-retriever
+preseed-common
+initrd-preseed
Index: build/pkg-lists/netboot/common
===================================================================
--- build/pkg-lists/netboot/common (revision 24457)
+++ build/pkg-lists/netboot/common (working copy)
@@ -12,6 +12,8 @@
cdebconf-newt-udeb
rootskel-locale
di-utils-terminfo
+preseed-common
+initrd-preseed
network-preseed
# there's space for an editor
Index: build/pkg-lists/generic/common
===================================================================
--- build/pkg-lists/generic/common (revision 24457)
+++ build/pkg-lists/generic/common (working copy)
@@ -13,5 +13,7 @@
# there's space for an editor
nano-udeb
+preseed-common
+initrd-preseed
network-preseed
Index: debian/changelog
===================================================================
--- debian/changelog (revision 24457)
+++ debian/changelog (working copy)
@@ -12,6 +12,20 @@
crash when the installed system boots.
- Add new usb-modules to sparc64 images to support usb keyboard on sun
blades.
+ - Add preseed-common to all initrds, split out from file/network-preseed.
+ - Add initrd-preseed too.
+ - Add a PRESEED variable, which can be used to specify a preseed file to
+ add to the initrd in the location initrd-preseed expects to find one
+ (/preseed.cfg).
+ - Default PRESEED to unstable.cfg, which sets mirror/udeb/suite, which
+ means that all d-i developmental and daily builds that download udebs
+ will download them from unstable, not testing, which is appropriate
+ given a) d-i's current, forked state and b) the kernel ABI's current,
+ fucked state.
+ - However, in release builds of the package, this is unset, so those will
+ pull udebs from sarge as previously.
+ - Fix SUITE setting so debian/rules can override it. I guess this never
+ worked as intended before!
* Thiemo Seufer
- Do an e2fsck for the extra floppy images.
- Handle sparse files in cramfs images more efficiently.
Index: debian/rules
===================================================================
--- debian/rules (revision 24457)
+++ debian/rules (working copy)
@@ -29,7 +29,7 @@
# Must run as root, so is not run as part of regular build.
build-images:
$(MAKE) -C build all_build stats \
- SUITE=$(DISTRIBUTION) BUILD_DATE=$(DATE)
+ SUITE=$(DISTRIBUTION) BUILD_DATE=$(DATE) PRESEED=
build: build-stamp
build-stamp:
Attachment:
signature.asc
Description: Digital signature