Skip to content

Commit

Permalink
dracut: support mountpoint=legacy for root dataset
Browse files Browse the repository at this point in the history 
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.

Signed-off-by: Rafael Kitover <rkitover@gmail.com>
  • Loading branch information
@rkitover @nabijaczleweli
rkitover authored and nabijaczleweli committed Aug 4, 2023
1 parent e47e9bb commit 3eaacdf
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions contrib/dracut/90zfs/zfs-env-bootfs.service.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,12 @@ ExecStart=/bin/sh -c '
decode_root_args || exit 0; \
[ "$root" = "zfs:AUTO" ] && root="$(@sbindir@/zpool list -H -o bootfs | grep -m1 -vFx -)"; \
rootflags="$(getarg rootflags=)"; \
case ",$rootflags," in \
*,zfsutil,*) ;; \
,,) rootflags=zfsutil ;; \
*) rootflags="zfsutil,$rootflags" ;; \
esac; \
[ "$(@sbindir@/zfs get -H -o value mountpoint "$root")" = legacy ] || \
case ",$rootflags," in \
*,zfsutil,*) ;; \
,,) rootflags=zfsutil ;; \
*) rootflags="zfsutil,$rootflags" ;; \
esac; \
exec systemctl set-environment BOOTFS="$root" BOOTFSFLAGS="$rootflags"'

[Install]
Expand Down

0 comments on commit 3eaacdf

Please sign in to comment.