sparc64 disklabel(8) must be compiled with SUN_CYLCHECK and SUN_AAT0.

sparc64 auto allocation during install does not use fdisk(8).

Add *.sparc64.ok files that reflect sparc64 reality.

Should fix disklabel(8) regression on sparc64.

Requested by & ok bluhm@

diff --git a/regress/sbin/disklabel/1000.sparc64.ok b/regress/sbin/disklabel/1000.sparc64.ok
new file mode 100644 (file)
index 0000000..c2aee11
--- /dev/null
+++ b/regress/sbin/disklabel/1000.sparc64.ok
@@ -0,0 +1,26 @@
+=== Start 1000MB disk ===
+Primary GPT:
+Not Found
+
+Secondary GPT:
+Not Found
+
+MBR:
+Disk: vnd0     geometry: 20500/1/100 [2050048 Sectors]
+Offset: 0      Signature: 0x0
+            Starting         Ending         LBA Info:
+ #: id      C   H   S -      C   H   S [       start:        size ]
+-------------------------------------------------------------------------------
+ 0: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+ 1: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+ 2: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+ 3: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+
+  a:             1.0G                0  4.2BSD   2048 16384     1 # /
+  a:          2017300                0  4.2BSD   2048 16384     1 
+  b:             0.0G          2017300    swap                    
+  b:            32700          2017300    swap                    
+
+/dev/vnd0a / ffs rw 1 1
+/dev/vnd0b none swap sw
+=== End 1000MB disk ===

diff --git a/regress/sbin/disklabel/1024.sparc64.ok b/regress/sbin/disklabel/1024.sparc64.ok
new file mode 100644 (file)
index 0000000..c659ab7
--- /dev/null
+++ b/regress/sbin/disklabel/1024.sparc64.ok
@@ -0,0 +1,26 @@
+=== Start 1024MB disk ===
+Primary GPT:
+Not Found
+
+Secondary GPT:
+Not Found
+
+MBR:
+Disk: vnd0     geometry: 20992/1/100 [2099200 Sectors]
+Offset: 0      Signature: 0x0
+            Starting         Ending         LBA Info:
+ #: id      C   H   S -      C   H   S [       start:        size ]
+-------------------------------------------------------------------------------
+ 0: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+ 1: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+ 2: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+ 3: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+
+  a:             1.0G                0  4.2BSD   2048 16384     1 # /
+  a:          2064000                0  4.2BSD   2048 16384     1 
+  b:             0.0G          2064000    swap                    
+  b:            35200          2064000    swap                    
+
+/dev/vnd0a / ffs rw 1 1
+/dev/vnd0b none swap sw
+=== End 1024MB disk ===

diff --git a/regress/sbin/disklabel/12000.sparc64.ok b/regress/sbin/disklabel/12000.sparc64.ok
new file mode 100644 (file)
index 0000000..34aec92
--- /dev/null
+++ b/regress/sbin/disklabel/12000.sparc64.ok
@@ -0,0 +1,50 @@
+=== Start 12000MB disk ===
+Primary GPT:
+Not Found
+
+Secondary GPT:
+Not Found
+
+MBR:
+Disk: vnd0     geometry: 245780/1/100 [24578048 Sectors]
+Offset: 0      Signature: 0x0
+            Starting         Ending         LBA Info:
+ #: id      C   H   S -      C   H   S [       start:        size ]
+-------------------------------------------------------------------------------
+ 0: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+ 1: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+ 2: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+ 3: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+
+  a:             0.2G                0  4.2BSD   2048 16384     1 # /
+  a:           411600                0  4.2BSD   2048 16384     1 
+  b:             0.2G           411600    swap                    
+  b:           372600           411600    swap                    
+  d:             0.2G           784200  4.2BSD   2048 16384     1 # /tmp
+  d:           412800           784200  4.2BSD   2048 16384     1 
+  e:             0.2G          1197000  4.2BSD   2048 16384     1 # /var
+  e:           435200          1197000  4.2BSD   2048 16384     1 
+  f:             1.6G          1632200  4.2BSD   2048 16384     1 # /usr
+  f:          3280700          1632200  4.2BSD   2048 16384     1 
+  g:             0.4G          4912900  4.2BSD   2048 16384     1 # /usr/X11R6
+  g:           849100          4912900  4.2BSD   2048 16384     1 
+  h:             1.1G          5762000  4.2BSD   2048 16384     1 # /usr/local
+  h:          2410200          5762000  4.2BSD   2048 16384     1 
+  i:             1.5G          8172200  4.2BSD   2048 16384     1 # /usr/src
+  i:          3113800          8172200  4.2BSD   2048 16384     1 
+  j:             5.0G         11286000  4.2BSD   2048 16384     1 # /usr/obj
+  j:         10569300         11286000  4.2BSD   2048 16384     1 
+  k:             1.3G         21855300  4.2BSD   2048 16384     1 # /home
+  k:          2722700         21855300  4.2BSD   2048 16384     1 
+
+/dev/vnd0a / ffs rw 1 1
+/dev/vnd0k /home ffs rw 1 2
+/dev/vnd0d /tmp ffs rw 1 2
+/dev/vnd0f /usr ffs rw 1 2
+/dev/vnd0g /usr/X11R6 ffs rw 1 2
+/dev/vnd0h /usr/local ffs rw 1 2
+/dev/vnd0j /usr/obj ffs rw 1 2
+/dev/vnd0i /usr/src ffs rw 1 2
+/dev/vnd0e /var ffs rw 1 2
+/dev/vnd0b none swap sw
+=== End 12000MB disk ===

