[Date Prev][Date Next] [Thread Prev][Thread Next]
[Thread Index]
[Date Index]
[Author Index]
[PATCH] Add an exception to DUD version checking for 6.0 and 6.1 kernels (#699745)
- From: Martin Sivak <msivak redhat com>
- To: anaconda-devel-list redhat com
- Subject: [PATCH] Add an exception to DUD version checking for 6.0 and 6.1 kernels (#699745)
- Date: Mon, 27 Jun 2011 12:41:51 +0200
---
loader/driverdisk.c | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/loader/driverdisk.c b/loader/driverdisk.c
index 69d7daf..97aecd1 100644
--- a/loader/driverdisk.c
+++ b/loader/driverdisk.c
@@ -77,7 +77,18 @@ int dlabelProvides(const char* dep, const char* version, uint32_t sense, void *u
if (version == NULL)
return -1;
- return strcmp(dep, "kernel-modules") || matchVersions(kernelver, sense, version);
+ /* not a modules package */
+ if (strcmp(dep, "kernel-modules")) return 1;
+
+ /*
+ * exception for 6.0 and 6.1 DUDs, we changed the logic a bit and need to maintain compatibility.
+ */
+ if (!strncmp(version, "2.6.32-131", 10) || !strncmp(version, "2.6.32-71", 9)) return 0;
+
+ /*
+ * Use this package only if the version match string is true for this kernel version
+ */
+ return !matchVersions(kernelver, sense, version);
}
/*
--
1.7.4.4
[Date Prev][Date Next] [Thread Prev][Thread Next]
[Thread Index]
[Date Index]
[Author Index]