diff options
Diffstat (limited to 'release/sysinstall')
47 files changed, 118 insertions, 200 deletions
diff --git a/release/sysinstall/anonFTP.c b/release/sysinstall/anonFTP.c index 389f48b569fa..05db66a50624 100644 --- a/release/sysinstall/anonFTP.c +++ b/release/sysinstall/anonFTP.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: anonFTP.c,v 1.5 1995/11/11 11:56:40 jkh Exp $ + * $Id: anonFTP.c,v 1.6 1995/11/12 07:27:55 jkh Exp $ * * Copyright (c) 1995 * Coranth Gryphon. All rights reserved. diff --git a/release/sysinstall/apache.c b/release/sysinstall/apache.c index 9e2c80b1f3c2..2ebaa1980fc2 100644 --- a/release/sysinstall/apache.c +++ b/release/sysinstall/apache.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: apache.c,v 1.11 1995/11/05 01:00:27 jkh Exp $ + * $Id: apache.c,v 1.12 1995/11/12 20:39:18 jkh Exp $ * * Copyright (c) 1995 * Coranth Gryphon. All rights reserved. diff --git a/release/sysinstall/attr.c b/release/sysinstall/attr.c index 7d9906b4085f..bcf287a0c06e 100644 --- a/release/sysinstall/attr.c +++ b/release/sysinstall/attr.c @@ -4,7 +4,7 @@ * This is probably the last attempt in the `sysinstall' line, the next * generation being slated to essentially a complete rewrite. * - * $Id: attr.c,v 1.3.2.5 1995/10/21 20:02:56 jkh Exp $ + * $Id: attr.c,v 1.3.2.7 1995/10/22 17:38:56 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/cdrom.c b/release/sysinstall/cdrom.c index 7449699ac691..e3a6f93d9244 100644 --- a/release/sysinstall/cdrom.c +++ b/release/sysinstall/cdrom.c @@ -4,7 +4,7 @@ * This is probably the last attempt in the `sysinstall' line, the next * generation being slated to essentially a complete rewrite. * - * $Id: cdrom.c,v 1.7.2.12 1995/11/03 12:02:23 jkh Exp $ + * $Id: cdrom.c,v 1.7.2.13 1995/11/04 11:08:35 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/command.c b/release/sysinstall/command.c index cedd7aee7657..1b2a022646fc 100644 --- a/release/sysinstall/command.c +++ b/release/sysinstall/command.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: command.c,v 1.11.4.4 1995/11/04 11:42:25 jkh Exp $ + * $Id: command.c,v 1.11.4.5 1995/11/04 15:45:14 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/config.c b/release/sysinstall/config.c index 03846b1c6098..be5717ad79d4 100644 --- a/release/sysinstall/config.c +++ b/release/sysinstall/config.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: config.c,v 1.16.2.41 1995/11/11 11:44:26 jkh Exp $ + * $Id: config.c,v 1.16.2.42 1995/11/12 10:35:58 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/decode.c b/release/sysinstall/decode.c index 7a73cc747be2..68f97af9f72b 100644 --- a/release/sysinstall/decode.c +++ b/release/sysinstall/decode.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: decode.c,v 1.6.2.4 1995/10/19 15:54:54 jkh Exp $ + * $Id: decode.c,v 1.6.2.5 1995/11/03 12:02:26 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/dev2c.sh b/release/sysinstall/dev2c.sh index cbd2e711fda1..e92404f4b6ef 100644 --- a/release/sysinstall/dev2c.sh +++ b/release/sysinstall/dev2c.sh @@ -7,7 +7,7 @@ # this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp # ---------------------------------------------------------------------------- # -# $Id: dev2c.sh,v 1.1 1994/10/26 02:53:08 phk Exp $ +# $Id: dev2c.sh,v 1.1.1.1 1995/04/27 12:50:35 jkh Exp $ # # During installation, we suffer badly of we have to run MAKEDEV. MAKEDEV # need sh, ln, chown, mknod, awk, rm, test and probably emacs too when diff --git a/release/sysinstall/devices.c b/release/sysinstall/devices.c index c8582208b105..7951422f53fc 100644 --- a/release/sysinstall/devices.c +++ b/release/sysinstall/devices.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: devices.c,v 1.36.2.10 1995/11/08 07:09:16 jkh Exp $ + * $Id: devices.c,v 1.36.2.11 1995/11/15 06:57:02 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/disks.c b/release/sysinstall/disks.c index 6a481f810739..90e4301a2eee 100644 --- a/release/sysinstall/disks.c +++ b/release/sysinstall/disks.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: disks.c,v 1.31.2.34 1995/11/16 08:10:14 jkh Exp $ + * $Id: disks.c,v 1.31.2.35 1995/11/16 08:35:16 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/dist.c b/release/sysinstall/dist.c index 181fbb828a5e..510782de9805 100644 --- a/release/sysinstall/dist.c +++ b/release/sysinstall/dist.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: dist.c,v 1.36.2.24 1995/11/07 10:45:35 jkh Exp $ + * $Id: dist.c,v 1.36.2.25 1995/11/08 07:09:19 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/dmenu.c b/release/sysinstall/dmenu.c index 3e527df543e5..333f9b5e3a8a 100644 --- a/release/sysinstall/dmenu.c +++ b/release/sysinstall/dmenu.c @@ -4,7 +4,7 @@ * This is probably the last attempt in the `sysinstall' line, the next * generation being slated for what's essentially a complete rewrite. * - * $Id: dmenu.c,v 1.12.2.4 1995/10/18 00:12:02 jkh Exp $ + * $Id: dmenu.c,v 1.12.2.5 1995/10/19 15:55:00 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/doc.c b/release/sysinstall/doc.c index 187362ddc64d..6c9d0d77caf5 100644 --- a/release/sysinstall/doc.c +++ b/release/sysinstall/doc.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: doc.c,v 1.9 1995/11/04 08:47:22 jkh Exp $ + * $Id: doc.c,v 1.10 1995/11/06 12:49:23 jkh Exp $ * * Jordan Hubbard * diff --git a/release/sysinstall/dos.c b/release/sysinstall/dos.c index 9a248a20a427..2ff7a064fc4e 100644 --- a/release/sysinstall/dos.c +++ b/release/sysinstall/dos.c @@ -4,7 +4,7 @@ * This is probably the last attempt in the `sysinstall' line, the next * generation being slated to essentially a complete rewrite. * - * $Id: dos.c,v 1.6.2.8 1995/10/22 17:39:06 jkh Exp $ + * $Id: dos.c,v 1.6.2.9 1995/11/04 11:08:53 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/floppy.c b/release/sysinstall/floppy.c index e5eddce3045b..f4512a2e2ae5 100644 --- a/release/sysinstall/floppy.c +++ b/release/sysinstall/floppy.c @@ -4,7 +4,7 @@ * This is probably the last attempt in the `sysinstall' line, the next * generation being slated to essentially a complete rewrite. * - * $Id: floppy.c,v 1.7.2.6 1995/10/20 21:57:04 jkh Exp $ + * $Id: floppy.c,v 1.7.2.8 1995/10/22 17:39:07 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/ftp.c b/release/sysinstall/ftp.c index d2bb234df114..e4b2c3eb5e04 100644 --- a/release/sysinstall/ftp.c +++ b/release/sysinstall/ftp.c @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $Id: ftp.c,v 1.14 1995/06/11 19:29:55 rgrimes Exp $ + * $Id: ftp.c,v 1.14.2.1 1995/10/21 14:06:35 jkh Exp $ * * Return values have been sanitized: * -1 error, but you (still) have a session. diff --git a/release/sysinstall/ftp_strat.c b/release/sysinstall/ftp_strat.c index 154eeabd0fd7..513e0e8674d8 100644 --- a/release/sysinstall/ftp_strat.c +++ b/release/sysinstall/ftp_strat.c @@ -4,7 +4,7 @@ * This is probably the last attempt in the `sysinstall' line, the next * generation being slated to essentially a complete rewrite. * - * $Id: ftp_strat.c,v 1.7.2.39 1995/11/04 17:16:40 jkh Exp $ + * $Id: ftp_strat.c,v 1.7.2.40 1995/11/08 07:09:21 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/globals.c b/release/sysinstall/globals.c index 661f82a74b94..bc303e58d015 100644 --- a/release/sysinstall/globals.c +++ b/release/sysinstall/globals.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: globals.c,v 1.10 1995/06/11 19:29:57 rgrimes Exp $ + * $Id: globals.c,v 1.10.2.1 1995/10/21 14:06:41 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/help/apache.hlp b/release/sysinstall/help/apache.hlp index 3880dddb2ba6..6edc347afe24 100644 --- a/release/sysinstall/help/apache.hlp +++ b/release/sysinstall/help/apache.hlp @@ -2,48 +2,48 @@ There are two sets of options that the Apache HTTP Server needs. The first set covers how it operates. These are as follows: - The "HostName" field is the name of this host, as it is - reported to each client connection. Normally, the fully - qualified domain name of the host running the server is - returned. If you want this set to something else, however, - (usually "www.my.domain") then this can be entered here. - - Additionally, the server needs to know how many connections - are allowed at one time - this is the "Max Connections" - field. If more than this number of clients attempt to connect - at once, the additional connections will be refused. This is - used to limit how much system load will be imposed by the HTTP - server. - - The "Email Address" field is the address of the person (or - system alias) who is the administrator for this web site. In - addition to being used by the Apache Server itself, it is also - put at the bottom of the sample web page that is created. - - Finally, the "Default User" and "Default Group" fields specify - what user id and group id should be used by the server for - remote connections. Local connections are kept as the UID and - GID of the local process. + The "HostName" field is the name of this host, as it is + reported to each client connection. Normally, the fully + qualified domain name of the host running the server is + returned. If you want this set to something else, however, + (usually "www.my.domain") then this can be entered here. + + Additionally, the server needs to know how many connections + are allowed at one time - this is the "Max Connections" + field. If more than this number of clients attempt to connect + at once, the additional connections will be refused. This is + used to limit how much system load will be imposed by the HTTP + server. + + The "Email Address" field is the address of the person (or + system alias) who is the administrator for this web site. In + addition to being used by the Apache Server itself, it is also + put at the bottom of the sample web page that is created. + + Finally, the "Default User" and "Default Group" fields specify + what user id and group id should be used by the server for + remote connections. Local connections are kept as the UID and + GID of the local process. The second set of options determine what information is made available to each client: - The "Document Root Path" is the top of the tree of documents - that are made avaliable. For example, if the value is - "/usr/web", then the URL "http://www.foo.com/doc.html" would - translate as "/usr/web/doc.html". - - Similarly, the "User Directory" is the location in each user's - home directory where their public web documents are - stored. Thus if the value if this is "Public", then the URL - "http://www.foo.com/~joe/doc" would translate to the path - "~joe/Public/doc". - - Finally, if the URL points to a directory, there is always a - "Default Document" that Apache will use. This field holds the - name (not the path) of this document. By default, Apache uses - the file "index.html". However, some sites may be more used to - using the file "welcome.html". + The "Document Root Path" is the top of the tree of documents + that are made avaliable. For example, if the value is + "/usr/web", then the URL "http://www.foo.com/doc.html" would + translate as "/usr/web/doc.html". + + Similarly, the "User Directory" is the location in each user's + home directory where their public web documents are + stored. Thus if the value if this is "Public", then the URL + "http://www.foo.com/~joe/doc" would translate to the path + "~joe/Public/doc". + + Finally, if the URL points to a directory, there is always a + "Default Document" that Apache will use. This field holds the + name (not the path) of this document. By default, Apache uses + the file "index.html". However, some sites may be more used to + using the file "welcome.html". There are a number of other options that can be configured with Apache, such as path aliases, masquerading as multiple hosts, server diff --git a/release/sysinstall/help/hardware.hlp b/release/sysinstall/help/hardware.hlp index c28e0a37e1d9..7741c0d63158 100644 --- a/release/sysinstall/help/hardware.hlp +++ b/release/sysinstall/help/hardware.hlp @@ -1,4 +1,4 @@ -Hardware Documentation Guide: $Id: hardware.hlp,v 1.1.2.9 1995/10/30 08:04:55 jkh Exp $ +Hardware Documentation Guide: $Id: hardware.hlp,v 1.1.2.10 1995/11/04 08:48:00 jkh Exp $ Table of Contents ----------------- diff --git a/release/sysinstall/help/install.hlp b/release/sysinstall/help/install.hlp index b569f061bbd3..a083926820b4 100644 --- a/release/sysinstall/help/install.hlp +++ b/release/sysinstall/help/install.hlp @@ -28,8 +28,6 @@ Table of Contents: 3.1 Repairing an existing FreeBSD installation. -3.2 Upgrading from FreeBSD 2.0.5 - 1.0 DOS user's Question and Answer section === ====================================== @@ -48,13 +46,13 @@ DOS 6.xx "DEFRAG" utility or the Norton Disk tools, then run FIPS. It will prompt you for the rest of the information it needs. Afterwards, you can reboot and install FreeBSD on the new partition. Also note that FIPS will create the second partition as a "clone" of the first, -so you'll actually see that you now have two DOS Primary partitions -where you formerly had one. Don't be alarmed! You can simply delete -the extra DOS Primary parititon (making sure it's the right one by -examining its size! :) +so you'll actually see that you now have two DOS Primary partitions where +you formerly had one. Don't be alarmed! You can simply delete the extra +DOS Primary parititon (making sure it's the right one by examining its size! :) -See the Distributions menu for an estimation of how much free space -you'll need for the kind of installation you want. +See the +Distributions menu for an estimation of how much free space you'll +need for the kind of installation you want. 1.2 Can I use compressed DOS filesystems from FreeBSD? @@ -176,8 +174,8 @@ is still not a bad idea though you don't need to put a DOS filesystem on each floppy. You can use the `disklabel' and `newfs' commands to put a UFS filesystem on them instead, like so: - disklabel -w -r fd0 floppy3 (use floppy5 for 1.2MB disks) - newfs /dev/rfd0 + disklabel -w -r fd0 floppy3 (use floppy5 for 1.2MB disks) + newfs /dev/rfd0 Then you can mount and write to them like any other file system. @@ -334,14 +332,14 @@ installation can continue over NFS or FTP. FTP installation may be done from any mirror site containing a reasonably up-to-date version of FreeBSD 2.1. A full menu of reasonable choices for almost any location in the world is - provided in the FTP site menu. + provided in the FTP site menu. If you are installing from some other FTP site not listed in - this menu, or you are having troubles getting your name server - configured properly, you can also specify your own URL by - selecting the ``Other'' choice in that menu. A URL can - contain a hostname or an IP address, so the following would - work in the absence of a name server: + this menu, or you are having troubles getting your name server + configured properly, you can also specify your own URL by + selecting the ``Other'' choice in that menu. A URL can + contain a hostname or an IP address, so the following would + work in the absence of a name server: ftp://192.216.191.11/pub/FreeBSD/2.1.0-RELEASE @@ -350,20 +348,20 @@ installation can continue over NFS or FTP. o FTP: For all FTP transfers, use the standard "Active" mode for - transfers. This will not work through most firewalls but - will often work best with older ftp servers that do not - support passive mode. If your connection hangs with - passive mode, try this one! + transfers. This will not work through most firewalls but + will often work best with older ftp servers that do not + support passive mode. If your connection hangs with + passive mode, try this one! o FTP Passive: For all FTP transfers, use "Passive" mode. This allows - the user to pass through firewalls that do not allow - incoming connections on random port addresses. + the user to pass through firewalls that do not allow + incoming connections on random port addresses. NOTE: ACTIVE AND PASSIVE MODES ARE NOT THE SAME AS A `PROXY' CONNECTIONS, WHERE A PROXY FTP SERVER IS LISTENING ON A - DIFFERENT PORT! + DIFFERENT PORT! In such instances, you should specify the URL as something like: @@ -373,8 +371,8 @@ installation can continue over NFS or FTP. -3.0 Installing FreeBSD ---- ------------------ +3. Installing FreeBSD +-- ------------------ Once you've taken note of the appropriate preinstallation steps, you should be able to install FreeBSD without any further trouble. @@ -464,21 +462,21 @@ follows: you to chose how your drives will be used for FreeBSD. If you're dedicating an entire drive to FreeBSD, the `A' command is probably all you need to type here, otherwise - move to a partition marked `Unused' (or delete an existing one) - and use the `C' command to create a FreeBSD partition in its - place. + move to a partition marked `Unused' (or delete an existing one) + and use the `C' command to create a FreeBSD partition in its + place. o Next, with the `Label Editor', you can specify how the space in any FreeBSD partitions should be used by FreeBSD. You can also mount any non-FreeBSD partitions (such as DOS) in this - screen. If you want the standard layout, simply type `A' for - the defaults. + screen. If you want the standard layout, simply type `A' for + the defaults. o Next, the `Distributions' menu allows you to specify how much of FreeBSD you'd like to load. A good choice is the "User" distribution for a small system or the "Developer" distribution for someone wanting a more programmer-oriented configuration. - If none of the existing collections seem applicable, select + If none of the existing collections seem applicable, select Custom to choose the component distributions yourself. o Next, the `Media' menu allows you to specify what kind of @@ -518,62 +516,6 @@ under /stand/sysinstall on the installed system. Good luck! If you really get stuck, you may send mail to our support mailing list - questions@FreeBSD.org. We'll do our best to help you! - -3.1 Repairing an existing FreeBSD installation. ---- ------------------------------------------- - -FreeBSD 2.1 now features a "Fixit" option in the top menu of the boot -floppy. To use it, you will also need a fixit.flp image floppy, -generated in the same fashion as the boot floppy. - -To invoke fixit, simply boot the boot floppy, chose the "Fixit" -item and insert the fixit floppy when asked. You will then be placed -into a shell with a wide variety of commands available (in the /stand -and /mnt2/stand directories) for checking, repairing and examining file -systems and their contents. Some UNIX administration experience *is* -required to use the fixit option! - - -3.2 Upgrading from FreeBSD 2.0.5 ---- ---------------------------- - -It must first be said that this upgrade DOES NOT take a particularly -sophisticated approach to the upgrade problem, it being more a question -of providing what seemed "good enough" at the time. A truly polished -upgrade that deals properly with the broad spectrum of installed 2.0.5 -systems would be nice to have, but until that gets written what you get is -this - the brute-force approach! - -What this upgrade will attempt to do is best summarized thusly: - - 1. fsck and mount all file systems chosen in the label editor. - 2. Ask for a location to preserve your /etc directory into and do so. - 3. Extract all selected distributions on top of your existing system. - 4. Copy certain obvious files back from the preserved /etc, leaving the - rest of the /etc file merge up to the user. - 5. Drop user in a shell so that they may perform that merge before - rebooting into the new system. - -And that's it! This "upgrade" is not going to hold your hand in all -major respects, it's simply provided to make one PART of the upgrade -easier. - -IMPORTANT NOTE: What this upgrade procedure may also do, in fact, is -completely destroy your system (though much more quickly than you -would have been able to destroy it yourself). It is simply impossible -to guarantee that this procedure's crude form of upgrade automation -will work in all cases and if you do this upgrade without proper -BACKUPS for any important data then you really must like living life -close to the edge, that's all we can say! - -NOTE to 2.0 users: We're sorry, but the "slice" changes that were -added in FreeBSD 2.0.5 made automated upgrades pretty difficult due to -the fact that a complete reinstall is pretty much called for. Things -may still *work* after a 2.1 upgrade, but you will also no doubt -receive many warnings at boot time about non-aligned slices and such; -we really do recommend a fresh installation for 2.0 systems! (But -back up your user data first :-). - Jordan ---- End of Installation Guide --- diff --git a/release/sysinstall/help/readme.hlp b/release/sysinstall/help/readme.hlp index 8ede34bf13eb..7fd77bf88b9d 100644 --- a/release/sysinstall/help/readme.hlp +++ b/release/sysinstall/help/readme.hlp @@ -99,8 +99,8 @@ searching facilities. If you wish to use Netscape as your browser, you may install the BSDI version from ftp://ftp.mcom.com or simply type: - # cd /usr/ports/net/netscape - # make all install + # cd /usr/ports/net/netscape + # make all install If you have the Ports collection installed (see the Configuration menu or enable the Ports collection when given the chance to do so during @@ -118,4 +118,4 @@ syntax in any HTML capable browser. We sincerely hope you enjoy this release of FreeBSD! - The FreeBSD Project + The FreeBSD Project diff --git a/release/sysinstall/help/relnotes.hlp b/release/sysinstall/help/relnotes.hlp index eb495922845b..db22aecf51a1 100644 --- a/release/sysinstall/help/relnotes.hlp +++ b/release/sysinstall/help/relnotes.hlp @@ -140,12 +140,12 @@ DAT) and CD ROM drives. The following CD-ROM type systems are supported at this time: (cd) SCSI interface (also includes ProAudio Spectrum and - SoundBlaster SCSI) + SoundBlaster SCSI) (mcd) Mitsumi proprietary interface (all models) (matcd) Matsushita/Panasonic (Creative SoundBlaster) proprietary - interface (562/563 models) + interface (562/563 models) (scd) Sony proprietary interface (all models) -(wcd) ATAPI IDE interface (experimental and should be considered ALPHA +(wcd) ATAPI IDE interface (experimental and should be considered ALPHA quality!). diff --git a/release/sysinstall/index.c b/release/sysinstall/index.c index 6198a5eaf1ed..4410583a18dd 100644 --- a/release/sysinstall/index.c +++ b/release/sysinstall/index.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: index.c,v 1.19 1995/11/06 22:26:28 jkh Exp $ + * $Id: index.c,v 1.20 1995/11/12 20:47:12 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/install.c b/release/sysinstall/install.c index dbc35fecf915..741e952356bb 100644 --- a/release/sysinstall/install.c +++ b/release/sysinstall/install.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: install.c,v 1.71.2.81 1995/11/12 07:27:57 jkh Exp $ + * $Id: install.c,v 1.71.2.82 1995/11/12 11:12:21 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/installFinal.c b/release/sysinstall/installFinal.c index 050e86ed3105..902ecf20f851 100644 --- a/release/sysinstall/installFinal.c +++ b/release/sysinstall/installFinal.c @@ -73,21 +73,11 @@ static DMenu MenuSamba = { #define SMB_CONF "./smb.conf" -/* Load gated package */ +/* Load gated package and maybe even seek to configure or explain it a little */ int configGated(char *unused) { - if (package_add("gated-3.5a11") == RET_SUCCESS) - variable_set2("gated", "YES"); - return RET_SUCCESS; -} - -/* Load pcnfsd package */ -int -configPCNFSD(char *unused) -{ - if (package_add("pcnfsd-93.02.16") == RET_SUCCESS) - variable_set2("pcnfsd", "YES"); + variable_set2("gated", "YES"); return RET_SUCCESS; } @@ -98,8 +88,6 @@ configSamba(char *unused) if (!dmenuOpenSimple(&MenuSamba)) i = RET_FAIL; - else if (package_add("samba-1.9.14") != RET_SUCCESS) - i = RET_FAIL; else { FILE *fptr; char tbuf[256], *tptr; @@ -221,3 +209,4 @@ configNFSServer(char *unused) variable_set2("nfs_server", "YES"); return RET_SUCCESS; } + diff --git a/release/sysinstall/installPreconfig.c b/release/sysinstall/installPreconfig.c index e5f323223c7e..86a8d1f64014 100644 --- a/release/sysinstall/installPreconfig.c +++ b/release/sysinstall/installPreconfig.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: installPreconfig.c,v 1.16 1995/10/27 17:00:23 jkh Exp $ + * $Id: installPreconfig.c,v 1.17 1995/11/03 12:02:35 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/installUpgrade.c b/release/sysinstall/installUpgrade.c index 2a2d19b217ec..b1599cc0ee38 100644 --- a/release/sysinstall/installUpgrade.c +++ b/release/sysinstall/installUpgrade.c @@ -72,18 +72,6 @@ doByHand(HitList *h) "this).", h->name); } -static void -yellSysconfig(HitList *h) -{ - dialog_clear(); - msgConfirm("/etc/sysconfig is one of those files that this upgrade procedure just isn't\n" - "smart enough to deal with right now. Unfortunately, your system\n" - "will also come up with a very different \"personality\" than it had\n" - "before if you do not merge at LEAST the hostname and ifconfig lines\n" - "from the old one! This is very important, so please do this merge\n" - "even if you do no others before the system is allowed to reboot."); -} - /* These are the only meaningful files I know about */ static HitList etc_files [] = { { JUST_COPY, "Xaccel.ini", TRUE, NULL }, @@ -144,7 +132,7 @@ static HitList etc_files [] = { { JUST_COPY, "skeykeys", TRUE, NULL }, { JUST_COPY, "spwd.db", TRUE, NULL }, { JUST_COPY, "supfile", TRUE, NULL }, - { CALL_HANDLER, "sysconfig", FALSE, yellSysconfig }, + { CALL_HANDLER, "sysconfig", FALSE, doByHand }, { JUST_COPY, "syslog.conf", TRUE, NULL }, { JUST_COPY, "termcap", TRUE, NULL }, { JUST_COPY, "ttys", TRUE, NULL }, diff --git a/release/sysinstall/label.c b/release/sysinstall/label.c index 2b53e348d569..d0e79bf66eb7 100644 --- a/release/sysinstall/label.c +++ b/release/sysinstall/label.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: label.c,v 1.32.2.28 1995/11/04 15:45:23 jkh Exp $ + * $Id: label.c,v 1.32.2.29 1995/11/08 07:09:30 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/lang.c b/release/sysinstall/lang.c index b5dcfdb502b7..f39827d41817 100644 --- a/release/sysinstall/lang.c +++ b/release/sysinstall/lang.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: lang.c,v 1.6.2.3 1995/06/05 04:39:59 jkh Exp $ + * $Id: lang.c,v 1.7 1995/06/11 19:30:01 rgrimes Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/main.c b/release/sysinstall/main.c index e7ff4d3a9249..cbf99932d215 100644 --- a/release/sysinstall/main.c +++ b/release/sysinstall/main.c @@ -4,7 +4,7 @@ * This is probably the last attempt in the `sysinstall' line, the next * generation being slated for what's essentially a complete rewrite. * - * $Id: main.c,v 1.13.2.10 1995/10/26 08:55:54 jkh Exp $ + * $Id: main.c,v 1.13.2.11 1995/10/27 17:00:25 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/media.c b/release/sysinstall/media.c index a8d7cd763c1f..94fb28cd7bd8 100644 --- a/release/sysinstall/media.c +++ b/release/sysinstall/media.c @@ -4,7 +4,7 @@ * This is probably the last attempt in the `sysinstall' line, the next * generation being slated to essentially a complete rewrite. * - * $Id: media.c,v 1.25.2.21 1995/10/22 08:33:16 jkh Exp $ + * $Id: media.c,v 1.25.2.23 1995/10/22 17:39:22 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/menus.c b/release/sysinstall/menus.c index 5c601d241c6c..49ef1a3e7a24 100644 --- a/release/sysinstall/menus.c +++ b/release/sysinstall/menus.c @@ -747,7 +747,7 @@ aspects of your system's network configuration.", { "Gateway", "This machine will route packets between interfaces", DMENU_SET_VARIABLE, "gateway=YES", 0, 0, 0 }, { "Gated", "This machine wants to run gated", - DMENU_CALL, configGated, 0, 0, 0 }, + DMENU_SET_VARIABLE, "gated=YES", 0, 0, 0 }, { "Ntpdate", "Select a clock-syncronization server", DMENU_SUBMENU, &MenuNTP, (int)"ntpdate", 0, dmenuVarCheck }, { "Routed", "Set flags for routed (default: -q)", @@ -761,7 +761,7 @@ aspects of your system's network configuration.", { "Samba", "Install Samba for LanManager (NETBUI) access.", DMENU_CALL, configSamba, 0, 0, 0 }, { "PCNFSD", "Run authentication server for clients with PC-NFS.", - DMENU_CALL, configPCNFSD, 0, 0, 0 }, + DMENU_SET_VARIABLE, "pcnfsd=YES", 0, 0, 0 }, { NULL } }, }; diff --git a/release/sysinstall/misc.c b/release/sysinstall/misc.c index bb535b2fe6a9..b4dd63b23890 100644 --- a/release/sysinstall/misc.c +++ b/release/sysinstall/misc.c @@ -1,7 +1,7 @@ /* * Miscellaneous support routines.. * - * $Id: misc.c,v 1.12.2.7 1995/11/04 11:09:11 jkh Exp $ + * $Id: misc.c,v 1.12.2.8 1995/11/04 15:08:21 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/msg.c b/release/sysinstall/msg.c index 987becb52340..ae5e3f375c46 100644 --- a/release/sysinstall/msg.c +++ b/release/sysinstall/msg.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: msg.c,v 1.29.2.6 1995/10/22 01:32:54 jkh Exp $ + * $Id: msg.c,v 1.29.2.8 1995/10/22 21:38:17 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/network.c b/release/sysinstall/network.c index 53993f99054b..7f11af2f2d32 100644 --- a/release/sysinstall/network.c +++ b/release/sysinstall/network.c @@ -4,7 +4,7 @@ * This is probably the last attempt in the `sysinstall' line, the next * generation being slated to essentially a complete rewrite. * - * $Id: network.c,v 1.7.2.14 1995/10/26 08:56:02 jkh Exp $ + * $Id: network.c,v 1.7.2.15 1995/11/04 11:09:14 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/nfs.c b/release/sysinstall/nfs.c index c361295304dd..4dc2b97f1d85 100644 --- a/release/sysinstall/nfs.c +++ b/release/sysinstall/nfs.c @@ -4,7 +4,7 @@ * This is probably the last attempt in the `sysinstall' line, the next * generation being slated to essentially a complete rewrite. * - * $Id: nfs.c,v 1.5.2.14 1995/10/26 08:56:04 jkh Exp $ + * $Id: nfs.c,v 1.5.2.15 1995/11/04 11:09:16 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/options.c b/release/sysinstall/options.c index c9c099afe766..b2a1f55a550a 100644 --- a/release/sysinstall/options.c +++ b/release/sysinstall/options.c @@ -4,7 +4,7 @@ * This is probably the last attempt in the `sysinstall' line, the next * generation being slated for what's essentially a complete rewrite. * - * $Id: options.c,v 1.26 1995/11/03 12:02:44 jkh Exp $ + * $Id: options.c,v 1.27 1995/11/06 12:49:25 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/package.c b/release/sysinstall/package.c index cd75c084f720..2a639006eea7 100644 --- a/release/sysinstall/package.c +++ b/release/sysinstall/package.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: package.c,v 1.26 1995/11/12 11:02:43 jkh Exp $ + * $Id: package.c,v 1.27 1995/11/12 20:47:15 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/sysinstall.h b/release/sysinstall/sysinstall.h index b2f57ef385b2..2e86c69d50a3 100644 --- a/release/sysinstall/sysinstall.h +++ b/release/sysinstall/sysinstall.h @@ -489,7 +489,6 @@ extern Boolean rootExtract(void); /* installFinal.c */ extern int configGated(char *unused); extern int configSamba(char *unused); -extern int configPCNFSD(char *unused); extern int configNFSServer(char *unused); /* label.c */ diff --git a/release/sysinstall/system.c b/release/sysinstall/system.c index 4367c327a13d..b543891e4344 100644 --- a/release/sysinstall/system.c +++ b/release/sysinstall/system.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: system.c,v 1.44.2.16 1995/11/08 07:09:36 jkh Exp $ + * $Id: system.c,v 1.44.2.17 1995/11/09 02:32:05 jkh Exp $ * * Jordan Hubbard * diff --git a/release/sysinstall/tape.c b/release/sysinstall/tape.c index d61533655c92..7cc92dd1a7bb 100644 --- a/release/sysinstall/tape.c +++ b/release/sysinstall/tape.c @@ -4,7 +4,7 @@ * This is probably the last attempt in the `sysinstall' line, the next * generation being slated to essentially a complete rewrite. * - * $Id: tape.c,v 1.6.2.10 1995/10/22 17:39:29 jkh Exp $ + * $Id: tape.c,v 1.6.2.11 1995/11/15 06:59:52 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/tcpip.c b/release/sysinstall/tcpip.c index ad744876a933..5bcf7bf7a847 100644 --- a/release/sysinstall/tcpip.c +++ b/release/sysinstall/tcpip.c @@ -1,5 +1,5 @@ /* - * $Id: tcpip.c,v 1.30.2.16 1995/11/06 07:27:31 jkh Exp $ + * $Id: tcpip.c,v 1.30.2.17 1995/11/06 07:28:51 jkh Exp $ * * Copyright (c) 1995 * Gary J Palmer. All rights reserved. diff --git a/release/sysinstall/ufs.c b/release/sysinstall/ufs.c index 43cd85956e80..0176baccd828 100644 --- a/release/sysinstall/ufs.c +++ b/release/sysinstall/ufs.c @@ -4,7 +4,7 @@ * This is probably the last attempt in the `sysinstall' line, the next * generation being slated to essentially a complete rewrite. * - * $Id: ufs.c,v 1.5.2.3 1995/10/18 00:12:47 jkh Exp $ + * $Id: ufs.c,v 1.5.2.4 1995/10/22 01:33:02 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/variable.c b/release/sysinstall/variable.c index 31c030d43df2..5cbaa847ade0 100644 --- a/release/sysinstall/variable.c +++ b/release/sysinstall/variable.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: variable.c,v 1.6.2.5 1995/10/20 07:02:53 jkh Exp $ + * $Id: variable.c,v 1.6.2.7 1995/10/26 08:56:18 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/version.h b/release/sysinstall/version.h index b42c26e8937d..a2aa4459d536 100644 --- a/release/sysinstall/version.h +++ b/release/sysinstall/version.h @@ -1 +1 @@ -#define RELEASE_NAME "__RELEASE" +#define RELEASE_NAME "2.1.0-RELEASE" diff --git a/release/sysinstall/wizard.c b/release/sysinstall/wizard.c index fae4833c54db..66e2233ddff0 100644 --- a/release/sysinstall/wizard.c +++ b/release/sysinstall/wizard.c @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $Id: wizard.c,v 1.6 1995/06/11 19:30:16 rgrimes Exp $ + * $Id: wizard.c,v 1.6.2.1 1995/09/20 10:43:13 jkh Exp $ * */ |