diff --git a/regress/sbin/disklabel/18000.sparc64.ok b/regress/sbin/disklabel/18000.sparc64.ok
new file mode 100644 (file)
index 0000000..ef72a00
--- /dev/null
+++ b/regress/sbin/disklabel/18000.sparc64.ok
@@ -0,0 +1,50 @@
+=== Start 18000MB disk ===
+Primary GPT:
+Not Found
+
+Secondary GPT:
+Not Found
+
+MBR:
+Disk: vnd0     geometry: 368660/1/100 [36866048 Sectors]
+Offset: 0      Signature: 0x0
+            Starting         Ending         LBA Info:
+ #: id      C   H   S -      C   H   S [       start:        size ]
+-------------------------------------------------------------------------------
+ 0: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+ 1: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+ 2: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+ 3: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+
+  a:             0.5G                0  4.2BSD   2048 16384     1 # /
+  a:          1026000                0  4.2BSD   2048 16384     1 
+  b:             0.8G          1026000    swap                    
+  b:          1601400          1026000    swap                    
+  d:             0.7G          2627400  4.2BSD   2048 16384     1 # /tmp
+  d:          1395800          2627400  4.2BSD   2048 16384     1 
+  e:             1.0G          4023200  4.2BSD   2048 16384     1 # /var
+  e:          2032600          4023200  4.2BSD   2048 16384     1 
+  f:             2.2G          6055800  4.2BSD   2048 16384     1 # /usr
+  f:          4509500          6055800  4.2BSD   2048 16384     1 
+  g:             0.6G         10565300  4.2BSD   2048 16384     1 # /usr/X11R6
+  g:          1217700         10565300  4.2BSD   2048 16384     1 
+  h:             2.0G         11783000  4.2BSD   2048 16384     1 # /usr/local
+  h:          4253400         11783000  4.2BSD   2048 16384     1 
+  i:             1.6G         16036400  4.2BSD   2048 16384     1 # /usr/src
+  i:          3359500         16036400  4.2BSD   2048 16384     1 
+  j:             5.3G         19395900  4.2BSD   2048 16384     1 # /usr/obj
+  j:         11060800         19395900  4.2BSD   2048 16384     1 
+  k:             3.1G         30456700  4.2BSD   2048 16384     1 # /home
+  k:          6409300         30456700  4.2BSD   2048 16384     1 
+
+/dev/vnd0a / ffs rw 1 1
+/dev/vnd0k /home ffs rw 1 2
+/dev/vnd0d /tmp ffs rw 1 2
+/dev/vnd0f /usr ffs rw 1 2
+/dev/vnd0g /usr/X11R6 ffs rw 1 2
+/dev/vnd0h /usr/local ffs rw 1 2
+/dev/vnd0j /usr/obj ffs rw 1 2
+/dev/vnd0i /usr/src ffs rw 1 2
+/dev/vnd0e /var ffs rw 1 2
+/dev/vnd0b none swap sw
+=== End 18000MB disk ===

diff --git a/regress/sbin/disklabel/2000.sparc64.ok b/regress/sbin/disklabel/2000.sparc64.ok
new file mode 100644 (file)
index 0000000..fe52349
--- /dev/null
+++ b/regress/sbin/disklabel/2000.sparc64.ok
@@ -0,0 +1,26 @@
+=== Start 2000MB disk ===
+Primary GPT:
+Not Found
+
+Secondary GPT:
+Not Found
+
+MBR:
+Disk: vnd0     geometry: 40980/1/100 [4098048 Sectors]
+Offset: 0      Signature: 0x0
+            Starting         Ending         LBA Info:
+ #: id      C   H   S -      C   H   S [       start:        size ]
+-------------------------------------------------------------------------------
+ 0: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+ 1: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+ 2: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+ 3: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+
+  a:             1.9G                0  4.2BSD   2048 16384     1 # /
+  a:          3962900                0  4.2BSD   2048 16384     1 
+  b:             0.1G          3962900    swap                    
+  b:           135100          3962900    swap                    
+
+/dev/vnd0a / ffs rw 1 1
+/dev/vnd0b none swap sw
+=== End 2000MB disk ===

diff --git a/regress/sbin/disklabel/20000.sparc64.ok b/regress/sbin/disklabel/20000.sparc64.ok
new file mode 100644 (file)
index 0000000..c9bc742
--- /dev/null
+++ b/regress/sbin/disklabel/20000.sparc64.ok
@@ -0,0 +1,50 @@
+=== Start 20000MB disk ===
+Primary GPT:
+Not Found
+
+Secondary GPT:
+Not Found
+
+MBR:
+Disk: vnd0     geometry: 409620/1/100 [40962048 Sectors]
+Offset: 0      Signature: 0x0
+            Starting         Ending         LBA Info:
+ #: id      C   H   S -      C   H   S [       start:        size ]
+-------------------------------------------------------------------------------
+ 0: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+ 1: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+ 2: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+ 3: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+
+  a:             0.6G                0  4.2BSD   2048 16384     1 # /
+  a:          1230800                0  4.2BSD   2048 16384     1 
+  b:             1.0G          1230800    swap                    
+  b:          2011000          1230800    swap                    
+  d:             0.8G          3241800  4.2BSD   2048 16384     1 # /tmp
+  d:          1723500          3241800  4.2BSD   2048 16384     1 
+  e:             1.2G          4965300  4.2BSD   2048 16384     1 # /var
+  e:          2565100          4965300  4.2BSD   2048 16384     1 
+  f:             2.3G          7530400  4.2BSD   2048 16384     1 # /usr
+  f:          4919100          7530400  4.2BSD   2048 16384     1 
+  g:             0.6G         12449500  4.2BSD   2048 16384     1 # /usr/X11R6
+  g:          1340600         12449500  4.2BSD   2048 16384     1 
+  h:             2.3G         13790100  4.2BSD   2048 16384     1 # /usr/local
+  h:          4867800         13790100  4.2BSD   2048 16384     1 
+  i:             1.6G         18657900  4.2BSD   2048 16384     1 # /usr/src
+  i:          3441500         18657900  4.2BSD   2048 16384     1 
+  j:             5.4G         22099400  4.2BSD   2048 16384     1 # /usr/obj
+  j:         11224600         22099400  4.2BSD   2048 16384     1 
+  k:             3.6G         33324000  4.2BSD   2048 16384     1 # /home
+  k:          7638000         33324000  4.2BSD   2048 16384     1 
+
+/dev/vnd0a / ffs rw 1 1
+/dev/vnd0k /home ffs rw 1 2
+/dev/vnd0d /tmp ffs rw 1 2
+/dev/vnd0f /usr ffs rw 1 2
+/dev/vnd0g /usr/X11R6 ffs rw 1 2
+/dev/vnd0h /usr/local ffs rw 1 2
+/dev/vnd0j /usr/obj ffs rw 1 2
+/dev/vnd0i /usr/src ffs rw 1 2
+/dev/vnd0e /var ffs rw 1 2
+/dev/vnd0b none swap sw
+=== End 20000MB disk ===

