mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2024-11-18 02:20:59 +03:00
245529d85f
So far, everything parsed root= manually, which meant that while zfs-parse.sh was updated, and supposedly supported + -> ' ' conversion, it meant nothing Instead, centralise parsing, and allow: root= root=zfs root=zfs: root=zfs:AUTO root=ZFS=data/set root=zfs:data/set root=zfs:ZFS=data/set (as a side-effect; allowed but undocumented) rootfstype=zfs AND root=data/set <=> root=data/set rootfstype=zfs AND root= <=> root=zfs:AUTO So rootfstype=zfs /also/ behaves as expected, and + decoding works Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz> Closes #13291
100 lines
3.2 KiB
Bash
Executable File
100 lines
3.2 KiB
Bash
Executable File
#!/bin/sh
|
|
# shellcheck disable=SC2016,SC1004,SC2154
|
|
|
|
grep -wq debug /proc/cmdline && debug=1
|
|
[ -n "$debug" ] && echo "zfs-generator: starting" >> /dev/kmsg
|
|
|
|
GENERATOR_DIR="$1"
|
|
[ -n "$GENERATOR_DIR" ] || {
|
|
echo "zfs-generator: no generator directory specified, exiting" >> /dev/kmsg
|
|
exit 1
|
|
}
|
|
|
|
# shellcheck source=zfs-lib.sh.in
|
|
. /lib/dracut-zfs-lib.sh
|
|
decode_root_args || exit 0
|
|
|
|
[ -z "${rootflags}" ] && rootflags=$(getarg rootflags=)
|
|
case ",${rootflags}," in
|
|
*,zfsutil,*) ;;
|
|
,,) rootflags=zfsutil ;;
|
|
*) rootflags="zfsutil,${rootflags}" ;;
|
|
esac
|
|
|
|
[ -n "$debug" ] && echo "zfs-generator: writing extension for sysroot.mount to $GENERATOR_DIR/sysroot.mount.d/zfs-enhancement.conf" >> /dev/kmsg
|
|
|
|
|
|
mkdir -p "$GENERATOR_DIR"/sysroot.mount.d "$GENERATOR_DIR"/initrd-root-fs.target.requires "$GENERATOR_DIR"/dracut-pre-mount.service.d
|
|
{
|
|
echo "[Unit]"
|
|
echo "Before=initrd-root-fs.target"
|
|
echo "After=zfs-import.target"
|
|
echo
|
|
echo "[Mount]"
|
|
if [ "${root}" = "zfs:AUTO" ]; then
|
|
echo "PassEnvironment=BOOTFS"
|
|
echo 'What=${BOOTFS}'
|
|
else
|
|
echo "What=${root}"
|
|
fi
|
|
echo "Type=zfs"
|
|
echo "Options=${rootflags}"
|
|
} > "$GENERATOR_DIR"/sysroot.mount.d/zfs-enhancement.conf
|
|
ln -fs ../sysroot.mount "$GENERATOR_DIR"/initrd-root-fs.target.requires/sysroot.mount
|
|
|
|
|
|
if [ "${root}" = "zfs:AUTO" ]; then
|
|
{
|
|
echo "[Unit]"
|
|
echo "Before=initrd-root-fs.target"
|
|
echo "After=sysroot.mount"
|
|
echo "DefaultDependencies=no"
|
|
echo
|
|
echo "[Service]"
|
|
echo "Type=oneshot"
|
|
echo "PassEnvironment=BOOTFS"
|
|
echo "ExecStart=/bin/sh -c '" ' \
|
|
. /lib/dracut-zfs-lib.sh; \
|
|
_zfs_nonroot_necessities_cb() { \
|
|
zfs mount | grep -m1 -q "^$1 " && return 0; \
|
|
echo "Mounting $1 on /sysroot$2"; \
|
|
mount -o zfsutil -t zfs "$1" "/sysroot$2"; \
|
|
}; \
|
|
for_relevant_root_children "${BOOTFS}" _zfs_nonroot_necessities_cb;' \
|
|
"'"
|
|
} > "$GENERATOR_DIR"/zfs-nonroot-necessities.service
|
|
ln -fs ../zfs-nonroot-necessities.service "$GENERATOR_DIR"/initrd-root-fs.target.requires/zfs-nonroot-necessities.service
|
|
else
|
|
# We can solve this statically at generation time, so do!
|
|
_zfs_generator_cb() {
|
|
dset="${1}"
|
|
mpnt="${2}"
|
|
unit="$(systemd-escape --suffix=mount -p "/sysroot${mpnt}")"
|
|
|
|
{
|
|
echo "[Unit]"
|
|
echo "Before=initrd-root-fs.target"
|
|
echo "After=sysroot.mount"
|
|
echo
|
|
echo "[Mount]"
|
|
echo "Where=/sysroot${mpnt}"
|
|
echo "What=${dset}"
|
|
echo "Type=zfs"
|
|
echo "Options=zfsutil"
|
|
} > "$GENERATOR_DIR/${unit}"
|
|
ln -fs ../"${unit}" "$GENERATOR_DIR"/initrd-root-fs.target.requires/"${unit}"
|
|
}
|
|
|
|
for_relevant_root_children "${root}" _zfs_generator_cb
|
|
fi
|
|
|
|
|
|
{
|
|
echo "[Unit]"
|
|
echo "After=zfs-import.target"
|
|
} > "$GENERATOR_DIR"/dracut-pre-mount.service.d/zfs-enhancement.conf
|
|
|
|
[ -n "$debug" ] && echo "zfs-generator: finished" >> /dev/kmsg
|
|
|
|
exit 0
|