From 131d434ef8b52849b2d2ecf24a8adb18ccdb541f Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Tue, 21 Sep 2004 00:45:35 +0000 Subject: [PATCH] Add "--" end of installer kernel params markers to yaboot.conf. --- data/sarge/yaboot/yaboot.conf | 24 ++++++++++++------------ debian/changelog | 2 ++ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/data/sarge/yaboot/yaboot.conf b/data/sarge/yaboot/yaboot.conf index 9a7239bf..79717e53 100644 --- a/data/sarge/yaboot/yaboot.conf +++ b/data/sarge/yaboot/yaboot.conf @@ -14,7 +14,7 @@ image=/install/powerpc/vmlinux label=install-powerpc alias=install initrd=/install/powerpc/initrd.gz - append="devfs=mount,dall init=/linuxrc" + append="devfs=mount,dall init=/linuxrc --" initrd-size=10240 read-only @@ -22,7 +22,7 @@ image=/install/powerpc/vmlinux label=expert-powerpc alias=expert initrd=/install/powerpc/initrd.gz - append="DEBCONF_PRIORITY=low devfs=mount,dall init=/linuxrc" + append="DEBCONF_PRIORITY=low devfs=mount,dall init=/linuxrc --" initrd-size=10240 read-only @@ -30,14 +30,14 @@ image=/install/powerpc/vmlinux image=/install/power3/vmlinux label=install-power3 initrd=/install/power3/initrd.gz - append="devfs=mount,dall init=/linuxrc" + append="devfs=mount,dall init=/linuxrc --" initrd-size=10240 read-only image=/install/power3/vmlinux label=expert-power3 initrd=/install/power3/initrd.gz - append="DEBCONF_PRIORITY=low devfs=mount,dall init=/linuxrc" + append="DEBCONF_PRIORITY=low devfs=mount,dall init=/linuxrc --" initrd-size=10240 read-only @@ -45,14 +45,14 @@ image=/install/power3/vmlinux image=/install/power4/vmlinux label=install-power4 initrd=/install/power4/initrd.gz - append="devfs=mount,dall init=/linuxrc" + append="devfs=mount,dall init=/linuxrc --" initrd-size=10240 read-only image=/install/power4/vmlinux label=expert-power4 initrd=/install/power4/initrd.gz - append="DEBCONF_PRIORITY=low devfs=mount,dall init=/linuxrc" + append="DEBCONF_PRIORITY=low devfs=mount,dall init=/linuxrc --" initrd-size=10240 read-only @@ -63,7 +63,7 @@ image=/install/powerpc/2.4/vmlinux label=install-powerpc-2.4 alias=install-2.4 initrd=/install/powerpc/2.4/initrd.gz - append="devfs=mount,dall init=/linuxrc" + append="devfs=mount,dall init=/linuxrc --" initrd-size=8192 read-only @@ -71,7 +71,7 @@ image=/install/powerpc/2.4/vmlinux label=expert-powerpc-2.4 alias=expert-2.4 initrd=/install/powerpc/2.4/initrd.gz - append="DEBCONF_PRIORITY=low devfs=mount,dall init=/linuxrc" + append="DEBCONF_PRIORITY=low devfs=mount,dall init=/linuxrc --" initrd-size=8192 read-only @@ -79,14 +79,14 @@ image=/install/powerpc/2.4/vmlinux image=/install/power3/2.4/vmlinux label=install-power3-2.4 initrd=/install/power3/2.4/initrd.gz - append="devfs=mount,dall init=/linuxrc" + append="devfs=mount,dall init=/linuxrc --" initrd-size=8192 read-only image=/install/power3/2.4/vmlinux label=expert-power3-2.4 initrd=/install/power3/2.4/initrd.gz - append="DEBCONF_PRIORITY=low devfs=mount,dall init=/linuxrc" + append="DEBCONF_PRIORITY=low devfs=mount,dall init=/linuxrc --" initrd-size=8192 read-only @@ -94,13 +94,13 @@ image=/install/power3/2.4/vmlinux image=/install/power4/2.4/vmlinux label=install-power4-2.4 initrd=/install/power4/2.4/initrd.gz - append="devfs=mount,dall init=/linuxrc" + append="devfs=mount,dall init=/linuxrc --" initrd-size=8192 read-only image=/install/power4/2.4/vmlinux label=expert-power4-2.4 initrd=/install/power4/2.4/initrd.gz - append="DEBCONF_PRIORITY=low devfs=mount,dall init=/linuxrc" + append="DEBCONF_PRIORITY=low devfs=mount,dall init=/linuxrc --" initrd-size=8192 read-only diff --git a/debian/changelog b/debian/changelog index 1e001368..16de1df0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,6 +23,8 @@ debian-cd (2.2.20) UNRELEASED; urgency=low - Add floppy/asian-root.img, floppy/mideast-root.img and floppy/cyrillic-root.img to EXTRA_DISK_IMAGES (but may it be treated as DISK_IMAGES?) + * Colin Watson + - Add "--" end of installer kernel params markers to yaboot.conf. -- Joey Hess Mon, 30 Aug 2004 15:23:19 -0400