diff --git a/regress/sbin/disklabel/2200.sparc64.ok b/regress/sbin/disklabel/2200.sparc64.ok
new file mode 100644 (file)
index 0000000..b588369
--- /dev/null
+++ b/regress/sbin/disklabel/2200.sparc64.ok
@@ -0,0 +1,26 @@
+=== Start 2200MB disk ===
+Primary GPT:
+Not Found
+
+Secondary GPT:
+Not Found
+
+MBR:
+Disk: vnd0     geometry: 45076/1/100 [4507648 Sectors]
+Offset: 0      Signature: 0x0
+            Starting         Ending         LBA Info:
+ #: id      C   H   S -      C   H   S [       start:        size ]
+-------------------------------------------------------------------------------
+ 0: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+ 1: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+ 2: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+ 3: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+
+  a:             2.1G                0  4.2BSD   2048 16384     1 # /
+  a:          4352000                0  4.2BSD   2048 16384     1 
+  b:             0.1G          4352000    swap                    
+  b:           155600          4352000    swap                    
+
+/dev/vnd0a / ffs rw 1 1
+/dev/vnd0b none swap sw
+=== End 2200MB disk ===

diff --git a/regress/sbin/disklabel/2300.sparc64.ok b/regress/sbin/disklabel/2300.sparc64.ok
new file mode 100644 (file)
index 0000000..1af813f
--- /dev/null
+++ b/regress/sbin/disklabel/2300.sparc64.ok
@@ -0,0 +1,26 @@
+=== Start 2300MB disk ===
+Primary GPT:
+Not Found
+
+Secondary GPT:
+Not Found
+
+MBR:
+Disk: vnd0     geometry: 47124/1/100 [4712448 Sectors]
+Offset: 0      Signature: 0x0
+            Starting         Ending         LBA Info:
+ #: id      C   H   S -      C   H   S [       start:        size ]
+-------------------------------------------------------------------------------
+ 0: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+ 1: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+ 2: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+ 3: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+
+  a:             2.2G                0  4.2BSD   2048 16384     1 # /
+  a:          4546600                0  4.2BSD   2048 16384     1 
+  b:             0.1G          4546600    swap                    
+  b:           165800          4546600    swap                    
+
+/dev/vnd0a / ffs rw 1 1
+/dev/vnd0b none swap sw
+=== End 2300MB disk ===

diff --git a/regress/sbin/disklabel/256.sparc64.ok b/regress/sbin/disklabel/256.sparc64.ok
new file mode 100644 (file)
index 0000000..4034f5f
--- /dev/null
+++ b/regress/sbin/disklabel/256.sparc64.ok
@@ -0,0 +1,23 @@
+=== Start 256MB disk ===
+Primary GPT:
+Not Found
+
+Secondary GPT:
+Not Found
+
+MBR:
+Disk: vnd0     geometry: 5263/1/100 [526336 Sectors]
+Offset: 0      Signature: 0x0
+            Starting         Ending         LBA Info:
+ #: id      C   H   S -      C   H   S [       start:        size ]
+-------------------------------------------------------------------------------
+ 0: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+ 1: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+ 2: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+ 3: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+
+  a:             0.3G                0  4.2BSD   2048 16384     1 # /
+  a:           526300                0  4.2BSD   2048 16384     1 
+
+/dev/vnd0a / ffs rw 1 1
+=== End 256MB disk ===

diff --git a/regress/sbin/disklabel/3000.sparc64.ok b/regress/sbin/disklabel/3000.sparc64.ok
new file mode 100644 (file)
index 0000000..fefa084
--- /dev/null
+++ b/regress/sbin/disklabel/3000.sparc64.ok
@@ -0,0 +1,32 @@
+=== Start 3000MB disk ===
+Primary GPT:
+Not Found
+
+Secondary GPT:
+Not Found
+
+MBR:
+Disk: vnd0     geometry: 61460/1/100 [6146048 Sectors]
+Offset: 0      Signature: 0x0
+            Starting         Ending         LBA Info:
+ #: id      C   H   S -      C   H   S [       start:        size ]
+-------------------------------------------------------------------------------
+ 0: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+ 1: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+ 2: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+ 3: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+
+  a:             0.8G                0  4.2BSD   2048 16384     1 # /
+  a:          1696300                0  4.2BSD   2048 16384     1 
+  b:             0.1G          1696300    swap                    
+  b:           279600          1696300    swap                    
+  d:             1.7G          1975900  4.2BSD   2048 16384     1 # /usr
+  d:          3565000          1975900  4.2BSD   2048 16384     1 
+  e:             0.3G          5540900  4.2BSD   2048 16384     1 # /home
+  e:           605100          5540900  4.2BSD   2048 16384     1 
+
+/dev/vnd0a / ffs rw 1 1
+/dev/vnd0e /home ffs rw 1 2
+/dev/vnd0d /usr ffs rw 1 2
+/dev/vnd0b none swap sw
+=== End 3000MB disk ===

