X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=dracut%2F90zfs%2Fparse-zfs.sh;h=a5e84ad1915e5bbcd49af793beb51b73316ceee4;hb=1ef5e8296a07a0d208d0663ae966c8b0206f7e6a;hp=f8974b95ecc5b810cb1c875bd15c6e37d555bfb3;hpb=beb982690293310b14a4835d3ffeb883ba03cc0a;p=zfs.git diff --git a/dracut/90zfs/parse-zfs.sh b/dracut/90zfs/parse-zfs.sh index f8974b9..a5e84ad 100755 --- a/dracut/90zfs/parse-zfs.sh +++ b/dracut/90zfs/parse-zfs.sh @@ -5,42 +5,42 @@ # Let the command line override our host id. spl_hostid=`getarg spl_hostid=` if [ "${spl_hostid}" != "" ] ; then - info "ZFS: Using hostid from command line: ${spl_hostid}" - echo "${spl_hostid}" > /etc/hostid + info "ZFS: Using hostid from command line: ${spl_hostid}" + echo "${spl_hostid}" > /etc/hostid elif [ -f /etc/hostid ] ; then - info "ZFS: Using hostid from /etc/hostid: `cat /etc/hostid`" + info "ZFS: Using hostid from /etc/hostid: `cat /etc/hostid`" else - warn "ZFS: No hostid found on kernel command line or /etc/hostid. ZFS pools may not import correctly." + warn "ZFS: No hostid found on kernel command line or /etc/hostid. ZFS pools may not import correctly." fi case "$root" in - ""|zfs|zfs:) - # We'll take root unset, root=zfs, or root=zfs: - # No root set, so we want to read the bootfs attribute. We can't do - # that until udev settles so we'll set dummy values and hope for the - # best later on. - root="zfs:AUTO" - rootok=1 - - info "ZFS: Enabling autodetection of bootfs after udev settles." - ;; - - ZFS\=*|zfs:*|zfs:FILESYSTEM\=*|FILESYSTEM\=*) - # 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 - - # Strip down to just the pool/fs - root="${root#zfs:}" - root="${root#FILESYSTEM=}" - root="zfs:${root#ZFS=}" - rootok=1 - - info "ZFS: Set ${root} as bootfs." - ;; + ""|zfs|zfs:) + # We'll take root unset, root=zfs, or root=zfs: + # No root set, so we want to read the bootfs attribute. We can't do + # that until udev settles so we'll set dummy values and hope for the + # best later on. + root="zfs:AUTO" + rootok=1 + + info "ZFS: Enabling autodetection of bootfs after udev settles." + ;; + + ZFS\=*|zfs:*|zfs:FILESYSTEM\=*|FILESYSTEM\=*) + # 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 + + # Strip down to just the pool/fs + root="${root#zfs:}" + root="${root#FILESYSTEM=}" + root="zfs:${root#ZFS=}" + rootok=1 + + info "ZFS: Set ${root} as bootfs." + ;; esac # Make sure Dracut is happy that we have a root and will wait for ZFS