]> git.ipfire.org Git - thirdparty/systemd.git/commit
Revert "initrd: extend SYSTEMD_IN_INITRD to accept non-ramfs rootfs"
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Sun, 6 Nov 2022 19:34:21 +0000 (20:34 +0100)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Mon, 7 Nov 2022 11:46:19 +0000 (12:46 +0100)
commit0fef5b0f0bd9ded1ae7bcb3e4e4b2893e36c51a6
tree843771b56a5ac4659a3537baece01ac1e8d791f5
parentbcb639662ed0b93b3106973f205f8b990ea862fa
Revert "initrd: extend SYSTEMD_IN_INITRD to accept non-ramfs rootfs"

This reverts commit 1f22621ba33f8089d2ae5fbcaf8b3970dd68aaf0.

As described in the reverted commit, we don't want to get rid of the check
completely. But the check requires opting-in by setting SYSTEMD_IN_INITRD=lenient,
which is cumbersome and doesn't seem to actually happen.
https://bugzilla.redhat.com/show_bug.cgi?id=2137631 is caused by systemd refusing
to treat the system as an initrd because overlayfs is used. Let's revert this
approach and do something that doesn't require opt-in instead.

I don't think it makes sense to keep support for "SYSTEMD_IN_INITRD=lenient" or
"SYSTEMD_IN_INITRD=auto". To get "auto" behaviour, just unset the option. And
"lenient" will be reimplemented as a better check. Thus the changes to the
option interface are completely reverted.
docs/ENVIRONMENT.md
src/basic/util.c