diff --git a/regress/sbin/disklabel/12000.ok b/regress/sbin/disklabel/12000.ok index 947c5630567..8164705b63e 100644 --- a/regress/sbin/disklabel/12000.ok +++ b/regress/sbin/disklabel/12000.ok @@ -1,35 +1,17 @@ === Start 12000MB disk === Writing MBR at offset 0. - a: 0.2G 128 4.2BSD 2048 16384 1 # / - a: 355392 128 4.2BSD 2048 16384 1 - b: 0.1G 355520 swap - b: 260280 355520 swap - d: 0.2G 615808 4.2BSD 2048 16384 1 # /tmp - d: 322880 615808 4.2BSD 2048 16384 1 - e: 0.1G 938688 4.2BSD 2048 16384 1 # /var - e: 289184 938688 4.2BSD 2048 16384 1 - f: 1.5G 1227872 4.2BSD 2048 16384 1 # /usr - f: 3168416 1227872 4.2BSD 2048 16384 1 - g: 0.4G 4396288 4.2BSD 2048 16384 1 # /usr/X11R6 - g: 815360 4396288 4.2BSD 2048 16384 1 - h: 1.1G 5211648 4.2BSD 2048 16384 1 # /usr/local - h: 2241792 5211648 4.2BSD 2048 16384 1 - i: 2.0G 7453440 4.2BSD 2048 16384 1 # /usr/src - i: 4213568 7453440 4.2BSD 2048 16384 1 - j: 5.0G 11667008 4.2BSD 2048 16384 1 # /usr/obj - j: 10524320 11667008 4.2BSD 2048 16384 1 - k: 1.1G 22191328 4.2BSD 2048 16384 1 # /home - k: 2386720 22191328 4.2BSD 2048 16384 1 + a: 1.2G 128 4.2BSD 2048 16384 1 # / + a: 2617824 128 4.2BSD 2048 16384 1 + b: 0.2G 2617952 swap + b: 524288 2617952 swap + d: 3.0G 3142240 4.2BSD 2048 16384 1 # /usr + d: 6291456 3142240 4.2BSD 2048 16384 1 + e: 2.0G 9433696 4.2BSD 2048 16384 1 # /home + e: 4194304 9433696 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/vnd0e /home ffs rw 1 2 +/dev/vnd0d /usr ffs rw 1 2 /dev/vnd0b none swap sw === End 12000MB disk === diff --git a/regress/sbin/disklabel/18000.ok b/regress/sbin/disklabel/18000.ok index de8d17fae2b..bd91e96ab7e 100644 --- a/regress/sbin/disklabel/18000.ok +++ b/regress/sbin/disklabel/18000.ok @@ -1,26 +1,26 @@ === Start 18000MB disk === Writing MBR at offset 0. - a: 0.5G 128 4.2BSD 2048 16384 1 # / - a: 969792 128 4.2BSD 2048 16384 1 - b: 0.7G 969920 swap - b: 1489080 969920 swap - d: 0.6G 2459008 4.2BSD 2048 16384 1 # /tmp - d: 1305920 2459008 4.2BSD 2048 16384 1 - e: 0.9G 3764928 4.2BSD 2048 16384 1 # /var - e: 1886624 3764928 4.2BSD 2048 16384 1 - f: 2.1G 5651552 4.2BSD 2048 16384 1 # /usr - f: 4397216 5651552 4.2BSD 2048 16384 1 - g: 0.6G 10048768 4.2BSD 2048 16384 1 # /usr/X11R6 - g: 1184000 10048768 4.2BSD 2048 16384 1 - h: 1.9G 11232768 4.2BSD 2048 16384 1 # /usr/local - h: 4084992 11232768 4.2BSD 2048 16384 1 - i: 2.1G 15317760 4.2BSD 2048 16384 1 # /usr/src - i: 4459328 15317760 4.2BSD 2048 16384 1 - j: 5.3G 19777088 4.2BSD 2048 16384 1 # /usr/obj - j: 11015840 19777088 4.2BSD 2048 16384 1 - k: 2.9G 30792928 4.2BSD 2048 16384 1 # /home - k: 6073120 30792928 4.2BSD 2048 16384 1 + a: 0.3G 128 4.2BSD 2048 16384 1 # / + a: 655232 128 4.2BSD 2048 16384 1 + b: 0.4G 655360 swap + b: 859940 655360 swap + d: 0.4G 1515328 4.2BSD 2048 16384 1 # /tmp + d: 802592 1515328 4.2BSD 2048 16384 1 + e: 0.5G 2317920 4.2BSD 2048 16384 1 # /var + e: 1068768 2317920 4.2BSD 2048 16384 1 + f: 1.8G 3386688 4.2BSD 2048 16384 1 # /usr + f: 3768096 3386688 4.2BSD 2048 16384 1 + g: 0.5G 7154784 4.2BSD 2048 16384 1 # /usr/X11R6 + g: 995232 7154784 4.2BSD 2048 16384 1 + h: 1.5G 8150016 4.2BSD 2048 16384 1 # /usr/local + h: 3141280 8150016 4.2BSD 2048 16384 1 + i: 2.1G 11291296 4.2BSD 2048 16384 1 # /usr/src + i: 4333504 11291296 4.2BSD 2048 16384 1 + j: 8.1G 15624800 4.2BSD 2048 16384 1 # /usr/obj + j: 17055648 15624800 4.2BSD 2048 16384 1 + k: 2.0G 32680448 4.2BSD 2048 16384 1 # /home + k: 4185600 32680448 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 6dd53ea896d..3efc74a04c9 100644 --- a/regress/sbin/disklabel/20000.ok +++ b/regress/sbin/disklabel/20000.ok @@ -1,26 +1,26 @@ === Start 20000MB disk === Writing MBR at offset 0. - a: 0.6G 128 4.2BSD 2048 16384 1 # / - a: 1174592 128 4.2BSD 2048 16384 1 - b: 0.9G 1174720 swap - b: 1898680 1174720 swap - d: 0.8G 3073408 4.2BSD 2048 16384 1 # /tmp - d: 1633600 3073408 4.2BSD 2048 16384 1 - e: 1.2G 4707008 4.2BSD 2048 16384 1 # /var - e: 2419104 4707008 4.2BSD 2048 16384 1 - f: 2.3G 7126112 4.2BSD 2048 16384 1 # /usr - f: 4806816 7126112 4.2BSD 2048 16384 1 - g: 0.6G 11932928 4.2BSD 2048 16384 1 # /usr/X11R6 - g: 1306880 11932928 4.2BSD 2048 16384 1 - h: 2.2G 13239808 4.2BSD 2048 16384 1 # /usr/local - h: 4699392 13239808 4.2BSD 2048 16384 1 - i: 2.2G 17939200 4.2BSD 2048 16384 1 # /usr/src - i: 4541248 17939200 4.2BSD 2048 16384 1 - j: 5.3G 22480448 4.2BSD 2048 16384 1 # /usr/obj - j: 11179680 22480448 4.2BSD 2048 16384 1 - k: 3.5G 33660128 4.2BSD 2048 16384 1 # /home - k: 7301920 33660128 4.2BSD 2048 16384 1 + a: 0.4G 128 4.2BSD 2048 16384 1 # / + a: 860032 128 4.2BSD 2048 16384 1 + b: 0.6G 860160 swap + b: 1269540 860160 swap + d: 0.5G 2129728 4.2BSD 2048 16384 1 # /tmp + d: 1130272 2129728 4.2BSD 2048 16384 1 + e: 0.8G 3260000 4.2BSD 2048 16384 1 # /var + e: 1601248 3260000 4.2BSD 2048 16384 1 + f: 2.0G 4861248 4.2BSD 2048 16384 1 # /usr + f: 4177696 4861248 4.2BSD 2048 16384 1 + g: 0.5G 9038944 4.2BSD 2048 16384 1 # /usr/X11R6 + g: 1118112 9038944 4.2BSD 2048 16384 1 + h: 1.8G 10157056 4.2BSD 2048 16384 1 # /usr/local + h: 3755680 10157056 4.2BSD 2048 16384 1 + i: 2.1G 13912736 4.2BSD 2048 16384 1 # /usr/src + i: 4415424 13912736 4.2BSD 2048 16384 1 + j: 8.2G 18328160 4.2BSD 2048 16384 1 # /usr/obj + j: 17219488 18328160 4.2BSD 2048 16384 1 + k: 2.6G 35547648 4.2BSD 2048 16384 1 # /home + k: 5414400 35547648 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 da9510bf994..d81559afb29 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: 29.6G 118097152 4.2BSD 2048 16384 1 # /usr - f: 62150816 118097152 4.2BSD 2048 16384 1 - g: 1.0G 180247968 4.2BSD 2048 16384 1 # /usr/X11R6 - g: 2097152 180247968 4.2BSD 2048 16384 1 - h: 20.0G 182345120 4.2BSD 2048 16384 1 # /usr/local - h: 41943040 182345120 4.2BSD 2048 16384 1 - i: 5.0G 224288160 4.2BSD 2048 16384 1 # /usr/src - i: 10485760 224288160 4.2BSD 2048 16384 1 - j: 6.0G 234773920 4.2BSD 2048 16384 1 # /usr/obj - j: 12582912 234773920 4.2BSD 2048 16384 1 - k: 175.0G 247356864 4.2BSD 4096 32768 1 # /home - k: 367045184 247356864 4.2BSD 4096 32768 1 + f: 29.3G 118097152 4.2BSD 2048 16384 1 # /usr + f: 61521696 118097152 4.2BSD 2048 16384 1 + g: 1.0G 179618848 4.2BSD 2048 16384 1 # /usr/X11R6 + g: 2097152 179618848 4.2BSD 2048 16384 1 + h: 20.0G 181716000 4.2BSD 2048 16384 1 # /usr/local + h: 41943040 181716000 4.2BSD 2048 16384 1 + i: 5.0G 223659040 4.2BSD 2048 16384 1 # /usr/src + i: 10485760 223659040 4.2BSD 2048 16384 1 + j: 10.0G 234144800 4.2BSD 2048 16384 1 # /usr/obj + j: 20971520 234144800 4.2BSD 2048 16384 1 + k: 171.3G 255116352 4.2BSD 4096 32768 1 # /home + k: 359285696 255116352 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 75625da56fd..5889ab1f1ea 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: 2.9G 2097280 swap - b: 5994680 2097280 swap - d: 2.3G 8091968 4.2BSD 2048 16384 1 # /tmp - d: 4910400 8091968 4.2BSD 2048 16384 1 - e: 3.7G 13002368 4.2BSD 2048 16384 1 # /var - e: 7743904 13002368 4.2BSD 2048 16384 1 - f: 4.2G 20746272 4.2BSD 2048 16384 1 # /usr - f: 8902816 20746272 4.2BSD 2048 16384 1 - g: 1.0G 29649088 4.2BSD 2048 16384 1 # /usr/X11R6 - g: 2097152 29649088 4.2BSD 2048 16384 1 - h: 5.2G 31746240 4.2BSD 2048 16384 1 # /usr/local - h: 10843392 31746240 4.2BSD 2048 16384 1 - i: 2.6G 42589632 4.2BSD 2048 16384 1 # /usr/src - i: 5360448 42589632 4.2BSD 2048 16384 1 - j: 6.0G 47950080 4.2BSD 2048 16384 1 # /usr/obj - j: 12582912 47950080 4.2BSD 2048 16384 1 - k: 10.2G 60532992 4.2BSD 2048 16384 1 # /home - k: 21389056 60532992 4.2BSD 2048 16384 1 + b: 2.6G 2097280 swap + b: 5365540 2097280 swap + d: 2.1G 7462848 4.2BSD 2048 16384 1 # /tmp + d: 4407072 7462848 4.2BSD 2048 16384 1 + e: 3.3G 11869920 4.2BSD 2048 16384 1 # /var + e: 6926048 11869920 4.2BSD 2048 16384 1 + f: 3.9G 18795968 4.2BSD 2048 16384 1 # /usr + f: 8273696 18795968 4.2BSD 2048 16384 1 + g: 1.0G 27069664 4.2BSD 2048 16384 1 # /usr/X11R6 + g: 2097152 27069664 4.2BSD 2048 16384 1 + h: 4.7G 29166816 4.2BSD 2048 16384 1 # /usr/local + h: 9899680 29166816 4.2BSD 2048 16384 1 + i: 2.5G 39066496 4.2BSD 2048 16384 1 # /usr/src + i: 5234624 39066496 4.2BSD 2048 16384 1 + j: 9.0G 44301120 4.2BSD 2048 16384 1 # /usr/obj + j: 18857888 44301120 4.2BSD 2048 16384 1 + k: 8.9G 63159008 4.2BSD 2048 16384 1 # /home + k: 18763040 63159008 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 91ad56d157c..5b5596cb5f7 100644 --- a/regress/sbin/disklabel/90000.ok +++ b/regress/sbin/disklabel/90000.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: 7.7G 2097280 swap - b: 16234680 2097280 swap - d: 4.0G 18331968 4.2BSD 2048 16384 1 # /tmp - d: 8388576 18331968 4.2BSD 2048 16384 1 - e: 10.0G 26720544 4.2BSD 2048 16384 1 # /var - e: 21055904 26720544 4.2BSD 2048 16384 1 - f: 9.1G 47776448 4.2BSD 2048 16384 1 # /usr - f: 19142816 47776448 4.2BSD 2048 16384 1 - g: 1.0G 66919264 4.2BSD 2048 16384 1 # /usr/X11R6 - g: 2097152 66919264 4.2BSD 2048 16384 1 - h: 12.5G 69016416 4.2BSD 2048 16384 1 # /usr/local - h: 26203392 69016416 4.2BSD 2048 16384 1 - i: 3.5G 95219808 4.2BSD 2048 16384 1 # /usr/src - i: 7408448 95219808 4.2BSD 2048 16384 1 - j: 6.0G 102628256 4.2BSD 2048 16384 1 # /usr/obj - j: 12582912 102628256 4.2BSD 2048 16384 1 - k: 33.0G 115211168 4.2BSD 2048 16384 1 # /home - k: 69110880 115211168 4.2BSD 2048 16384 1 + b: 7.4G 2097280 swap + b: 15605540 2097280 swap + d: 4.0G 17702848 4.2BSD 2048 16384 1 # /tmp + d: 8388576 17702848 4.2BSD 2048 16384 1 + e: 9.7G 26091424 4.2BSD 2048 16384 1 # /var + e: 20238048 26091424 4.2BSD 2048 16384 1 + f: 8.8G 46329472 4.2BSD 2048 16384 1 # /usr + f: 18513696 46329472 4.2BSD 2048 16384 1 + g: 1.0G 64843168 4.2BSD 2048 16384 1 # /usr/X11R6 + g: 2097152 64843168 4.2BSD 2048 16384 1 + h: 12.0G 66940320 4.2BSD 2048 16384 1 # /usr/local + h: 25259680 66940320 4.2BSD 2048 16384 1 + i: 3.5G 92200000 4.2BSD 2048 16384 1 # /usr/src + i: 7282624 92200000 4.2BSD 2048 16384 1 + j: 10.0G 99482624 4.2BSD 2048 16384 1 # /usr/obj + j: 20971520 99482624 4.2BSD 2048 16384 1 + k: 30.5G 120454144 4.2BSD 2048 16384 1 # /home + k: 63867904 120454144 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 d35f7d284c2..8b3f69150a2 100644 --- a/regress/sbin/disklabel/900000.ok +++ b/regress/sbin/disklabel/900000.ok @@ -17,10 +17,10 @@ Writing MBR at offset 0. h: 41943040 183108864 4.2BSD 2048 16384 1 i: 5.0G 225051904 4.2BSD 2048 16384 1 # /usr/src i: 10485760 225051904 4.2BSD 2048 16384 1 - j: 6.0G 235537664 4.2BSD 2048 16384 1 # /usr/obj - j: 12582912 235537664 4.2BSD 2048 16384 1 - k: 300.0G 248120576 4.2BSD 4096 32768 1 # /home - k: 629145600 248120576 4.2BSD 4096 32768 1 + j: 10.0G 235537664 4.2BSD 2048 16384 1 # /usr/obj + j: 20971520 235537664 4.2BSD 2048 16384 1 + k: 300.0G 256509184 4.2BSD 4096 32768 1 # /home + k: 629145600 256509184 4.2BSD 4096 32768 1 /dev/vnd0a / ffs rw 1 1 /dev/vnd0k /home ffs rw 1 2