head	1.27;
access;
symbols
	RELEASE_2_0:1.13.4.1
	BETA_2_0:1.13.4.1.0.2
	ALPHA_2_0:1.13.0.2;
locks; strict;
comment	@# @;


1.27
date	95.12.30.18.52.18;	author peter;	state dead;
branches;
next	1.26;

1.26
date	95.02.26.20.39.39;	author phk;	state Exp;
branches;
next	1.25;

1.25
date	95.02.13.06.52.03;	author phk;	state Exp;
branches;
next	1.24;

1.24
date	95.02.01.11.15.45;	author jkh;	state Exp;
branches;
next	1.23;

1.23
date	95.01.29.02.31.33;	author phk;	state Exp;
branches;
next	1.22;

1.22
date	95.01.29.01.45.54;	author ats;	state Exp;
branches;
next	1.21;

1.21
date	95.01.29.01.25.17;	author ats;	state Exp;
branches;
next	1.20;

1.20
date	95.01.28.09.17.58;	author jkh;	state Exp;
branches;
next	1.19;

1.19
date	95.01.28.09.16.41;	author jkh;	state Exp;
branches;
next	1.18;

1.18
date	95.01.14.02.20.42;	author jkh;	state Exp;
branches;
next	1.17;

1.17
date	94.12.27.23.26.48;	author jkh;	state Exp;
branches;
next	1.16;

1.16
date	94.11.22.13.34.43;	author paul;	state Exp;
branches;
next	1.15;

1.15
date	94.11.19.05.19.54;	author paul;	state Exp;
branches;
next	1.14;

1.14
date	94.11.18.18.13.06;	author paul;	state Exp;
branches;
next	1.13;

1.13
date	94.11.01.10.10.16;	author phk;	state Exp;
branches
	1.13.4.1;
next	1.12;

1.12
date	94.10.26.02.53.07;	author phk;	state Exp;
branches;
next	1.11;

1.11
date	94.10.24.03.30.52;	author paul;	state Exp;
branches;
next	1.10;

1.10
date	94.10.21.18.08.28;	author paul;	state Exp;
branches;
next	1.9;

1.9
date	94.10.21.02.14.47;	author phk;	state Exp;
branches;
next	1.8;

1.8
date	94.10.20.04.59.55;	author phk;	state Exp;
branches;
next	1.7;

1.7
date	94.10.20.02.51.50;	author phk;	state Exp;
branches;
next	1.6;

1.6
date	94.10.19.23.57.58;	author paul;	state Exp;
branches;
next	1.5;

1.5
date	94.10.18.07.56.31;	author paul;	state Exp;
branches;
next	1.4;

1.4
date	94.10.16.06.17.03;	author paul;	state Exp;
branches;
next	1.3;

1.3
date	94.10.16.02.25.54;	author paul;	state Exp;
branches;
next	1.2;

1.2
date	94.10.16.00.04.42;	author paul;	state Exp;
branches;
next	1.1;

1.1
date	94.10.15.14.34.48;	author paul;	state Exp;
branches;
next	;

1.13.4.1
date	94.11.21.03.11.55;	author phk;	state Exp;
branches;
next	;


desc
@@


1.27
log
@recording cvs-1.6 file death
@
text
@PROG = sysinstall
MANEXT = 1
NOMAN= yet
CLEANFILES=	makedevs.c rtermcap

.PATH: ${.CURDIR}/../disklabel

SRCS =	exec.c dkcksum.c label.c main.c mbr.c \
	stage0.c stage1.c stage2.c stage3.c stage5.c \
	termcap.c utils.c makedevs.c ourcurses.c

CFLAGS += -Wall -g -static
LDADD =  -ldialog -lncurses -lmytinfo
DPADD = ${LIBDIALOG} ${LIBNCURSES} ${LIBMYTINFO}

.if exists(${.CURDIR}/../../sys/i386/boot/biosboot/obj)
BOOTS=${.CURDIR}/../../sys/i386/boot/biosboot/obj
.else
BOOTS=${.CURDIR}/../../sys/i386/boot/biosboot
.endif

makedevs.c:	dev2c.sh Makefile rtermcap
	mkdir -p dev
	cp ${.CURDIR}/../../etc/etc.i386/MAKEDEV dev
	( cd dev; sh ./MAKEDEV all )
	sh ${.CURDIR}/dev2c.sh dev > makedevs.tmp
	rm -rf dev
	uudecode < ${.CURDIR}/bteasy17.uu
	file2c 'const unsigned char boot0[] = {' '};' \
		< bteasy17 >> makedevs.tmp
	rm -rf bteasy17
	file2c 'const unsigned char boot1[] = {' '};' \
		< ${BOOTS}/boot1 >> makedevs.tmp
	file2c 'const unsigned char boot2[] = {' '};' \
		< ${BOOTS}/boot2 >> makedevs.tmp
	./rtermcap cons25 | \
		file2c 'const char termcap_cons25[] = {' ',0};' \
		>> makedevs.tmp
	./rtermcap cons25-m | \
		file2c 'const char termcap_cons25_m[] = {' ',0};' \
		>> makedevs.tmp
	./rtermcap vt100 | \
		file2c 'const char termcap_vt100[] = {' ',0};' \
		>> makedevs.tmp
	mv makedevs.tmp makedevs.c

