From patchwork Thu Sep 24 07:23:35 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "MOESSBAUER, Felix" X-Patchwork-Id: 5489 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Thu, 24 Sep 2026 09:24:00 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-pj1-f55.google.com (mail-pj1-f55.google.com [209.85.216.55]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 68O7NwnL018922 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 24 Sep 2026 09:23:59 +0200 Received: by mail-pj1-f55.google.com with SMTP id 98e67ed59e1d1-395543dc382sf1885875a91.0 for ; Thu, 24 Sep 2026 00:23:59 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1790234633; cv=pass; d=google.com; s=arc-20260327; b=kcoQvaDnifrliPPTFAUnsvfyMFxL8uh8Q/MOKDMYChdL+jmr4mmTv3KBvdgrbQCnD1 iOnP4svVPCKcsZ+zf9IU7EsvUzoB+px13DQh1DouzT8sqI/RZ7dpAZlCUGl853HZlxOe WbQ7pLbaHdAArnUwKUzQtLmutV2svxf4Qeqj0CNiD02NO6ao1EqecEQhk1R/0dnd/LyC 1kn+XVkjKkHtf7CjD196V0BwTq0LOKSHXKzFjoSF0pqS8Z6jQ/Q5/KoqXTHg5TBEPQaN pmCpfYiy1+0rjqF8C3BE0oj5LZNqhxDpCrXs2DDKKf4axmHfXWYKWW3EivELQpGp952T XzUQ== 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=c+/lSeRl6RD1g/PjD+ItP3sYwVD0CKL1JN7ktEVd7s8=; fh=g5DicOW1X1Nyx9qRTG7mysuMcWD8F5646bYaH8Tcz/M=; b=pO1oCsu+K9knF7oRkPPx8Iq52ThhQaGwJYAxNtsobGkBfh8V+xCOUMpnSBsw+wd14f ZUwVyhX2tDOSJ9QZF3ItsavTBiE74d4yMMvShfDnlXH7VnhpmmGtymFmpBty14EcoWY4 ftwfxIvXS1xbPvuRdyJhvyo2rTu6II2UogO8N4h2AqbFokgEPZyeSBtM0pdkvlwu3Ue4 lT9z42T3/yQ9lsbe9m0CEdxYpDDAm1cPqQq6t4h34Faonu0b1xax7H0Wbf3Gx85T010Y wEWKgPICzqU0xHgED4iVNO5bwNLyUl+7UZ4YzeXpMuBXncWx8dveCcQune+Kvgk8R7ta nc8Q==; darn=isar-build.org ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=J29ShKFm; 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=1790234633; x=1790839433; 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=c+/lSeRl6RD1g/PjD+ItP3sYwVD0CKL1JN7ktEVd7s8=; b=vodSSAyXHRuQnxSv/jFJhMM5gfqr60Mio4Dl2rELDRZKYwxDc/IpVm7mDRQEZ7RX4P PLTTaWj2U1OSJkCg14GOALdqXVUi2tx37mHnNpQ0p5F56jVWpbwpLi8Ak4eScW5wTLke ZynZ6TdQ3uylV9E+VFSlLnOHWY8a4uJNEf93mWjtYLsNx/9676OOug01qOtod6J6Tcq8 mHUZepPPKWtQmO+jWyJYxL/urVLcf+53HLqoOzMDcuJt8Fp0W13zkFXtJA8qkVuRnfNJ CND48tcZowWRMzBn8q6BN6kKeMHQ2OFimc2PfvJZOyoAXsBWcoSTnpNNOBCxVU+KHfw/ arfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790234633; x=1790839433; 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=c+/lSeRl6RD1g/PjD+ItP3sYwVD0CKL1JN7ktEVd7s8=; b=vYKREIUmizOlBh7ZHKVSs48AV/5Q2R/pSvCSRfTwrEZrWtELLIeeorZtS4QS2o+16F svbM3c3VHjgcDaEuC3S2uOOa73vSAiJ79K5YQp3kUGTdVXjD77mYpAp8B6ATSAHMrQBv tMJPaGDAGsWNnVl0jtVswbZDsUff1WCX/U8lJYgJwInflZKAtIKA6uGdvF/R8nRghLJx uk0DfppVX1pLGmdvixbqxR/Q5JjE36vNZAITkYGIoQ2jddVWi1KXdY9FYOhxU+HtrOmC 7U0TzoHclcqrpQnhY3GGxSeklyuSy4v39tHR72aSleqOUvZ/mFqsqogo5hF7k5i/+PTY qqLQ== X-Forwarded-Encrypted: i=3; AKwUvBzdg6okUKuzKl7aVPkKcRmN0TZntOGr+43xFEaClBDDKQJGQxb1dIAUG1NAXZDx1/ih2l6qeuw=@isar-build.org X-Gm-Message-State: AFuF++l3+X6Z8waWp0J8k7kTpgfdahYB7Ade/zUpMJEY6T6sPVon2bLO ygDOgLUOjCwVhKa2hiSW9vFjFlAyu7b0alRv5RCaRSHY6kOib3/G8iAs X-Received: by 2002:a17:90a:ec8e:b0:39e:6c68:1559 with SMTP id 98e67ed59e1d1-3a098ac23c9mr1248183a91.33.1790234633158; Thu, 24 Sep 2026 00:23:53 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h="ATskLdeHi/U7Sbcts7UJhJfBcr95BDAuirmOU1paIwLeC6FDTQ==" Received: by 2002:a17:90b:1cd0:b0:39a:f306:c5e7 with SMTP id 98e67ed59e1d1-39e36a5f83als10385484a91.1.-pod-prod-02-us; Thu, 24 Sep 2026 00:23:52 -0700 (PDT) X-Received: by 2002:a17:90b:2647:b0:39d:ef3e:9035 with SMTP id 98e67ed59e1d1-3a0985bd43dmr1347115a91.10.1790234631819; Thu, 24 Sep 2026 00:23:51 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1790234631; cv=pass; d=google.com; s=arc-20260327; b=bdn9sur2L5W6wpxRtCdoDOVxEQNef2fmj9vrMPvvYL8hjHGVGEwJ2pssfjLrFqQJCa c/DlIZDPRyKv0NocXLg/9R+g3A6wTiWAe1CrcV7rLVcHHBg9fPfqbGhgB1Ik6qEKYHwL G3Hw9MbNuCZtBYu8MpDPt1USYIP8TEK5vEX5j1ZGCXKTTa0BtjQC1efFz5f0xt+jzR1I Yv2cVAeJ0+hkAgP0seEJ0KG7U9H2Lgy8xbElXUQ3v3RFVN/oxJnUt+Mwd5Aiw2m9Bn6f 4MYU1cnpwDlL1xuwfLVJGA0UzQIYbrAEIxm6Gk/siMqIf1kOFupVd+GRC4cEEtjDgitc R+sw== 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=MoF03foCp2Gr+OOea3nP2wlG6I6AXJFd/ObUacIsQOk=; fh=FYARRfYWSZi+xaBGHs/WkhcniURPXOu7KAfLF/5BK1Q=; b=sA6NfiupFj3g+oxhARd0/XzoR3rY/nOQzpG8jeUNn0JeiiyfBLWtWgIX8M++lFW2Z6 oeVW+6ispYULGaC76y+YXxp11MTrE+0W/UJcTKb5zsOYOpZBzq+rFy+IIFQXc3ejSs2f 3tBHMEfpK6jfx3rRiIUVDLfuOnjUkZlpHIVIm4bhlz0xU7R7X56vnjUovWUAxKmjw3go K7VzzBGiNppZiwwXplBP3BaE6vm193V/p92FUzpuir5XviQ+lJer1OWIYqMb+0UEBpn4 NNC5Mhw7GJ3gdNjgTpertcNsUp+fGZW3hI6YkEdZVgySfF8yG0JtC1B1YokjwDBFfQ6e /mCg==; dara=google.com ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=J29ShKFm; 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 98e67ed59e1d1-3a07fa6cef1si95994a91.1.2026.09.24.00.23.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Sep 2026 00:23:51 -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=yIoZ4/BLbL+TxBxbwH2pNQWHtVOQ7ObrdUUBILoMp2SG05wOc8rfjPZe4ELuYWnydERG3B6ufp34Da50S6jVavUQ+0vuOLa2AJdHt4vmzGuP0FYE+Ak6cV1z8BqfKgVXc3RERuhHUFxIP26xR73WFpE1lBGVf9jTBnLewrSxFKv31oX4OzMWlKEyVFjqk3Nc1lptUJ+v04xcMdncrGfgKTFo+qBkNQeRG1V4Ih3m2IWEea3/O0OUg9ZA+UU74ch0g1cW3Y6kpt//JVsFMHv6Z0CE0H671dc55222nVlY71kdhpIMTqI+4qx8688o+8RxqOQcz5OwG0VL3VjXXKIemg== 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=MoF03foCp2Gr+OOea3nP2wlG6I6AXJFd/ObUacIsQOk=; b=T36uaw5wGl/kTA+HkhxdAo6Q5q/71nJDVbN4mkTT1ZXGTBXzEyOG4KsCZDuir+8J+eYFQm4t/voiH+3YtfBb51IY8ZDzcH4qKTptrdg2e85mCa2qwnzPx0xJsl17KvwtNk/dA9FKH2YUF1UUAUoJe64MfzppufibaWw2N+knyGFfgAQsaMdp2GDvHxT7MATmn39UBbSJP0BdgZE0z08ADOtpk3s5TPo38vr5qpJ3ZS6Kun07ylZ5LgmCsOrgOaZD9Gkv3/2dyd4j6yHjH/rsxIzrl6hoRoKCtyhp7djZ2xbdPraEQPdADqO/uu0uqn9AXiTU0AXVt98OuA9KhpyZ0g== 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 AS5PR10MB8146.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:673::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.451.18; Thu, 24 Sep 2026 07:23:49 +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; Thu, 24 Sep 2026 07:23:49 +0000 X-Patchwork-Original-From: "'Felix Moessbauer' via isar-users" From: "MOESSBAUER, Felix" To: isar-users@googlegroups.com Cc: quirin.gylstorff@siemens.com, jan.kiszka@siemens.com, Felix Moessbauer Subject: [PATCH v2 3/8] initramfs: move dracut logic to initrd-dracut class Date: Thu, 24 Sep 2026 09:23:35 +0200 Message-ID: <20260924072340.4038396-4-felix.moessbauer@siemens.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260924072340.4038396-1-felix.moessbauer@siemens.com> References: <20260924072340.4038396-1-felix.moessbauer@siemens.com> X-ClientProxiedBy: ZR0P278CA0003.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:16::13) To AM7PR10MB3956.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:17e::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM7PR10MB3956:EE_|AS5PR10MB8146:EE_ X-MS-Office365-Filtering-Correlation-Id: 01594ef9-3b42-4a2a-4bb0-08df1a0cc72d 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|1800799024|376014|11063799006|56012099006|22082099003|55112099003|18002099003|10067099003|6133799003; X-Microsoft-Antispam-Message-Info: VAjyjBFfENEkYP9uoPIb4awBwWAGzoMxcWPv0yEOA2Va6hQh7IBpbsdTj7hQjjN1A4G8L8VNHDFG/CgmV6X+Juqc2doW1cq0P4OqjAvVUPbUVtXH6+S8paTnBGW8bMBcM7aZ96kWRovCCn4SiGwG/7wfuswHyi+malZn458mVxMTuUwkCuZ6yAHZZCEu6jNBWdaxM5u8sYVUz2QIxiddubmPj4MdhcakqYEjEILZhFIiiX1sd3IU06q8U8j4kdGPOD1U5kcETHPFUeGKEluRina9iYjiJQd04SGjMatISP9al0pvGoSzPcvMt1770nj61YJaHUBZsD9CbSR8icE94iEkXmp/KX8E02rBpJWeAEJFIcNElQyY7RM1C68lF2P0FY1iKwdJ36buAF794e6NvsWstix1zAb47XoreAvnF6Epqi6faJFXShi1SWNjJTS7ZlEXIVCVn6/yX8HX8iF7JzgcYus8zBuYJ67Gf0TIxgWu0SAZCZvtfbNs6tmUeuC4NVlyLsUitm91XBao3rKByLNq0rFiDNjYDEwtqBo6p6hkut3tUW63is+IWt69jFuH2/YDXgshvQYN4+cUEM9GK5BIeo4cVaDViDyciQ76VvfYhw9jIc4v2UUiYRRTpd4hGG6qXHJPLxrlfDO/eHNiWTfTowurXkQvFqrTAyYGQ5s= 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)(1800799024)(376014)(11063799006)(56012099006)(22082099003)(55112099003)(18002099003)(10067099003)(6133799003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 2 X-MS-Exchange-AntiSpam-MessageData-0: uxk74ScnOAu6dhp6XZsOiqbq1hJXdKe2YtuHh2d1VTHR3zeT2TNqlLGe3c1283MpXe8toT44QzySl6wqsl+BzYMeSpUQQGmjRygmPIBvwicpbMuoX3Xvt3/6o+77mK3SFGQgPz91lZdxYJg0WavbhFXJ/CrvpRzGV3alMR6lSE04eVkuStT2TWbcjtZT72pRj9qaAbGnQgoeuXCYIhkXZDJat5GKY2hXC+TBsq6acCl8j8q+UPWD/jiqX0IK3H6LWTs2RhEDp9yn4+TzRYIVwUyvXn/gpXkVVYr+lJH6convBYpE6YQDwt0LGt9YJms0Rr0Zs2qvoX6eVOKu2COPjvGFP34BBLGMef00Pm6FUH6L+eYpj5Lt6HkrWg9jY1KmvMC29oqKWwpnPocebWvoPSrqF5KpNhzS9laFVuaZugoEGv2Lrofbq7IB0/PhySkNaO7/QqRWsl4t2DJpcGKDxjKx1kStTaBubjwdvfOhu2AvVkFqY93zI4hQIT8xiHpP7oREcMf+E9puPE/RVlnxOzeq4HnbLqaZcgS2ZgL3lvLQ7ELEJucFX33o2BqqCmzx0/GL5NSBFhXSqLiQ8JENMj0O4PVwdxSkiNYgIeJav+P6UBaItmQwzurDu9cnGoLMx1WHDsO7/xfN5JiVesz10AXNQbH9LrgjB//QvTmn8PC5ID1UnBTAjVVBFhfg7BgVojwbQoJuxl4/9dOxnar50ItwTlhYi+FSv63lcZ/2Z5dMbZD2xXGeldCW1i8NX+WRbYHnqDOQAx5E0/STycKECC+jAaISapNYcFlfqcq644E1r9d+qRdyA9K8NAqxkxpfRECh/Y6ICrfCANfwWmcXExfuv0Ua2SG8FYmXeEwVYArDJGNr7D8IHd+2+6x9rvDPlCfAKNLTplyl22eLsAT+iZhZb9bbCypb2pTaAo5UaUsh3Lncpw1WlOpzbus7d1pjK3GYLr7tKfMhqadb0bxOuUguJ0ivJNaymkDwB7ljW6TaMG81XOdsqvp75Vo+8zmyzkX5HSEU1E0o0HMKx46xAuv9bMvhlLaPBTL86cY+5keI9W8/izY4w0u97/M3JgE8yb8sVLVBwscl8unIBXt0xgm7JO3x+Cm74OHBLDWhp63dQJdAcMFymmiqN+HCHvYRe5lZkCzNu8yfqGPA8S1g3mqccPSWeoqthjUQohml4UZyHBzINOEzFgUx6CZ5c/8D2nFaWxB2koeRteaaYTHqg6wlOWMrdZFbNK1z0TSDVTyFPOV73vnlHXiSHSRkAwGGxHLIp5ePfwyX7qgdCd/wup+tfZqQLCtASC9epn7WUcsxjbsUUpjpyhNAwCmM2faofjK6ftQdUiKLyjpdl1jFVzVkGZ1ySGQARrPejNf/UfTfheiScegIEwbGJvxsBKCuZ9HmNGivYfVpYEIYzwW614RVX8leXq4YD1KUKBHeQByfansRcfF0VV0+nN+YEByWGtic6lHdy5TnAbIfwndZWImhAVKta+ZUxQqyoKVdwqGkQSPxjW92T0P7Q022d1iGJZnW9yOWB/uHzT74akKziCs55/wVEew3C1zWdGOte9UpSQhS5dKrIYKFr3ADDQYo/e01nGrYt1Ub30VZ8krznnhJ0kSuOlWs3eJUL967/UE1zMzZzoCfvhaC0g3nI3KcfjY6GCZESO4f8nLhH97hzfVbYHar2wkSd887E6VVR3QoBnbu6EtW9OaUnQbx6v2ztsKrda4qQgqTYdzQfng9UH5blFrtxY2RVH7m0In9fMPnu1vLxWepO5G7J5r2Y+O2Nq5nLyqn X-MS-Exchange-AntiSpam-MessageData-1: e1vh7Ji3R/n5QEhFCxwEWZxqk0wdw1kqmAY= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: 01594ef9-3b42-4a2a-4bb0-08df1a0cc72d X-MS-Exchange-CrossTenant-AuthSource: AM7PR10MB3956.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Sep 2026 07:23:49.4576 (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: d845E26KYzVY0Rf+Ij0pdy5Iu8zj2IzCjwvHqKsTrcdcZt/hX7of/z7+aTpdVM9OpiT57qhfZ7UgP0TDKW9Z7I1KY1d/n7m0n7TwkxpvJTg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS5PR10MB8146 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=J29ShKFm; 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 d3b0d471..1de27d7b 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: @@ -650,6 +652,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" @@ -657,10 +667,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}