Page MenuHomeFreeBSD
Files F147261548

D17217.diff
No OneTemporary
Actions

D17217.diff
View Options

Index: head/etc/Makefile
===================================================================
--- head/etc/Makefile
+++ head/etc/Makefile
@@ -13,7 +13,6 @@
.endif
BIN1= \
- disktab \
group \
hosts.allow \
libalias.conf \
Index: head/etc/disktab
===================================================================
--- head/etc/disktab
+++ head/etc/disktab
@@ -1,204 +0,0 @@
-# $FreeBSD$
-#
-# Disk geometry and partition layout tables.
-# See disktab(5) for format of this file.
-#
-
-#
-# Floppy formats:
-#
-# To make a filesystem on a floppy:
-# fdformat [-f <size>] fd<drive>[.<size>]
-# disklabel -B -r -w fd<drive>[.<size>] fd<size>
-# newfs <opts> fd<drive>[.<size>]
-#
-# with <opts>:
-# -t 2 - two heads
-# -u 9|15|18 - sectors per track
-# (using the default value of 1/4096 is not much useful for floppies)
-# -l 1 - interleave 1 (for most floppies)
-# -i 65536 - bytes of data per i-node
-# (the default -i value will render you with a floppy wasting way
-# too much space in i-node areas)
-#
-
-fd360:\
- :ty=floppy:se#512:nt#2:rm#300:ns#9:nc#40:\
- :pa#720:oa#0:ba#4096:fa#512:\
- :pc#720:oc#0:bc#4096:fc#512:
-
-fd720:\
- :ty=floppy:se#512:nt#2:rm#300:ns#9:nc#80:\
- :pa#1440:oa#0:ba#4096:fa#512:\
- :pc#1440:oc#0:bc#4096:fc#512:
-
-fd1200|floppy5|5in|5.25in High Density Floppy:\
- :ty=floppy:se#512:nt#2:rm#360:ns#15:nc#80:\
- :pa#2400:oa#0:ba#4096:fa#512:\
- :pc#2400:oc#0:bc#4096:fc#512:
-
-fd1440|floppy|floppy3|3in|3.5in High Density Floppy:\
- :ty=floppy:se#512:nt#2:rm#300:ns#18:nc#80:\
- :pa#2880:oa#0:ba#4096:fa#512:\
- :pc#2880:oc#0:bc#4096:fc#512:
-
-fd2880|2.88MB 3.5in Extra High Density Floppy:\
- :ty=floppy:se#512:nt#2:rm#300:ns#36:nc#80:\
- :pa#5760:oa#0:ba#4096:fa#512:\
- :pb#5760:ob#0:bb#4096:fa#512:\
- :pc#5760:oc#0:bb#4096:fa#512:
-
-#
-# Stressed floppy-formats. No guarantees given.
-#
-
-fd800:\
- :ty=floppy:se#512:nt#2:rm#300:ns#10:nc#80:\
- :pa#1600:oa#0:ba#4096:fa#512:\
- :pc#1600:oc#0:bc#4096:fc#512:
-
-fd820:\
- :ty=floppy:se#512:nt#2:rm#300:ns#10:nc#82:\
- :pa#1640:oa#0:ba#4096:fa#512:\
- :pc#1640:oc#0:bc#4096:fc#512:
-
-fd1480:\
- :ty=floppy:se#512:nt#2:rm#300:ns#18:nc#82:\
- :pa#2952:oa#0:ba#4096:fa#512:\
- :pc#2952:oc#0:bc#4096:fc#512:
-
-fd1720:\
- :ty=floppy:se#512:nt#2:rm#300:ns#21:nc#82:\
- :pa#3444:oa#0:ba#4096:fa#512:\
- :pc#3444:oc#0:bc#4096:fc#512:
-
-#
-# LS-120 floppy-format.
-#
-fd120m|floppy120|floppy120m|3.5in LS-120 Floppy:\
- :ty=floppy:se#512:nt#8:rm#300:ns#32:nc#963:\
- :pa#246528:oa#0:ba#4096:fa#512:\
- :pc#246528:oc#0:bc#4096:fc#512:
-
-#
-# Harddisk formats
-#
-qp120at|Quantum Peripherals 120MB IDE:\
- :dt=ESDI:ty=winchester:se#512:nt#9:ns#32:nc#813:sf: \
- :pa#13824:oa#0:ta=4.2BSD:ba#4096:fa#512: \
- :pb#13824:ob#13824:tb=swap: \
- :pc#234144:oc#0: \
- :ph#206496:oh#27648:th=4.2BSD:bh#4096:fh#512:
-
-pan60|Panasonic Laptop's 60MB IDE:\
- :dt=ST506:ty=winchester:se#512:nt#13:ns#17:nc#565:\
- :pa#13260:oa#0:ta=4.2BSD:ba#4096:fa#512:\
- :pb#13260:ob#13260:tb=swap: \
- :pc#124865:oc#0: \
- :ph#97682:oh#26520:th=4.2BSD:bh#4096:fh#512:
-
-mk156|toshiba156|Toshiba MK156 156Mb:\
- :dt=SCSI:ty=winchester:se#512:nt#10:ns#35:nc#825:\
- :pa#15748:oa#0:ba#4096:fa#512:ta=4.2BSD:\
- :pb#15748:ob#15748:tb=swap:\
- :pc#288750:oc#0:\
- :ph#257250:oh#31500:bh#4096:fh#512:th=4.2BSD:
-
-cp3100|Connor Peripherals 100MB IDE:\
- :dt=ST506:ty=winchester:se#512:nt#8:ns#33:nc#766: \
- :pa#12144:oa#0:ta=4.2BSD:ba#4096:fa#512: \
- :pb#12144:ob#12144:tb=swap: \
- :pc#202224:oc#0: \
- :ph#177936:oh#24288:th=4.2BSD:bh#4096:fh#512:
-
-# a == root
-# b == swap
-# c == d == whole disk
-# e == /var
-# f == scratch
-# h == /usr
-
-cp3100new|Connor Peripherals 100MB IDE, with a different configuration:\
- :dt=ST506:ty=winchester:se#512:nt#8:ns#33:nc#766: \
- :pa#15840:oa#0:ta=4.2BSD:ba#4096:fa#512: \
- :pb#24288:ob#15840:tb=swap: \
- :pc#202224:oc#0: \
- :pd#202224:od#0: \
- :pe#15840:oe#40128:te=4.2BSD:be#4096:fe#512: \
- :pg#15840:og#55968:tg=4.2BSD:bg#4096:fg#512: \
- :ph#130416:oh#71808:th=4.2BSD:bh#4096:fh#512:
-
-maxtor4380|Maxtor XT4380E ESDI :\
- :dt=ESDI:ty=winchester:se#512:nt#15:ns#36:nc#1222:sf: \
- :pa#21600:oa#0:ta=4.2BSD:ba#4096:fa#512:\
- :pb#21600:ob#21600:tb=swap: \
- :pc#659880:oc#0: \
- :pd#216000:od#53200:td=4.2BSD:bd#4096:fd#512: \
- :ph#398520:oh#269200:th=4.2BSD:bh#4096:fh#512:
-
-miniscribe9380|compaq38|Miniscribe 9380 ESDI :\
- :ty=winchester:dt=ESDI:se#512:nt#15:ns#35:nc#1223:rm#3600:sf: \
- :pa#21000:oa#0:ba#8192:fa#1024:ta=4.2BSD: \
- :pb#42000:ob#21000:tb=swap: \
- :pc#642075:oc#0: \
- :pd#21000:od#63000:bd#8192:fd#1024:td=4.2BSD: \
- :ph#556500:oh#84000:bh#8192:fh#1024:th=4.2BSD:
-
-ida4|compaq88|Compaq IDA (4 drives) :\
- :ty=winchester:dt=IDA:se#512:nt#16:ns#63:nc#1644:rm#3600:\
- :pa#20160:oa#0:ba#8192:fa#1024:ta=4.2BSD: \
- :pb#80640:ob#20160:tb=swap: \
- :pc#1659168:oc#0: \
- :pd#201600:od#100800:bd#8192:fd#1024:td=4.2BSD: \
- :pe#20160:oe#1310400:be#8192:fe#1024:te=4.2BSD: \
- :ph#1008000:oh#302400:bh#8192:fh#1024:th=4.2BSD: \
- :pg#302400:og#1330560:bg#4096:fg#512:tg=4.2BSD:
-
-fuji513|Fujitsu M22XXXX: \
- :ty=winchester:dt=ESDI:se#512:nt#16:ns#63:nc#954:rm#3600:\
- :pa#20160:oa#82656:ba#4096:fa#512:ta=4.2BSD: \
- :pb#40320:ob#102816:tb=swap: \
- :pc#961632:oc#0: \
- :ph#656208:oh#143136:bh#4096:fh#512:th=4.2BSD:
-
-sony650|Sony 650 MB MOD|\
- :ty=removable:dt=SCSI:se#512:nt#1:ns#31:nc#18600:ts#1:rm#4800:\
- :pc#576600:oc#0:\
- :pa#576600:oa#0:ta=4.2BSD:ba#8192:fa#1024:
-
-mta3230|mo230|IBM MTA-3230 230 Meg 3.5inch Magneto-Optical:\
- :ty=removeable:dt=SCSI:rm#3600:\
- :se#512:nt#64:ns#32:nc#216:sc#2048:su#444384:\
- :pa#444384:oa#0:ba#4096:fa#0:ta=4.2BSD:\
- :pc#444384:oc#0:
-
-minimum:ty=mfs:se#512:nt#1:rm#300:\
- :ns#2880:nc#1:\
- :pa#2880:oa#0:ba#4096:fa#512:\
- :pc#2880:oc#0:bc#4096:fc#512:
-
-minimum2:ty=mfs:se#512:nt#1:rm#300:\
- :ns#5760:nc#1:\
- :pa#5760:oa#0:ba#4096:fa#512:\
- :pc#5760:oc#0:bc#4096:fc#512:
-
-minimum3:ty=mfs:se#512:nt#1:rm#300:\
- :ns#8640:nc#1:\
- :pa#8640:oa#0:ba#4096:fa#512:\
- :pc#8640:oc#0:bc#4096:fc#512:
-
-zip100|zip 100:\
- :ty=removable:se#512:nc#96:nt#64:ns#32:\
- :pa#196608:oa#0:ba#4096:fa#512:\
- :pc#196608:oc#0:bc#4096:fc#512:
-
-zip250|zip 250:\
- :ty=removable:se#512:nc#239:nt#64:ns#32:\
- :pa#489472:oa#0:ba#4096:fa#512:\
- :pc#489472:oc#0:bc#4096:fc#512:
-
-orb2200|orb22|orb:\
- :ty=removable:ns#63:nt#128:nc#4273:sc#1008:su#4307184:se#512:\
- :pa#4307184:oa#0:ba#8192:fa#1024:\
- :pc#4307184:oc#0:bc#8192:fc#1024:
-
Index: head/sbin/bsdlabel/Makefile
===================================================================
--- head/sbin/bsdlabel/Makefile
+++ head/sbin/bsdlabel/Makefile
@@ -3,6 +3,7 @@
.PATH: ${SRCTOP}/sys/geom
+CONFS= disktab
PACKAGE=runtime
PROG= bsdlabel
SRCS= bsdlabel.c geom_bsd_enc.c
Index: head/sbin/bsdlabel/disktab
===================================================================
--- head/sbin/bsdlabel/disktab
+++ head/sbin/bsdlabel/disktab
@@ -0,0 +1,204 @@
+# $FreeBSD$
+#
+# Disk geometry and partition layout tables.
+# See disktab(5) for format of this file.
+#
+
+#
+# Floppy formats:
+#
+# To make a filesystem on a floppy:
+# fdformat [-f <size>] fd<drive>[.<size>]
+# disklabel -B -r -w fd<drive>[.<size>] fd<size>
+# newfs <opts> fd<drive>[.<size>]
+#
+# with <opts>:
+# -t 2 - two heads
+# -u 9|15|18 - sectors per track
+# (using the default value of 1/4096 is not much useful for floppies)
+# -l 1 - interleave 1 (for most floppies)
+# -i 65536 - bytes of data per i-node
+# (the default -i value will render you with a floppy wasting way
+# too much space in i-node areas)
+#
+
+fd360:\
+ :ty=floppy:se#512:nt#2:rm#300:ns#9:nc#40:\
+ :pa#720:oa#0:ba#4096:fa#512:\
+ :pc#720:oc#0:bc#4096:fc#512:
+
+fd720:\
+ :ty=floppy:se#512:nt#2:rm#300:ns#9:nc#80:\
+ :pa#1440:oa#0:ba#4096:fa#512:\
+ :pc#1440:oc#0:bc#4096:fc#512:
+
+fd1200|floppy5|5in|5.25in High Density Floppy:\
+ :ty=floppy:se#512:nt#2:rm#360:ns#15:nc#80:\
+ :pa#2400:oa#0:ba#4096:fa#512:\
+ :pc#2400:oc#0:bc#4096:fc#512:
+
+fd1440|floppy|floppy3|3in|3.5in High Density Floppy:\
+ :ty=floppy:se#512:nt#2:rm#300:ns#18:nc#80:\
+ :pa#2880:oa#0:ba#4096:fa#512:\
+ :pc#2880:oc#0:bc#4096:fc#512:
+
+fd2880|2.88MB 3.5in Extra High Density Floppy:\
+ :ty=floppy:se#512:nt#2:rm#300:ns#36:nc#80:\
+ :pa#5760:oa#0:ba#4096:fa#512:\
+ :pb#5760:ob#0:bb#4096:fa#512:\
+ :pc#5760:oc#0:bb#4096:fa#512:
+
+#
+# Stressed floppy-formats. No guarantees given.
+#
+
+fd800:\
+ :ty=floppy:se#512:nt#2:rm#300:ns#10:nc#80:\
+ :pa#1600:oa#0:ba#4096:fa#512:\
+ :pc#1600:oc#0:bc#4096:fc#512:
+
+fd820:\
+ :ty=floppy:se#512:nt#2:rm#300:ns#10:nc#82:\
+ :pa#1640:oa#0:ba#4096:fa#512:\
+ :pc#1640:oc#0:bc#4096:fc#512:
+
+fd1480:\
+ :ty=floppy:se#512:nt#2:rm#300:ns#18:nc#82:\
+ :pa#2952:oa#0:ba#4096:fa#512:\
+ :pc#2952:oc#0:bc#4096:fc#512:
+
+fd1720:\
+ :ty=floppy:se#512:nt#2:rm#300:ns#21:nc#82:\
+ :pa#3444:oa#0:ba#4096:fa#512:\
+ :pc#3444:oc#0:bc#4096:fc#512:
+
+#
+# LS-120 floppy-format.
+#
+fd120m|floppy120|floppy120m|3.5in LS-120 Floppy:\
+ :ty=floppy:se#512:nt#8:rm#300:ns#32:nc#963:\
+ :pa#246528:oa#0:ba#4096:fa#512:\
+ :pc#246528:oc#0:bc#4096:fc#512:
+
+#
+# Harddisk formats
+#
+qp120at|Quantum Peripherals 120MB IDE:\
+ :dt=ESDI:ty=winchester:se#512:nt#9:ns#32:nc#813:sf: \
+ :pa#13824:oa#0:ta=4.2BSD:ba#4096:fa#512: \
+ :pb#13824:ob#13824:tb=swap: \
+ :pc#234144:oc#0: \
+ :ph#206496:oh#27648:th=4.2BSD:bh#4096:fh#512:
+
+pan60|Panasonic Laptop's 60MB IDE:\
+ :dt=ST506:ty=winchester:se#512:nt#13:ns#17:nc#565:\
+ :pa#13260:oa#0:ta=4.2BSD:ba#4096:fa#512:\
+ :pb#13260:ob#13260:tb=swap: \
+ :pc#124865:oc#0: \
+ :ph#97682:oh#26520:th=4.2BSD:bh#4096:fh#512:
+
+mk156|toshiba156|Toshiba MK156 156Mb:\
+ :dt=SCSI:ty=winchester:se#512:nt#10:ns#35:nc#825:\
+ :pa#15748:oa#0:ba#4096:fa#512:ta=4.2BSD:\
+ :pb#15748:ob#15748:tb=swap:\
+ :pc#288750:oc#0:\
+ :ph#257250:oh#31500:bh#4096:fh#512:th=4.2BSD:
+
+cp3100|Connor Peripherals 100MB IDE:\
+ :dt=ST506:ty=winchester:se#512:nt#8:ns#33:nc#766: \
+ :pa#12144:oa#0:ta=4.2BSD:ba#4096:fa#512: \
+ :pb#12144:ob#12144:tb=swap: \
+ :pc#202224:oc#0: \
+ :ph#177936:oh#24288:th=4.2BSD:bh#4096:fh#512:
+
+# a == root
+# b == swap
+# c == d == whole disk
+# e == /var
+# f == scratch
+# h == /usr
+
+cp3100new|Connor Peripherals 100MB IDE, with a different configuration:\
+ :dt=ST506:ty=winchester:se#512:nt#8:ns#33:nc#766: \
+ :pa#15840:oa#0:ta=4.2BSD:ba#4096:fa#512: \
+ :pb#24288:ob#15840:tb=swap: \
+ :pc#202224:oc#0: \
+ :pd#202224:od#0: \
+ :pe#15840:oe#40128:te=4.2BSD:be#4096:fe#512: \
+ :pg#15840:og#55968:tg=4.2BSD:bg#4096:fg#512: \
+ :ph#130416:oh#71808:th=4.2BSD:bh#4096:fh#512:
+
+maxtor4380|Maxtor XT4380E ESDI :\
+ :dt=ESDI:ty=winchester:se#512:nt#15:ns#36:nc#1222:sf: \
+ :pa#21600:oa#0:ta=4.2BSD:ba#4096:fa#512:\
+ :pb#21600:ob#21600:tb=swap: \
+ :pc#659880:oc#0: \
+ :pd#216000:od#53200:td=4.2BSD:bd#4096:fd#512: \
+ :ph#398520:oh#269200:th=4.2BSD:bh#4096:fh#512:
+
+miniscribe9380|compaq38|Miniscribe 9380 ESDI :\
+ :ty=winchester:dt=ESDI:se#512:nt#15:ns#35:nc#1223:rm#3600:sf: \
+ :pa#21000:oa#0:ba#8192:fa#1024:ta=4.2BSD: \
+ :pb#42000:ob#21000:tb=swap: \
+ :pc#642075:oc#0: \
+ :pd#21000:od#63000:bd#8192:fd#1024:td=4.2BSD: \
+ :ph#556500:oh#84000:bh#8192:fh#1024:th=4.2BSD:
+
+ida4|compaq88|Compaq IDA (4 drives) :\
+ :ty=winchester:dt=IDA:se#512:nt#16:ns#63:nc#1644:rm#3600:\
+ :pa#20160:oa#0:ba#8192:fa#1024:ta=4.2BSD: \
+ :pb#80640:ob#20160:tb=swap: \
+ :pc#1659168:oc#0: \
+ :pd#201600:od#100800:bd#8192:fd#1024:td=4.2BSD: \
+ :pe#20160:oe#1310400:be#8192:fe#1024:te=4.2BSD: \
+ :ph#1008000:oh#302400:bh#8192:fh#1024:th=4.2BSD: \
+ :pg#302400:og#1330560:bg#4096:fg#512:tg=4.2BSD:
+
+fuji513|Fujitsu M22XXXX: \
+ :ty=winchester:dt=ESDI:se#512:nt#16:ns#63:nc#954:rm#3600:\
+ :pa#20160:oa#82656:ba#4096:fa#512:ta=4.2BSD: \
+ :pb#40320:ob#102816:tb=swap: \
+ :pc#961632:oc#0: \
+ :ph#656208:oh#143136:bh#4096:fh#512:th=4.2BSD:
+
+sony650|Sony 650 MB MOD|\
+ :ty=removable:dt=SCSI:se#512:nt#1:ns#31:nc#18600:ts#1:rm#4800:\
+ :pc#576600:oc#0:\
+ :pa#576600:oa#0:ta=4.2BSD:ba#8192:fa#1024:
+
+mta3230|mo230|IBM MTA-3230 230 Meg 3.5inch Magneto-Optical:\
+ :ty=removeable:dt=SCSI:rm#3600:\
+ :se#512:nt#64:ns#32:nc#216:sc#2048:su#444384:\
+ :pa#444384:oa#0:ba#4096:fa#0:ta=4.2BSD:\
+ :pc#444384:oc#0:
+
+minimum:ty=mfs:se#512:nt#1:rm#300:\
+ :ns#2880:nc#1:\
+ :pa#2880:oa#0:ba#4096:fa#512:\
+ :pc#2880:oc#0:bc#4096:fc#512:
+
+minimum2:ty=mfs:se#512:nt#1:rm#300:\
+ :ns#5760:nc#1:\
+ :pa#5760:oa#0:ba#4096:fa#512:\
+ :pc#5760:oc#0:bc#4096:fc#512:
+
+minimum3:ty=mfs:se#512:nt#1:rm#300:\
+ :ns#8640:nc#1:\
+ :pa#8640:oa#0:ba#4096:fa#512:\
+ :pc#8640:oc#0:bc#4096:fc#512:
+
+zip100|zip 100:\
+ :ty=removable:se#512:nc#96:nt#64:ns#32:\
+ :pa#196608:oa#0:ba#4096:fa#512:\
+ :pc#196608:oc#0:bc#4096:fc#512:
+
+zip250|zip 250:\
+ :ty=removable:se#512:nc#239:nt#64:ns#32:\
+ :pa#489472:oa#0:ba#4096:fa#512:\
+ :pc#489472:oc#0:bc#4096:fc#512:
+
+orb2200|orb22|orb:\
+ :ty=removable:ns#63:nt#128:nc#4273:sc#1008:su#4307184:se#512:\
+ :pa#4307184:oa#0:ba#8192:fa#1024:\
+ :pc#4307184:oc#0:bc#8192:fc#1024:
+

File Metadata

Mime Type
text/plain
Expires
Tue, Mar 10, 12:58 PM (7 h, 46 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29492036
Default Alt Text
D17217.diff (12 KB)

Event Timeline