rtermcap:	${.CURDIR}/rtermcap.c
	${CC} -o rtermcap ${.CURDIR}/rtermcap.c -ltermcap

.include <bsd.prog.mk>

@


1.26
log
@The things you have to go through some times!  Add a minimal program to
read a termcap entry, since tset is picky about filedescriptors...
@
text
@@


1.25
log
@Made the changes needed here to install from a CDrom.
Cleaned some cruft in the process.
This program becomes curiouser curiouser...
@
text
@d4 1
d22 1
a22 1
makedevs.c:	dev2c.sh Makefile
d36 1
a36 1
	tset -Q -S cons25 | sed 's/^.* //' | \
d39 1
a39 1
	tset -Q -S cons25-m | sed 's/^.* //' | \
d42 1
a42 1
	tset -Q -S vt100 | sed 's/^.* //' | \
d46 3
@


1.24
log
@Do what I think Poul *intended* to do, rather than what he did.. :-)
@
text
@d8 1
a8 1
	stage0.c stage1.c stage2.c stage3.c stage4.c stage5.c \
d28 2
a29 1
	file2c 'const char boot0[] = {' '};' < bteasy17 >> makedevs.tmp
d31 4
a34 2
	file2c 'const char boot1[] = {' '};' < ${BOOTS}/boot1 >> makedevs.tmp
	file2c 'const char boot2[] = {' '};' < ${BOOTS}/boot2 >> makedevs.tmp
@


1.23
log
@Some cleanup done.

Include bteasy, bootsd, sdboot and termcap entries using file2.c

Remove all traces of "termcap.small".

The policy in this program regarding termcap is:

| If $TERM is set
| 	do nothing special, rely on usual termcap.
| else
| 	use compiled in (via file2c) termcap entries
@
text
@d15 6
d28 1
a28 3
	file2c 'const char boot0[] = {' '};' < \
		bteasy17 \
		>> makedevs.tmp
d30 2
a31 6
	file2c 'const char boot1[] = {' '};' < \
		../../sys/i386/boot/biosboot/boot1 \
		>> makedevs.tmp
	file2c 'const char boot2[] = {' '};' < \
		../../sys/i386/boot/biosboot/boot2 \
		>> makedevs.tmp
@


1.22
log
@fix another bug in the MAKEDEV cludge :-). The x-bit permission are not
necessarly copied over. So better call it explicit with a sh ./MAKEDEV .
@
text
@d15 1
a15 1
makedevs.c:	dev2c.sh
d19 1
a19 1
	sh ${.CURDIR}/dev2c.sh dev > makedevs.c
d21 21
@


1.21
log
@Correct the relative path for the etc directory in the makedev cludge :-).
@
text
@d18 1
a18 1
	( cd dev; ./MAKEDEV all )
@


1.20
log
@Less kludge dev.
@
text
@d17 1
a17 1
	cp ${.CURDIR}/../etc/etc.i386/MAKEDEV dev
@


1.19
log
@A different kludge for /dev
@
text
@d16 5
a20 4
	mkdir -p /tmp/dev
	cp ${.CURDIR}/../etc/etc.i386/MAKEDEV /tmp/dev
	( cd /tmp/dev; ./MAKEDEV all)
	sh ${.CURDIR}/dev2c.sh /tmp/dev > makedevs.c ; \
@


1.18
log
@Patch from Remy Card for bogus path in Makefile.
@
text
@d16 4
a19 1
	sh ${.CURDIR}/dev2c.sh ${DESTDIR}/dev > makedevs.c ; \
@


1.17
log
@Bring the 2.0 RELEASE version back into -current.  Now I just need
to resurrect my changes for the last snapshot, which were unfortunately
lost in a forest fire on time.
@
text
@d5 1
a5 1
.PATH: /usr/src/sbin/disklabel
@


1.16
log
@Added
CLEANFILES += makedevs.c
@
text
@d7 1
a7 1
SRCS =	bootarea.c editor.c exec.c dkcksum.c label.c main.c mbr.c \
d11 1
a11 2
CFLAGS += -Wall -g -static -I${.CURDIR}/../../sys/
CLEANFILES += makedevs.c
@


1.15
log
@I hope this gets my changes merged back into the current branch.

Removed a layer of menus.
Auto select partition to install into -- first FreeBSD partition
in MBR table. Abort if no FreeBSD partition.
Added a F_BUTTON type.
Fixed up label editor to show free space properly.
Fixed a few bugs.
@
text
@d12 1
@


1.14
log
@Merge in my new mbr and disklabel code.
@
text
@d12 1
a12 1
LDADD =  -ldialog -lncurses -lmytinfo -lforms
@