diff --git a/regress/sbin/disklabel/300000.sparc64.ok b/regress/sbin/disklabel/300000.sparc64.ok
new file mode 100644 (file)
index 0000000..04c89a3
--- /dev/null
+++ b/regress/sbin/disklabel/300000.sparc64.ok
@@ -0,0 +1,50 @@
+=== Start 300000MB disk ===
+Primary GPT:
+Not Found
+
+Secondary GPT:
+Not Found
+
+MBR:
+Disk: vnd0     geometry: 6144020/1/100 [614402048 Sectors]
+Offset: 0      Signature: 0x0
+            Starting         Ending         LBA Info:
+ #: id      C   H   S -      C   H   S [       start:        size ]
+-------------------------------------------------------------------------------
+ 0: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+ 1: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+ 2: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+ 3: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+
+  a:             1.0G                0  4.2BSD   2048 16384     1 # /
+  a:          2097200                0  4.2BSD   2048 16384     1 
+  b:            15.9G          2097200    swap                    
+  b:         33423800          2097200    swap                    
+  d:             4.0G         35521000  4.2BSD   2048 16384     1 # /tmp
+  d:          8388700         35521000  4.2BSD   2048 16384     1 
+  e:            35.4G         43909700  4.2BSD   2048 16384     1 # /var
+  e:         74187600         43909700  4.2BSD   2048 16384     1 
+  f:            29.7G        118097300  4.2BSD   2048 16384     1 # /usr
+  f:         62263100        118097300  4.2BSD   2048 16384     1 
+  g:             1.0G        180360400  4.2BSD   2048 16384     1 # /usr/X11R6
+  g:          2097200        180360400  4.2BSD   2048 16384     1 
+  h:            20.0G        182457600  4.2BSD   2048 16384     1 # /usr/local
+  h:         41943100        182457600  4.2BSD   2048 16384     1 
+  i:             3.0G        224400700  4.2BSD   2048 16384     1 # /usr/src
+  i:          6291500        224400700  4.2BSD   2048 16384     1 
+  j:             6.0G        230692200  4.2BSD   2048 16384     1 # /usr/obj
+  j:         12583000        230692200  4.2BSD   2048 16384     1 
+  k:           177.0G        243275200  4.2BSD   4096 32768     1 # /home
+  k:        371126800        243275200  4.2BSD   4096 32768     1 
+
+/dev/vnd0a / ffs rw 1 1
+/dev/vnd0k /home ffs rw 1 2
+/dev/vnd0d /tmp ffs rw 1 2
+/dev/vnd0f /usr ffs rw 1 2
+/dev/vnd0g /usr/X11R6 ffs rw 1 2
+/dev/vnd0h /usr/local ffs rw 1 2
+/dev/vnd0j /usr/obj ffs rw 1 2
+/dev/vnd0i /usr/src ffs rw 1 2
+/dev/vnd0e /var ffs rw 1 2
+/dev/vnd0b none swap sw
+=== End 300000MB disk ===

diff --git a/regress/sbin/disklabel/3500.sparc64.ok b/regress/sbin/disklabel/3500.sparc64.ok
new file mode 100644 (file)
index 0000000..3ab798f
--- /dev/null
+++ b/regress/sbin/disklabel/3500.sparc64.ok
@@ -0,0 +1,32 @@
+=== Start 3500MB disk ===
+Primary GPT:
+Not Found
+
+Secondary GPT:
+Not Found
+
+MBR:
+Disk: vnd0     geometry: 71700/1/100 [7170048 Sectors]
+Offset: 0      Signature: 0x0
+            Starting         Ending         LBA Info:
+ #: id      C   H   S -      C   H   S [       start:        size ]
+-------------------------------------------------------------------------------
+ 0: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+ 1: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+ 2: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+ 3: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+
+  a:             0.8G                0  4.2BSD   2048 16384     1 # /
+  a:          1747500                0  4.2BSD   2048 16384     1 
+  b:             0.2G          1747500    swap                    
+  b:           382000          1747500    swap                    
+  d:             2.1G          2129500  4.2BSD   2048 16384     1 # /usr
+  d:          4363700          2129500  4.2BSD   2048 16384     1 
+  e:             0.3G          6493200  4.2BSD   2048 16384     1 # /home
+  e:           676800          6493200  4.2BSD   2048 16384     1 
+
+/dev/vnd0a / ffs rw 1 1
+/dev/vnd0e /home ffs rw 1 2
+/dev/vnd0d /usr ffs rw 1 2
+/dev/vnd0b none swap sw
+=== End 3500MB disk ===

diff --git a/regress/sbin/disklabel/400.sparc64.ok b/regress/sbin/disklabel/400.sparc64.ok
new file mode 100644 (file)
index 0000000..09a3714
--- /dev/null
+++ b/regress/sbin/disklabel/400.sparc64.ok
@@ -0,0 +1,23 @@
+=== Start 400MB disk ===
+Primary GPT:
+Not Found
+
+Secondary GPT:
+Not Found
+
+MBR:
+Disk: vnd0     geometry: 8212/1/100 [821248 Sectors]
+Offset: 0      Signature: 0x0
+            Starting         Ending         LBA Info:
+ #: id      C   H   S -      C   H   S [       start:        size ]
+-------------------------------------------------------------------------------
+ 0: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+ 1: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+ 2: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+ 3: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+
+  a:             0.4G                0  4.2BSD   2048 16384     1 # /
+  a:           821200                0  4.2BSD   2048 16384     1 
+
+/dev/vnd0a / ffs rw 1 1
+=== End 400MB disk ===

