Skip to content

Commit

Permalink
feat: update mdadm to 4.3
Browse files Browse the repository at this point in the history
Previous version even with patches segfaulted with musl 1.2.5.

Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com>
  • Loading branch information
smira committed May 13, 2024
1 parent 2f97116 commit 01808ff
Show file tree
Hide file tree
Showing 12 changed files with 157 additions and 745 deletions.
2 changes: 1 addition & 1 deletion .kres.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ spec:
- name: EXTENSIONS_IMAGE_REF
defaultValue: $(REGISTRY_AND_USERNAME)/extensions:$(TAG)
- name: PKGS
defaultValue: v1.8.0-alpha.0-14-g492638d
defaultValue: v1.8.0-alpha.0-15-gf9559de
- name: PKGS_PREFIX
defaultValue: ghcr.io/siderolabs
useBldrPkgTagResolver: true
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
#
# Generated on 2024-05-09T17:24:39Z by kres 1e986af.
# Generated on 2024-05-13T12:53:55Z by kres ce88e1c.

# common variables

Expand Down Expand Up @@ -52,7 +52,7 @@ COMMON_ARGS += --build-arg=PKGS_PREFIX="$(PKGS_PREFIX)"
# extra variables

EXTENSIONS_IMAGE_REF ?= $(REGISTRY_AND_USERNAME)/extensions:$(TAG)
PKGS ?= v1.8.0-alpha.0-14-g492638d
PKGS ?= v1.8.0-alpha.0-15-gf9559de
PKGS_PREFIX ?= ghcr.io/siderolabs

# targets defines all the available targets
Expand Down
1 change: 1 addition & 0 deletions hack/release.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ gasket: 5815ee3
Tailscale: 1.64.2
ecr-credential-provider: 1.30.0
qemu-guest-agent: 8.2.3
mdadm: 4.3
"""


Expand Down
Original file line number Diff line number Diff line change
@@ -1,25 +1,23 @@
Description: Exit gracefully when md device not found
Author: Felix Lechner <felix.lechner@lease-up.com>
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=970329
Forwarded: no
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/Monitor.c
+++ b/Monitor.c
@@ -539,8 +539,14 @@ static int check_array(struct state *st,
Description: Exit gracefully when md device not found (Closes: #970329).

diff -Naurp mdadm.orig/Monitor.c mdadm/Monitor.c
--- mdadm.orig/Monitor.c
+++ mdadm/Monitor.c
@@ -554,8 +554,14 @@ static int check_array(struct state *st,
if (fd < 0)
goto disappeared;

- if (st->devnm[0] == 0)
- strcpy(st->devnm, fd2devnm(fd));
- snprintf(st->devnm, MD_NAME_MAX, "%s", fd2devnm(fd));
+ if (st->devnm[0] == 0) {
+ char *found = fd2devnm(fd);
+ if (!found) {
+ alert("DeviceDisappeared", dev, NULL, ainfo);
+ alert(EVENT_DEVICE_DISAPPEARED, NULL, 0, dev, NULL);
+ goto out;
+ }
+ strcpy(st->devnm, found);
+ snprintf(st->devnm, MD_NAME_MAX, "%s", found);
+ }

for (mse2 = mdstat; mse2; mse2 = mse2->next)
if (strcmp(mse2->devnm, st->devnm) == 0) {
16 changes: 0 additions & 16 deletions storage/mdadm/patches/fix-monitor-tv_sec.patch

This file was deleted.

Loading

0 comments on commit 01808ff

Please sign in to comment.