merge changes from taroon-branch. this merges up to anaconda-9.0.2-1.RHEL

1 files changed, 10 insertions, 1 deletions

diff --git a/isys/lang.c b/isys/lang.c
index 684ae2247..e1c12587b 100644
--- a/isys/lang.c
+++ b/isys/lang.c
@@ -180,6 +180,10 @@ int isysStartBterm(void) {
     int rc;
     struct stat sb;
 
+    /* if we've already successfully started bterm, we don't need to again */
+    if (!access("/var/run/bterm.run", R_OK))
+        return 0;
+
     /* assume that if we're already on a pty we can handle unicode */
     fstat(0, &sb);
     if (major(sb.st_rdev) == 3 || major(sb.st_rdev) == 136)
@@ -192,9 +196,14 @@ int isysStartBterm(void) {
     else if (!access("font.bgf.gz", R_OK))
 	btermargs[3] = "font.bgf.gz";
     else
-        return 0;
+        return 1;
     
     rc = bterm_main(4, btermargs);
+
+    if (!rc) {
+        int fd = open("/var/run/bterm.run", O_CREAT | O_TRUNC | O_RDWR, 0600);
+        close(fd);
+    }
  
     return rc;
 }