diff --git a/regress/sbin/disklabel/4000.sparc64.ok b/regress/sbin/disklabel/4000.sparc64.ok
new file mode 100644 (file)
index 0000000..caa096a
--- /dev/null
+++ b/regress/sbin/disklabel/4000.sparc64.ok
@@ -0,0 +1,32 @@
+=== Start 4000MB disk ===
+Primary GPT:
+Not Found
+
+Secondary GPT:
+Not Found
+
+MBR:
+Disk: vnd0     geometry: 81940/1/100 [8194048 Sectors]
+Offset: 0      Signature: 0x0
+            Starting         Ending         LBA Info:
+ #: id      C   H   S -      C   H   S [       start:        size ]
+-------------------------------------------------------------------------------
+ 0: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+ 1: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+ 2: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+ 3: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+
+  a:             0.9G                0  4.2BSD   2048 16384     1 # /
+  a:          1798700                0  4.2BSD   2048 16384     1 
+  b:             0.2G          1798700    swap                    
+  b:           484400          1798700    swap                    
+  d:             2.5G          2283100  4.2BSD   2048 16384     1 # /usr
+  d:          5162400          2283100  4.2BSD   2048 16384     1 
+  e:             0.4G          7445500  4.2BSD   2048 16384     1 # /home
+  e:           748500          7445500  4.2BSD   2048 16384     1 
+
+/dev/vnd0a / ffs rw 1 1
+/dev/vnd0e /home ffs rw 1 2
+/dev/vnd0d /usr ffs rw 1 2
+/dev/vnd0b none swap sw
+=== End 4000MB disk ===

diff --git a/regress/sbin/disklabel/40000.sparc64.ok b/regress/sbin/disklabel/40000.sparc64.ok
new file mode 100644 (file)
index 0000000..1a96cf8
--- /dev/null
+++ b/regress/sbin/disklabel/40000.sparc64.ok
@@ -0,0 +1,50 @@
+=== Start 40000MB disk ===
+Primary GPT:
+Not Found
+
+Secondary GPT:
+Not Found
+
+MBR:
+Disk: vnd0     geometry: 819220/1/100 [81922048 Sectors]
+Offset: 0      Signature: 0x0
+            Starting         Ending         LBA Info:
+ #: id      C   H   S -      C   H   S [       start:        size ]
+-------------------------------------------------------------------------------
+ 0: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+ 1: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+ 2: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+ 3: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+
+  a:             1.0G                0  4.2BSD   2048 16384     1 # /
+  a:          2097200                0  4.2BSD   2048 16384     1 
+  b:             2.9G          2097200    swap                    
+  b:          6107000          2097200    swap                    
+  d:             2.4G          8204200  4.2BSD   2048 16384     1 # /tmp
+  d:          5000300          8204200  4.2BSD   2048 16384     1 
+  e:             3.8G         13204500  4.2BSD   2048 16384     1 # /var
+  e:          7889900         13204500  4.2BSD   2048 16384     1 
+  f:             4.3G         21094400  4.2BSD   2048 16384     1 # /usr
+  f:          9015100         21094400  4.2BSD   2048 16384     1 
+  g:             1.0G         30109500  4.2BSD   2048 16384     1 # /usr/X11R6
+  g:          2097200         30109500  4.2BSD   2048 16384     1 
+  h:             5.3G         32206700  4.2BSD   2048 16384     1 # /usr/local
+  h:         11011800         32206700  4.2BSD   2048 16384     1 
+  i:             2.0G         43218500  4.2BSD   2048 16384     1 # /usr/src
+  i:          4260700         43218500  4.2BSD   2048 16384     1 
+  j:             6.0G         47479200  4.2BSD   2048 16384     1 # /usr/obj
+  j:         12583000         47479200  4.2BSD   2048 16384     1 
+  k:            10.4G         60062200  4.2BSD   2048 16384     1 # /home
+  k:         21859800         60062200  4.2BSD   2048 16384     1 
+
+/dev/vnd0a / ffs rw 1 1
+/dev/vnd0k /home ffs rw 1 2
+/dev/vnd0d /tmp ffs rw 1 2
+/dev/vnd0f /usr ffs rw 1 2
+/dev/vnd0g /usr/X11R6 ffs rw 1 2
+/dev/vnd0h /usr/local ffs rw 1 2
+/dev/vnd0j /usr/obj ffs rw 1 2
+/dev/vnd0i /usr/src ffs rw 1 2
+/dev/vnd0e /var ffs rw 1 2
+/dev/vnd0b none swap sw
+=== End 40000MB disk ===

diff --git a/regress/sbin/disklabel/4100.sparc64.ok b/regress/sbin/disklabel/4100.sparc64.ok
new file mode 100644 (file)
index 0000000..4cafecd
--- /dev/null
+++ b/regress/sbin/disklabel/4100.sparc64.ok
@@ -0,0 +1,32 @@
+=== Start 4100MB disk ===
+Primary GPT:
+Not Found
+
+Secondary GPT:
+Not Found
+
+MBR:
+Disk: vnd0     geometry: 83988/1/100 [8398848 Sectors]
+Offset: 0      Signature: 0x0
+            Starting         Ending         LBA Info:
+ #: id      C   H   S -      C   H   S [       start:        size ]
+-------------------------------------------------------------------------------
+ 0: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+ 1: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+ 2: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+ 3: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+
+  a:             0.9G                0  4.2BSD   2048 16384     1 # /
+  a:          1808900                0  4.2BSD   2048 16384     1 
+  b:             0.2G          1808900    swap                    
+  b:           504900          1808900    swap                    
+  d:             2.5G          2313800  4.2BSD   2048 16384     1 # /usr
+  d:          5322200          2313800  4.2BSD   2048 16384     1 
+  e:             0.4G          7636000  4.2BSD   2048 16384     1 # /home
+  e:           762800          7636000  4.2BSD   2048 16384     1 
+
+/dev/vnd0a / ffs rw 1 1
+/dev/vnd0e /home ffs rw 1 2
+/dev/vnd0d /usr ffs rw 1 2
+/dev/vnd0b none swap sw
+=== End 4100MB disk ===

