Commit Graph

162 Commits

Author SHA1 Message Date
Paul Richards
9e3f27547d Merge in my new mbr and disklabel code. 1994-11-18 18:13:13 +00:00
Poul-Henning Kamp
f1dd848016 Add a "write Bootcode" option to the Fdisk editor.
unzip sysinstall on the way to the hd.
1994-11-18 11:30:04 +00:00
Jordan K. Hubbard
3902fd08ed Give the user a chance to retry the cpio floppy. 1994-11-18 10:12:56 +00:00
Andrey A. Chernov
d31ec8c65b Remove edit_line(), use line_edit() libdialog function instead in all places 1994-11-18 01:16:58 +00:00
Andrey A. Chernov
4195601de8 Use dialog_clear_norefresh() if possible 1994-11-17 23:36:49 +00:00
Andrey A. Chernov
5007f4061c Use -1, -1 where is possible 1994-11-17 19:44:55 +00:00
Jordan K. Hubbard
540bb26ac5 Rethink the cpio floppy verify a little. Don't use a magic cookie,
check for bininst instead (see comments in release/Makefile).
1994-11-17 14:18:43 +00:00
Jordan K. Hubbard
c1b05c7986 1. Add check to see if CPIO floppy extracted properly.
2. See if swapon() failed and at least print a diagnostic.
3. Use -1 instead of strheight()/strwidth() everywhere.

Reviewed by:
Submitted by:
Obtained from:
1994-11-17 14:12:38 +00:00
Andrey A. Chernov
8b6840ff55 Remove str{width,height} functions, they are in libdialog now.
It is only first hook for new autosizing changes, more changes
will follow.
1994-11-16 14:42:22 +00:00
Andrey A. Chernov
ebd8696266 Use autodetected dimensions in Sorry! window 1994-11-15 12:17:42 +00:00
Andrey A. Chernov
f7b5cb4380 Use TellEm instead of dialog_msgbox 1994-11-15 12:15:51 +00:00
Jordan K. Hubbard
b8565ceeb3 I buggered the last commit. Make sysinstall work again (^$&*!! missing
comma!).
1994-11-13 04:20:23 +00:00
Jordan K. Hubbard
5ece1e4625 Whoops! Update the size of the main menu to 7 items. I'm sleepy. 1994-11-13 02:06:50 +00:00
Jordan K. Hubbard
65890857c5 Now I know what this message is really supposed to say.. :-) 1994-11-13 01:14:38 +00:00
Jordan K. Hubbard
c6c612c2c6 Add hooks for a short trouble shooting document. 1994-11-12 20:34:18 +00:00
Poul-Henning Kamp
e8411f60b0 Don't continue if we don't get a /, swap and a /usr or 80Mb in /. 1994-11-12 05:40:28 +00:00
Jordan K. Hubbard
7c6f13dc4b Make sysinstall deal with user interrupts properly. 1994-11-11 23:22:56 +00:00
Jordan K. Hubbard
dcaed5228b 1. Ask the user one final time before newfs'ing his disk into oblivion.
This means that even "proceed" can be chosen now without going
   irrevokably down that path.
2. Clean up the stage5 text.
1994-11-11 07:58:09 +00:00
Jordan K. Hubbard
700b814a89 Poul's and my idea of avoiding the last reboot at the end was
too ambitious; we can't make the transiton from install to /sbin/init
without another reboot.  Sigh..  Oh well, not that big a deal.
1994-11-08 18:44:14 +00:00
Jordan K. Hubbard
df8cd9c1ac Detect that bininst has finished and go straight into the new system.
Reviewed by: phk
1994-11-08 14:04:19 +00:00
Poul-Henning Kamp
4222ad130a swapon had a bug. Thanks Michael, but couldn't you told me and not Jordan ?
now I have to listen to him all morning teasing me...
1994-11-08 13:40:01 +00:00
Poul-Henning Kamp
e0196256c7 Remember to set the d_type field correctly 1994-11-08 11:51:44 +00:00
Jordan K. Hubbard
02006c7644 Change TITLE to something more rational. Make sysinstall.c use it instead
of its own hardcoded constant.
1994-11-08 11:44:04 +00:00
Poul-Henning Kamp
46c134684c Always say the magic word at the end. 1994-11-08 10:14:19 +00:00
Jordan K. Hubbard
4bb50116ba Change Fatals to Warnings. 1994-11-08 07:44:57 +00:00
Jordan K. Hubbard
295acba8ba Fixup:
1. Don't use kernel name for headers - I'm running 2.0.1-Development,
   not ALPHA, and this messes things up.
