Module Name:    src
Committed By:   mlelstv
Date:           Sat Mar 18 11:36:23 UTC 2023

Modified Files:
        src/distrib/utils/embedded/files: resize_disklabel

Log Message:
Can't use disklabel to find the real size of a disk since a fake disklabel
read from disk is trusted. Revert to use drvctl again.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/distrib/utils/embedded/files/resize_disklabel

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/utils/embedded/files/resize_disklabel
diff -u src/distrib/utils/embedded/files/resize_disklabel:1.4 src/distrib/utils/embedded/files/resize_disklabel:1.5
--- src/distrib/utils/embedded/files/resize_disklabel:1.4	Sat Feb 18 07:58:34 2023
+++ src/distrib/utils/embedded/files/resize_disklabel	Sat Mar 18 11:36:23 2023
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: resize_disklabel,v 1.4 2023/02/18 07:58:34 mlelstv Exp $
+# $NetBSD: resize_disklabel,v 1.5 2023/03/18 11:36:23 mlelstv Exp $
 #
 
 # PROVIDE: resize_disklabel
@@ -27,8 +27,7 @@ get_total_sectors()
 	local disk
 
 	disk=$1
-	/sbin/disklabel -t "$disk" \
-	| sed -ne 's/.*:su#\([0-9]*\):.*/\1/p'
+	/sbin/drvctl -p "$disk" disk-info/geometry/sectors-per-unit
 }
 
 get_rawpart_sectors()

Reply via email to