e861e7137f
CentOS version was upversioned and is very close to the Debian package. Copied all patches. 1 needed small adjustment. Needed to enable lintian overrides for upstream package. Copied the drbd.service file from CentOS. Did build drbd-utils. Did build iso. Story: 2009101 Task: 43496 Signed-off-by: Dan Voiculeasa <dan.voiculeasa@windriver.com> Change-Id: I44d5b67deb43b2894e7c0213666d54636f39cd40
60 lines
1.9 KiB
Diff
60 lines
1.9 KiB
Diff
From 5e556644cae530eddb75487d2993cc7d88da8dc8 Mon Sep 17 00:00:00 2001
|
|
From: Dan Voiculeasa <dan.voiculeasa@windriver.com>
|
|
Date: Thu, 30 Sep 2021 14:32:11 +0300
|
|
Subject: [PATCH 3/5] Avoid kernel userspace version check
|
|
|
|
Copy of 0003_915-avoid-kernel-userspace-version-check.patch from
|
|
CentOS with very small adaptation.
|
|
|
|
Signed-off-by: Dan Voiculeasa <dan.voiculeasa@windriver.com>
|
|
---
|
|
user/v84/drbdadm_usage_cnt.c | 32 +-------------------------------
|
|
1 file changed, 1 insertion(+), 31 deletions(-)
|
|
|
|
diff --git a/user/v84/drbdadm_usage_cnt.c b/user/v84/drbdadm_usage_cnt.c
|
|
index 29e2dc2..7952233 100644
|
|
--- a/user/v84/drbdadm_usage_cnt.c
|
|
+++ b/user/v84/drbdadm_usage_cnt.c
|
|
@@ -244,37 +244,7 @@ static int vcs_ver_cmp(struct vcs_rel *rev1, struct vcs_rel *rev2)
|
|
|
|
void warn_on_version_mismatch(void)
|
|
{
|
|
- char *msg;
|
|
- int cmp;
|
|
-
|
|
- /* get the kernel module version from /proc/drbd */
|
|
- vcs_get_current();
|
|
-
|
|
- /* get the userland version from PACKAGE_VERSION */
|
|
- vcs_get_userland();
|
|
-
|
|
- cmp = vcs_ver_cmp(&userland_version, ¤t_vcs_rel);
|
|
- /* no message if equal */
|
|
- if (cmp == 0)
|
|
- return;
|
|
- if (cmp > 0xffff || cmp < -0xffff) /* major version differs! */
|
|
- msg = "mixing different major numbers will not work!";
|
|
- else if (cmp < 0) /* userland is older. always warn. */
|
|
- msg = "you should upgrade your drbd tools!";
|
|
- else if (cmp & 0xff00) /* userland is newer minor version */
|
|
- msg = "please don't mix different DRBD series.";
|
|
- else /* userland is newer, but only differ in sublevel. */
|
|
- return;
|
|
-
|
|
- fprintf(stderr, "DRBD module version: %u.%u.%u\n"
|
|
- " userland version: %u.%u.%u\n%s\n",
|
|
- current_vcs_rel.version.major,
|
|
- current_vcs_rel.version.minor,
|
|
- current_vcs_rel.version.sublvl,
|
|
- userland_version.version.major,
|
|
- userland_version.version.minor,
|
|
- userland_version.version.sublvl,
|
|
- msg);
|
|
+ return;
|
|
}
|
|
|
|
void add_lib_drbd_to_path(void)
|
|
--
|
|
2.30.0
|
|
|