[kernel] r10752 - people/waldi/dkt/lib/dkt/hooks/modules
Bastian Blank
waldi at alioth.debian.org
Sat Mar 8 22:04:39 UTC 2008
Author: waldi
Date: Sat Mar 8 22:04:38 2008
New Revision: 10752
Log:
lib/dkt/hooks/modules/backward_symlinks.py:
Use default values for symlink targets and dir.
Modified:
people/waldi/dkt/lib/dkt/hooks/modules/backward_symlinks.py
Modified: people/waldi/dkt/lib/dkt/hooks/modules/backward_symlinks.py
==============================================================================
--- people/waldi/dkt/lib/dkt/hooks/modules/backward_symlinks.py (original)
+++ people/waldi/dkt/lib/dkt/hooks/modules/backward_symlinks.py Sat Mar 8 22:04:38 2008
@@ -4,6 +4,7 @@
from dkt.config.interfaces import IMutableConfig
from dkt.hooks import default_registry, interfaces, register
from dkt.imageconfig.interfaces import IImageBaseConfig
+from dkt.support.system import architecture
class Hook(object):
def _check_active(self, systemconfig):
@@ -133,8 +134,19 @@
if config.get('backward-compatibility', 'symlink-remove', None):
symlink_remove = i
- symlink_dir = symlink_act.config.get('backward-compatibility', 'symlink-dir')
- symlink_image_file = symlink_act.config.get('backward-compatibility', 'symlink-image-file')
+ if symlink_act:
+ symlink_dir = symlink_act.config.get('backward-compatibility', 'symlink-dir')
+ symlink_image_file = symlink_act.config.get('backward-compatibility', 'symlink-image-file')
+ elif symlink_old:
+ symlink_dir = symlink_old.config.get('backward-compatibility', 'symlink-dir')
+ symlink_image_file = symlink_old.config.get('backward-compatibility', 'symlink-image-file')
+ else:
+ symlink_dir = '/'
+ if systemconfig.get('backward-compatibility', 'kpkg-link-in-boot', None):
+ symlink_dir = '/boot'
+ symlink_image_file = "vmlinuz"
+ if architecture in ('mips', 'mipsel', 'hppa', 'powerpc'):
+ symlink_image_file = "vmlinux"
if symlink_create is not None and symlink_create is not symlink_act and symlink_create is not symlink_old:
symlink_old = symlink_act
More information about the Kernel-svn-changes
mailing list