From patchwork Fri Sep 25 07:30:37 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Moessbauer X-Patchwork-Id: 5508 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 25 Sep 2026 09:31:08 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-ot1-f58.google.com (mail-ot1-f58.google.com [209.85.210.58]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 68P7V6DR026420 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 25 Sep 2026 09:31:07 +0200 Received: by mail-ot1-f58.google.com with SMTP id 46e09a7af769-815f2b1ecc3sf892729a34.2 for ; Fri, 25 Sep 2026 00:31:07 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1790321459; cv=pass; d=google.com; s=arc-20260327; b=ZUefUssHKmifkfxuaPx8z2dIWsuw6IIvstiO8bW4SVCn9G8ZmD70KOLPsRcS33ISXa vddRGWN2Ffvve1rsYdhgSigTYg41Pm7AKW5WDPcn19OjI5IOfsQupZa0sWTgd3ernIl0 d6nZdXGyBg0Alfx3YfrMhuwBwIVNpYlcWgCIPth+VCyDIKDkXSDc8YkUW+Evmy69oxXD sEbdkfxnLroizM03V764XSHAO0GH4n7g2woBn0KcXENJEepTCetCSjqBbBStuT/901XW 5cWZUjiRXhmUsshS4N3u5w7Pc2cHb1YmAaU+DGlnJ0BWfm1+R2j1ENWnVMVNa9waZBog e1Vw== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=mYiBsRbVPdkasJPmaIsFht83UEvIOmwu8ehH/O9mt6c=; fh=q+QKsBi+rEdf1c7AxqlZrQQwaaRwdCGrcxuu09g/akY=; b=mVmKgbYXIQGkF8X30sk2WVGdat0At2rxfaY+g2XaObPyF99nbRskvX7HcyPwaH+JUI P8JtCRUNWIvP8rhUsxKpeGaIJe6gAO1P//4k03cDu3pWLD92108gvjYQ/qkwTXaM5hYb HHSiNgqoBDGPHjRQAKhJEpn277aaidezSTZaT1pTcz3BArD6b/NDngI+ZWAxZaSYINFo Xm5qMNQzH8XiZGdigKek+jWCqHittnApE/MfJtwmBJw0XGw/ax9wFtZTiMDg7LXAIRB7 5i7QsCmyhk3rrFvd6TQkqqY6GS+oUQ+heKiNlADeXW3Q9EXXlaVtbNG+f5JDt/9q2RVE 4yIw==; darn=isar-build.org ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=banEMf2+; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of felix.moessbauer@siemens.com designates 2a01:111:f403:c200::1 as permitted sender) smtp.mailfrom=felix.moessbauer@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20251104; t=1790321459; x=1790926259; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:mime-version :content-type:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=mYiBsRbVPdkasJPmaIsFht83UEvIOmwu8ehH/O9mt6c=; b=EaTrE64grYmzx2OKXFpAoIbtwAZ83Q48rH2EnKuam+TkjpglhvlPWVZ9jb3nbf0Cv9 yn9hE2b2FbdEeR5R6EyGm3+K2oc6JD6fabCVzXEEY2op46SZZVG1R2TbH6HwPrvDNdkQ PDc5vcjzeFykeudsHjp/0+Ie6PCds5djF1XQNVQGMEJovJP1nmzgfbcyJG/lcjsq7ggy bO5EJYJ59d560NWE81yMFOXyTRFeICOAU1iZYXPSbtpqVgOLTRyVHVGm2F0oXoNpx1Yl ODNhS1dJhjqfyzuMf0MhrYs0rwJypwgFyLr5rt7q7Vl8lUomIaJT72UGqLm8/0UlVPhW XX7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790321459; x=1790926259; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:mime-version :content-type:references:in-reply-to:message-id:date:subject:cc:to :from:x-beenthere:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=mYiBsRbVPdkasJPmaIsFht83UEvIOmwu8ehH/O9mt6c=; b=dP/q3sros+BaK6oyTMXZQzxOW2xmwdqEgHhUavhVYhrjVmuQpnXeExsjBd3zyOilrT BrVZzo9+8ItcTt43BxKg9Hrin0ah5Oi/gPtEmCeVanXEy5R1wNKlvGNEbLacW5chsuDY mENHZZ4DMjHY0RtmEL7VSK34MDmjPdnvFQSVMoxpuVkSUGf4vwIUpyYcSAzRS0GQmFHT XlV6qTgsIJkbu5YRXA1heb8OsiPmx4D0dEXEqoTV01dUknG+7yCDtX5O5YMz3Adm60YN icc36qyhMlYrh2yqsKRz48c9A07LRX76Szi0+dPZChlqfjTlxhudI8ZblUhquVM1YKYN EfxA== X-Forwarded-Encrypted: i=3; AKwUvBzcZmrJIs7IZXcNh67pgpmhgaCeAIFChpYTjqhniuM7FHCvqOR997QARFzp7QQ1X8ZMifzy8sI=@isar-build.org X-Gm-Message-State: AFuF++nqWDcoqzbKmkWFbmluJc/r6nLr3L/7bVcSWKHWhcVl8R7hOdBI mYht2/MkTsOCNzITIGhcK/4htqQfvPU6ODZhQMe3L0H0Fiy59sa3Q2eU X-Received: by 2002:a05:6820:81cf:b0:6c0:6199:8274 with SMTP id 006d021491bc7-6d4417a054bmr5451070eaf.63.1790321459295; Fri, 25 Sep 2026 00:30:59 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h="ATskLdeGQqAdK3gmYXjJl3Y8Cijfi7sysDmjRlLQNBnMuYmkPw==" Received: by 2002:a05:6820:a289:20b0:6c3:b162:4692 with SMTP id 006d021491bc7-6d56b5d2d7fls679980eaf.0.-pod-prod-05-us; Fri, 25 Sep 2026 00:30:58 -0700 (PDT) X-Received: by 2002:a05:6820:3092:b0:6cd:3ffc:ad06 with SMTP id 006d021491bc7-6d441e7785emr4637867eaf.86.1790321458386; Fri, 25 Sep 2026 00:30:58 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1790321458; cv=pass; d=google.com; s=arc-20260327; b=IHZPrrTDlTq0r5wQF188+UGPwF9Gn4UQDEAUfJh4mA6xnk7Fo8IG2NJlniRu/CyCTA vx/bYSsEfvHNOq/FeWVD5smZK8G7CbA8XkBwxEJ26i30qz+fULqIeBWNSpHnkMjyIx2T ooEY5MFAdQ3nzisQFeM8mHOouLuHULcenkMwUO4mVDhIuFLMgm3bqXedgmAxw8wehRvQ 4VdYSd/osRP4Kb1sESQQB1PNBpRzG9khzkESftCCDDDtuWanR/3slIrrjMp78hh6ndyW VfJswpCSRjJhGc2h/tWUo1/mh2B/x9Uys7kbgk5YviNG8OhcBzqLNJLN7KSGSw8uwolf z0Tg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=mime-version:content-transfer-encoding:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=cYMCtpjrg44MQ/X7LV0abmm9c3GGxSEELLEnJHYyi4A=; fh=FYARRfYWSZi+xaBGHs/WkhcniURPXOu7KAfLF/5BK1Q=; b=oAz7D7T2t4djpAm0ELBitJtmGOY3uYeOVSDPQXFAMP9sO97zyorls1n8Rtku4qbduZ q78hXcrVFIaxCBTkl6JVZdAZA3mXxypCxh8Mrc7lhcfx/exu1ebe6Gz1Lf/jcf/+P1lP dWrfzIW3ueSL8eRoYv+uFO+8p/riQzpM6pEOb/T5cm5Rs+wl4XRovVApUMj5kcuDHBjx xfcj1lQgYobJ9vZNt2dGq1wTG3CqTDafqz+naf0EUc+34YX4s2E0yzDu/O7bPr/hJpI2 LctWcdTAGe8hjz3syyeYCLfldGSz8a/41kVE+Rf9QYtZQbcH9gHoZXKpVA2o6Bs89PpU D6Yw==; dara=google.com ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=banEMf2+; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of felix.moessbauer@siemens.com designates 2a01:111:f403:c200::1 as permitted sender) smtp.mailfrom=felix.moessbauer@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from DB3PR0202CU003.outbound.protection.outlook.com (mail-northeuropeazlp170100001.outbound.protection.outlook.com. [2a01:111:f403:c200::1]) by gmr-mx.google.com with ESMTPS id 006d021491bc7-6d5bb5295cbsi50417eaf.2.2026.09.25.00.30.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Sep 2026 00:30:58 -0700 (PDT) Received-SPF: pass (google.com: domain of felix.moessbauer@siemens.com designates 2a01:111:f403:c200::1 as permitted sender) client-ip=2a01:111:f403:c200::1; ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=xzFEg4g3FfMhAFOKJ+u8rRwb6jzaO5+IZD46lZlQIrQy3+E4QykIKU7cXLK3LBEo2mREg6dz/F1vJMGMMRpP2tg63x12H0UBJfM0XnGLc2sV6dBN6Yl1WR71xdpRZ3m55rHxZLz6p7yV2zvz6TcCVX+4RDpJBQnODeR9G17QyiSXambfD22q36t0me6O86gW2E2WHpitA0zgeS2e1gTYvXfr1sAWg3tmX5Bm4/Kt6Tz9uWqhkfc2jaDBAZ4xIj5fjetS1FTJ9t2KSmWLOHMyjCiV2FnUJ02tZz2ieB1SanwbLdBkCCE3mDzu+AJwBHLRsyQ3IZJGz9TJv7knm9mOBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=cYMCtpjrg44MQ/X7LV0abmm9c3GGxSEELLEnJHYyi4A=; b=bHSpm3N7jg+oVLJqR0SwXyFZazIKAvdK7PZxoIVJ5udBLHLVACRQShqj/JexDO8emnRBaSj4xUAXX3ok4OkkuQVSPdRV8+UFhO2NoRDaUMxyTIhqkVwShnfJnHWCwScCv+m1MSrm68HHSHnRR/JvbAZbwPqRmU253+rch2aiSqyQ4GHRjSFd4/qdSD2uFuRHBlaSZcqnvR8iIi9npkSVKvc+kQ/FIFq0fn8IkT1/oURcCeb+PRep/umednhgxI8PFp7PNlucHWiYq8j63XbaCpINP5xDkpYmnV3hj5/gA476J+4dIUN6A/NDQg2eIhNlsVKttSmWx9uIYLOkYjK8xQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=siemens.com; dmarc=pass action=none header.from=siemens.com; dkim=pass header.d=siemens.com; arc=none Received: from AM7PR10MB3956.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:17e::10) by PAXPR10MB5208.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:282::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.451.18; Fri, 25 Sep 2026 07:30:50 +0000 Received: from AM7PR10MB3956.EURPRD10.PROD.OUTLOOK.COM ([fe80::c54c:ccd8:ebbf:477c]) by AM7PR10MB3956.EURPRD10.PROD.OUTLOOK.COM ([fe80::c54c:ccd8:ebbf:477c%3]) with mapi id 15.21.0451.014; Fri, 25 Sep 2026 07:30:50 +0000 X-Patchwork-Original-From: "'Felix Moessbauer' via isar-users" From: Felix Moessbauer To: isar-users@googlegroups.com Cc: quirin.gylstorff@siemens.com, jan.kiszka@siemens.com, Felix Moessbauer Subject: [PATCH v3 3/8] initramfs: move dracut logic to initrd-dracut class Date: Fri, 25 Sep 2026 09:30:37 +0200 Message-ID: <20260925073042.1737353-4-felix.moessbauer@siemens.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260925073042.1737353-1-felix.moessbauer@siemens.com> References: <20260925073042.1737353-1-felix.moessbauer@siemens.com> X-ClientProxiedBy: FR0P281CA0211.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:ac::6) To AM7PR10MB3956.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:17e::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM7PR10MB3956:EE_|PAXPR10MB5208:EE_ X-MS-Office365-Filtering-Correlation-Id: a85901ab-6b12-43ff-4eae-08df1ad6ecc2 X-MS-Exchange-AtpMessageProperties: SA X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|23010399003|10070799003|366016|376014|1800799024|56012099006|11063799006|10067099003|22082099003|18002099003|55112099003|6133799003; X-Microsoft-Antispam-Message-Info: q111H6NXmIoO6xTG6/OWZxktWWatE7uLs3cbyOUB7TZqpF010S4cbtDTVsNH6OAEHin3QvXkcHJr3hqFJM2XPK5hGMyuBxrCDbspVaAUFL1DbhmxD3iLDSXy89tFv9JlY4T+H5ac6tleCJaNPLahF6SY4VZ7YmtEjK17Q6QUuthnEE9Ixvdyat3ujmp0C7aCekpi0o0WRtaTeYDSw7gVb9QNQkMRvKAhyxK8IHR+q8qvl3bfpkQVBAY7/er5PUX+RqSb+UalwlXmaQGSNaLAEugRzm+kdQyl/ad/uU1BC2aHRkd/6WuzdhLvxfvc4HvirWktFMsF92ESC22SAQQjfW2Q9zeV/qGZ4NKiMfAaYphcobFX494UKlx02BCBeHgl01zj2eSkNwt+DZ2yBfSnkXdvyxLHnODa1n7xK1TpxzXSwaH9OYzfSJG3qnno0QGYKQKNecz0TvHjO4k0b1ze7rfNgDB2TGoHmRgkseb3F/j3/Ns66Fp+jy/SSPFIqd/DD1IlPyIOXerAimMIOzMo5d8yrhm8iSSv999YsumtDCZ6grUd5ndM2UqlZRctrR965KQUGE3FmrkhgGbeK5XI6RYzvswcthE8UCYctbpSJDy+ZeaS9mOTNK1LsPAYAIlYrq5JT715w7CcbAd3tu0Aj763yCfux9sdvNP+Wt/+jRs= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM7PR10MB3956.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230040)(23010399003)(10070799003)(366016)(376014)(1800799024)(56012099006)(11063799006)(10067099003)(22082099003)(18002099003)(55112099003)(6133799003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 2 X-MS-Exchange-AntiSpam-MessageData-0: 0UN3lALY0+GtyWOPt/3gJghNyE9qA4dDTgrxI6TPXVQyZ+Ae+jUH+vyG3uxXFU5sxwKP2i/Nbq0742R69MKG6YltSeu2ExNOauY1L+u50wKirTxMK4KD4Om8QTosUkkylUEC3T9HkNfuV8WmcjHGavLgO25940WfT0cNAoEPUcOV6h56rgcvOjzSmKhqDD3Z1F/4PJkfFfOfR4XX7tz4/iAGhzVX71KMHUj6U4/Y8znJ56hF4cMdbZZ+1MMmBowCEqn5Q18ck+mSx9PjRWb1vXsFWN6Ej1OdZ78gOnAJhtFTS1o3CMjDosq5BKvZ8G0nd3xBL71O2I2PCJECzNVjibewZB43JuKm5YDmQ7ysHuwzrvLevF7cRNj/9YWbBRm1G77pov6zIu/INHFHYdbV5C1EQTGTJeJWmN7IfLqjH4nzCKJDJj6vj3D4ainaw+6v1hWGMANO6RRaQWBsTfIBh1owjAnHCmYOh4ZhNvdCz5hZ/0eeZkTKlzhv3GP2/IQIeVokTcyjix8CR21HcYZhbWpWG6vARBPljzTV/ijT285VeITvIGHtXJOXFG5mJKEq3b7tTZsuHrHB9w/XiX7uLrtJcP4qismxryYNyy7m/3+f7iGIOin8cAMRg/rF0HZtJ2Gs0FVU1eKUkqJzlody211w+CcQaPKGkWNIU7JfGii52Q41OJM2L5yzFj2eRFDXzxvpOv+lEEEYhqQwc4rdF9wvzPHLqQOLitcytARwlCLRgO6CkWkS/U7m9VB+LDWNhvyjzZbV7nf/tYe7fVoEbjFUBzHw++lKd5L0/b0pkE2x9MQSSk/lqI7EV7KXeOXKNMz7z/MmGqT/4AcxV7VILCrLpkMmj9vNIO90XjFifltFXeDk0b7qXrlup6JMoxEgCVdHfp5M0Yygl1bIdsr1r50L7dS+ZYNHlbUO6GzQ2JsGXpN8EEZwaaUCzdpiiKjXzzhy1mRG3TlwLGD6noiDZGR9+qsenqlcDJ22jrncM18dwzt+pEpB3KLCOFlAnvO2fXW4Q6FmYZF+ObarXXJ37nqkYWjboGc2droS0YGsSuCmV79m4h690Vqhf9vXmIRL5yUB7KA7oFCIQiZN7jGcE8ulLDz3pkPsuZ4+XYADaq3hUTGVNO1SBmocrOX4MK9AyMbHIF6rX5+nd8e01fDWPIRml7TCcJSBkIZpV1sVGSkPTZDymZIfd3cv8w3PQphhm8srDwLd/Um7mEl2mESHiM55/FgQ4Q+YrPUmPlZ+QGyCW/jKl2SFBxZ/DrOn7EwroPmBs1N9wMFr/CS/D4uzPXienaB6smtrg0jvmw8Im79b+TU3FR2MxV1gNLruyWRQWvhYLG4REwQ+80TMQAXdyXR6dGhce+wy2BioWzgZCTf5TiW825Qa8KRJ9la8PkILFUvGRzb1jG9y9N+L16/xt3VgBpkv9FZK5NM/3AFZZhX7AXkTiKnxCBFZ1ZhByGSP452lcO8QrSKCe+GL19hSpsm07Xix4Ig8+JkxxfOQMvIxFd+ueG5sA8knA0YP8X2H3mFCkV481Ixppwic2aK6tksa3lDaSq5KTMkMWmDDFBe+M3zSuis355iqsRI6X3/eQtjoc+QsUKyCntGdiOvc+cHgwUrc5ykrNhbuLhTChIYTPG++MNxB1evbytQBLlZaikWbX4HgqjodmEPKmM7yd1pM3WXqifmyLCLBm01b3BL1l6rV+m0AVBrPZZtz+4Uf1TRJJDmo++e0REsuD8t/eGcMVLz+b0gvVEKRR2tYfMQj9PD+ASAlOggo6zRp10I3YE1c0uxU X-MS-Exchange-AntiSpam-MessageData-1: aay99/Ym6D95p+NMqWxeDYX3JTL7mwm0ZkM= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: a85901ab-6b12-43ff-4eae-08df1ad6ecc2 X-MS-Exchange-CrossTenant-AuthSource: AM7PR10MB3956.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Sep 2026 07:30:50.8467 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: MzFPr8fNu4JEQrlriT1KPcjiRo17IU1aYAijXT056XPHH5Md2PeTPeR67c8jLNGgdCGz4MIjziazAEoF5/x828gqwbHpJlh6+X07j6+ec5A= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR10MB5208 X-Original-Sender: felix.moessbauer@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=banEMf2+; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of felix.moessbauer@siemens.com designates 2a01:111:f403:c200::1 as permitted sender) smtp.mailfrom=felix.moessbauer@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Felix Moessbauer Reply-To: Felix Moessbauer Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-4.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, RCVD_IN_RP_CERTIFIED,RCVD_IN_RP_RNBL,RCVD_IN_RP_SAFE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= As a preparation to extend the dracut logic for cross, we move it to the initrd-dracut class. This also gives a cleaner interface for initrd generation, as both mkinitramfs and dracut can now be generated by inheriting the initramfs.bbclass. Signed-off-by: Felix Moessbauer --- .../recipes-initramfs/images/isar-dracut.bb | 4 ++- meta/classes-recipe/initramfs.bbclass | 2 ++ meta/classes-recipe/initrd-dracut.bbclass | 7 ++++- meta/classes-recipe/rootfs.bbclass | 28 ++++++++++++------- 4 files changed, 29 insertions(+), 12 deletions(-) diff --git a/meta-isar/recipes-initramfs/images/isar-dracut.bb b/meta-isar/recipes-initramfs/images/isar-dracut.bb index c75b69e3..efd6d1ec 100644 --- a/meta-isar/recipes-initramfs/images/isar-dracut.bb +++ b/meta-isar/recipes-initramfs/images/isar-dracut.bb @@ -4,7 +4,9 @@ # # This software is a part of Isar. -inherit initrd-dracut +INITRAMFS_USE_DRACUT = "1" + +inherit initramfs # Debian packages that should be installed into the system for building the # initramfs. E.g. the cryptsetup package which contains initramfs scripts for diff --git a/meta/classes-recipe/initramfs.bbclass b/meta/classes-recipe/initramfs.bbclass index 45626319..41828487 100644 --- a/meta/classes-recipe/initramfs.bbclass +++ b/meta/classes-recipe/initramfs.bbclass @@ -10,6 +10,7 @@ INITRAMFS_PREINSTALL ?= "" INITRAMFS_ROOTFS ?= "${WORKDIR}/rootfs" INITRAMFS_IMAGE_NAME = "${INITRAMFS_FULLNAME}-initrd.img" INITRAMFS_GENERATOR_PKG ??= "initramfs-tools" +INITRAMFS_USE_DRACUT ??= "0" INITRD_DEPLOY_FILE = "${INITRAMFS_IMAGE_NAME}" # Install proper kernel @@ -28,6 +29,7 @@ DEPENDS += "${INITRAMFS_INSTALL}" ROOTFSDIR = "${INITRAMFS_ROOTFS}" ROOTFS_FEATURES += "generate-manifest generate-sbom generate-initrd" ROOTFS_PACKAGES = "${INITRAMFS_GENERATOR_PKG} ${INITRAMFS_PREINSTALL} ${INITRAMFS_INSTALL}" +ROOTFS_USE_DRACUT ?= "${INITRAMFS_USE_DRACUT}" # validate whether there are incompatible packages in the installation list python do_validate_rootfs_packages () { diff --git a/meta/classes-recipe/initrd-dracut.bbclass b/meta/classes-recipe/initrd-dracut.bbclass index 542b1fbe..c2018f03 100644 --- a/meta/classes-recipe/initrd-dracut.bbclass +++ b/meta/classes-recipe/initrd-dracut.bbclass @@ -53,6 +53,11 @@ def extend_dracut_cmdline(d): cmdline.append(f'--add "{extra_modules}"') return ' '.join(cmdline) +ROOTFS_INITRAMFS_GENERATOR_CMDLINE = "dracut --force --kver $kernel_version" ROOTFS_INITRAMFS_GENERATOR_CMDLINE:append = " ${@ extend_dracut_cmdline(d)}" -inherit initramfs +run_initrd_generator() { + mods_total="$(find ${ROOTFSDIR}/usr/lib/modules/$kernel_version -type f -name '*.ko*' | wc -l)" + echo "Total number of modules: $mods_total (dracut)" + run_in_chroot "${ROOTFSDIR}" sh -c "${ROOTFS_INITRAMFS_GENERATOR_CMDLINE}" +} diff --git a/meta/classes-recipe/rootfs.bbclass b/meta/classes-recipe/rootfs.bbclass index bbaafa01..9b5572a7 100644 --- a/meta/classes-recipe/rootfs.bbclass +++ b/meta/classes-recipe/rootfs.bbclass @@ -13,18 +13,20 @@ DEPLOYDIR = "${WORKDIR}/deploy" # This variable is intended to be set if dracut is # the default initramfs generator and it is not # possible to derive the value in another way -ROOTFS_USE_DRACUT ??= "" +ROOTFS_USE_DRACUT ??= "${@ '1' if 'dracut' in (d.getVar('ROOTFS_PACKAGES') or '').split() else '0' }" -def initramfs_generator_cmdline(d): - rootfs_packages = d.getVar('ROOTFS_PACKAGES') or '' - if 'dracut' in rootfs_packages or bb.utils.to_boolean(d.getVar('ROOTFS_USE_DRACUT')): - return "dracut --force --kver \"$kernel_version\"" - return "update-initramfs -u -v -k \"$kernel_version\"" +# In case no initrd is generated, force dracut off to not let bitbake hashes +# depend on the dracut config which anyways is not used. +python () { + rootfs_features = d.getVar('ROOTFS_FEATURES') or '' + if 'generate-initrd' not in rootfs_features.split(): + d.setVar('ROOTFS_USE_DRACUT', '0') +} ROOTFS_PACKAGES ?= "" ROOTFS_VARDEPS ?= "" ROOTFS_INITRAMFS_GENERATOR_CMD = "${@ d.getVar('ROOTFS_INITRAMFS_GENERATOR_CMDLINE').split()[0]}" -ROOTFS_INITRAMFS_GENERATOR_CMDLINE = "${@ initramfs_generator_cmdline(d)}" +ROOTFS_INITRAMFS_GENERATOR_CMDLINE = "update-initramfs -u -v -k $kernel_version" ROOTFS_BASE_DISTRO ?= "${BASE_DISTRO}" # Features of the rootfs creation: @@ -649,6 +651,14 @@ rootfs_set_timestamps() { -exec touch '{}' -h -d@${SOURCE_DATE_EPOCH} ';' } +run_initrd_generator() { + mods_total="$(find ${ROOTFSDIR}/usr/lib/modules/$kernel_version -type f -name '*.ko*' | wc -l)" + echo "Total number of modules: $mods_total (mkinitramfs)" + run_in_chroot "${ROOTFSDIR}" sh -ec '${ROOTFS_INITRAMFS_GENERATOR_CMDLINE}' +} + +inherit_defer ${@'initrd-dracut' if bb.utils.to_boolean(d.getVar('ROOTFS_USE_DRACUT')) else ''} + ROOTFS_INSTALL_COMMAND += "${@bb.utils.contains('ROOTFS_FEATURES', 'generate-initrd', 'rootfs_generate_initramfs', '', d)}" rootfs_generate_initramfs[weight] = "1000" rootfs_generate_initramfs[progress] = "custom:rootfs_progress.InitrdProgressHandler" @@ -656,10 +666,8 @@ rootfs_generate_initramfs() { if [ -n "$(find '${ROOTFSDIR}/boot' -type f -name 'vmlinu[xz]*')" ]; then for kernel in ${ROOTFSDIR}/boot/vmlinu[xz]-*; do export kernel_version=$(basename $kernel | cut -d'-' -f2-) - mods_total="$(find ${ROOTFSDIR}/usr/lib/modules/$kernel_version -type f -name '*.ko*' | wc -l)" - echo "Total number of modules: $mods_total" echo "Generating initrd for kernel version: $kernel_version" - run_in_chroot "${ROOTFSDIR}" sh -ec '${ROOTFS_INITRAMFS_GENERATOR_CMDLINE}' + run_initrd_generator # on dracut, the initrd is not world-readable run_privileged find ${ROOTFSDIR}/boot -name "initrd.img-$kernel_version*" -exec cat {} \; \ > ${DEPLOYDIR}/${INITRD_DEPLOY_FILE}