summaryrefslogtreecommitdiffstats
path: root/loader2
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2005-11-21 16:35:46 +0000
committerJeremy Katz <katzj@redhat.com>2005-11-21 16:35:46 +0000
commit8e71519ae4b61dbcaf520409d421a591118d11b7 (patch)
tree33648cadf7a9199928e753ff3099913a371c387c /loader2
parentefff54ebbce49f577f853fffb0cf8856e6b5fea0 (diff)
downloadanaconda-8e71519ae4b61dbcaf520409d421a591118d11b7.tar.gz
anaconda-8e71519ae4b61dbcaf520409d421a591118d11b7.tar.xz
anaconda-8e71519ae4b61dbcaf520409d421a591118d11b7.zip
2005-11-21 Jeremy Katz <katzj@redhat.com>
* anaconda.spec: Bump version. * loader2/loader.c: pcspkr breaks on powerpc
Diffstat (limited to 'loader2')
-rw-r--r--loader2/loader.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/loader2/loader.c b/loader2/loader.c
index faa826e50..2eef430f0 100644
--- a/loader2/loader.c
+++ b/loader2/loader.c
@@ -1266,9 +1266,14 @@ int main(int argc, char ** argv) {
partition, so use a terminal type that is appripriate */
if (isVioConsole())
setenv("TERM", "vt100", 1);
-
+
+#if defined(__powerpc__) /* hack for pcspkr breaking ppc right now */
+ mlLoadModuleSet("cramfs:vfat:nfs:loop:isofs:floppy:edd",
+ modLoaded, modDeps, modInfo, flags);
+#else
mlLoadModuleSet("cramfs:vfat:nfs:loop:isofs:floppy:edd:pcspkr",
modLoaded, modDeps, modInfo, flags);
+#endif
/* now let's do some initial hardware-type setup */
ideSetup(modLoaded, modDeps, modInfo, flags);