Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

dracut: support mountpoint=legacy for root dataset 

Support mountpoint=legacy for the root dataset in the dracut zfs support
scripts.

mountpoint=/ or mountpoint=/sysroot also works.

Change zfs-env-bootfs.service to add zfsutil to BOOTFSFLAGS only for
root datasets with mountpoint != legacy.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Signed-off-by: Rafael Kitover <rkitover@gmail.com>
Closes #15149
This commit is contained in:
Rafael Kitover 2023-08-08 16:38:34 +00:00 committed by GitHub
parent 019dea0a55
commit b8c9070d09
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
contrib/dracut/90zfs/zfs-env-bootfs.service.in
View File

@ -12,11 +12,12 @@ ExecStart=/bin/sh -c '
decode_root_args || exit 0; \ decode_root_args || exit 0; \
[ "$root" = "zfs:AUTO" ] && root="$(@sbindir@/zpool list -H -o bootfs | grep -m1 -vFx -)"; \ [ "$root" = "zfs:AUTO" ] && root="$(@sbindir@/zpool list -H -o bootfs | grep -m1 -vFx -)"; \
rootflags="$(getarg rootflags=)"; \ rootflags="$(getarg rootflags=)"; \
case ",$rootflags," in \ [ "$(@sbindir@/zfs get -H -o value mountpoint "$root")" = legacy ] || \
*,zfsutil,*) ;; \ case ",$rootflags," in \
,,) rootflags=zfsutil ;; \ *,zfsutil,*) ;; \
*) rootflags="zfsutil,$rootflags" ;; \ ,,) rootflags=zfsutil ;; \
esac; \ *) rootflags="zfsutil,$rootflags" ;; \
esac; \
exec systemctl set-environment BOOTFS="$root" BOOTFSFLAGS="$rootflags"' exec systemctl set-environment BOOTFS="$root" BOOTFSFLAGS="$rootflags"'
[Install] [Install]