merge from anaconda-6-2j-branch

1 files changed, 8 insertions, 4 deletions

diff --git a/milo.py b/milo.py
index 3f4e0346b..3e890d905 100644
--- a/milo.py
+++ b/milo.py
@@ -106,13 +106,16 @@ class MiloInstall:
 		pass
             os.symlink("../boot/milo.conf",
                        self.todo.instPath + "/etc/milo.conf")
+            if os.access (self.todo.instPath + "/boot/milo.conf", os.R_OK):
+                os.rename (self.todo.instPath + "/boot/milo.conf",
+                           self.todo.instPath + "/boot/milo.conf.rpmsave")
         else:
             hasboot = 0
             kernelroot = '/boot/'
+            if os.access (self.todo.instPath + "/etc/milo.conf", os.R_OK):
+                os.rename (self.todo.instPath + "/etc/milo.conf",
+                           self.todo.instPath + "/etc/milo.conf.rpmsave")
 
-        if os.access (self.todo.instPath + "/etc/milo.conf", os.R_OK):
-           os.rename (self.todo.instPath + "/etc/milo.conf",
-                      self.todo.instPath + "/etc/milo.conf.rpmsave")
         f = open (self.todo.instPath + "/etc/milo.conf", "w")
         if hasboot:
             f.write ("# NOTICE:  You have a /boot partition.  This means that all\n")
@@ -133,7 +136,8 @@ class MiloInstall:
         for version, label in kernels:
             f.write ("image=%svmlinuz-%s\n" % (kernelroot, version))
             f.write ("\tlabel=%s\n" % label)
-            f.write ("\troot=/dev/%s" % rootDevice)
+            f.write ("\troot=/dev/%s\n" % rootDevice)
+        f.close()
                 
     def write (self):
         if onMILO ():