From: "Moessbauer, Felix" <felix.moessbauer@siemens.com>
To: "Moessbauer, Felix" <felix.moessbauer@siemens.com>,
"Schild, Henning" <henning.schild@siemens.com>
Cc: "isar-users@googlegroups.com" <isar-users@googlegroups.com>,
"jan.kiszka@siemens.com" <jan.kiszka@siemens.com>,
"Schmidl, Tobias" <tobiasschmidl@siemens.com>
Subject: RE: [PATCH 1/1] fix on-first-boot for systemd >= 247
Date: Mon, 25 Jul 2022 14:00:56 +0000 [thread overview]
Message-ID: <AM9PR10MB4869D35232EFC6B698C9B30289959@AM9PR10MB4869.EURPRD10.PROD.OUTLOOK.COM> (raw)
In-Reply-To: <AM9PR10MB4869C2A9537643BF92AB960589909@AM9PR10MB4869.EURPRD10.PROD.OUTLOOK.COM>
> > Am Fri, 22 Jul 2022 00:04:04 +0200
> > schrieb Felix Moessbauer <felix.moessbauer@siemens.com>:
> >
> > > This patch fixes the bug that /etc/machine-id is never generated
> > > when running from within an initrd with an ro rootfs.
> > >
> > > In this case, the magic value "uninitialized" has to be used instead
> > > of deleting the file.
> > >
> > > Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
> > > ---
> > > meta/classes/image-postproc-extension.bbclass | 9 ++++++++-
> > > 1 file changed, 8 insertions(+), 1 deletion(-)
> > >
> > > diff --git a/meta/classes/image-postproc-extension.bbclass
> > > b/meta/classes/image-postproc-extension.bbclass index
> > > 0c412c0d..98c697b2 100644 ---
> > > a/meta/classes/image-postproc-extension.bbclass +++
> > > b/meta/classes/image-postproc-extension.bbclass @@ -56,8 +56,15 @@
> > > image_postprocess_mark() { ROOTFS_POSTPROCESS_COMMAND =+
> > > "image_postprocess_machine_id" image_postprocess_machine_id() {
> > > # systemd(1) takes care of recreating the machine-id on first
> > > boot
> > > + # for systemd < v247, remove the file, else set to uninitialized
> > > + # (required if initramfs with ro root is used)
> > > + SYSTEMD_VERSION=$( sudo chroot ${IMAGE_ROOTFS} dpkg-query
> > > --showformat='${source:Upstream-Version}' --show systemd )
> > > + if dpkg --compare-versions "$SYSTEMD_VERSION" "lt" "247"; then
> > > + sudo rm -f '${IMAGE_ROOTFS}/etc/machine-id'
> > > + else
> > > + echo "uninitialized" | sudo tee
> > > '${IMAGE_ROOTFS}/etc/machine-id'
> > > + fi
> > > sudo rm -f '${IMAGE_ROOTFS}/var/lib/dbus/machine-id'
> > > - sudo rm -f '${IMAGE_ROOTFS}/etc/machine-id'
> >
> > I would keep the rm and follow up with a conditional write. Also i
> > found that /etc/machine-id seems to be 444 at least at the end of the
> > day. If it already is at that point, the tee might fail. And it might
> > be that we need to 444 it when we create it.
>
> I thought about that as well, but to keep the access rights (which are not 444
> initially), I decided to not remove the file.
Just found out that systemd is not in all images we generate (e.g. the SDK).
This breaks the patch.
Will send out a v2 soon, with a detection if systemd is installed.
Felix
>
> Felix
>
> >
> > Henning
> >
> > > }
> > >
> > > ROOTFS_POSTPROCESS_COMMAND =+
> > "image_postprocess_sshd_key_regen"
>
> --
> You received this message because you are subscribed to the Google Groups
> "isar-users" group.
> To unsubscribe from this group and stop receiving emails from it, send an email
> to isar-users+unsubscribe@googlegroups.com.
> To view this discussion on the web visit
> https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgroups.g
> oogle.com%2Fd%2Fmsgid%2Fisar-
> users%2FAM9PR10MB4869C2A9537643BF92AB960589909%2540AM9PR10MB4
> 869.EURPRD10.PROD.OUTLOOK.COM&data=05%7C01%7Cfelix.moessbau
> er%40siemens.com%7Cbff2e2353511402d995b08da6bbd768e%7C38ae3bcd957
> 94fd4addab42e1495d55a%7C1%7C0%7C637940758721837057%7CUnknown%7
> CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJ
> XVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=rSoTRCqgcsncXBFPUX27Nkpj
> T8rM0mr%2FH6l3sDDu1fY%3D&reserved=0.
next prev parent reply other threads:[~2022-07-25 14:00 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-21 22:04 [PATCH 0/1] " Felix Moessbauer
2022-07-21 22:04 ` [PATCH 1/1] " Felix Moessbauer
2022-07-22 7:34 ` Henning Schild
2022-07-22 8:37 ` Moessbauer, Felix
2022-07-25 14:00 ` Moessbauer, Felix [this message]
2022-07-22 8:02 ` Schmidl, Tobias
2022-07-22 8:27 ` Henning Schild
2022-07-22 8:34 ` Moessbauer, Felix
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=AM9PR10MB4869D35232EFC6B698C9B30289959@AM9PR10MB4869.EURPRD10.PROD.OUTLOOK.COM \
--to=felix.moessbauer@siemens.com \
--cc=henning.schild@siemens.com \
--cc=isar-users@googlegroups.com \
--cc=jan.kiszka@siemens.com \
--cc=tobiasschmidl@siemens.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox