From 370cdeb36c72011f536137b4e84745eed4ce0b4d Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 9 Mar 2026 07:31:52 +0000 Subject: [PATCH] sys-fs/mdadm: Sync with Gentoo It's from Gentoo commit 88363d5349960e09082915da4e7e5b08e379c564. Signed-off-by: Flatcar Buildbot --- .../portage-stable/sys-fs/mdadm/files/mdraid.rc | 15 ++++++++++++++- .../{mdadm-4.4.ebuild => mdadm-4.4-r1.ebuild} | 2 +- .../{mdadm-4.5.ebuild => mdadm-4.5-r1.ebuild} | 0 3 files changed, 15 insertions(+), 2 deletions(-) rename sdk_container/src/third_party/portage-stable/sys-fs/mdadm/{mdadm-4.4.ebuild => mdadm-4.4-r1.ebuild} (98%) rename sdk_container/src/third_party/portage-stable/sys-fs/mdadm/{mdadm-4.5.ebuild => mdadm-4.5-r1.ebuild} (100%) diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/mdadm/files/mdraid.rc b/sdk_container/src/third_party/portage-stable/sys-fs/mdadm/files/mdraid.rc index a30035dbbb..6fbe4a26ea 100644 --- a/sdk_container/src/third_party/portage-stable/sys-fs/mdadm/files/mdraid.rc +++ b/sdk_container/src/third_party/portage-stable/sys-fs/mdadm/files/mdraid.rc @@ -7,11 +7,24 @@ depend() { after modules } +assemble() { + local rv + mdadm -As ${MDADM_ASSEMBLE_OPTS} 2>&1 + rv=$? + if [ ${rv} -eq 2 ]; then + # mdadm exits with status 2 when there is nothing to assemble. + # This is undocumented. + # https://bugs.gentoo.org/295397 + return 0 + fi + return "${rv}" +} + start() { local output ebegin "Starting up RAID devices" - output=$(mdadm -As ${MDADM_ASSEMBLE_OPTS} 2>&1) + output=$(assemble) eend $? "${output}" local pat="/dev/md_d*" diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/mdadm/mdadm-4.4.ebuild b/sdk_container/src/third_party/portage-stable/sys-fs/mdadm/mdadm-4.4-r1.ebuild similarity index 98% rename from sdk_container/src/third_party/portage-stable/sys-fs/mdadm/mdadm-4.4.ebuild rename to sdk_container/src/third_party/portage-stable/sys-fs/mdadm/mdadm-4.4-r1.ebuild index cb3b0a96ed..3e0c88d505 100644 --- a/sdk_container/src/third_party/portage-stable/sys-fs/mdadm/mdadm-4.4.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-fs/mdadm/mdadm-4.4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2025 Gentoo Authors +# Copyright 1999-2026 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/mdadm/mdadm-4.5.ebuild b/sdk_container/src/third_party/portage-stable/sys-fs/mdadm/mdadm-4.5-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-fs/mdadm/mdadm-4.5.ebuild rename to sdk_container/src/third_party/portage-stable/sys-fs/mdadm/mdadm-4.5-r1.ebuild