mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2024-12-27 11:29:36 +03:00
3399a30ee0
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. Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz> Closes #14690
132 lines
4.4 KiB
Bash
Executable File
132 lines
4.4 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
# shellcheck disable=SC2154
|
|
|
|
check() {
|
|
# We depend on udev-rules being loaded
|
|
[[ "${1}" = "-d" ]] && return 0
|
|
|
|
# Verify the zfs tool chain
|
|
for tool in "zgenhostid" "zpool" "zfs" "mount.zfs"; do
|
|
command -v "${tool}" >/dev/null || return 1
|
|
done
|
|
}
|
|
|
|
depends() {
|
|
echo udev-rules
|
|
}
|
|
|
|
installkernel() {
|
|
instmods -c zfs
|
|
}
|
|
|
|
install() {
|
|
inst_rules 90-zfs.rules 69-vdev.rules 60-zvol.rules
|
|
|
|
inst_multiple \
|
|
zgenhostid \
|
|
zfs \
|
|
zpool \
|
|
mount.zfs \
|
|
hostid \
|
|
grep \
|
|
awk \
|
|
tr \
|
|
cut \
|
|
head ||
|
|
{ dfatal "Failed to install essential binaries"; exit 1; }
|
|
|
|
# Adapted from https://github.com/zbm-dev/zfsbootmenu
|
|
if ! ldd "$(command -v zpool)" | grep -qF 'libgcc_s.so'; then
|
|
# On systems with gcc-config (Gentoo, Funtoo, etc.), use it to find libgcc_s
|
|
if command -v gcc-config >/dev/null; then
|
|
inst_simple "/usr/lib/gcc/$(s=$(gcc-config -c); echo "${s%-*}/${s##*-}")/libgcc_s.so.1" ||
|
|
{ dfatal "Unable to install libgcc_s.so"; exit 1; }
|
|
# Otherwise, use dracut's library installation function to find the right one
|
|
elif ! inst_libdir_file "libgcc_s.so*"; then
|
|
# If all else fails, just try looking for some gcc arch directory
|
|
inst_simple /usr/lib/gcc/*/*/libgcc_s.so* ||
|
|
{ dfatal "Unable to install libgcc_s.so"; exit 1; }
|
|
fi
|
|
fi
|
|
|
|
inst_hook cmdline 95 "${moddir}/parse-zfs.sh"
|
|
if [[ -n "${systemdutildir}" ]]; then
|
|
inst_script "${moddir}/zfs-generator.sh" "${systemdutildir}/system-generators/dracut-zfs-generator"
|
|
fi
|
|
inst_hook pre-mount 90 "${moddir}/zfs-load-key.sh"
|
|
inst_hook mount 98 "${moddir}/mount-zfs.sh"
|
|
inst_hook cleanup 99 "${moddir}/zfs-needshutdown.sh"
|
|
inst_hook shutdown 20 "${moddir}/export-zfs.sh"
|
|
|
|
inst_script "${moddir}/zfs-lib.sh" "/lib/dracut-zfs-lib.sh"
|
|
|
|
# -H ensures they are marked host-only
|
|
# -o ensures there is no error upon absence of these files
|
|
inst_multiple -o -H \
|
|
"@sysconfdir@/zfs/zpool.cache" \
|
|
"@sysconfdir@/zfs/vdev_id.conf"
|
|
|
|
# Synchronize initramfs and system hostid
|
|
if ! inst_simple -H @sysconfdir@/hostid; then
|
|
if HOSTID="$(hostid 2>/dev/null)" && [[ "${HOSTID}" != "00000000" ]]; then
|
|
zgenhostid -o "${initdir}@sysconfdir@/hostid" "${HOSTID}"
|
|
mark_hostonly @sysconfdir@/hostid
|
|
fi
|
|
fi
|
|
|
|
if dracut_module_included "systemd"; then
|
|
inst_simple "${systemdsystemunitdir}/zfs-import.target"
|
|
systemctl -q --root "${initdir}" add-wants initrd.target zfs-import.target
|
|
|
|
inst_simple "${moddir}/zfs-env-bootfs.service" "${systemdsystemunitdir}/zfs-env-bootfs.service"
|
|
systemctl -q --root "${initdir}" add-wants zfs-import.target zfs-env-bootfs.service
|
|
|
|
inst_simple "${moddir}/zfs-nonroot-necessities.service" "${systemdsystemunitdir}/zfs-nonroot-necessities.service"
|
|
systemctl -q --root "${initdir}" add-requires initrd-root-fs.target zfs-nonroot-necessities.service
|
|
|
|
# Add user-provided unit overrides:
|
|
# - /etc/systemd/system/${_service}
|
|
# - /etc/systemd/system/${_service}.d/overrides.conf
|
|
# -H ensures they are marked host-only
|
|
# -o ensures there is no error upon absence of these files
|
|
inst_multiple -o -H \
|
|
"${systemdsystemconfdir}/zfs-import.target" \
|
|
"${systemdsystemconfdir}/zfs-import.target.d/"*.conf
|
|
|
|
for _service in \
|
|
"zfs-import-scan.service" \
|
|
"zfs-import-cache.service"; do
|
|
inst_simple "${systemdsystemunitdir}/${_service}"
|
|
systemctl -q --root "${initdir}" add-wants zfs-import.target "${_service}"
|
|
|
|
# Add user-provided unit overrides:
|
|
# - /etc/systemd/system/${_service}
|
|
# - /etc/systemd/system/${_service}.d/overrides.conf
|
|
# -H ensures they are marked host-only
|
|
# -o ensures there is no error upon absence of these files
|
|
inst_multiple -o -H \
|
|
"${systemdsystemconfdir}/${_service}" \
|
|
"${systemdsystemconfdir}/${_service}.d/"*.conf
|
|
|
|
done
|
|
|
|
for _service in \
|
|
"zfs-snapshot-bootfs.service" \
|
|
"zfs-rollback-bootfs.service"; do
|
|
inst_simple "${moddir}/${_service}" "${systemdsystemunitdir}/${_service}"
|
|
systemctl -q --root "${initdir}" add-wants initrd.target "${_service}"
|
|
|
|
# Add user-provided unit overrides:
|
|
# - /etc/systemd/system/${_service}
|
|
# - /etc/systemd/system/${_service}.d/overrides.conf
|
|
# -H ensures they are marked host-only
|
|
# -o ensures there is no error upon absence of these files
|
|
inst_multiple -o -H \
|
|
"${systemdsystemconfdir}/${_service}" \
|
|
"${systemdsystemconfdir}/${_service}.d/"*.conf
|
|
done
|
|
|
|
inst_simple "${moddir}/import-opts-generator.sh" "${systemdutildir}/system-environment-generators/zfs-import-opts.sh"
|
|
fi
|
|
}
|