1.13
log
@Public apology:
I have walked all over Paul Richards code again, and severely lobotomized
some of his stuff, in order to cut some corners for the 2.0-Alpha release.
I belive that we can now manipulate fdisk and disklabel-stuff sufficiently
for the release to actually be produced.
It's not that I don't like Paul and his code, I just need something I
can kick out of the door RSN.

Sysinstall is now under absolute code-freeze, only Jordan has my permission
to commit to this code (stage0 & 5).  I would appreciate if everybody
else would finds problems in sysinstall send patches to me, and I will
commit them. THANKYOU.

The fdisk/disklabel editors are made in pure ncurses, and follow a model
"a`la spreadsheet".

There are some important functions which are missing still, and I would
appreciate if somebody would look at them.
The FDISK part needs a "whole-disk" option, and it needs a "rewrite
MBR-boot code" option.
The DISKLABEL part needs to be able to "import DOS-partition".
Both need a "HELP" function, (display a file "/HELP" using dialog is OK).

It seems to me like the wd.c and sd.c should reread the physical record
when a DIOCGDINFO is made, so that they can pick up changes in the
MBR-data.  Otherwise there will be a couple of weird cases where we
cannot avoid replicating code from the kernel.

If you want to play with this, look at src/release/Makefile.  You may need
to step back to version 1.38 of sys/i386/isa/fd.c to make "rootable"
floppies, it is not clear at this time if that indeed is the problem I
have been having.

Sleep well, my friends, and expect the real Alpha in 24H, if the tree is
still solid.
@
text
@d7 1
a7 1
SRCS =	bootarea.c exec.c dkcksum.c label.c main.c mbr.c \
d11 2
a12 2
CFLAGS += -Wall -g -static
LDADD =  -ldialog -lncurses -lmytinfo
@


1.13.4.1
log
@20 hours worth of assorted hacking.  You'll see it when you install BETA :-)
@
text
@d7 1
a7 1
SRCS =	exec.c dkcksum.c label.c main.c mbr.c \
@


1.12
log
@New and Improved!  crunch with gzip, newfs, fsck and cpio.  gzip result.
fits on 1200 kb floppy with unstripped GENERIC kernel.
@
text
@d9 1
a9 1
	termcap.c utils.c makedevs.c
d11 1
a11 1
CFLAGS += -Wall
@


1.11
log
@Round partitions to the next whole cylinder.
Fill in devicename and mountpoint structures from default_disklabel()
so stage2 code knows what to do.
New file label.c for disklabel editing code.
@
text
@d7 3
a9 3
SRCS = bootarea.c exec.c dkcksum.c label.c \
       main.c mbr.c stage0.c stage1.c \
		 stage2.c stage3.c termcap.c utils.c
d15 3
d19 1
@


1.10
log
@Fix all the bugs introduced by the source shuffle.

All the mbr code now seems to be working. We can build a basic
unix disklabel in any existing DOS partition while retaining the
existing mbr bootcode or we can install to the whole disk which
puts FreeBSD's boot code into the MBR and creates a clean MBR
partition table with FreeBSD in partition 0 taking up the whole disk.
@
text
@d7 3
a9 3
SRCS =	stage1.c dkcksum.c bootarea.c mbr.c \
	utils.c termcap.c exec.c \
	stage0.c stage2.c stage3.c main.c
d11 1
a11 1
CFLAGS += -Wall -g
@


1.9
log
@Latest changes from me.  Over to you Paul...
@
text
@d11 1
a11 1
CFLAGS += -Wall
@


1.8
log
@Integrate my code a lot more with Pauls.  (I have left sysinstall.c
here, even though it isn't used in the Makefile for Paul not to have
an heart-attack when he wakes up. :-)

Way to go still...
@
text
@d8 1
a8 1
	utils.c termcap.c \
@


1.7
log
@The beginning of some structural changes, and the merge of my code into
Pauls.
@
text
@d7 3
a9 3
SRCS =	sysinstall.c \
	dkcksum.c bootarea.c mbr.c \
	utils.c stage0.c stage3.c main.c
@


1.6
log
@More code rearrangment, moved all mbr code into its own file
so it can be used by other programs.

Added all the necessary menus to take the user through the installation
of the bootblocks.
@
text
@d7 3
a9 1
SRCS = sysinstall.c dkcksum.c bootarea.c mbr.c
@


1.5
log
@Lates snapshot:

Re-organised files, moved bootcode routines into their own files.
Check return types of everything and pass error messages to
windows so we get good diagnostics.

Made start on stage 2 installation. Implemented a status file that
keeeps track of where we are in the installation process and allows
installation from media sequences.
@
text
@d7 1
a7 1
SRCS = sysinstall.c dkcksum.c bootarea.c
@


1.4
log
@Remove a bogus BINDIR line
@
text
@d7 1
a7 1
SRCS = sysinstall.c dkcksum.c
@


1.3
log
@Add DPADD for libraries.
@
text
@a1 1
BINDIR = sbin
@


1.2
log
@Add some missing libraries to LDADD
@
text
@d12 1
@


1.1
log
@Work in progress.
@
text
@d11 1
a11 1
LDADD =  -ldialog
@
