summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2006-01-25 20:45:22 +0000
committerJeremy Katz <katzj@redhat.com>2006-01-25 20:45:22 +0000
commit654603393639239430b7f272ccff288f84665910 (patch)
tree738de0f973eab780d873aff0444afeea95909729
parent7c616c6050f1a2dd3e996f9b171bcfd5562fdf97 (diff)
downloadanaconda-654603393639239430b7f272ccff288f84665910.tar.gz
anaconda-654603393639239430b7f272ccff288f84665910.tar.xz
anaconda-654603393639239430b7f272ccff288f84665910.zip
2006-01-25 Jeremy Katz <katzj@redhat.com>
* isys/lang.c (loadKeymap): Can't load keymaps under Xen, so don't fail in a loud fashion.
-rw-r--r--ChangeLog3
-rw-r--r--isys/lang.c2
2 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index dc85ccffe..21caee51b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2006-01-25 Jeremy Katz <katzj@redhat.com>
+ * isys/lang.c (loadKeymap): Can't load keymaps under Xen, so don't
+ fail in a loud fashion.
+
* anaconda: Don't ask about VNC in kickstart
2006-01-25 Chris Lumens <clumens@redhat.com>
diff --git a/isys/lang.c b/isys/lang.c
index 453176ebc..4625a6b51 100644
--- a/isys/lang.c
+++ b/isys/lang.c
@@ -89,6 +89,8 @@ int loadKeymap(gzFile stream) {
#endif
if (isVioConsole())
return 0;
+ if (!access("/proc/xen", R_OK)) /* xen can't load keymaps */
+ return 0;
/* assume that if we're already on a pty loading a keymap is silly */
fstat(0, &sb);