From cdba914b3fc37a10c8bab42d1615a0d10b86e60b Mon Sep 17 00:00:00 2001 From: Alexander Motin Date: Fri, 11 Mar 2016 13:06:11 +0000 Subject: [PATCH] Use `geom disk list` instead `camcontrol identify`. The new way works for almost any disk, while the old only for ATA. MFC after: 2 weeks --- usr.sbin/pc-sysinstall/backend-query/disk-list.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/pc-sysinstall/backend-query/disk-list.sh b/usr.sbin/pc-sysinstall/backend-query/disk-list.sh index 2616ef9bf5e8..875b330ef64b 100755 --- a/usr.sbin/pc-sysinstall/backend-query/disk-list.sh +++ b/usr.sbin/pc-sysinstall/backend-query/disk-list.sh @@ -82,8 +82,8 @@ do esac fi - # Try and find some identification information with camcontrol - NEWLINE=$(camcontrol identify $DEV 2>/dev/null | sed -ne 's/^device model *//p') + # Try and get some identification information from GEOM + NEWLINE=$(geom disk list $DEV 2>/dev/null | sed -ne 's/^ descr: *//p') if [ -z "$NEWLINE" ]; then NEWLINE=" " fi