Remove -safe options from powerpc yaboot menu, as they caused combinatorial

explosion. Instead, document video=ofonly in boot.msg.
This commit is contained in:
Colin Watson 2004-07-25 13:04:35 +00:00
parent f0b7ad7305
commit 9d439c92b2
3 changed files with 8 additions and 101 deletions

View File

@ -3,13 +3,12 @@ Welcome to Debian GNU/Linux ${DEBIAN_VERSION}!
This is a Debian installation ${MEDIA_TYPE},
built on ${BUILD_DATE}.
In addition to the default 'install' option,
there is 'install-safe' which you should try if
the system fails to boot at all (the typical
symptom is a white screen which doesn't go away).
The default option is 'install'. For maximum
control, you can use the 'expert' option.
For maximum control, you can use the 'expert'
and 'expert-safe' options.
If the system fails to boot at all (the typical
symptom is a white screen which doesn't go away),
use 'install video=ofonly' or 'expert video=ofonly'.
The plain options are for the powerpc family of
processors (from 601 to G4). The -power3 options
@ -18,5 +17,5 @@ are for IBM Power4 and Apple G5 boxes.
************************************
If in doubt, just choose 'install', and if that
doesn't work, try 'install-safe'.
doesn't work, try 'install video=ofonly'.
************************************

View File

@ -26,23 +26,6 @@ image=/install/powerpc/vmlinux
initrd-size=10240
read-only
# some machines have wonky framebuffer support
image=/install/powerpc/vmlinux
label=install-safe-powerpc
alias=install-safe
initrd=/install/powerpc/initrd.gz
initrd-size=10240
append="devfs=mount,dall video=ofonly init=/linuxrc"
read-only
image=/install/powerpc/vmlinux
label=expert-safe-powerpc
alias=expert-safe
initrd=/install/powerpc/initrd.gz
initrd-size=10240
append="DEBCONF_PRIORITY=low devfs=mount,dall video=ofonly init=/linuxrc"
read-only
# Power3 subarch
image=/install/power3/vmlinux
label=install-power3
@ -58,21 +41,6 @@ image=/install/power3/vmlinux
initrd-size=10240
read-only
# some machines have wonky framebuffer support
image=/install/power3/vmlinux
label=install-safe-power3
initrd=/install/power3/initrd.gz
initrd-size=10240
append="devfs=mount,dall video=ofonly init=/linuxrc"
read-only
image=/install/power3/vmlinux
label=expert-safe-power3
initrd=/install/power3/initrd.gz
initrd-size=10240
append="DEBCONF_PRIORITY=low devfs=mount,dall video=ofonly init=/linuxrc"
read-only
# Power 4 subarch
image=/install/power4/vmlinux
label=install-power4
@ -88,21 +56,6 @@ image=/install/power4/vmlinux
initrd-size=10240
read-only
# some machines have wonky framebuffer support
image=/install/power4/vmlinux
label=install-safe-power4
initrd=/install/power4/initrd.gz
initrd-size=10240
append="devfs=mount,dall video=ofonly init=/linuxrc"
read-only
image=/install/power4/vmlinux
label=expert-safe-power4
initrd=/install/power4/initrd.gz
initrd-size=10240
append="DEBCONF_PRIORITY=low devfs=mount,dall video=ofonly init=/linuxrc"
read-only
# ... and now massive clone-and-hack for 2.6 ...
# Powerpc subarch
@ -122,23 +75,6 @@ image=/install/powerpc/2.6/vmlinux
initrd-size=8192
read-only
# some machines have wonky framebuffer support
image=/install/powerpc/2.6/vmlinux
label=install-safe-powerpc-2.6
alias=install-safe-2.6
initrd=/install/powerpc/2.6/initrd.gz
initrd-size=8192
append="devfs=mount,dall video=ofonly init=/linuxrc"
read-only
image=/install/powerpc/2.6/vmlinux
label=expert-safe-powerpc-2.6
alias=expert-safe-2.6
initrd=/install/powerpc/2.6/initrd.gz
initrd-size=8192
append="DEBCONF_PRIORITY=low devfs=mount,dall video=ofonly init=/linuxrc"
read-only
# Power3 subarch
image=/install/power3/2.6/vmlinux
label=install-power3-2.6
@ -154,21 +90,6 @@ image=/install/power3/2.6/vmlinux
initrd-size=8192
read-only
# some machines have wonky framebuffer support
image=/install/power3/2.6/vmlinux
label=install-safe-power3-2.6
initrd=/install/power3/2.6/initrd.gz
initrd-size=8192
append="devfs=mount,dall video=ofonly init=/linuxrc"
read-only
image=/install/power3/2.6/vmlinux
label=expert-safe-power3-2.6
initrd=/install/power3/2.6/initrd.gz
initrd-size=8192
append="DEBCONF_PRIORITY=low devfs=mount,dall video=ofonly init=/linuxrc"
read-only
# Power 4 subarch
image=/install/power4/2.6/vmlinux
label=install-power4-2.6
@ -183,18 +104,3 @@ image=/install/power4/2.6/vmlinux
append="DEBCONF_PRIORITY=low devfs=mount,dall init=/linuxrc"
initrd-size=8192
read-only
# some machines have wonky framebuffer support
image=/install/power4/2.6/vmlinux
label=install-safe-power4-2.6
initrd=/install/power4/2.6/initrd.gz
initrd-size=8192
append="devfs=mount,dall video=ofonly init=/linuxrc"
read-only
image=/install/power4/2.6/vmlinux
label=expert-safe-power4-2.6
initrd=/install/power4/2.6/initrd.gz
initrd-size=8192
append="DEBCONF_PRIORITY=low devfs=mount,dall video=ofonly init=/linuxrc"
read-only

2
debian/changelog vendored
View File

@ -115,6 +115,8 @@ debian-cd (2.2.18) UNRELEASED; urgency=low
installs it.
- Bump initrd-size to 10MB for powerpc 2.4. Current d-i initrds exceed
that.
- Remove -safe options from powerpc yaboot menu, as they caused
combinatorial explosion. Instead, document video=ofonly in boot.msg.
* Sven Luther
- fixed powerpc list so it includes the 2.6 kernels too as well as the
power3 and power4 2.4 kernels.