>From b6683d73589550486563946985416d596a59b637 Mon Sep 17 00:00:00 2001
From: Bill Peck <[EMAIL PROTECTED]>
Date: Thu, 16 Oct 2008 11:44:35 -0400
Subject: [PATCH] track minor number in os_version
Also update kickstart search to look for minor version first
---
cobbler/action_import.py | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/cobbler/action_import.py b/cobbler/action_import.py
index ada238d..d741b08 100644
--- a/cobbler/action_import.py
+++ b/cobbler/action_import.py
@@ -941,17 +941,21 @@ class RedHatImporter ( BaseImporter ) :
os_version = "rhel2.1"
else:
try:
- os_version = "rhel%s" % int(major)
+ os_version = "rhel%s.%s" % (int(major), int(minor))
except:
os_version = "other"
kickbase = "/var/lib/cobbler/kickstarts"
- # Look for ARCH/OS_VERSION kickstart first
+ # Look for ARCH/OS_VERSION.MINOR kickstart first
+ # ARCH/OS_VERSION next
# OS_VERSION next
+ # OS_VERSION.MINOR next
# ARCH/default.ks next
# default.ks finally.
- kickstarts = ["%s/%s/%s.ks" % (kickbase,distro.arch,distro.os_version),
+ kickstarts = ["%s/%s/%s.ks" %
(kickbase,distro.arch,distro.os_version]),
+ "%s/%s/%s.ks" %
(kickbase,distro.arch,distro.os_version.split('.')[0]),
"%s/%s.ks" % (kickbase,distro.os_version),
+ "%s/%s.ks" % (kickbase,distro.os_version.split('.')[0]),
"%s/%s/default.ks" % (kickbase,distro.arch),
"%s/default.ks" % kickbase]
for kickstart in kickstarts:
--
1.5.5.1
_______________________________________________
cobbler mailing list
[email protected]
https://fedorahosted.org/mailman/listinfo/cobbler
