diff options
| author | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2019-08-23 11:11:19 +0000 |
|---|---|---|
| committer | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2019-08-23 11:11:19 +0000 |
| commit | 99c1769bba3bc06920588da1a12802d4fdd6050e (patch) | |
| tree | bbbd728209ad957bb6f0e7a9f858754bb388ec5b /regress | |
| parent | 2243c4c1318eadb984d4367cd56234b8427683b5 (diff) | |
Default layout for disklabel(8) has changed, /usr became larger.
Adjust expected values in test.
reminded by Moritz Buhl
Diffstat (limited to 'regress')
| -rw-r--r-- | regress/sbin/disklabel/12000.ok | 38 | ||||
| -rw-r--r-- | regress/sbin/disklabel/18000.ok | 38 | ||||
| -rw-r--r-- | regress/sbin/disklabel/20000.ok | 38 | ||||
| -rw-r--r-- | regress/sbin/disklabel/300000.ok | 24 | ||||
| -rw-r--r-- | regress/sbin/disklabel/40000.ok | 36 | ||||
| -rw-r--r-- | regress/sbin/disklabel/90000.ok | 34 | ||||
| -rw-r--r-- | regress/sbin/disklabel/900000.ok | 24 |
7 files changed, 116 insertions, 116 deletions
diff --git a/regress/sbin/disklabel/12000.ok b/regress/sbin/disklabel/12000.ok index 75b0b57a769..0149af1feea 100644 --- a/regress/sbin/disklabel/12000.ok +++ b/regress/sbin/disklabel/12000.ok @@ -2,25 +2,25 @@ Writing MBR at offset 0. a: 0.2G 128 4.2BSD 2048 16384 1 # / - a: 452480 128 4.2BSD 2048 16384 1 - b: 0.2G 452608 swap - b: 454430 452608 swap - d: 0.2G 907040 4.2BSD 2048 16384 1 # /tmp - d: 478208 907040 4.2BSD 2048 16384 1 - e: 0.3G 1385248 4.2BSD 2048 16384 1 # /var - e: 541600 1385248 4.2BSD 2048 16384 1 - f: 1.3G 1926848 4.2BSD 2048 16384 1 # /usr - f: 2807680 1926848 4.2BSD 2048 16384 1 - g: 0.4G 4734528 4.2BSD 2048 16384 1 # /usr/X11R6 - g: 873600 4734528 4.2BSD 2048 16384 1 - h: 1.2G 5608128 4.2BSD 2048 16384 1 # /usr/local - h: 2533024 5608128 4.2BSD 2048 16384 1 - i: 1.3G 8141152 4.2BSD 2048 16384 1 # /usr/src - i: 2720512 8141152 4.2BSD 2048 16384 1 - j: 5.1G 10861664 4.2BSD 2048 16384 1 # /usr/obj - j: 10601984 10861664 4.2BSD 2048 16384 1 - k: 1.5G 21463648 4.2BSD 2048 16384 1 # /home - k: 3114336 21463648 4.2BSD 2048 16384 1 + a: 432000 128 4.2BSD 2048 16384 1 + b: 0.2G 432128 swap + b: 413470 432128 swap + d: 0.2G 845600 4.2BSD 2048 16384 1 # /tmp + d: 445440 845600 4.2BSD 2048 16384 1 + e: 0.2G 1291040 4.2BSD 2048 16384 1 # /var + e: 488352 1291040 4.2BSD 2048 16384 1 + f: 1.5G 1779392 4.2BSD 2048 16384 1 # /usr + f: 3196800 1779392 4.2BSD 2048 16384 1 + g: 0.4G 4976192 4.2BSD 2048 16384 1 # /usr/X11R6 + g: 861312 4976192 4.2BSD 2048 16384 1 + h: 1.2G 5837504 4.2BSD 2048 16384 1 # /usr/local + h: 2471584 5837504 4.2BSD 2048 16384 1 + i: 1.3G 8309088 4.2BSD 2048 16384 1 # /usr/src + i: 2712320 8309088 4.2BSD 2048 16384 1 + j: 5.0G 11021408 4.2BSD 2048 16384 1 # /usr/obj + j: 10585600 11021408 4.2BSD 2048 16384 1 + k: 1.4G 21607008 4.2BSD 2048 16384 1 # /home + k: 2970976 21607008 4.2BSD 2048 16384 1 /dev/vnd0a / ffs rw 1 1 /dev/vnd0k /home ffs rw 1 2 diff --git a/regress/sbin/disklabel/18000.ok b/regress/sbin/disklabel/18000.ok index 571dccf5287..99e8b9a88d6 100644 --- a/regress/sbin/disklabel/18000.ok +++ b/regress/sbin/disklabel/18000.ok @@ -2,25 +2,25 @@ Writing MBR at offset 0. a: 0.5G 128 4.2BSD 2048 16384 1 # / - a: 1066880 128 4.2BSD 2048 16384 1 - b: 0.8G 1067008 swap - b: 1683230 1067008 swap - d: 0.7G 2750240 4.2BSD 2048 16384 1 # /tmp - d: 1461248 2750240 4.2BSD 2048 16384 1 - e: 1.0G 4211488 4.2BSD 2048 16384 1 # /var - e: 2139040 4211488 4.2BSD 2048 16384 1 - f: 1.6G 6350528 4.2BSD 2048 16384 1 # /usr - f: 3422080 6350528 4.2BSD 2048 16384 1 - g: 0.6G 9772608 4.2BSD 2048 16384 1 # /usr/X11R6 - g: 1242240 9772608 4.2BSD 2048 16384 1 - h: 2.1G 11014848 4.2BSD 2048 16384 1 # /usr/local - h: 4376224 11014848 4.2BSD 2048 16384 1 - i: 1.4G 15391072 4.2BSD 2048 16384 1 # /usr/src - i: 2966272 15391072 4.2BSD 2048 16384 1 - j: 5.3G 18357344 4.2BSD 2048 16384 1 # /usr/obj - j: 11093504 18357344 4.2BSD 2048 16384 1 - k: 3.5G 29450848 4.2BSD 2048 16384 1 # /home - k: 7415136 29450848 4.2BSD 2048 16384 1 + a: 1046400 128 4.2BSD 2048 16384 1 + b: 0.8G 1046528 swap + b: 1642270 1046528 swap + d: 0.7G 2688800 4.2BSD 2048 16384 1 # /tmp + d: 1428480 2688800 4.2BSD 2048 16384 1 + e: 1.0G 4117280 4.2BSD 2048 16384 1 # /var + e: 2085792 4117280 4.2BSD 2048 16384 1 + f: 1.8G 6203072 4.2BSD 2048 16384 1 # /usr + f: 3811200 6203072 4.2BSD 2048 16384 1 + g: 0.6G 10014272 4.2BSD 2048 16384 1 # /usr/X11R6 + g: 1229952 10014272 4.2BSD 2048 16384 1 + h: 2.1G 11244224 4.2BSD 2048 16384 1 # /usr/local + h: 4314784 11244224 4.2BSD 2048 16384 1 + i: 1.4G 15559008 4.2BSD 2048 16384 1 # /usr/src + i: 2958080 15559008 4.2BSD 2048 16384 1 + j: 5.3G 18517088 4.2BSD 2048 16384 1 # /usr/obj + j: 11077120 18517088 4.2BSD 2048 16384 1 + k: 3.5G 29594208 4.2BSD 2048 16384 1 # /home + k: 7271776 29594208 4.2BSD 2048 16384 1 /dev/vnd0a / ffs rw 1 1 /dev/vnd0k /home ffs rw 1 2 diff --git a/regress/sbin/disklabel/20000.ok b/regress/sbin/disklabel/20000.ok index 1ba95a6101c..ed67200ddc7 100644 --- a/regress/sbin/disklabel/20000.ok +++ b/regress/sbin/disklabel/20000.ok @@ -2,25 +2,25 @@ Writing MBR at offset 0. a: 0.6G 128 4.2BSD 2048 16384 1 # / - a: 1271680 128 4.2BSD 2048 16384 1 - b: 1.0G 1271808 swap - b: 2092830 1271808 swap - d: 0.9G 3364640 4.2BSD 2048 16384 1 # /tmp - d: 1788928 3364640 4.2BSD 2048 16384 1 - e: 1.3G 5153568 4.2BSD 2048 16384 1 # /var - e: 2671520 5153568 4.2BSD 2048 16384 1 - f: 1.7G 7825088 4.2BSD 2048 16384 1 # /usr - f: 3626880 7825088 4.2BSD 2048 16384 1 - g: 0.7G 11451968 4.2BSD 2048 16384 1 # /usr/X11R6 - g: 1365120 11451968 4.2BSD 2048 16384 1 - h: 2.4G 12817088 4.2BSD 2048 16384 1 # /usr/local - h: 4990624 12817088 4.2BSD 2048 16384 1 - i: 1.5G 17807712 4.2BSD 2048 16384 1 # /usr/src - i: 3048192 17807712 4.2BSD 2048 16384 1 - j: 5.4G 20855904 4.2BSD 2048 16384 1 # /usr/obj - j: 11257344 20855904 4.2BSD 2048 16384 1 - k: 4.2G 32113248 4.2BSD 2048 16384 1 # /home - k: 8848736 32113248 4.2BSD 2048 16384 1 + a: 1251200 128 4.2BSD 2048 16384 1 + b: 1.0G 1251328 swap + b: 2051870 1251328 swap + d: 0.8G 3303200 4.2BSD 2048 16384 1 # /tmp + d: 1756160 3303200 4.2BSD 2048 16384 1 + e: 1.2G 5059360 4.2BSD 2048 16384 1 # /var + e: 2618272 5059360 4.2BSD 2048 16384 1 + f: 1.9G 7677632 4.2BSD 2048 16384 1 # /usr + f: 4016000 7677632 4.2BSD 2048 16384 1 + g: 0.6G 11693632 4.2BSD 2048 16384 1 # /usr/X11R6 + g: 1352832 11693632 4.2BSD 2048 16384 1 + h: 2.4G 13046464 4.2BSD 2048 16384 1 # /usr/local + h: 4929184 13046464 4.2BSD 2048 16384 1 + i: 1.4G 17975648 4.2BSD 2048 16384 1 # /usr/src + i: 3040000 17975648 4.2BSD 2048 16384 1 + j: 5.4G 21015648 4.2BSD 2048 16384 1 # /usr/obj + j: 11240960 21015648 4.2BSD 2048 16384 1 + k: 4.2G 32256608 4.2BSD 2048 16384 1 # /home + k: 8705376 32256608 4.2BSD 2048 16384 1 /dev/vnd0a / ffs rw 1 1 /dev/vnd0k /home ffs rw 1 2 diff --git a/regress/sbin/disklabel/300000.ok b/regress/sbin/disklabel/300000.ok index 3515ebabede..cb2aaabe3af 100644 --- a/regress/sbin/disklabel/300000.ok +++ b/regress/sbin/disklabel/300000.ok @@ -9,18 +9,18 @@ Writing MBR at offset 0. d: 8388608 35521024 4.2BSD 2048 16384 1 e: 35.4G 43909632 4.2BSD 2048 16384 1 # /var e: 74187520 43909632 4.2BSD 2048 16384 1 - f: 2.0G 118097152 4.2BSD 2048 16384 1 # /usr - f: 4194304 118097152 4.2BSD 2048 16384 1 - g: 1.0G 122291456 4.2BSD 2048 16384 1 # /usr/X11R6 - g: 2097152 122291456 4.2BSD 2048 16384 1 - h: 20.0G 124388608 4.2BSD 2048 16384 1 # /usr/local - h: 41943040 124388608 4.2BSD 2048 16384 1 - i: 2.0G 166331648 4.2BSD 2048 16384 1 # /usr/src - i: 4194304 166331648 4.2BSD 2048 16384 1 - j: 6.0G 170525952 4.2BSD 2048 16384 1 # /usr/obj - j: 12582912 170525952 4.2BSD 2048 16384 1 - k: 205.7G 183108864 4.2BSD 4096 32768 1 # /home - k: 431293120 183108864 4.2BSD 4096 32768 1 + f: 3.0G 118097152 4.2BSD 2048 16384 1 # /usr + f: 6291456 118097152 4.2BSD 2048 16384 1 + g: 1.0G 124388608 4.2BSD 2048 16384 1 # /usr/X11R6 + g: 2097152 124388608 4.2BSD 2048 16384 1 + h: 20.0G 126485760 4.2BSD 2048 16384 1 # /usr/local + h: 41943040 126485760 4.2BSD 2048 16384 1 + i: 2.0G 168428800 4.2BSD 2048 16384 1 # /usr/src + i: 4194304 168428800 4.2BSD 2048 16384 1 + j: 6.0G 172623104 4.2BSD 2048 16384 1 # /usr/obj + j: 12582912 172623104 4.2BSD 2048 16384 1 + k: 204.7G 185206016 4.2BSD 4096 32768 1 # /home + k: 429195968 185206016 4.2BSD 4096 32768 1 /dev/vnd0a / ffs rw 1 1 /dev/vnd0k /home ffs rw 1 2 diff --git a/regress/sbin/disklabel/40000.ok b/regress/sbin/disklabel/40000.ok index 41c54c9dc24..a9b78811322 100644 --- a/regress/sbin/disklabel/40000.ok +++ b/regress/sbin/disklabel/40000.ok @@ -3,24 +3,24 @@ Writing MBR at offset 0. a: 1.0G 128 4.2BSD 2048 16384 1 # / a: 2097152 128 4.2BSD 2048 16384 1 - b: 3.0G 2097280 swap - b: 6188830 2097280 swap - d: 2.4G 8286112 4.2BSD 2048 16384 1 # /tmp - d: 5065728 8286112 4.2BSD 2048 16384 1 - e: 3.8G 13351840 4.2BSD 2048 16384 1 # /var - e: 7996320 13351840 4.2BSD 2048 16384 1 - f: 2.0G 21348160 4.2BSD 2048 16384 1 # /usr - f: 4194304 21348160 4.2BSD 2048 16384 1 - g: 1.0G 25542464 4.2BSD 2048 16384 1 # /usr/X11R6 - g: 2097152 25542464 4.2BSD 2048 16384 1 - h: 5.3G 27639616 4.2BSD 2048 16384 1 # /usr/local - h: 11134624 27639616 4.2BSD 2048 16384 1 - i: 1.8G 38774240 4.2BSD 2048 16384 1 # /usr/src - i: 3867392 38774240 4.2BSD 2048 16384 1 - j: 6.0G 42641632 4.2BSD 2048 16384 1 # /usr/obj - j: 12582912 42641632 4.2BSD 2048 16384 1 - k: 12.7G 55224544 4.2BSD 2048 16384 1 # /home - k: 26697440 55224544 4.2BSD 2048 16384 1 + b: 2.9G 2097280 swap + b: 6147870 2097280 swap + d: 2.4G 8245152 4.2BSD 2048 16384 1 # /tmp + d: 5032960 8245152 4.2BSD 2048 16384 1 + e: 3.8G 13278112 4.2BSD 2048 16384 1 # /var + e: 7943072 13278112 4.2BSD 2048 16384 1 + f: 2.9G 21221184 4.2BSD 2048 16384 1 # /usr + f: 6064000 21221184 4.2BSD 2048 16384 1 + g: 1.0G 27285184 4.2BSD 2048 16384 1 # /usr/X11R6 + g: 2097152 27285184 4.2BSD 2048 16384 1 + h: 5.3G 29382336 4.2BSD 2048 16384 1 # /usr/local + h: 11073184 29382336 4.2BSD 2048 16384 1 + i: 1.8G 40455520 4.2BSD 2048 16384 1 # /usr/src + i: 3859200 40455520 4.2BSD 2048 16384 1 + j: 6.0G 44314720 4.2BSD 2048 16384 1 # /usr/obj + j: 12582912 44314720 4.2BSD 2048 16384 1 + k: 11.9G 56897632 4.2BSD 2048 16384 1 # /home + k: 25024352 56897632 4.2BSD 2048 16384 1 /dev/vnd0a / ffs rw 1 1 /dev/vnd0k /home ffs rw 1 2 diff --git a/regress/sbin/disklabel/90000.ok b/regress/sbin/disklabel/90000.ok index 0baccb53fdf..5f6d8ab46dd 100644 --- a/regress/sbin/disklabel/90000.ok +++ b/regress/sbin/disklabel/90000.ok @@ -4,23 +4,23 @@ Writing MBR at offset 0. a: 1.0G 128 4.2BSD 2048 16384 1 # / a: 2097152 128 4.2BSD 2048 16384 1 b: 7.8G 2097280 swap - b: 16428830 2097280 swap - d: 4.0G 18526112 4.2BSD 2048 16384 1 # /tmp - d: 8388576 18526112 4.2BSD 2048 16384 1 - e: 10.2G 26914688 4.2BSD 2048 16384 1 # /var - e: 21308320 26914688 4.2BSD 2048 16384 1 - f: 2.0G 48223008 4.2BSD 2048 16384 1 # /usr - f: 4194304 48223008 4.2BSD 2048 16384 1 - g: 1.0G 52417312 4.2BSD 2048 16384 1 # /usr/X11R6 - g: 2097152 52417312 4.2BSD 2048 16384 1 - h: 12.6G 54514464 4.2BSD 2048 16384 1 # /usr/local - h: 26494624 54514464 4.2BSD 2048 16384 1 - i: 2.0G 81009088 4.2BSD 2048 16384 1 # /usr/src - i: 4194304 81009088 4.2BSD 2048 16384 1 - j: 6.0G 85203392 4.2BSD 2048 16384 1 # /usr/obj - j: 12582912 85203392 4.2BSD 2048 16384 1 - k: 41.3G 97786304 4.2BSD 2048 16384 1 # /home - k: 86535680 97786304 4.2BSD 2048 16384 1 + b: 16387870 2097280 swap + d: 4.0G 18485152 4.2BSD 2048 16384 1 # /tmp + d: 8388576 18485152 4.2BSD 2048 16384 1 + e: 10.1G 26873728 4.2BSD 2048 16384 1 # /var + e: 21255072 26873728 4.2BSD 2048 16384 1 + f: 3.0G 48128800 4.2BSD 2048 16384 1 # /usr + f: 6291456 48128800 4.2BSD 2048 16384 1 + g: 1.0G 54420256 4.2BSD 2048 16384 1 # /usr/X11R6 + g: 2097152 54420256 4.2BSD 2048 16384 1 + h: 12.6G 56517408 4.2BSD 2048 16384 1 # /usr/local + h: 26433184 56517408 4.2BSD 2048 16384 1 + i: 2.0G 82950592 4.2BSD 2048 16384 1 # /usr/src + i: 4194304 82950592 4.2BSD 2048 16384 1 + j: 6.0G 87144896 4.2BSD 2048 16384 1 # /usr/obj + j: 12582912 87144896 4.2BSD 2048 16384 1 + k: 40.3G 99727808 4.2BSD 2048 16384 1 # /home + k: 84594176 99727808 4.2BSD 2048 16384 1 /dev/vnd0a / ffs rw 1 1 /dev/vnd0k /home ffs rw 1 2 diff --git a/regress/sbin/disklabel/900000.ok b/regress/sbin/disklabel/900000.ok index 433c3ce9be0..917da331ca9 100644 --- a/regress/sbin/disklabel/900000.ok +++ b/regress/sbin/disklabel/900000.ok @@ -9,18 +9,18 @@ Writing MBR at offset 0. d: 8388608 35521024 4.2BSD 2048 16384 1 e: 35.4G 43909632 4.2BSD 2048 16384 1 # /var e: 74187520 43909632 4.2BSD 2048 16384 1 - f: 2.0G 118097152 4.2BSD 2048 16384 1 # /usr - f: 4194304 118097152 4.2BSD 2048 16384 1 - g: 1.0G 122291456 4.2BSD 2048 16384 1 # /usr/X11R6 - g: 2097152 122291456 4.2BSD 2048 16384 1 - h: 20.0G 124388608 4.2BSD 2048 16384 1 # /usr/local - h: 41943040 124388608 4.2BSD 2048 16384 1 - i: 2.0G 166331648 4.2BSD 2048 16384 1 # /usr/src - i: 4194304 166331648 4.2BSD 2048 16384 1 - j: 6.0G 170525952 4.2BSD 2048 16384 1 # /usr/obj - j: 12582912 170525952 4.2BSD 2048 16384 1 - k: 300.0G 183108864 4.2BSD 4096 32768 1 # /home - k: 629145600 183108864 4.2BSD 4096 32768 1 + f: 3.0G 118097152 4.2BSD 2048 16384 1 # /usr + f: 6291456 118097152 4.2BSD 2048 16384 1 + g: 1.0G 124388608 4.2BSD 2048 16384 1 # /usr/X11R6 + g: 2097152 124388608 4.2BSD 2048 16384 1 + h: 20.0G 126485760 4.2BSD 2048 16384 1 # /usr/local + h: 41943040 126485760 4.2BSD 2048 16384 1 + i: 2.0G 168428800 4.2BSD 2048 16384 1 # /usr/src + i: 4194304 168428800 4.2BSD 2048 16384 1 + j: 6.0G 172623104 4.2BSD 2048 16384 1 # /usr/obj + j: 12582912 172623104 4.2BSD 2048 16384 1 + k: 300.0G 185206016 4.2BSD 4096 32768 1 # /home + k: 629145600 185206016 4.2BSD 4096 32768 1 /dev/vnd0a / ffs rw 1 1 /dev/vnd0k /home ffs rw 1 2 |