[Xen-devel] [PATCH] [Xend] Fix appending policy module to end of grub's config file

[Stefan Berger <stefanb@xxxxxxxxxx>]

This patch fixes the case where a module line is supposed to be added to
the very end of the file but the file does not end in with a new line.
Also fixes a problem that in some cases the module line would not be
properly be removed.

Signed-off-by: Stefan Berger <stefanb@xxxxxxxxxx>

Index: root/xen-unstable.hg/tools/python/xen/util/bootloader.py
===================================================================
--- root.orig/xen-unstable.hg/tools/python/xen/util/bootloader.py
+++ root/xen-unstable.hg/tools/python/xen/util/bootloader.py
@@ -64,6 +64,8 @@ def get_kernel_val(index, att):
 
 def set_boot_policy(title_idx, filename):
     boottitles = get_boot_policies()
+    for key in boottitles.iterkeys():
+        boottitles[key] += ".bin"
     if boottitles.has_key(title_idx):
         rm_policy_from_boottitle(title_idx, [ boottitles[title_idx] ])
     rc = add_boot_policy(title_idx, filename)
@@ -335,6 +337,8 @@ class Grub(Bootloader):
                 os.write(tmp_fd, line)
 
             if module_line != "" and not found:
+                if ord(line[-1]) not in [ 10 ]:
+                    os.write(tmp_fd, '\n')
                 os.write(tmp_fd, module_line)
                 found = True
 

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel