mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2025-01-15 20:50:30 +03:00
18edf7a3ba
This had always worked in my testing, but a user on hardware reported
this to happen 100%, and I reproduced it once with cold VM host caches.
dracut-zfs-generator runs as a systemd generator, i.e. at Some
Relatively Early Time; if root= is a fixed dataset, it tries to
"solve [necessities] statically at generation time".
If by that point zfs-import.target hasn't popped (because the import is
taking a non-negligible amount of time for whatever reason), it'll see
no children for the root datase, and as such generate no mounts.
This has never had any right to work. No-one caught this earlier because
it's just that much more convenient to have root=zfs:AUTO, which orders
itself properly.
To fix this, always run zfs-nonroot-necessities.service;
this additionally simplifies the implementation by:
* making BOOTFS from zfs-env-bootfs.service be the real, canonical,
root dataset name, not just "whatever the first bootfs is",
and only set it if we're ZFS-booting
* zfs-{rollback,snapshot}-bootfs.service can use this instead of
re-implementing it
* having zfs-env-bootfs.service also set BOOTFSFLAGS
* this means the sysroot.mount drop-in can be fixed text
* zfs-nonroot-necessities.service can also be constant and always
enabled, because it's conditioned on BOOTFS being set
There is no longer any code generated at run-time
(the sysroot.mount drop-in is an unavoidable gratuitous cp).
The flow of BOOTFS{,FLAGS} from zfs-env-bootfs.service to sysroot.mount
is not noted explicitly in dracut.zfs(7), because (a) at some point it's
just visual noise and (b) it's already ordered via d-p-m.s from z-i.t.
Backport-of: 3399a30ee0
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
26 lines
671 B
Makefile
26 lines
671 B
Makefile
include $(top_srcdir)/config/Substfiles.am
|
|
include $(top_srcdir)/config/Shellcheck.am
|
|
|
|
pkgdracutdir = $(dracutdir)/modules.d/90zfs
|
|
pkgdracut_SCRIPTS = \
|
|
export-zfs.sh \
|
|
module-setup.sh \
|
|
mount-zfs.sh \
|
|
parse-zfs.sh \
|
|
zfs-generator.sh \
|
|
zfs-load-key.sh \
|
|
zfs-needshutdown.sh \
|
|
zfs-lib.sh \
|
|
import-opts-generator.sh
|
|
|
|
pkgdracut_DATA = \
|
|
zfs-env-bootfs.service \
|
|
zfs-nonroot-necessities.service \
|
|
zfs-snapshot-bootfs.service \
|
|
zfs-rollback-bootfs.service
|
|
|
|
SUBSTFILES += $(pkgdracut_SCRIPTS) $(pkgdracut_DATA)
|
|
|
|
# Provided by /bin/sleep, and, again, every implementation of that supports this
|
|
CHECKBASHISMS_IGNORE = -e 'sleep only takes one integer' -e 'sleep 0.'
|