[kernel] r10341 - in people/waldi/dkt/lib/dkt/hooks: . modules

Bastian Blank waldi at alioth.debian.org
Thu Jan 31 14:51:57 UTC 2008


Author: waldi
Date: Thu Jan 31 14:51:57 2008
New Revision: 10341

Log:
* lib/dkt/hooks/interfaces.py: Update method signatures.
* lib/dkt/hooks/modules/backward_config_boot.py: Save names of symlinks.


Modified:
   people/waldi/dkt/lib/dkt/hooks/interfaces.py
   people/waldi/dkt/lib/dkt/hooks/modules/backward_config_boot.py

Modified: people/waldi/dkt/lib/dkt/hooks/interfaces.py
==============================================================================
--- people/waldi/dkt/lib/dkt/hooks/interfaces.py	(original)
+++ people/waldi/dkt/lib/dkt/hooks/interfaces.py	Thu Jan 31 14:51:57 2008
@@ -13,7 +13,7 @@
     pass
 
 class IImageConfig(IHookRunAll):
-    def image_config(systemconfig):
+    def image_config(imageconfigs, systemconfig):
         pass
 
 class IImageTask(IHookRunAll):

Modified: people/waldi/dkt/lib/dkt/hooks/modules/backward_config_boot.py
==============================================================================
--- people/waldi/dkt/lib/dkt/hooks/modules/backward_config_boot.py	(original)
+++ people/waldi/dkt/lib/dkt/hooks/modules/backward_config_boot.py	Thu Jan 31 14:51:57 2008
@@ -17,7 +17,8 @@
                 'features': [],
             },
             'backward': {
-                'symlink': data[2],
+                'symlink-file': data[2][0],
+                'symlink-type': data[2][1],
             },
         }
         if data[1] is not None:
@@ -86,9 +87,9 @@
                 e = versions.get(link_parts[1], None)
                 if e is not None:
                     if file[1].endswith('.old'):
-                        e[2] = 'old'
+                        e[2] = (file[0], 'old')
                     else:
-                        e[2] = 'actual'
+                        e[2] = (file[0], 'actual')
 
         for file in iter(files[3]):
             if not os.path.islink(file[0]):
@@ -97,7 +98,10 @@
 
         return versions
 
-    def image_config(self, configs):
+    def image_config(self, configs, systemconfig):
+        if not systemconfig.get_parse_boolean('backward-compatibility', 'scan-boot', False):
+            return
+
         versions = self._get_versions()
         for version, data in versions.iteritems():
             self._check_config(configs, version, data)



More information about the Kernel-svn-changes mailing list