Commit Graph

843 Commits

Author SHA1 Message Date
dsl
a8f1b6c6be Move definition of PART_USR to md.h where it has a chance of having some effect. 2003-08-30 13:53:28 +00:00
lukem
668e6c5574 s/exitisting/existing/ 2003-08-27 16:00:30 +00:00
dsl
41fc0f3e23 No need to build sysinstmsgs.en (they are compiled into the program).
(I'd failed to persuade make to do this before...)
2003-08-27 10:23:53 +00:00
dsl
b969d59ce5 make sysinst compile for amd64 2003-08-19 17:25:49 +00:00
dsl
b0559c2322 Add some trailing spaces to force line breaks. 2003-08-19 14:33:16 +00:00
dsl
b2fa78b58e Let noexec, nodev and nosuid be written to /ets fstab entries
Always use 1023 cylinders in mbr for large disks
2003-08-10 14:51:48 +00:00
mrg
fa688653a3 return type of sizeof() is size_t not long. 2003-08-10 08:28:09 +00:00
dsl
fe536754c3 Allow user to shoot themselves in the foot by specifing a non-standard
'average bytes per inode' for each partition.
Fixes PR install/8509
2003-08-09 21:36:26 +00:00
dsl
144c38f82d Don't delete \r that aren't followed by '\n' when relaying program output.
Needed to get progress bar displayed correctly.
Kill a level of indent to get some coding space.
2003-08-09 19:26:38 +00:00
agc
74b7d6e9f2 Move UCB-licensed code from 4-clause to 3-clause licence.
Patches provided by Joel Baker in PR 22268, verified by myself.
2003-08-07 09:27:56 +00:00
itojun
4b276b6083 use bounded string op 2003-08-06 13:56:58 +00:00
itojun
7f01f184d4 fix realpath vuln, just like SA2003-011. i do not think it attackable 2003-08-06 13:36:16 +00:00
dsl
117888d14f When writing /etc/fstab:
add support for setting mount options of async, noatime, nodevmtine and softdep.
add noauto if 'mount' was not requested.
add entry for /proc (with noauto)
Display fragment size and block size on the correct line.
Ask for numeric fragment size (not # fragments/block).
Show one unused partition when editing disklabel.
Zap all fields when a partition is made FS_UNSED.
Tweak some menu texts (a space at the end of a line causes a line break!).
Simplify code that displays output from commands - curses is requied to not DTRT
with CR/LF sequences, I need to revert libcurses :-(
2003-08-05 13:35:26 +00:00
skrll
0dcbb09c7a Put a quote in the right place. 2003-08-04 09:23:50 +00:00
lukem
980c535c83 the new world order is to use DPSRCS to add extra dependencies... 2003-08-02 05:16:56 +00:00
hubertf
e13dec7b2a Making device files -> Making device nodes 2003-07-31 13:50:05 +00:00
dsl
11d928c5ee Fix display of localtime on timezone update screen.
(missing "." in "%.*s")
Reduce memory leak in setenv() by only calling it for changes.
2003-07-29 12:08:32 +00:00
dsl
02dbd70852 Remove extra process and pipe that relayed data from the master pty
to sysinst's main process when a command is run (eg the file list from pax).
Since the pty is in 'packet' mode, the boundaries of the pty reads would
need to be preserved in order to detect control records.
If the pipe became full the main process could treat part of a filename
as a control byte and then save the rest of the name as tty settings.
The effect of 'random' tty settings is unknown, but could be responsible
for core dumps while displaying the full file list from pax.
I suspect that the extra pipe was originally used because select wasn't
supported on the master side of a pty (not checked).

Also cd out of /targetroot if set installation is killed with ^C ^C.
2003-07-28 11:32:21 +00:00
dsl
b42a6fa21a Stop (attempted) coredump when ftp/nfs install attempted.
(incorrect empty strings check for active interfaces)
2003-07-27 21:09:57 +00:00
dsl
d0bba60fad Default boot blocks to those used to install the system.
Add 19200 baud and serial ports com1, com2 and com3.
Fixes PR install/21418
2003-07-27 20:25:07 +00:00
dsl
faefcd3805 Force localfs_dir to be an absolute path - fixes PR install/14130.
Put disklabel info into /tmp/disktab in case / isn't writable,
fixes PR 17347.  Note the /etc/disktab isn't the target /etc anyway...
2003-07-27 08:57:27 +00:00
dsl
96ace5d58c Remove 'menu_ent' parameter from action routines.
Add menu for all disklabel partition types.
Default 'partition type' and 'sizechoice' menus to current value.
Change 'standard/use existing' to 'set sizes/use existing'.
2003-07-27 07:45:08 +00:00
salo
8d1781e39d netbsd.org->NetBSD.org 2003-07-26 17:06:22 +00:00
dsl
7f5beafa6b Sprinkle a load of consts, and change a few variable names.
Now compiles with WARNS=3.
2003-07-25 08:26:21 +00:00
dsl
f8beccb8d0 Ask for sets when doing 'install more sets' 2003-07-22 12:18:39 +00:00
dsl
92c7597c91 Specify username+password to ftp even when username is 'ftp'.
Only use 'ftp -a ...' when the username is ftp and the password is null.
Fixed PR install/13656
2003-07-22 11:45:16 +00:00
dsl
bdd53bdf93 Output a messge before the 5 second delay while the network comes up.
Ask user before deleting set files (fixes PR/7190).
2003-07-22 08:30:10 +00:00
abs
ef8e75ce98 Make net_namesvr6 extern again to fix compilation if INET6 is defined. 2003-07-19 22:07:36 +00:00
dsl
195bdd51af Tested version of code to get local directory (I'd got waylaid by etc.old)
Messages for net.c changes.
2003-07-18 10:29:36 +00:00
dsl
0bf9a036c9 Remember which sets we sucessfully installed (so we know when to
restore /etc).
Improve handling of absent directories in get_via_localdir.
distname[] isn't needed (twice)
2003-07-18 09:49:18 +00:00
dsl
da36837548 Copy /etc.old back to /etc if it was saved, but we didn't actually
install the ETC set.
2003-07-18 09:46:11 +00:00
dsl
6e575ea980 Network info has gone to net.c and is now static.
Stuff to put /etc back in upgrade aborted.
2003-07-18 09:44:20 +00:00
dsl
9a9b340a64 Pull local data here and make it static.
Remove one or two fixed length strings (use malloc etc instead).
Change a lot of 'if (strlen(x) == 0)' to 'if (x[0] === 0)'.
Let user skip network config if any non-loopback interfaces are UP.
Always free() buffer allocated by collect(), could be a massive leak.
Whitespace changes.
2003-07-18 09:42:59 +00:00
dsl
6684cadd5e Remove some fixed length strings.
Do limited filename globbing.
2003-07-18 09:34:42 +00:00
dsl
9c3018b9f2 Remove the endwin() and refresh() pair which caused the screen to flash
whenever a command was run.  Maybe a screen redraw is required if the
command is able to corrupt the screen - but the refresh was happening
much too early to fix that, and it would be better to collect/discard
the commands output anyway.
2003-07-17 19:44:53 +00:00
dsl
6445d05466 Add explicit msg_string() call to MSG_hidden to stop core dump
when the password is set and the usename not ftp.
Whitespace changes.
2003-07-14 10:53:42 +00:00
dsl
a2d5357066 Fix code that guesses bios geometry from mbr info.
When asking for bios geometry, ask for sectors per track and heads
then calculate cylinders from volume size.
Write MBR_MAGIC into correct place when writing extened partitions.
2003-07-14 09:59:00 +00:00
dsl
e64fcd4452 Use a menu when asking for the install disk (fixes PR install/20121).
Make disk_desc[], disk and numdisks local to get_disks (instead of globals).
Fix a little fallout from the above.
A bit of mbr.c was missing #ifdef BOOTSEL...
2003-07-11 15:28:58 +00:00
dsl
8e56a9f2a2 Delete code that did nothing!
The disk parameters it fetched were overwritten by those obtained (from
the default label) in get_disks.
2003-07-11 14:48:42 +00:00
dsl
0f636f6d49 Ensure correct curses tty settings are restored after a program runs.
Remove the abberant call to endwin() in i386 md_update() that caused
echo to be left on. I've not removed the endwin from the other ports.
Only run MAKEDEV if etc.tgz installed.
Some extra sanity checks on an 'rm -rf %s'.
2003-07-10 13:36:48 +00:00
lukem
001c68bd94 Rename a large chunk of the make(1) variables which refer to a
program/tool from "FOO" to "TOOL_FOO".  The new variables are:
	TOOL_ASN1_COMPILE  TOOL_CAP_MKDB  TOOL_CAT  TOOL_CKSUM  TOOL_COMPILE_ET
	TOOL_CONFIG  TOOL_CRUNCHGEN  TOOL_CTAGS  TOOL_DB  TOOL_EQN  TOOL_FGEN
	TOOL_GENCAT  TOOL_GROFF  TOOL_HEXDUMP  TOOL_INDXBIB  TOOL_INSTALLBOOT
	TOOL_INSTALL_INFO  TOOL_M4  TOOL_MAKEFS  TOOL_MAKEINFO  TOOL_MAKEWHATIS
	TOOL_MDSETIMAGE  TOOL_MENUC  TOOL_MKCSMAPPER  TOOL_MKESDB
	TOOL_MKLOCALE  TOOL_MKMAGIC  TOOL_MKTEMP  TOOL_MSGC  TOOL_MTREE
	TOOL_PAX  TOOL_PIC  TOOL_PREPMKBOOTIMAGE  TOOL_PWD_MKDB  TOOL_REFER
	TOOL_ROFF_ASCII  TOOL_ROFF_DVI  TOOL_ROFF_HTML  TOOL_ROFF_PS
	TOOL_ROFF_RAW  TOOL_RPCGEN  TOOL_SOELIM  TOOL_SUNLABEL  TOOL_TBL
	TOOL_UUDECODE  TOOL_VGRIND  TOOL_ZIC

For each, provide default in <bsd.sys.mk> of the form:
	TOOL_FOO?=	foo
and for the ${USETOOLS}=="yes" case in <bsd.own.mk>, provide override:
	TOOL_FOO=	${TOOLDIR}/bin/${_TOOL_PREFIX}foo

Document all of these in bsd.README.

This cleans up a chunk of potential (and actual) namespace collision
within our build infrastructure, as well as improves consistency in
the share/mk documentation and provision of appropriate defaults for
each of these variables.
2003-07-10 10:33:58 +00:00
dsl
5a411fd464 Create mount point used for target system. 2003-07-09 20:02:35 +00:00
dsl
6da321c1aa Sort out (and remember) the disk partition we will install into.
This should stop the i386 code splatting all over the start of the disk
during upgrade.
Upgrade will still use partition 'a' (unless you loop through the install
far enough first!)
2003-07-08 17:38:54 +00:00
dsl
a72609cec0 Only save and merge /etc if the /etc set is being installed.
Actually this needs changing to use /usr/sbin/etcupdate (or similar),
but the script needs fixing first.
Might be better for sysinst to have its own copy, gets to be fun to run
because you have to pull the commands from the target FS.
2003-07-08 16:12:18 +00:00
dsl
294dd49644 Stop timezone submenu exploding (strcmp of MSG_xxxx).
Allow mbr partition type to be changed without losing disklabel info
for same area of disk (allows type to be changed from 165 to 169).
2003-07-08 11:58:57 +00:00
dsl
4314639609 Remove some messages that are not used and are unliklely to be needed. 2003-07-07 21:26:32 +00:00
dsl
33ae7b798b Fix non-i386 builds 2003-07-07 12:55:48 +00:00
dsl
0e919832bd Another pass of the rototiller. Mainly:
1) New MBR editor
2) Hierarchic timezone menu
2003-07-07 12:30:19 +00:00
dsl
d46341db86 Add French and Polish message file to i386 ramdisk.big
Change dummy dependancy for sysyinst message files so they get built
by the crunched makefile.
2003-06-28 08:25:07 +00:00
dsl
16a2d1e961 Add run-time selection of installation language.
Make 'doingwhat' an argument to find_disks() instead of a global.
2003-06-27 22:20:14 +00:00
dsl
5363c7e2ee Pull texts from MI menus into language dependant text files.
Minor change to name of some strings (eg: MSG_yes -> MSG_Yes == "Yes")
2003-06-27 13:36:04 +00:00
dbj
68c6633b6a avoid complex regular expression features not available in older awks 2003-06-25 22:08:30 +00:00
dsl
9ef6b561d7 Add a -D (debug) option for testing.
Ignore inability to remove swap if -D specified.
Select disk before sets (but label after)
Let mac68k sysinst run on i386.
2003-06-25 15:45:21 +00:00
dsl
4652a607d7 French messages - from Adrien Auzanneau 2003-06-25 15:41:16 +00:00
dsl
217d84900a Fix stupid typo 2003-06-16 20:12:44 +00:00
dsl
24a3da65f0 Fix some typos 2003-06-16 20:11:40 +00:00
dsl
855d662c15 Whitespace fixes 2003-06-16 20:10:02 +00:00
dsl
08fc1c1957 A load of KNF changes, plus a couple of strnxxx => strlxxx my fingers did
on the way through.
2003-06-16 19:42:13 +00:00
dsl
430c90c3f6 Correct check for active swap on install disk.
Use swapctl() for all swap operations.
Remove md_upgrade_mbrtype() from arc and hpcmips ports.
(I haven't finalised what I'm doing about type 165 partitions, but the
existing code is borked.)
2003-06-16 10:42:47 +00:00
dsl
17ae477780 Implement a limit on the size of / so that its guaranteed readable by the boot code.
Remove pointless 'len' parameter from read_mbr and write_mbr.
Make read_mbr initialise mbr if it can't be read (delete MD code).
Make i386 always ask at least once about the bootcode.
Move LIB_MOVE and LIB_COUNT from md.h to aout2elf.c
2003-06-14 12:58:45 +00:00
dsl
deef134ca4 Fix code that determines BIOS CHS from MBR - used to get confused by big disks.
Make same function return useful defaults if it can't find an answer.
Make all ports default to the useful defaults if bios geometry is unknown.
Move some messages to mbr set from mi set.
Fix i386 code that selects which bios disk, simplify interface to menus.
Remove now unnecessary global data from many ports.
2003-06-13 22:27:03 +00:00
dsl
bc119f42a4 Remove all references to minfsdmb and STDNEEDMB - neither are used any more. 2003-06-13 11:57:28 +00:00
dsl
88e7a0c7dc Report actual minimum size of partitions (instead of a number that is
4 times system memory). (These numbers need moving to a different menu still.)
Remove size of /usr from default sized / when /usr created.
Shrink swap in order to get partitions into available disk space.
Add twice ram size to / if space available (for system dumps).
Keep all but last partition cylinder aligned when the disk isn't a whole
number of cylinders.
2003-06-13 11:45:49 +00:00
dsl
52e8cddd9b KNF 2003-06-12 16:48:43 +00:00
dsl
84bdf1950e kernel names mixed up on i386/amd64 port
Default to TINY, LAPTOP or PS2 if running from such a kernel.
Do wscons stuff unless we installed a TINT kernel (not if running one)
2003-06-12 12:41:55 +00:00
dsl
d7bcb6d75d Move emulbackup message to MI set (conditional on AOUT2ELF marker).
Remove abberant dependencies of fdisk.o and md.o against menu/msg_defs.h
(nbmake depend gives the correct dependencies)
2003-06-12 11:20:00 +00:00
dsl
6a7cda9698 Move a couple of messages into msg.mbr.??
Remove some unused menus and messages from the ports that use mbr.c
(I'll re-implement the 1024 cylinder limit properly soon...)
2003-06-12 10:51:37 +00:00
dsl
c9b8d8909b make rammb sum correct for memory sizes between 2GB and 4GB.
Fixes sysinst/17551
2003-06-11 23:06:15 +00:00
dsl
31a2215cd0 Fix window size when asking for partition mount pt and size.
Hack to give free space to a default sized /usr
Add extra space to / and /usr is any of the X sets are included.
Remove last reference to 'layoutkind == 3'.
2003-06-11 22:17:03 +00:00
dsl
608254d0b8 rototil of the set selection menu
I've also made the set selection happen first.  This lets me test it!
also measn the selected sets could be used in the disk partition code.
Removed the 'with X' disk layout question (now too late to change the sets).
2003-06-11 21:35:35 +00:00
dsl
8fc9389e15 KNF 2003-06-11 11:00:39 +00:00
dsl
df45325b8e Make French and Polish compile (many missing translations though) 2003-06-11 09:03:32 +00:00
dsl
3316b2a3d8 Use dynamic menu for final editing of partition stable 2003-06-10 17:47:15 +00:00
dsl
44fa8ce69d Use dynamic menu to select partition to edit 2003-06-09 19:06:48 +00:00
dsl
99d1eb21d4 Add (back) support for mfs /tmp
Fix menu size so that user defined partitions can be allocated instead of
standard ones (need > MAXPARTITIONS entries in menu).
Make partition size info static - with a view to including it in a longer loop.
2003-06-06 21:37:13 +00:00
dsl
8e9ba8b898 Fix build if MAXPARTITIONS is 8 2003-06-06 19:04:55 +00:00
dsl
783c7d4424 Delete more messages that are never output 2003-06-06 18:57:13 +00:00
dsl
456a798f32 Remove a cpuple of unused buffers 2003-06-06 17:05:02 +00:00
dsl
32fda96392 Remove a load of messages that are no longer used.
Make the French and Polish versions compile (seems I didn't fix it last time)
2003-06-06 14:31:22 +00:00
dsl
7504698df3 Change i386 sysinst to use my new boot code.
Update lists for ramdisks to include the required files.
NB /usr/sbin/installboot is not used by sysinst and is only in ramdisk-big.
Increase the sizes of the ramdisks, there is plenty of space in all the
boot floppies except rescue-tiny (2k) and boot-tiny (32k).
2003-06-05 14:30:11 +00:00
dsl
d19795892c A rototil of the partition size requesting code. 2003-06-04 20:05:12 +00:00
dsl
8376bdad86 Add extra parameter (exit text) to new_menu() calls 2003-06-04 19:09:50 +00:00
dsl
19b2fb2fb0 Add NULL to all process_menu() calls - value is passed through to the
action routine.
Make the french and polish versions compile.
NB needs a new version of menuc - so need 'build.sh tools'
2003-06-03 11:54:48 +00:00
dsl
d800ee579a No need to #include "bsddisklabel.c" into md.c, add to Makefile instead. 2003-05-31 08:09:59 +00:00
dsl
b62cbc21e9 Make all architectures (except amiga and mac68k) use the MI make_bsd_partitions.
This does change the default size of /, but I'm going to rewrite
make_bsd_partitions next to make it less user-hostile.
(I'm not sure adding in 2 * ram is actually useful! Especially size it left
/usr with a -ve size on all my test installs with 256MB ram and 1GB disk)
Make bootsel code delete menu names if the partition is unused.
Use raw device for cdrom access (I've a kernel that doesn't report an invalid
label so /dev/cd0a dosn't work).
2003-05-30 22:17:00 +00:00
dsl
b0b2a88fe2 KNF 2003-05-30 17:34:31 +00:00
dsl
028c9f0a91 KNF 2003-05-30 17:24:13 +00:00
dsl
127236bc6a KNF 2003-05-30 13:58:25 +00:00
dsl
291768820b KNF 2003-05-30 13:34:58 +00:00
dsl
ad480b2e44 KNF 2003-05-30 13:23:26 +00:00
dsl
4948e51933 layout changes 2003-05-30 13:13:30 +00:00
dsl
4b8e98ee2a Further collapsing of MD code:
- make_bsd_partitions() correctly handles PART_BOOT
- use bsddisklabel.c for pc532 and sgimips (this does change the default size
  for the root partition, as it no longer includes twice the memory size).
- Change way ports define disk_names[] (in particular this lets me add "vnd"
  for testing), also ensures all ports pick up new drivers.
  I've make most ports use the default "wd", "sd", "ld".
  Abort the search for disk units if we get ENOENT (ie no /dev entry) to
  speed up the case where we are looking for a disk type that isn't
  supprted by the port.
  (it is possible we could just check all possible disks on all ports...)
2003-05-30 11:56:23 +00:00
dsl
c522fd9f62 partsize and partstart don't need to be globals 2003-05-29 17:54:22 +00:00
dsl
4ed96ba68a Use local partstart and partsize.
Add code that might let this code add the boot partition for the 2 ports that need it.
2003-05-29 17:53:24 +00:00
dsl
83067f27c6 psrtsize and partstart are only over used inside md_make_bsd_partitions,
use locals instead of globals.
2003-05-29 17:51:26 +00:00
dsl
6fb33c4537 Reduce the number of global variables slightly, use the ones that are
left consistently.
Make the i386 install let you partition a disk beyond the CHS limit if the
system bios doesn't support LBA reads (the checks aren't ideal yet).
Make the bsddislabel.c code usable onan i386 system - but don't use it yet.
2003-05-21 10:05:20 +00:00
dsl
09746cd0ad Stop double-inclusion being an error.
Adjust whitespace and remove names from prototypes
2003-05-18 20:40:09 +00:00
dsl
1d6ff8632d White-space, buffer-overrun and long-line police,
Correct code that selects one of the available disks.
2003-05-18 20:04:21 +00:00
dsl
33180ff44d Use MD menus and msgs for mbr code.
Remove a couple of unused variables.
Use actual raw partition when looking for disklabel in sparc code
2003-05-18 18:54:05 +00:00
dsl
b1389a6fef md menus and messages are taken from the i386 directory.
mbr stuff is now mi
2003-05-18 08:00:38 +00:00