search out localized lilo message files (#25023)

2 files changed, 16 insertions, 3 deletions

diff --git a/lilo.py b/lilo.py
index f4ae82b6e..d8dbdb706 100644
--- a/lilo.py
+++ b/lilo.py
@@ -256,7 +256,7 @@ class LiloConfiguration:
 	    self.initrdsMade[kernelTag] = 1
 	return initrd
 
-    def install(self, fstab, instRoot, hdList, upgrade):
+    def install(self, fstab, instRoot, hdList, upgrade, langs):
 	# If self.liloDevice is None, skipping lilo doesn't work
 	if not self.liloDevice: return
 
@@ -310,7 +310,13 @@ class LiloConfiguration:
 	lilo.addEntry("install", "/boot/boot.b", replace = 0)
 	lilo.addEntry("prompt", replace = 0)
 	lilo.addEntry("timeout", "50", replace = 0)
-	lilo.addEntry("message", "/boot/message", replace = 0)
+        message = "/boot/message"
+        for lang in langs:
+            fn = "/boot/message." + lang
+            if os.access(instRoot + fn, os.R_OK):
+                message = fn
+                break
+	lilo.addEntry("message", message, replace = 0)
         # XXX edd overrides linear, lba32/linear are mutually exclusive
         #
         # test to see if one of these already in lilo.conf, use if so
diff --git a/todo.py b/todo.py
index 33e96f3e2..6b11cd4cf 100644
--- a/todo.py
+++ b/todo.py
@@ -279,6 +279,7 @@ class InstallTimeLanguage:
 	return self.font[lang]
 
     def getLangNick (self, lang):
+        # returns the short locale ID
 	return self.langNicks[lang]
 
     def getLangNameByNick(self, lang):
@@ -355,6 +356,10 @@ class Language (SimpleConfigFile):
 
 	raise KeyError, "language %s not found" % nick
 
+    def getLangNickByName(self, name):
+	(lang, map, font) = self.langInfoByName[name]
+        return lang
+
     def getSupported (self):
 	return self.supported
 
@@ -1961,8 +1966,10 @@ class ToDo:
                     self.silo.install (self.fstab, self.instPath, self.hdList, 
                                        self.upgrade)
                 elif arch == "i386":
+                    defaultlang = self.language.getLangNickByName(self.language.getDefault())
+                    langlist = expandLangs(defaultlang)
                     self.lilo.install (self.fstab, self.instPath, self.hdList, 
-                                       self.upgrade)
+                                       self.upgrade, langlist)
                 elif arch == "ia64":
                     self.eli.install (self.fstab, self.instPath, self.hdList, 
                                        self.upgrade)