Subject: Disklabels arrive for 2.11BSD (#253 part 4 of 18) Index: sys,bin,usr.lib,(many more)/ 2.11BSD Description: The moving the partitions tables out of the disk drivers and to a disklabel residing on the media has been on the wish list for many many years. Disklabels have finally arrived for 2.11BSD! Repeat-By: Observation. Also a reading of the setup and installation documentation for previous 2BSD releases (2.9, 2.10, 2.11) all have a paragraph similar to this present: "It is possible to change the partitions by changing the code for the table in the disk driver. Since it's desirable to do this, these tables really should be read off each pack...." Fix: This is part 4 of 18. Gather all parts before doing anything except reading the instructions which are in #250 (part 1). Modified by this part are: /usr/src/sys/conf/Make.sys /usr/src/sys/conf/Make.nsunix /usr/src/sys/conf/Make.sunix /usr/src/sys/conf/Make.unix /usr/src/sys/conf/Make.pdp /usr/src/sys/conf/Make.pdpnet All of the kernel Make files needed to have the new modules dealing with disklabels added. After applying the patch below you will need either 1) copy a couple of the modified files to EACH of your kernel directories or 2) remove your current kernel build directories and use the 'config' script. There is a reminder of this in the main instructions (part 1). Cut where indicated and save to a file (/tmp/253). Then: patch -p0 < /tmp/253 rm /tmp/253 ----------------------cut here----------------- *** /usr/src/sys/conf/Make.sys.old Mon Feb 20 19:54:52 1995 --- /usr/src/sys/conf/Make.sys Thu Apr 13 21:45:50 1995 *************** *** 9,15 **** # software without specific prior written permission. This software # is provided ``as is'' without express or implied warranty. # ! # 2.1 (2.11BSD GTE) 2/14/95 # S= ../sys VPATH= ../sys --- 9,15 ---- # software without specific prior written permission. This software # is provided ``as is'' without express or implied warranty. # ! # 2.2 (2.11BSD GTE) 1994/04/13 # S= ../sys VPATH= ../sys *************** *** 30,35 **** --- 30,36 ---- ${S}/ufs_alloc.c ${S}/ufs_bio.c ${S}/ufs_bmap.c \ ${S}/ufs_dsort.c ${S}/ufs_fio.c ${S}/ufs_inode.c \ ${S}/ufs_mount.c ${S}/ufs_namei.c ${S}/ufs_subr.c \ + ${S}/ufs_disksubr.c \ ${S}/ufs_syscalls.c ${S}/uipc_syscalls.c ${S}/vm_proc.c \ ${S}/vm_sched.c ${S}/vm_swap.c ${S}/vm_swp.c ${S}/vm_text.c OBJS= init_main.o init_sysent.o kern_acct.o kern_clock.o \ *************** *** 43,48 **** --- 44,50 ---- tty_subr.o tty_tb.o tty_tty.o ufs_alloc.o ufs_bio.o ufs_bmap.o \ ufs_dsort.o ufs_fio.o ufs_inode.o ufs_mount.o ufs_namei.o \ ufs_subr.o ufs_syscalls.o uipc_syscalls.o vm_proc.o vm_sched.o \ + ufs_disksubr.o \ vm_swap.o vm_swp.o vm_text.o .c.o: *** /usr/src/sys/conf/Make.nsunix.old Mon Feb 20 19:54:19 1995 --- /usr/src/sys/conf/Make.nsunix Tue May 9 22:06:19 1995 *************** *** 9,15 **** # software without specific prior written permission. This software # is provided ``as is'' without express or implied warranty. # ! # 2.1 (2.11BSD GTE) 2/14/95 # ######################################################### # Networking, separate I/D kernel # --- 9,15 ---- # software without specific prior written permission. This software # is provided ``as is'' without express or implied warranty. # ! # 2.3 (2.11BSD GTE) 1995/05/09 # ######################################################### # Networking, separate I/D kernel # *************** *** 49,55 **** CONF= scb.o libc_bcmp.o libc_bcopy.o libc_bzero.o libc_ffs.o \ libc_insque.o libc_ldiv.o libc_lmul.o libc_lrem.o libc_remque.o \ ! libc_uldiv.o libc_ulsh.o \ libc_strlen.o mch_backup.o mch_click.o mch_copy.o mch_csv.o \ mch_dump.o mch_dzpdma.o mch_KScall.o mch_profile.o \ mch_start.o mch_trap.o mch_vars.o mch_xxx.o conf.o ioconf.o boot.o --- 49,55 ---- CONF= scb.o libc_bcmp.o libc_bcopy.o libc_bzero.o libc_ffs.o \ libc_insque.o libc_ldiv.o libc_lmul.o libc_lrem.o libc_remque.o \ ! libc_udiv.o libc_uldiv.o libc_ulsh.o \ libc_strlen.o mch_backup.o mch_click.o mch_copy.o mch_csv.o \ mch_dump.o mch_dzpdma.o mch_KScall.o mch_profile.o \ mch_start.o mch_trap.o mch_vars.o mch_xxx.o conf.o ioconf.o boot.o *************** *** 77,83 **** OV6= clock.o dn.o init_main.o kern_pdp.o machdep2.o subr_prf.o syscalls.o \ subr_log.o toy.o OV7= tmscp.o kern_sysctl.o ! OV8= mch_fpsim.o ingreslock.o KERNOBJ=${CONF} ${BASE} ${OV1} ${OV2} ${OV3} ${OV4} ${OV5} \ ${OV6} ${OV7} ${OV8} ${OV9} ${OV10} ${OV11} ${OV12} \ --- 77,83 ---- OV6= clock.o dn.o init_main.o kern_pdp.o machdep2.o subr_prf.o syscalls.o \ subr_log.o toy.o OV7= tmscp.o kern_sysctl.o ! OV8= mch_fpsim.o ingreslock.o ufs_disksubr.o KERNOBJ=${CONF} ${BASE} ${OV1} ${OV2} ${OV3} ${OV4} ${OV5} \ ${OV6} ${OV7} ${OV8} ${OV9} ${OV10} ${OV11} ${OV12} \ *************** *** 132,139 **** # include ${NETOBJ} and ${KERNOBJ} on dependency line, but the pdp make doesn't # have enough table space. d.unix.o d.netnix.o: netbind FRC ! ld -r -d -X -i -o unix.o ${LD_KOBJ} ! ld -r -d -X -o netnix.o ${NETOBJ} ./netbind unix.o netnix.o rm unix.o netnix.o ${AS} - -o d.unix.o d.unix.s --- 132,139 ---- # include ${NETOBJ} and ${KERNOBJ} on dependency line, but the pdp make doesn't # have enough table space. d.unix.o d.netnix.o: netbind FRC ! ld -q -r -d -X -i -o unix.o ${LD_KOBJ} ! ld -q -r -d -X -o netnix.o ${NETOBJ} ./netbind unix.o netnix.o rm unix.o netnix.o ${AS} - -o d.unix.o d.unix.s *** /usr/src/sys/conf/Make.sunix.old Mon Feb 20 19:54:27 1995 --- /usr/src/sys/conf/Make.sunix Thu May 11 21:42:31 1995 *************** *** 9,15 **** # software without specific prior written permission. This software # is provided ``as is'' without express or implied warranty. # ! # 2.1 (2.11BSD GTE) 2/14/95 # ######################################################### # Non-network, but separate I/D kernel # --- 9,15 ---- # software without specific prior written permission. This software # is provided ``as is'' without express or implied warranty. # ! # 2.2 (2.11BSD GTE) 1995/05/11 # ######################################################### # Non-network, but separate I/D kernel # *************** *** 41,47 **** CONF= scb.o libc_bcmp.o libc_bcopy.o libc_bzero.o libc_ffs.o \ libc_insque.o libc_ldiv.o libc_lmul.o libc_lrem.o libc_remque.o \ ! libc_uldiv.o libc_ulsh.o \ libc_strlen.o mch_backup.o mch_click.o mch_copy.o mch_csv.o \ mch_dump.o mch_dzpdma.o mch_profile.o mch_start.o \ mch_trap.o mch_vars.o mch_xxx.o conf.o ioconf.o boot.o --- 41,47 ---- CONF= scb.o libc_bcmp.o libc_bcopy.o libc_bzero.o libc_ffs.o \ libc_insque.o libc_ldiv.o libc_lmul.o libc_lrem.o libc_remque.o \ ! libc_udiv.o libc_uldiv.o libc_ulsh.o \ libc_strlen.o mch_backup.o mch_click.o mch_copy.o mch_csv.o \ mch_dump.o mch_dzpdma.o mch_profile.o mch_start.o \ mch_trap.o mch_vars.o mch_xxx.o conf.o ioconf.o boot.o *************** *** 52,58 **** subr_rmap.o subr_xxx.o sys_inode.o sys_pipe.o trap.o tty.o \ tty_conf.o tty_subr.o tty_tb.o tty_tty.o ufs_alloc.o ufs_bio.o \ ufs_bmap.o ufs_dsort.o ufs_fio.o ufs_inode.o ufs_namei.o \ ! ufs_subr.o vm_sched.o vm_text.o xp.o OV1= sys_generic.o ufs_syscalls.o mem.o OV2= kern_acct.o kern_exec.o kern_exit.o kern_fork.o kern_resource.o OV3= clock.o cons.o kern_pdp.o kern_time.o \ --- 52,58 ---- subr_rmap.o subr_xxx.o sys_inode.o sys_pipe.o trap.o tty.o \ tty_conf.o tty_subr.o tty_tb.o tty_tty.o ufs_alloc.o ufs_bio.o \ ufs_bmap.o ufs_dsort.o ufs_fio.o ufs_inode.o ufs_namei.o \ ! ufs_subr.o vm_sched.o xp.o OV1= sys_generic.o ufs_syscalls.o mem.o OV2= kern_acct.o kern_exec.o kern_exit.o kern_fork.o kern_resource.o OV3= clock.o cons.o kern_pdp.o kern_time.o \ *************** *** 62,68 **** quota_ufs.o subr_log.o vm_swp.o vm_swap.o vm_proc.o toy.o OV5= ht.o tm.o ts.o OV6= tmscp.o kern_sysctl.o ! OV7= mch_fpsim.o ingreslock.o KERNOBJ=${CONF} ${BASE} ${OV1} ${OV2} ${OV3} ${OV4} ${OV5} \ ${OV6} ${OV7} ${OV8} ${OV9} ${OV10} ${OV11} ${OV12} \ --- 62,69 ---- quota_ufs.o subr_log.o vm_swp.o vm_swap.o vm_proc.o toy.o OV5= ht.o tm.o ts.o OV6= tmscp.o kern_sysctl.o ! OV7= mch_fpsim.o ingreslock.o ufs_disksubr.o ! OV8= vm_text.o KERNOBJ=${CONF} ${BASE} ${OV1} ${OV2} ${OV3} ${OV4} ${OV5} \ ${OV6} ${OV7} ${OV8} ${OV9} ${OV10} ${OV11} ${OV12} \ *** /usr/src/sys/conf/Make.unix.old Mon Feb 20 19:54:34 1995 --- /usr/src/sys/conf/Make.unix Thu Apr 13 21:48:53 1995 *************** *** 9,15 **** # software without specific prior written permission. This software # is provided ``as is'' without express or implied warranty. # ! # 2.1 (2.11BSD GTE) 2/14/95 # ######################################################### # Non-networking, non-separate I/D kernel # --- 9,15 ---- # software without specific prior written permission. This software # is provided ``as is'' without express or implied warranty. # ! # 2.2 (2.11BSD GTE) 1995/04/13 # ######################################################### # Non-networking, non-separate I/D kernel # *************** *** 62,68 **** ufs_bio.o ufs_bmap.o ufs_dsort.o ufs_fio.o ufs_inode.o \ ufs_mount.o ufs_namei.o ufs_subr.o ufs_syscalls.o \ vm_proc.o vm_sched.o vm_swap.o vm_swp.o vm_text.o xp.o subr_log.o \ ! kern_sysctl.o ingreslock.o OV1= OV2= --- 62,68 ---- ufs_bio.o ufs_bmap.o ufs_dsort.o ufs_fio.o ufs_inode.o \ ufs_mount.o ufs_namei.o ufs_subr.o ufs_syscalls.o \ vm_proc.o vm_sched.o vm_swap.o vm_swp.o vm_text.o xp.o subr_log.o \ ! kern_sysctl.o ingreslock.o ufs_disksubr.o OV1= OV2= *** /usr/src/sys/conf/Make.pdp.old Sat Jan 22 16:05:37 1994 --- /usr/src/sys/conf/Make.pdp Sun May 21 17:31:27 1995 *************** *** 9,15 **** # software without specific prior written permission. This software # is provided ``as is'' without express or implied warranty. # ! # %W% (Berkeley) %G% # M= ../machine VPATH= ../machine --- 9,15 ---- # software without specific prior written permission. This software # is provided ``as is'' without express or implied warranty. # ! # 2.0 (2.11BSD GTE) 1995/05/21 # M= ../machine VPATH= ../machine *************** *** 48,56 **** rm -f $*.s .s.o: ! ${CPP} $*.s >_xx.s; ! ${AS} - -o $*.o _xx.s; ! rm -f _xx.s all: assym.h ${COBJS} ${SOBJS} ../pdp/symbols.sort --- 48,54 ---- rm -f $*.s .s.o: ! ${CPP} $*.s | ${AS} -u -o $*.o all: assym.h ${COBJS} ${SOBJS} ../pdp/symbols.sort *** /usr/src/sys/conf/Make.pdpnet.old Sun Sep 4 18:19:09 1988 --- /usr/src/sys/conf/Make.pdpnet Sun May 21 17:45:19 1995 *************** *** 9,15 **** # software without specific prior written permission. This software # is provided ``as is'' without express or implied warranty. # ! # %W% (Berkeley) %G% # M= ../machine VPATH= ../machine --- 9,15 ---- # software without specific prior written permission. This software # is provided ``as is'' without express or implied warranty. # ! # 2.0 (2.11BSD GTE) 1995/05/21 # M= ../machine VPATH= ../machine *************** *** 30,38 **** rm -f $*.s .s.o: ! ${CPP} $*.s >_xx.s; ! ${AS} - -o $*.o _xx.s; ! rm -f _xx.s all: ${COBJS} ${SOBJS} --- 30,36 ---- rm -f $*.s .s.o: ! ${CPP} $*.s | ${AS} -u -o $*.o all: ${COBJS} ${SOBJS}