diff --git a/regress/sbin/disklabel/5000.sparc64.ok b/regress/sbin/disklabel/5000.sparc64.ok
new file mode 100644 (file)
index 0000000..b71486a
--- /dev/null
+++ b/regress/sbin/disklabel/5000.sparc64.ok
@@ -0,0 +1,32 @@
+=== Start 5000MB disk ===
+Primary GPT:
+Not Found
+
+Secondary GPT:
+Not Found
+
+MBR:
+Disk: vnd0     geometry: 102420/1/100 [10242048 Sectors]
+Offset: 0      Signature: 0x0
+            Starting         Ending         LBA Info:
+ #: id      C   H   S -      C   H   S [       start:        size ]
+-------------------------------------------------------------------------------
+ 0: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+ 1: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+ 2: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+ 3: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+
+  a:             0.9G                0  4.2BSD   2048 16384     1 # /
+  a:          1901100                0  4.2BSD   2048 16384     1 
+  b:             0.3G          1901100    swap                    
+  b:           524300          1901100    swap                    
+  d:             3.0G          2425400  4.2BSD   2048 16384     1 # /usr
+  d:          6291500          2425400  4.2BSD   2048 16384     1 
+  e:             0.7G          8716900  4.2BSD   2048 16384     1 # /home
+  e:          1525100          8716900  4.2BSD   2048 16384     1 
+
+/dev/vnd0a / ffs rw 1 1
+/dev/vnd0e /home ffs rw 1 2
+/dev/vnd0d /usr ffs rw 1 2
+/dev/vnd0b none swap sw
+=== End 5000MB disk ===

diff --git a/regress/sbin/disklabel/6000.sparc64.ok b/regress/sbin/disklabel/6000.sparc64.ok
new file mode 100644 (file)
index 0000000..f2cdd83
--- /dev/null
+++ b/regress/sbin/disklabel/6000.sparc64.ok
@@ -0,0 +1,32 @@
+=== Start 6000MB disk ===
+Primary GPT:
+Not Found
+
+Secondary GPT:
+Not Found
+
+MBR:
+Disk: vnd0     geometry: 122900/1/100 [12290048 Sectors]
+Offset: 0      Signature: 0x0
+            Starting         Ending         LBA Info:
+ #: id      C   H   S -      C   H   S [       start:        size ]
+-------------------------------------------------------------------------------
+ 0: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+ 1: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+ 2: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+ 3: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+
+  a:             1.0G                0  4.2BSD   2048 16384     1 # /
+  a:          2003500                0  4.2BSD   2048 16384     1 
+  b:             0.3G          2003500    swap                    
+  b:           524300          2003500    swap                    
+  d:             3.0G          2527800  4.2BSD   2048 16384     1 # /usr
+  d:          6291500          2527800  4.2BSD   2048 16384     1 
+  e:             1.7G          8819300  4.2BSD   2048 16384     1 # /home
+  e:          3470700          8819300  4.2BSD   2048 16384     1 
+
+/dev/vnd0a / ffs rw 1 1
+/dev/vnd0e /home ffs rw 1 2
+/dev/vnd0d /usr ffs rw 1 2
+/dev/vnd0b none swap sw
+=== End 6000MB disk ===

diff --git a/regress/sbin/disklabel/7000.sparc64.ok b/regress/sbin/disklabel/7000.sparc64.ok
new file mode 100644 (file)
index 0000000..6e53093
--- /dev/null
+++ b/regress/sbin/disklabel/7000.sparc64.ok
@@ -0,0 +1,32 @@
+=== Start 7000MB disk ===
+Primary GPT:
+Not Found
+
+Secondary GPT:
+Not Found
+
+MBR:
+Disk: vnd0     geometry: 143380/1/100 [14338048 Sectors]
+Offset: 0      Signature: 0x0
+            Starting         Ending         LBA Info:
+ #: id      C   H   S -      C   H   S [       start:        size ]
+-------------------------------------------------------------------------------
+ 0: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+ 1: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+ 2: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+ 3: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+
+  a:             1.0G                0  4.2BSD   2048 16384     1 # /
+  a:          2105900                0  4.2BSD   2048 16384     1 
+  b:             0.3G          2105900    swap                    
+  b:           524300          2105900    swap                    
+  d:             3.0G          2630200  4.2BSD   2048 16384     1 # /usr
+  d:          6291500          2630200  4.2BSD   2048 16384     1 
+  e:             2.0G          8921700  4.2BSD   2048 16384     1 # /home
+  e:          4194400          8921700  4.2BSD   2048 16384     1 
+
+/dev/vnd0a / ffs rw 1 1
+/dev/vnd0e /home ffs rw 1 2
+/dev/vnd0d /usr ffs rw 1 2
+/dev/vnd0b none swap sw
+=== End 7000MB disk ===

diff --git a/regress/sbin/disklabel/800.sparc64.ok b/regress/sbin/disklabel/800.sparc64.ok
new file mode 100644 (file)
index 0000000..5a0a0fe
--- /dev/null
+++ b/regress/sbin/disklabel/800.sparc64.ok
@@ -0,0 +1,26 @@
+=== Start 800MB disk ===
+Primary GPT:
+Not Found
+
+Secondary GPT:
+Not Found
+
+MBR:
+Disk: vnd0     geometry: 16404/1/100 [1640448 Sectors]
+Offset: 0      Signature: 0x0
+            Starting         Ending         LBA Info:
+ #: id      C   H   S -      C   H   S [       start:        size ]
+-------------------------------------------------------------------------------
+ 0: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+ 1: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+ 2: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+ 3: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+
+  a:             0.8G                0  4.2BSD   2048 16384     1 # /
+  a:          1628200                0  4.2BSD   2048 16384     1 
+  b:             0.0G          1628200    swap                    
+  b:            12200          1628200    swap                    
+
+/dev/vnd0a / ffs rw 1 1
+/dev/vnd0b none swap sw
+=== End 800MB disk ===

