From fb4fb07c0701278ee4093a412cab340ac16857d1 Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Wed, 12 Jan 2011 08:26:58 -0600 Subject: DebInit: Account for future lenny updates (Resolves Ticket #977) Signed-off-by: Sol Jerome --- src/lib/Client/Tools/DebInit.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/lib/Client/Tools/DebInit.py') diff --git a/src/lib/Client/Tools/DebInit.py b/src/lib/Client/Tools/DebInit.py index aee8ffd65..119036b32 100644 --- a/src/lib/Client/Tools/DebInit.py +++ b/src/lib/Client/Tools/DebInit.py @@ -7,10 +7,7 @@ import re import Bcfg2.Client.Tools # Debian squeeze and beyond uses a dependecy based boot sequence -DEBIAN_OLD_STYLE_BOOT_SEQUENCE = ( - 'etch', '4.0', - 'lenny', '5.0', '5.0.1', '5.0.2', '5.0.3', '5.0.4', '5.0.4', '5.0.5', - ) +DEBIAN_OLD_STYLE_BOOT_SEQUENCE = ('etch', '4.0', 'lenny') class DebInit(Bcfg2.Client.Tools.SvcTool): @@ -33,7 +30,8 @@ class DebInit(Bcfg2.Client.Tools.SvcTool): deb_version = 'unknown' if entry.get('sequence'): - if (deb_version in DEBIAN_OLD_STYLE_BOOT_SEQUENCE): + if (deb_version in DEBIAN_OLD_STYLE_BOOT_SEQUENCE or + deb_version.startswith('5')): start_sequence = int(entry.get('sequence')) kill_sequence = 100 - start_sequence else: -- cgit v1.2.3-1-g7c22