Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

contrib: dracut: zfs-lib: remove find_bootfs 

Upstream-commit: dac0b0785a
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Closes #13291
This commit is contained in:
наб 2022-04-04 23:16:59 +02:00 committed by Brian Behlendorf
parent 5c0aa409ed
commit 5c97f76f5a
2 changed files with 2 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/dracut/90zfs/mount-zfs.sh.in
View File

@ -28,10 +28,10 @@ ZFS_DATASET=
ZFS_POOL= ZFS_POOL=
if [ "${root}" = "zfs:AUTO" ] ; then 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 # shellcheck disable=SC2086
zpool import -N -a ${ZPOOL_IMPORT_OPTS} 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." warn "ZFS: No bootfs attribute found in importable pools."
zpool export -aF zpool export -aF

25
contrib/dracut/90zfs/zfs-lib.sh.in
View File

@ -27,31 +27,6 @@ if getargbool 0 zfs_force -y zfs.force -y zfsforce ; then
ZPOOL_IMPORT_OPTS="${ZPOOL_IMPORT_OPTS} -f" ZPOOL_IMPORT_OPTS="${ZPOOL_IMPORT_OPTS} -f"
fi 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 # import_pool POOL
# imports the given zfs pool if it isn't imported already. # imports the given zfs pool if it isn't imported already.
import_pool() { import_pool() {