]> git.proxmox.com Git - mirror_zfs.git/commitdiff
contrib: dracut: parse-zfs: stop pretending we support FILESYSTEM=
authorнаб <nabijaczleweli@nabijaczleweli.xyz>
Mon, 4 Apr 2022 18:59:53 +0000 (20:59 +0200)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Wed, 20 Apr 2022 23:44:37 +0000 (16:44 -0700)
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 <behlendorf1@llnl.gov>
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Closes #13291

contrib/dracut/90zfs/parse-zfs.sh.in

index 7b240a7bba060cf5225d086765bb80cc38854656..77595bcdb1e78dabfff4d5ca96d191f2ddeba4d2 100755 (executable)
@@ -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 '+' ' ')