From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9D19C138359 for ; Thu, 23 Jul 2020 23:57:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 10DD3E088F; Thu, 23 Jul 2020 23:57:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D5AB8E0872 for ; Thu, 23 Jul 2020 23:57:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2062B34F220 for ; Thu, 23 Jul 2020 23:57:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 353F42F4 for ; Thu, 23 Jul 2020 23:57:35 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1595545007.f6f9384b423e9bb9b8cee294f4ddbeee7c518463.whissi@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: defaults/, gkbuilds/ X-VCS-Repository: proj/genkernel X-VCS-Files: defaults/initrd.scripts defaults/linuxrc defaults/software.sh defaults/unlock-luks.sh gkbuilds/mdadm.gkbuild X-VCS-Directories: gkbuilds/ defaults/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: f6f9384b423e9bb9b8cee294f4ddbeee7c518463 X-VCS-Branch: master Date: Thu, 23 Jul 2020 23:57:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 88326698-6628-4b9b-94ec-689688aab2f5 X-Archives-Hash: 3ec5ccb5c9c40db36fda20db16e2236d commit: f6f9384b423e9bb9b8cee294f4ddbeee7c518463 Author: Thomas Deutschmann gentoo org> AuthorDate: Thu Jul 23 20:36:13 2020 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Thu Jul 23 22:56:47 2020 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=f6f9384b mdadm: Switch to UDEV usage Signed-off-by: Thomas Deutschmann gentoo.org> defaults/initrd.scripts | 38 -------------------------------------- defaults/linuxrc | 3 --- defaults/software.sh | 2 +- defaults/unlock-luks.sh | 1 - gkbuilds/mdadm.gkbuild | 3 +++ 5 files changed, 4 insertions(+), 43 deletions(-) diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts index 9b2b32c..5515f49 100644 --- a/defaults/initrd.scripts +++ b/defaults/initrd.scripts @@ -1525,24 +1525,6 @@ start_volumes() { run ln -sf /dev/device-mapper /dev/mapper/control fi - if [ "${USE_MDADM}" = '1' ] - then - if [ -x '/sbin/mdadm' ] - then - local mdadm_cmd="run /sbin/mdadm --assemble --scan 2>&1" - is_log_enabled && mdadm_cmd="${mdadm_cmd} | tee -a '${GK_INIT_LOG}'" - eval "${mdadm_cmd}" - - #Intel Matrix RAID (and possibly others) have a container layer above the actual volumes, - #So we have to look for volumes that haven't been activated. - mdadm_cmd="run /sbin/mdadm -IRs 2>&1" - is_log_enabled && mdadm_cmd="${mdadm_cmd} | tee -a '${GK_INIT_LOG}'" - eval "${mdadm_cmd}" - else - bad_msg "domdadm invoked but /sbin/mdadm not found; Skipping mdadm raid assembly ..." - fi - fi - if [ "${USE_MULTIPATH_NORMAL}" = '1' ] then for multipath_path in /sbin/multipath /bin/multipath MISSING @@ -1887,7 +1869,6 @@ openLUKS() { continue fi - setup_md_device ${LUKS_DEVICE} if ! run cryptsetup isLuks ${LUKS_DEVICE} then bad_msg "The LUKS device ${LUKS_DEVICE} does not contain a LUKS header" ${CRYPT_SILENT} @@ -2571,25 +2552,6 @@ setup_btrfsctl() { fi } -setup_md_device() { - local device - - [ -z "$1" ] && device="${REAL_ROOT}" || device="$1" - [ -z "${device}" ] && return # LiveCD - - if [ $(echo ${device}|sed -e 's#\(luks:\)\?\(/dev/md\)[[:digit:]]\+#\2#') = "/dev/md" ] - then - good_msg 'Detected real_root as a md device. Setting up the device node ...' - MD_NUMBER=$(echo ${device}|sed -e 's#\(luks:\)\?/dev/md\([[:digit:]]\+\)#\2#') - if [ ! -e /dev/md${MD_NUMBER} ] - then - run mknod /dev/md${MD_NUMBER} b 9 ${MD_NUMBER} >/dev/null 2>&1 - [ $? -ne 0 ] && bad_msg "Creation of /dev/md${MD_NUMBER} failed ..." - fi - run raidautorun /dev/md${MD_NUMBER} - fi -} - rundebugshell() { if is_debug then diff --git a/defaults/linuxrc b/defaults/linuxrc index 210085a..4c1b470 100644 --- a/defaults/linuxrc +++ b/defaults/linuxrc @@ -625,9 +625,6 @@ sdelay # Setup btrfs, see bug 303529 setup_btrfsctl -# Setup md device nodes if they dont exist -setup_md_device - # Scan volumes start_volumes diff --git a/defaults/software.sh b/defaults/software.sh index 463d8cf..3de9470 100644 --- a/defaults/software.sh +++ b/defaults/software.sh @@ -165,7 +165,7 @@ GKPKG_LZO_BINPKG="${GKPKG_LZO_BINPKG:-%%CACHE%%/lzo-${GKPKG_LZO_PV}-%%ARCH%%.tar GKPKG_MDADM_PN="mdadm" GKPKG_MDADM_PV="${GKPKG_MDADM_PV:-VERSION_MDADM}" -GKPKG_MDADM_DEPS="" +GKPKG_MDADM_DEPS="eudev" GKPKG_MDADM_SRCTAR="${GKPKG_MDADM_SRCTAR:-${DISTDIR}/mdadm-${GKPKG_MDADM_PV}.tar.xz}" GKPKG_MDADM_SRCDIR="${GKPKG_MDADM_SRCDIR:-mdadm-${GKPKG_MDADM_PV}}" GKPKG_MDADM_BINPKG="${GKPKG_MDADM_BINPKG:-%%CACHE%%/mdadm-${GKPKG_MDADM_PV}-%%ARCH%%.tar.xz}" diff --git a/defaults/unlock-luks.sh b/defaults/unlock-luks.sh index 87381ab..710d951 100644 --- a/defaults/unlock-luks.sh +++ b/defaults/unlock-luks.sh @@ -63,7 +63,6 @@ main() { exit 1 fi - setup_md_device "${LUKS_DEVICE}" if ! run cryptsetup isLuks "${LUKS_DEVICE}" then bad_msg "The LUKS device ${LUKS_DEVICE} does not contain a LUKS header" "${CRYPT_SILENT}" diff --git a/gkbuilds/mdadm.gkbuild b/gkbuilds/mdadm.gkbuild index 2307d0e..b43f753 100644 --- a/gkbuilds/mdadm.gkbuild +++ b/gkbuilds/mdadm.gkbuild @@ -10,6 +10,7 @@ src_prepare() { -e "/^CXFLAGS = /s:^CXFLAGS = \(.*\)$:CXFLAGS = ${CFLAGS} ${defs}:" \ -e "/^CWFLAGS = /s:^CWFLAGS = \(.*\)$:CWFLAGS = -Wall:" \ -e "s/^# LDFLAGS = -static/LDFLAGS = -static/" \ + -e "s|^UDEVDIR := .*|UDEVDIR = $(get_udevdir)|" \ Makefile \ || die "Failed to sed mdadm Makefile" } @@ -19,6 +20,8 @@ src_compile() { } src_install() { + gkmake V=1 DESTDIR="${D}" install-udev + mkdir -p "${D}"/sbin || die "Failed to create '${D}/sbin'!" cp -a mdadm "${D}"/sbin/ \