[kernel] r11183 - people/waldi/dkt/lib/dkt/hooks/modules

[Bastian Blank]

Author: waldi
Date: Fri Apr 25 15:01:31 2008
New Revision: 11183

Log:
lib/dkt/hooks/modules/backward_kpkg_symlinks.py:
Ignore lilo bootloader if update-grub is configured.


Modified:
   people/waldi/dkt/lib/dkt/hooks/modules/backward_kpkg_symlinks.py

Modified: people/waldi/dkt/lib/dkt/hooks/modules/backward_kpkg_symlinks.py
==============================================================================
--- people/waldi/dkt/lib/dkt/hooks/modules/backward_kpkg_symlinks.py	(original)
+++ people/waldi/dkt/lib/dkt/hooks/modules/backward_kpkg_symlinks.py	Fri Apr 25 15:01:31 2008
@@ -193,6 +193,12 @@
             except KeyError:
                 raise NotImplementedError("Backward compatible bootloader setup not supported for arch %s" % architecture)
 
+            # Ignore bootloader if update-grub is configured
+            if bootloader == 'lilo':
+                hook = systemconfig.get('backward-compatibility', 'kpkg-postinst-hook', None)
+                if hook is not None and 'update-grub' in hook:
+                    bootloader = None
+
             if bootloader is not None:
                 bootloader_filename = None