diff --git a/regress/sbin/disklabel/8000.sparc64.ok b/regress/sbin/disklabel/8000.sparc64.ok
new file mode 100644 (file)
index 0000000..521cddb
--- /dev/null
+++ b/regress/sbin/disklabel/8000.sparc64.ok
@@ -0,0 +1,32 @@
+=== Start 8000MB disk ===
+Primary GPT:
+Not Found
+
+Secondary GPT:
+Not Found
+
+MBR:
+Disk: vnd0     geometry: 163860/1/100 [16386048 Sectors]
+Offset: 0      Signature: 0x0
+            Starting         Ending         LBA Info:
+ #: id      C   H   S -      C   H   S [       start:        size ]
+-------------------------------------------------------------------------------
+ 0: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+ 1: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+ 2: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+ 3: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+
+  a:             1.1G                0  4.2BSD   2048 16384     1 # /
+  a:          2208300                0  4.2BSD   2048 16384     1 
+  b:             0.3G          2208300    swap                    
+  b:           524300          2208300    swap                    
+  d:             3.0G          2732600  4.2BSD   2048 16384     1 # /usr
+  d:          6291500          2732600  4.2BSD   2048 16384     1 
+  e:             2.0G          9024100  4.2BSD   2048 16384     1 # /home
+  e:          4194400          9024100  4.2BSD   2048 16384     1 
+
+/dev/vnd0a / ffs rw 1 1
+/dev/vnd0e /home ffs rw 1 2
+/dev/vnd0d /usr ffs rw 1 2
+/dev/vnd0b none swap sw
+=== End 8000MB disk ===

diff --git a/regress/sbin/disklabel/9000.sparc64.ok b/regress/sbin/disklabel/9000.sparc64.ok
new file mode 100644 (file)
index 0000000..9fb6ce9
--- /dev/null
+++ b/regress/sbin/disklabel/9000.sparc64.ok
@@ -0,0 +1,32 @@
+=== Start 9000MB disk ===
+Primary GPT:
+Not Found
+
+Secondary GPT:
+Not Found
+
+MBR:
+Disk: vnd0     geometry: 184340/1/100 [18434048 Sectors]
+Offset: 0      Signature: 0x0
+            Starting         Ending         LBA Info:
+ #: id      C   H   S -      C   H   S [       start:        size ]
+-------------------------------------------------------------------------------
+ 0: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+ 1: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+ 2: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+ 3: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+
+  a:             1.1G                0  4.2BSD   2048 16384     1 # /
+  a:          2310700                0  4.2BSD   2048 16384     1 
+  b:             0.3G          2310700    swap                    
+  b:           524300          2310700    swap                    
+  d:             3.0G          2835000  4.2BSD   2048 16384     1 # /usr
+  d:          6291500          2835000  4.2BSD   2048 16384     1 
+  e:             2.0G          9126500  4.2BSD   2048 16384     1 # /home
+  e:          4194400          9126500  4.2BSD   2048 16384     1 
+
+/dev/vnd0a / ffs rw 1 1
+/dev/vnd0e /home ffs rw 1 2
+/dev/vnd0d /usr ffs rw 1 2
+/dev/vnd0b none swap sw
+=== End 9000MB disk ===

diff --git a/regress/sbin/disklabel/90000.sparc64.ok b/regress/sbin/disklabel/90000.sparc64.ok
new file mode 100644 (file)
index 0000000..fa01a93
--- /dev/null
+++ b/regress/sbin/disklabel/90000.sparc64.ok
@@ -0,0 +1,50 @@
+=== Start 90000MB disk ===
+Primary GPT:
+Not Found
+
+Secondary GPT:
+Not Found
+
+MBR:
+Disk: vnd0     geometry: 1843220/1/100 [184322048 Sectors]
+Offset: 0      Signature: 0x0
+            Starting         Ending         LBA Info:
+ #: id      C   H   S -      C   H   S [       start:        size ]
+-------------------------------------------------------------------------------
+ 0: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+ 1: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+ 2: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+ 3: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+
+  a:             1.0G                0  4.2BSD   2048 16384     1 # /
+  a:          2097200                0  4.2BSD   2048 16384     1 
+  b:             7.8G          2097200    swap                    
+  b:         16347000          2097200    swap                    
+  d:             4.0G         18444200  4.2BSD   2048 16384     1 # /tmp
+  d:          8388700         18444200  4.2BSD   2048 16384     1 
+  e:            10.1G         26832900  4.2BSD   2048 16384     1 # /var
+  e:         21201900         26832900  4.2BSD   2048 16384     1 
+  f:             9.2G         48034800  4.2BSD   2048 16384     1 # /usr
+  f:         19255100         48034800  4.2BSD   2048 16384     1 
+  g:             1.0G         67289900  4.2BSD   2048 16384     1 # /usr/X11R6
+  g:          2097200         67289900  4.2BSD   2048 16384     1 
+  h:            12.6G         69387100  4.2BSD   2048 16384     1 # /usr/local
+  h:         26371800         69387100  4.2BSD   2048 16384     1 
+  i:             3.0G         95758900  4.2BSD   2048 16384     1 # /usr/src
+  i:          6291500         95758900  4.2BSD   2048 16384     1 
+  j:             6.0G        102050400  4.2BSD   2048 16384     1 # /usr/obj
+  j:         12583000        102050400  4.2BSD   2048 16384     1 
+  k:            33.2G        114633400  4.2BSD   2048 16384     1 # /home
+  k:         69688600        114633400  4.2BSD   2048 16384     1 
+
+/dev/vnd0a / ffs rw 1 1
+/dev/vnd0k /home ffs rw 1 2
+/dev/vnd0d /tmp ffs rw 1 2
+/dev/vnd0f /usr ffs rw 1 2
+/dev/vnd0g /usr/X11R6 ffs rw 1 2
+/dev/vnd0h /usr/local ffs rw 1 2
+/dev/vnd0j /usr/obj ffs rw 1 2
+/dev/vnd0i /usr/src ffs rw 1 2
+/dev/vnd0e /var ffs rw 1 2
+/dev/vnd0b none swap sw
+=== End 90000MB disk ===