2. The last dialog was too big, make it a little smaller.  Just cosmetic,
   while I'm in here.
1994-11-08 03:41:52 +00:00
Jordan K. Hubbard
b366e542cc My last cosmetic changes. 1994-11-07 13:48:54 +00:00
Jordan K. Hubbard
7c6b6c167c Cosmetic. 1994-11-07 09:49:06 +00:00
Poul-Henning Kamp
5529c6bf45 Always clear before we "TellEm()" 1994-11-07 04:53:23 +00:00
Poul-Henning Kamp
c4f1695923 Only Mount relative to Written disklabel. 1994-11-07 00:41:38 +00:00
Poul-Henning Kamp
44a88072bd Never have more than one active partition. 1994-11-06 23:33:20 +00:00
Andrey A. Chernov
7bcf49f368 After fixing curses bugs use LINExCOLS in show file 1994-11-06 15:35:50 +00:00
Jordan K. Hubbard
1d317df96c If a file is not present, it's not an error. This means you're using the
1.2MB floppy image.
1994-11-06 11:09:18 +00:00
Poul-Henning Kamp
af3b22a544 remember to tell dialog that we leave. 1994-11-06 04:34:46 +00:00
Jordan K. Hubbard
e9b2310837 Retreat from the idea of using gzip'd ascii files. 1994-11-06 04:10:13 +00:00
Poul-Henning Kamp
6b25616b3b label.c Make sure we always show 8 disk-partitions.
main.c	sanitize the logic of what we do when:

if(getpid()!=1) do stage0 & stage1  (very useful actually)
else if (floppy-marker-file is there) stage0-2, reboot
else stage3-5
1994-11-06 04:05:45 +00:00
Jordan K. Hubbard
a0c7a3b3cf Sigh. My error message printing was still wrong. Wipe the sleep from
my eyes and do this properly (debugging is especially difficult when you have
to burn a floppy every time you want to test your changes! :-( ).
1994-11-06 02:24:45 +00:00
Jordan K. Hubbard
e294dc8a7c Don't use a shell, silly, we don't have one! 1994-11-06 01:34:14 +00:00
Jordan K. Hubbard
feec7965b6 Tweak tweak.. 1994-11-06 01:16:30 +00:00
Jordan K. Hubbard
9d8db7f2f4 I misunderstood dialog_prgbox() - fix it. 1994-11-05 23:56:40 +00:00
Jordan K. Hubbard
b2e3ee0a69 Make ShowFile() now show gzip'd text files. This should save a fair
bit of space on the install floppy.  Modify stage0 and the target names
accordingly.
1994-11-05 23:12:10 +00:00
Andrey A. Chernov
e897bbe2ee Enable back dialog_msgbox in TellEm, real problem was delwin
into edit_line
1994-11-05 23:09:26 +00:00
Jordan K. Hubbard
f90d7a2f31 Whoops! Knew I forgot something.. Bump the menu size. 1994-11-05 08:20:54 +00:00
Jordan K. Hubbard
3f5bee85a0 Add a chance to read the release notes, too. 1994-11-05 08:20:08 +00:00
Jordan K. Hubbard
33d3e14480 I'm not sure if we're just supposed to fall off the end like this,
but at least return something.
1994-11-05 07:34:02 +00:00
Jordan K. Hubbard
6e213286f4 Make stage5 go either to a shell, or on to the bindist installation. 1994-11-05 07:23:58 +00:00
Jordan K. Hubbard
0fe610487f Make this work the way it was really supposed to - less intrusively. 1994-11-05 07:03:55 +00:00
Poul-Henning Kamp
73ba88d5d1 Use /DISKSPACE.FAQ as help-file in the disk-editor. 1994-11-05 06:03:06 +00:00
Jordan K. Hubbard
15196a0bab Change the logic for how error messages are printed so we can actually
see them.
1994-11-05 05:46:12 +00:00
Poul-Henning Kamp
21bd442d86 Cosmetics: edit_line() does standend() when done; 1994-11-05 03:59:34 +00:00
Poul-Henning Kamp
4c78915acc Added a (H)elp function to the fdisk/disklabel code, much needed, now I only
have to write the text-file it will dump on you.
Stopped using cleartoeol in AskEm(), just as a test to see if the screen
looks more sane.
Added a attempted auto-recognition of /, swap and /usr for the first disk
where it looks sensible.  Logic of this might need to be improved.
Made a "ShowFile()" which will not bomb/ignore you if the file isn't there.
1994-11-05 03:34:22 +00:00
Poul-Henning Kamp
7da9aa9e49 Fixed a ghastly mistake. Edit_line() would "delwin(window)". Bad move
buddy, you'd better not call with stdwin then!   fixed now.
Seems like dialog is a LOT more rational now.
1994-11-05 03:13:33 +00:00
Poul-Henning Kamp
70da208d21 Fix a potential bug in stage2.
disable the dialog_msgbox in TellEm(), until we find out why it
hangs on second or third invocation.
1994-11-04 21:38:37 +00:00
Andrey A. Chernov
512dc52632 Restore jkh's changes, now it works for const strings 1994-11-03 00:30:27 +00:00
Andrey A. Chernov
10a42e2218 Now autosizing code works with const strings too.
Prototype added.
1994-11-03 00:28:05 +00:00
Jordan K. Hubbard
bfb65cd092 Don't use autosizing code after all - it doesn't like const strings. 1994-11-02 22:39:57 +00:00
Poul-Henning Kamp
99133b4e1e a missing star. 1994-11-02 22:06:24 +00:00
Jordan K. Hubbard
fb7164eda6 Last changes before going to bed. Disk label editor should now work
a fair bit better.
1994-11-02 11:00:35 +00:00
Jordan K. Hubbard
045e459c30 Stage0 can't dump you into a shell. There isn't one. Just reboot.
Stage5 didn't have a large enough dialog box.  Fix that.  Also use
Andrew's autosizing code.
1994-11-02 09:05:49 +00:00
Poul-Henning Kamp
5a9ee65437 Make MkDir() actually do "mkdir -p", so that we can mount on /home/foo, even if
/home isn't a mountpoint.
1994-11-02 08:52:15 +00:00
Jordan K. Hubbard
207d0a541b Fix more mongoloid coding style.
Make a stab at getting free space display to work.
Forward decls to shut compiler warnings up.
Increase some fields to width 2 in order to get edit_line to let you
actually edit them.
Sanity check values and yell at bonehead users.
1994-11-02 08:15:46 +00:00
Andrey A. Chernov
9e92d9eb90 Restore things broken by phk, please use patches to 'cvs update'
instead of whole files commiting!
1994-11-02 07:37:40 +00:00
Andrey A. Chernov
00bc21cafc Restore things broken by phk, please use patches on 'cvs update'
instead of whole files!
1994-11-02 07:34:01 +00:00
Jordan K. Hubbard
eae3147757 More miscellaneous changes. Clear the screen in some appropriate spots. 1994-11-02 07:15:56 +00:00
Jordan K. Hubbard
0782333682 Get stage0 and stage5 working.
Try to reformat this code to be a little more human.  Weird europeans
have been writing this, and can't even seem to agree a single coding
style for more than 4 consecutive lines! :-)
1994-11-02 06:19:53 +00:00
Poul-Henning Kamp
9c354a29e7 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.
1994-11-01 10:10:43 +00:00
Andrey A. Chernov
f195e2e513 Don't make too big windows, count actually text width/height 1994-10-31 04:49:15 +00:00
Andrey A. Chernov
df59073be8 Change hardcoded 24x80 to LINES-1, COLS
Remove compiler warning
1994-10-31 04:07:43 +00:00
Poul-Henning Kamp
75c4377f4f Fixed another bunch of problems. I belive we are in a working shape now. 1994-10-29 12:03:59 +00:00
Poul-Henning Kamp
aa7d974a35 Fixed to make sysinstall work again. Notable changes:
Removed a dialog_clear() which somebody aimlessly had slammed into TellEm()
in absence of any understanding of the structure of this program. :-(

Skip through stage0 for now.

Make write_bootblocks write the disklabel using the kernel-call, and forget
about the boot-blocks for now.  This is wrong, but I havn't found the real
problem yet.  I will continue work on this problem.

Added a Debug-feature.  There is a printf' like Debug() now which sends its
output to ttyv1 (Alt-F2), and all "discarded output" from sub-processes end
up there too.  Made TellEm() put it's messages there also, so that we can
see where what happens.

Set the PATH for the shell we shouldn't start at the end :-)

set "npartitions" after the disklabel-editor returns, so that we actually
can edit all the 8 parts of the label.
1994-10-29 10:01:40 +00:00
Jordan K. Hubbard
61386f1ebb Totally refrobnicate stage0. Add an extern to sysinstall.h so we can
all share the same `selection' variable.
1994-10-28 15:19:57 +00:00
Poul-Henning Kamp
204218e079 Added two #defines to make this compile, until Paul gets out of bed again :-) 1994-10-28 03:02:47 +00:00
Jordan K. Hubbard
07e9e1dbd1 Correct a little spelling. 1994-10-26 10:33:36 +00:00
Paul Richards
f45d9f0072 Clean up the mess from the previous commit which used a out of sync
patch file.

Now, we should be able to configure disklabels using the editor.
1994-10-26 07:34:38 +00:00
Paul Richards
3b32505291 Added some glue code so disklabel editor can be used to edit disklabel
and have changes propagated to later stages.
1994-10-26 07:14:51 +00:00
Poul-Henning Kamp
281d3e3bd9 So there. Now we live on the hard-disk! 1994-10-26 05:41:02 +00:00
Paul Richards
933801dff5 Completed disklabel configuration editor. The editor is working but the
glue code to pass the edited configuration onto the following stages
isn't done yet.
1994-10-26 04:09:19 +00:00
Poul-Henning Kamp
3440124921 New and Improved! crunch with gzip, newfs, fsck and cpio. gzip result.
fits on 1200 kb floppy with unstripped GENERIC kernel.
1994-10-26 02:53:15 +00:00
Andrey A. Chernov
9dbfabe9eb Sync with termcap.src 1994-10-26 02:20:47 +00:00
Andrey A. Chernov
17bde3c52f Sync with termcap.src 1994-10-26 01:20:11 +00:00
Andrey A. Chernov
2c06e4a946 Remove unneeded dialog_update() because now in dialog_clear() 1994-10-25 22:23:18 +00:00
Andrey A. Chernov
fe08a6032f Use configurable dialog attributes instead of hard-coded ones 1994-10-24 05:16:00 +00:00
Andrey A. Chernov
cc1da582a5 label.c: add delwin(window)
mbr.c: use proper dims for newwin, add shadow
both: add ' ' and ESC as valid end-keys
1994-10-24 04:14:23 +00:00
Andrey A. Chernov
dfee7da9e7 Use proper dims for newwin.
Remove double-clear.
Add shadow.
1994-10-24 04:07:22 +00:00
Andrey A. Chernov
c21d850179 Clear screen on exit per Paul request 1994-10-24 03:55:25 +00:00
Paul Richards
302a30b002 Remove a couple of display_disklabel call used
for debuging.
Reviewed by:
Submitted by:
Obtained from:
1994-10-24 03:33:29 +00:00
Paul Richards
caf2d08d24 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.
1994-10-24 03:30:56 +00:00
Andrey A. Chernov
1ccea3128a Fatal() fixed:
end_dialog() called too early here.
1994-10-22 02:37:24 +00:00
Andrey A. Chernov
2592b4e4e5 Cosmetique: just fix tabs after patch of diff -cb (previous) 1994-10-22 02:35:09 +00:00
Andrey A. Chernov
70f29f87cd ExitSysinstall() fixed:
use dialog functions properly.
don't clear screen with last message on exit(0), I want to see it still.
relay on dialog_active properly.
1994-10-22 02:32:16 +00:00
Paul Richards
66e35128bf Fixed a typo and moved a dialog_clear() line. 1994-10-21 18:26:25 +00:00
Paul Richards
b4740339e8 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.
1994-10-21 18:08:33 +00:00
Poul-Henning Kamp
57a3ad3e15 Now stage2 runs all the way.. 1994-10-21 05:36:43 +00:00
Andrey A. Chernov
af5bd96f75 Add hardcoded cons25-m entry for mono console, if termcap.small
not fit on installation floppy.
1994-10-21 04:48:51 +00:00
Andrey A. Chernov
6373dcc600 Second time bugfix, please be carefully.
Use dialog functions in Fatal only if dialog_active, else
use fprintf(stderr, because it may be called before dialog
initialization
1994-10-21 04:43:07 +00:00
Poul-Henning Kamp
4752baca4a Latest changes from me. Over to you Paul... 1994-10-21 02:14:54 +00:00
Andrey A. Chernov
5d23a66b18 Remove ncurses.h, now included into dialog.h 1994-10-20 21:58:10 +00:00
Andrey A. Chernov
35c9f61260 remove unneded includes
use dialog functions properly
move alloc_memory early to prevent core dump at stage 3
Change 25x80 to 24x80
Fix setenv diagnostic
Fix Fatal to call end_dialog()
1994-10-20 19:30:56 +00:00
Poul-Henning Kamp
277a25ffe0 Now stage 2 should do it's job I hope. Havn't tested yet. 1994-10-20 06:48:40 +00:00
Poul-Henning Kamp
3a06e4e7bf Just a safety measure for me and Paul. 1994-10-20 06:14:29 +00:00