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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 38D6C158013 for ; Mon, 11 Dec 2023 11:11:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 33ED12BC01E; Mon, 11 Dec 2023 11:11:37 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DEB352BC018 for ; Mon, 11 Dec 2023 11:11:36 +0000 (UTC) Message-ID: <13496e5a0edc7613db8fb374c2943c9464eaa5bb.camel@gentoo.org> Subject: Re: [gentoo-dev] [PATCH] kernel-install.eclass: fix test phase on systemd systems From: =?UTF-8?Q?Micha=C5=82_G=C3=B3rny?= To: gentoo-dev@lists.gentoo.org Date: Mon, 11 Dec 2023 12:11:31 +0100 In-Reply-To: <52e0360e-965f-42e2-bb69-17de424f7d05@gentoo.org> References: <52e0360e-965f-42e2-bb69-17de424f7d05@gentoo.org> Organization: Gentoo Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-E4PJNTEgFG0WjWjUyUN7" User-Agent: Evolution 3.50.1 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 X-Archives-Salt: 22ba5efc-752d-4631-a31e-ca285d340b6d X-Archives-Hash: 13527e6037d16053dd70ad3e695221d2 --=-E4PJNTEgFG0WjWjUyUN7 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Mon, 2023-12-11 at 08:43 +0100, Andrew Ammerlaan wrote: > Patch is part of https://github.com/gentoo/gentoo/pull/34024 >=20 > Best regards, > Andrew >=20 > From 03e17149eef9eba08f8c8bf32845c18106d32290 Mon Sep 17 00:00:00 2001 > From: Andrew Ammerlaan > Date: Mon, 11 Dec 2023 08:36:58 +0100 > Subject: [PATCH] kernel-install.eclass: fix test phase on systemd systems >=20 > On systemd systems the dracut systemd modules are included automatically. > Systemd insists our dummy root has some valid /etc/os-release file,=20 > otherwise > it refuses the switch root operation. However, with this fix it still=20 > does not > boot up correctly on systemd systems, it gets stuck in an infinite boot= =20 > loop. > Presumably the reason has something to do with our dummy root not having= =20 > a real > systemd init to switch root to. We add the systemd dracut modules to the= =20 > omit > list to prevent the problem and ensure the test phase behaves the same on > systemd and non-systemd systems. >=20 > Signed-off-by: Andrew Ammerlaan > --- > eclass/kernel-install.eclass | 12 ++++++++++++ > 1 file changed, 12 insertions(+) >=20 > diff --git a/eclass/kernel-install.eclass b/eclass/kernel-install.eclass > index b4d84f3986c0d..f2a6ec75f2a88 100644 > --- a/eclass/kernel-install.eclass > +++ b/eclass/kernel-install.eclass > @@ -231,6 +231,17 @@ kernel-install_create_qemu_image() { > # some layout needed to pass dracut's usable_root() validation > mkdir -p "${imageroot}"/{bin,dev,etc,lib,proc,root,sbin,sys} || die > touch "${imageroot}/lib/ld-fake.so" || die > + # Initrd images with systemd require some os-release file > + cat <<-EOT >> "${imageroot}/etc/os-release" || die > + NAME=3DGentoo > + ID=3Dgentoo > + PRETTY_NAME=3D"Gentoo Linux" > + ANSI_COLOR=3D"1;32" > + HOME_URL=3D"https://www.gentoo.org/" > + SUPPORT_URL=3D"https://www.gentoo.org/support/" > + BUG_REPORT_URL=3D"https://bugs.gentoo.org/" > + VERSION_ID=3D"dist-kernel testing" > + EOT >=20 Can't we just copy it from host? --=20 Best regards, Micha=C5=82 G=C3=B3rny --=-E4PJNTEgFG0WjWjUyUN7 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part -----BEGIN PGP SIGNATURE----- iQFGBAABCgAwFiEEx2qEUJQJjSjMiybFY5ra4jKeJA4FAmV27mQSHG1nb3JueUBn ZW50b28ub3JnAAoJEGOa2uIyniQOWZsIAMQX/9TwN8/B7oIhNZeK9zmszjU/rE6x 1ja+CqJDPTv5JSG/tpYFzK58lXzu1YLZ9TrMJbL+Lj3ImvJtVESuhNQxJnfFgIQQ CtZOojvP1xKPzpIOm8ISZsAkO2Open4d9i0LXKxIdO40OblNqmz5oKNaD7zeK6qt xt95CoscEKBd4zElWICQlhK0cKwUfk9IruLy3kc7j9keGJw8WMjZRvlMb+KZSrbi GHoneZplcxhQHc6Q4sQexlVJ+N8Kuj/O2nXSnxmdKbuGKVRpUrG8rayTxSRDmdKP WH4g+wgMfb4q+kVn1PENRopuxfCcu5fk83mPEupPBzxfj6GYWxLwoSI= =hakA -----END PGP SIGNATURE----- --=-E4PJNTEgFG0WjWjUyUN7--