diff --git a/regress/sbin/disklabel/900000.sparc64.ok b/regress/sbin/disklabel/900000.sparc64.ok
new file mode 100644 (file)
index 0000000..89187a0
--- /dev/null
+++ b/regress/sbin/disklabel/900000.sparc64.ok
@@ -0,0 +1,50 @@
+=== Start 900000MB disk ===
+Primary GPT:
+Not Found
+
+Secondary GPT:
+Not Found
+
+MBR:
+Disk: vnd0     geometry: 18432020/1/100 [1843202048 Sectors]
+Offset: 0      Signature: 0x0
+            Starting         Ending         LBA Info:
+ #: id      C   H   S -      C   H   S [       start:        size ]
+-------------------------------------------------------------------------------
+ 0: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+ 1: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+ 2: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+ 3: 00      0   0   0 -      0   0   0 [           0:           0 ] Unused         
+
+  a:             1.0G                0  4.2BSD   2048 16384     1 # /
+  a:          2097200                0  4.2BSD   2048 16384     1 
+  b:            15.9G          2097200    swap                    
+  b:         33423800          2097200    swap                    
+  d:             4.0G         35521000  4.2BSD   2048 16384     1 # /tmp
+  d:          8388700         35521000  4.2BSD   2048 16384     1 
+  e:            35.4G         43909700  4.2BSD   2048 16384     1 # /var
+  e:         74187600         43909700  4.2BSD   2048 16384     1 
+  f:            30.0G        118097300  4.2BSD   2048 16384     1 # /usr
+  f:         62914600        118097300  4.2BSD   2048 16384     1 
+  g:             1.0G        181011900  4.2BSD   2048 16384     1 # /usr/X11R6
+  g:          2097200        181011900  4.2BSD   2048 16384     1 
+  h:            20.0G        183109100  4.2BSD   2048 16384     1 # /usr/local
+  h:         41943100        183109100  4.2BSD   2048 16384     1 
+  i:             3.0G        225052200  4.2BSD   2048 16384     1 # /usr/src
+  i:          6291500        225052200  4.2BSD   2048 16384     1 
+  j:             6.0G        231343700  4.2BSD   2048 16384     1 # /usr/obj
+  j:         12583000        231343700  4.2BSD   2048 16384     1 
+  k:           300.0G        243926700  4.2BSD   4096 32768     1 # /home
+  k:        629145600        243926700  4.2BSD   4096 32768     1 
+
+/dev/vnd0a / ffs rw 1 1
+/dev/vnd0k /home ffs rw 1 2
+/dev/vnd0d /tmp ffs rw 1 2
+/dev/vnd0f /usr ffs rw 1 2
+/dev/vnd0g /usr/X11R6 ffs rw 1 2
+/dev/vnd0h /usr/local ffs rw 1 2
+/dev/vnd0j /usr/obj ffs rw 1 2
+/dev/vnd0i /usr/src ffs rw 1 2
+/dev/vnd0e /var ffs rw 1 2
+/dev/vnd0b none swap sw
+=== End 900000MB disk ===

diff --git a/regress/sbin/disklabel/Makefile b/regress/sbin/disklabel/Makefile
index 7135845..ffdf924 100644 (file)
--- a/regress/sbin/disklabel/Makefile
+++ b/regress/sbin/disklabel/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.6 2020/12/17 00:51:12 bluhm Exp $
+#      $OpenBSD: Makefile,v 1.7 2023/05/30 15:10:39 krw Exp $
 #
 # Copyright (c) 2010 Theo de Raadt <deraadt@openbsd.org>
 # Copyright (c) 2018 Kenneth R Westerback <krw@openbsd.org>
@@ -43,6 +43,15 @@ DISK_SIZES =   18000 \
                 300000 \
                 900000
 
+.if ${MACHINE} == "sparc64"
+CFLAGS+= -DSUN_CYLCHECK -DSUN_AAT0
+FDISKOPT= -v
+OK= sparc64.ok
+.else
+FDISKOPT= -iy
+OK= ok
+.endif
+
 DISKLABEL ?=   ${.OBJDIR}/disklabel
 
 CLEANFILES +=  *.tmp *.out *.dl *.fstab diskimage disklabel.c manual.c
@@ -69,7 +78,7 @@ manual.c:
 
 REGRESS_TARGETS +=     run-disklabel-$s
 run-disklabel-$s: $s.out
-       diff -up ${.CURDIR}/$s.ok $s.out
+       diff -up ${.CURDIR}/$s.${OK} $s.out
 
 $s.out: ${DISKLABEL}
        rm -f $s.tmp $s.out
@@ -78,7 +87,7 @@ $s.out: ${DISKLABEL}
        echo "=== Start ${s}MB disk ===" >$s.tmp
        dd if=/dev/zero of=diskimage bs=1m count=1 seek=$s status=none
        ${SUDO} vnconfig vnd0 diskimage
-       ${SUDO} fdisk -iy vnd0 >>$s.tmp
+       ${SUDO} fdisk ${FDISKOPT} vnd0 >>$s.tmp
        echo >>$s.tmp
        ${SUDO} ${DISKLABEL} -A -p g vnd0 >$s.dl
        ${SUDO} ${DISKLABEL} -Aw -f $s.fstab vnd0 >>$s.dl
@@ -90,9 +99,9 @@ $s.out: ${DISKLABEL}
        mv $s.tmp $s.out
 
 $s-update: $s.out
-       cp $s.out ${.CURDIR}/$s.ok
+       cp $s.out ${.CURDIR}/$s.${OK}
 
-# replace all .ok files with the new generated .out files
+# replace all .${OK} files with the new generated .out files
 update: $s-update
 
 .endfor