diff options
| author | наб <[email protected]> | 2022-04-04 20:59:53 +0200 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2022-04-20 16:44:37 -0700 |
| commit | 2c74617bcf76b305937097278b614443d47681a0 (patch) | |
| tree | d854aa7cb48f47cd8b2e84edc90a9a397dd4e9fc | |
| parent | 47636f5661abf202c725f1975939878e7156d3c8 (diff) | |
contrib: dracut: parse-zfs: stop pretending we support FILESYSTEM=
It was added in the original ae26d0465a ("Add dracut support") commit
in 2011, and was then broken a bit later with the advent of
dracut-zfs-generator, or maybe earlier as part of other churn
Either way, it's broken, and has been in 2.0+ as well, and no-one
complained. Stop pretending we support it at all
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Ahelenia Ziemiańska <[email protected]>
Closes #13291
| -rwxr-xr-x | contrib/dracut/90zfs/parse-zfs.sh.in | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/contrib/dracut/90zfs/parse-zfs.sh.in b/contrib/dracut/90zfs/parse-zfs.sh.in index 7b240a7bb..77595bcdb 100755 --- a/contrib/dracut/90zfs/parse-zfs.sh.in +++ b/contrib/dracut/90zfs/parse-zfs.sh.in @@ -29,18 +29,15 @@ case "${root}" in info "ZFS: Enabling autodetection of bootfs after udev settles." ;; - ZFS=*|zfs:*|FILESYSTEM=*) + ZFS=*|zfs:*) # root is explicit ZFS root. Parse it now. We can handle # a root=... param in any of the following formats: # root=ZFS=rpool/ROOT # root=zfs:rpool/ROOT - # root=zfs:FILESYSTEM=rpool/ROOT - # root=FILESYSTEM=rpool/ROOT # root=ZFS=pool+with+space/ROOT+WITH+SPACE (translates to root=ZFS=pool with space/ROOT WITH SPACE) # Strip down to just the pool/fs root="${root#zfs:}" - root="${root#FILESYSTEM=}" root="zfs:${root#ZFS=}" # switch + with spaces because kernel cmdline does not allow us to quote parameters root=$(echo "$root" | tr '+' ' ') |