diff options
| author | наб <[email protected]> | 2022-04-04 23:16:59 +0200 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2022-04-20 16:45:11 -0700 |
| commit | dac0b0785a795efe3bbb5367af35e2c4fbe32040 (patch) | |
| tree | d5a6d8b13bc15e7211700650450d1481c0987d1e | |
| parent | 5d31169d7c8810baf87f1dc778c97a7024c8c205 (diff) | |
contrib: dracut: zfs-lib: remove find_bootfs
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Ahelenia Ziemiańska <[email protected]>
Closes #13291
| -rwxr-xr-x | contrib/dracut/90zfs/mount-zfs.sh.in | 4 | ||||
| -rwxr-xr-x | contrib/dracut/90zfs/zfs-lib.sh.in | 25 |
2 files changed, 2 insertions, 27 deletions
diff --git a/contrib/dracut/90zfs/mount-zfs.sh.in b/contrib/dracut/90zfs/mount-zfs.sh.in index 2288c80ae..5fd406231 100755 --- a/contrib/dracut/90zfs/mount-zfs.sh.in +++ b/contrib/dracut/90zfs/mount-zfs.sh.in @@ -28,10 +28,10 @@ ZFS_DATASET= ZFS_POOL= if [ "${root}" = "zfs:AUTO" ] ; then - if ! ZFS_DATASET="$(find_bootfs)" ; then + if ! ZFS_DATASET="$(zpool get -Ho value bootfs | grep -m1 -vFx -)"; then # shellcheck disable=SC2086 zpool import -N -a ${ZPOOL_IMPORT_OPTS} - if ! ZFS_DATASET="$(find_bootfs)" ; then + if ! ZFS_DATASET="$(zpool get -Ho value bootfs | grep -m1 -vFx -)"; then warn "ZFS: No bootfs attribute found in importable pools." zpool export -aF diff --git a/contrib/dracut/90zfs/zfs-lib.sh.in b/contrib/dracut/90zfs/zfs-lib.sh.in index 9c24e056e..6643e1bb3 100755 --- a/contrib/dracut/90zfs/zfs-lib.sh.in +++ b/contrib/dracut/90zfs/zfs-lib.sh.in @@ -27,31 +27,6 @@ if getargbool 0 zfs_force -y zfs.force -y zfsforce ; then ZPOOL_IMPORT_OPTS="${ZPOOL_IMPORT_OPTS} -f" fi -# find_bootfs -# returns the first dataset with the bootfs attribute. -find_bootfs() { - IFS="${NEWLINE}" - for dataset in $(zpool list -H -o bootfs); do - case "${dataset}" in - "" | "-") - continue - ;; - "no pools available") - IFS="${OLDIFS}" - return 1 - ;; - *) - IFS="${OLDIFS}" - echo "${dataset}" - return 0 - ;; - esac - done - - IFS="${OLDIFS}" - return 1 -} - # import_pool POOL # imports the given zfs pool if it isn't imported already. import_pool() { |