git: c6a311678d66 - main - nextboot: Improve the shell code used to figure out the zpool name

Allan Jude allanjude at FreeBSD.org
Sat Jun 5 14:32:53 UTC 2021


The branch main has been updated by allanjude:

URL: https://cgit.FreeBSD.org/src/commit/?id=c6a311678d667cb1e7b5417edb6567b7f07d148d

commit c6a311678d667cb1e7b5417edb6567b7f07d148d
Author:     Allan Jude <allanjude at FreeBSD.org>
AuthorDate: 2021-06-04 22:09:43 +0000
Commit:     Allan Jude <allanjude at FreeBSD.org>
CommitDate: 2021-06-05 14:32:18 +0000

    nextboot: Improve the shell code used to figure out the zpool name
    
    Reported by:    imp
    Reviewed by:    imp, tsoome
    Sponsored by:   Klara Inc.
    Differential Revision:  https://reviews.freebsd.org/D30650
---
 sbin/reboot/nextboot.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sbin/reboot/nextboot.sh b/sbin/reboot/nextboot.sh
index 849d7a377714..2350c42516bf 100644
--- a/sbin/reboot/nextboot.sh
+++ b/sbin/reboot/nextboot.sh
@@ -109,7 +109,7 @@ fi
 
 zfs=$(df -Tn "/boot/" 2>/dev/null | while read _fs _type _other ; do
 	[ "zfs" = "${_type}" ] || continue
-	echo "${_fs%/ROOT/*}"
+	echo "${_fs%%/*}"
 done)
 
 set -e


More information about the dev-commits-src-all mailing list