Commit 5bcc0362 authored by Colin Watson's avatar Colin Watson

Rename debian-installer/kernel/* to base-installer/kernel/*.

r24531
parent 6187ebea
* Use different waypoints on the progress bar for cdrom and network installs.
* Rename the debian-installer/kernel/* templates, since they're specific to
this package now, not globals in rootskel. I doubt anyone preseeds these.
......@@ -4,6 +4,10 @@ base-installer (1.14) UNRELEASED; urgency=low
* Frans Pop
- Add sanity check in postinst for empty COMPONENTS to guard against
ugly and difficult to trace errors from debootstrap. Closes: #283510.
* Joey Hess
- Moved debian-installer/kernel/image, debian-installer/kernel/image-2.6,
debian-installer/kernel/linux/initrd,
debian-installer/kernel/linux/initrd-2.6 from rootskel.
* Colin Watson
- Merge experimental kernel selection improvements branch:
+ Consolidate all the uname calls to find the kernel version into one
......@@ -20,12 +24,9 @@ base-installer (1.14) UNRELEASED; urgency=low
- Fix arch_get_kernel output on s390, and explicitly disallow -s390-tape
and -s390x (documenting why).
- Map lasat subarchitecture to r5k-lasat flavour on mipsel.
- Rename debian-installer/kernel/* to base-installer/kernel/*.
* Martin Michlmayr
- Add tests for various mips and mipsel subarchitectures.
* Joey Hess
- Moved debian-installer/kernel/image, debian-installer/kernel/image-2.6,
debian-installer/kernel/linux/initrd,
debian-installer/kernel/linux/initrd-2.6 from rootskel.
-- Frans Pop <aragorn@tiscali.nl> Wed, 1 Dec 2004 14:53:07 +0100
......
......@@ -356,9 +356,9 @@ get_arch_kernel () {
pick_kernel () {
# Fetch the current default
if db_get debian-installer/kernel/image-$KERNEL_MAJOR && [ "$RET" ]; then
if db_get base-installer/kernel/image-$KERNEL_MAJOR && [ "$RET" ]; then
KERNEL="$RET"
elif db_get debian-installer/kernel/image && [ "$RET" ]; then
elif db_get base-installer/kernel/image && [ "$RET" ]; then
KERNEL="$RET"
fi
......@@ -427,24 +427,24 @@ pick_kernel () {
info "Using kernel '$KERNEL'"
# Pass the kernel name on
db_set debian-installer/kernel/image "$KERNEL"
db_set base-installer/kernel/image "$KERNEL"
}
install_kernel () {
if db_get "debian-installer/kernel/linux/initrd-$KERNEL_MAJOR" ; then
if db_get "base-installer/kernel/linux/initrd-$KERNEL_MAJOR" ; then
if [ "$RET" = true ]; then
do_initrd=yes
else
do_initrd=no
fi
elif db_get debian-installer/kernel/linux/initrd ; then
elif db_get base-installer/kernel/linux/initrd ; then
if [ "$RET" = "true" ]; then
do_initrd=yes
else
do_initrd=no
fi
else
warning "Failed to get debconf answer 'debian-installer/kernel/linux/initrd'."
warning "Failed to get debconf answer 'base-installer/kernel/linux/initrd'."
do_initrd=yes
fi
......
Template: debian-installer/kernel/image
Template: base-installer/kernel/image
Type: string
Default: kernel-image
Default[hppa]: kernel-image-2.4.27-32
......@@ -7,7 +7,7 @@ Default[ia64]: kernel-image-2.4.27-1-itanium-smp
Default[s390]: kernel-image-2.4.27-1-s390
Description: default kernel image if nothing better is found
Template: debian-installer/kernel/image-2.6
Template: base-installer/kernel/image-2.6
Type: string
Default: kernel-image
Default[hppa]: kernel-image-2.6.8-1-32
......@@ -15,7 +15,7 @@ Default[i386]: kernel-image-2.6.8-1-386
Default[ia64]: kernel-image-2.6.8-1-itanium-smp
Description: default kernel image if nothing better is found (2.6)
Template: debian-installer/kernel/linux/initrd
Template: base-installer/kernel/linux/initrd
Type: boolean
Default: true
Default[s390]: false
......@@ -27,7 +27,7 @@ Default[m68k]: false
Default[sparc]: true
Description: kernel needs an initrd (linux only)
Template: debian-installer/kernel/linux/initrd-2.6
Template: base-installer/kernel/linux/initrd-2.6
Type: boolean
Default: true
Default[s390]: false
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment