Attachment 402307 Details for Bug 656105

[patch] Patch for detection of kernel version

drbd-ycp-detect-kernel-version.patch (text/plain), 2.89 KB, created by Boris Manojlovic on 2010-11-26 13:51:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Boris Manojlovic

Created: 2010-11-26 13:51:44 UTC

Size: 2.89 KB

patch

obsolete

>--- src/Drbd.ycp	2010-11-26 14:50:37.284990159 +0100
>+++ src/Drbd.ycp.orig	2010-11-26 14:49:44.222219031 +0100
>@@ -54,33 +54,6 @@
> 	   "net":["timeout", "connect-int", "ping-int", "max-buffers", "unplug-watermark", "max-epoch-size", "sndbuf-size", "ko-count"],
> 	   "startup":["wfc-timeout", "degr-wfc-timeout"]];
> 
>-// kernel_version_minimum_needed( system_kernel, kernel_min_version)
>-boolean kernel_version_minimum_needed ( map kernel1, map kernel2 ) {
>-	// function which checks if running kernel matches predefined one
>-	y2milestone("Kernel1 %1", kernel1);
>-	y2milestone("Kernel2 %1", kernel2);
>-	if (kernel1["major"]:0 >= kernel2["major"]:9) {
>-		if (kernel1["minor"]:0 >= kernel2["minor"]:0 || kernel1["major"]:0 > kernel2["major"]:0) {
>-			if (kernel1["release"]:0 >= kernel2["release"]:0 || kernel1["major"]:0 > kernel2["major"]:0 || kernel1["minor"]:0 > kernel2["minor"]:0) {
>-				y2milestone("Kernel RELEASE  OK");
>-				return true;
>-			} else {
>-				y2milestone("Kernel RELEASE FAILED");
>-				return false;
>-			}
>-			y2milestone("Kernel MINOR OK");
>-			return true;
>-		} else {
>-			y2milestone("Kernel MINOR FAILED");
>-			return false;
>-		}
>-		y2milestone("Kernel MAJOR OK");
>-		return true;
>-	} else {
>-		y2milestone("Kernel MAJOR FAILED");
>-		return false;
>-	}
>-}
> 
> global boolean Read() {
>     /* DRBD read dialog caption */
>@@ -102,33 +75,12 @@
> 
>     Progress::NextStage();
> 
>-    string regex = "([23]+)\.([0-9]+)\.([0-9]+).*(default|smp|bigsmp|pae|xen|xenpae|debug|ppc64|iseries64|desktop)";
>-    map out = (map) SCR::Execute(.target.bash_output, "uname -r");
>-    list<any> uname_r = regexptokenize( out["stdout"]:"2.6.16-99-default", regex );
>-    y2milestone ("stdout:  %1", regexptokenize( out["stdout"]:"2.6.16-99-default", regex ));
>-    map <string, integer > system_kernel = $[ 
>-        "major"   : tointeger(uname_r[0]:""),
>-        "minor"   : tointeger(uname_r[1]:""),
>-        "release" : tointeger(uname_r[2]:"")
>-    ];
>-
>     // check installed packages
>-    // Kernel which do not need external package drbd-kmp
>-    map <string, integer > kernel_min_version = $[
>-        "major"   : 2,
>-        "minor"   : 6,
>-        "release" : 33
>-    ];
>-
>     // find out which krbd-kmp-<arch> to be installed
>-    string krbd_kmp_arch= uname_r[3]:"default";
>- 
>-    list <string> required_packages = [ "drbd" ];
>-    if (!kernel_version_minimum_needed(system_kernel, kernel_min_version)) {
>-        required_packages = add ( required_packages, "drbd-kmp-" + krbd_kmp_arch);
>-    }
>+    map out = (map) SCR::Execute(.target.bash_output, "echo -n `uname -r|grep -Eo \"default|smp|bigsmp|pae|xen|xenpae|debug|ppc64|iseries64\"`");
>+    string krbd_kmp_arch= out["stdout"]:"default";
> 
>-    if (!Mode::test() && !PackageSystem::CheckAndInstallPackagesInteractive(required_packages))
>+    if (!Mode::test() && !PackageSystem::CheckAndInstallPackagesInteractive(["drbd", "drbd-kmp-" + krbd_kmp_arch]))
>     {
>         return false;
>     }

Actions: View | Diff

Attachments on bug 656105: 402307 | 402309