summaryrefslogtreecommitdiff
path: root/release/sysinstall
diff options
context:
space:
mode:
Diffstat (limited to 'release/sysinstall')
-rw-r--r--release/sysinstall/anonFTP.c2
-rw-r--r--release/sysinstall/attr.c2
-rw-r--r--release/sysinstall/cdrom.c2
-rw-r--r--release/sysinstall/command.c2
-rw-r--r--release/sysinstall/config.c4
-rw-r--r--release/sysinstall/dev2c.sh2
-rw-r--r--release/sysinstall/devices.c2
-rw-r--r--release/sysinstall/disks.c2
-rw-r--r--release/sysinstall/dispatch.c2
-rw-r--r--release/sysinstall/dist.c18
-rw-r--r--release/sysinstall/dist.h2
-rw-r--r--release/sysinstall/dmenu.c2
-rw-r--r--release/sysinstall/doc.c2
-rw-r--r--release/sysinstall/dos.c2
-rw-r--r--release/sysinstall/floppy.c2
-rw-r--r--release/sysinstall/ftp.c2
-rw-r--r--release/sysinstall/globals.c2
-rw-r--r--release/sysinstall/index.c11
-rw-r--r--release/sysinstall/install.c2
-rw-r--r--release/sysinstall/installUpgrade.c2
-rw-r--r--release/sysinstall/keymap.c2
-rw-r--r--release/sysinstall/label.c2
-rw-r--r--release/sysinstall/lang.c2
-rw-r--r--release/sysinstall/list.h2
-rw-r--r--release/sysinstall/main.c2
-rw-r--r--release/sysinstall/media.c2
-rw-r--r--release/sysinstall/menus.c2
-rw-r--r--release/sysinstall/misc.c2
-rw-r--r--release/sysinstall/mouse.c2
-rw-r--r--release/sysinstall/msg.c2
-rw-r--r--release/sysinstall/network.c2
-rw-r--r--release/sysinstall/nfs.c2
-rw-r--r--release/sysinstall/options.c2
-rw-r--r--release/sysinstall/package.c2
-rw-r--r--release/sysinstall/register.c2
-rw-r--r--release/sysinstall/sysinstall.82
-rw-r--r--release/sysinstall/sysinstall.h2
-rw-r--r--release/sysinstall/system.c2
-rw-r--r--release/sysinstall/tape.c2
-rw-r--r--release/sysinstall/tcpip.c2
-rw-r--r--release/sysinstall/uc_eisa.c2
-rw-r--r--release/sysinstall/uc_isa.c2
-rw-r--r--release/sysinstall/uc_kmem.c2
-rw-r--r--release/sysinstall/uc_list.c2
-rw-r--r--release/sysinstall/uc_main.c2
-rw-r--r--release/sysinstall/uc_main.h2
-rw-r--r--release/sysinstall/uc_pci.c2
-rw-r--r--release/sysinstall/uc_scsi.c2
-rw-r--r--release/sysinstall/ufs.c2
-rw-r--r--release/sysinstall/user.c2
-rw-r--r--release/sysinstall/variable.c2
-rw-r--r--release/sysinstall/version.h2
-rw-r--r--release/sysinstall/wizard.c2
53 files changed, 63 insertions, 70 deletions
diff --git a/release/sysinstall/anonFTP.c b/release/sysinstall/anonFTP.c
index 8a54ec319ace..f00b35346cfa 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.17.2.3 1997/03/09 22:37:47 jkh Exp $
+ * $Id: anonFTP.c,v 1.17.2.4 1997/04/02 07:05:16 jkh Exp $
*
* Copyright (c) 1995
* Coranth Gryphon. All rights reserved.
diff --git a/release/sysinstall/attr.c b/release/sysinstall/attr.c
index 3f44a33b6ef8..78f742be15c5 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.8.2.9 1997/03/28 23:17:23 jkh Exp $
+ * $Id: attr.c,v 1.8.2.10 1997/08/18 21:34:25 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
diff --git a/release/sysinstall/cdrom.c b/release/sysinstall/cdrom.c
index 91938bc8ece4..c0abe99b0b6e 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.26.2.7 1997/01/29 01:11:22 jkh Exp $
+ * $Id: cdrom.c,v 1.26.2.8 1998/07/21 05:15:05 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
diff --git a/release/sysinstall/command.c b/release/sysinstall/command.c
index fece9b066795..cb744b28a7d9 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.13 1995/12/07 10:33:33 peter Exp $
+ * $Id: command.c,v 1.14 1996/04/13 13:31:24 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
diff --git a/release/sysinstall/config.c b/release/sysinstall/config.c
index 37a09f8df686..46e57ab09af4 100644
--- a/release/sysinstall/config.c
+++ b/release/sysinstall/config.c
@@ -542,8 +542,8 @@ configXEnvironment(dialogMenuItem *self)
}
else {
dialog_clear_norefresh();
- msgConfirm("The XFree86 setup utility you chose does not appear to be installed!\n"
- "Please install this before attempting to configure XFree86.");
+ msgConfirm("XFree86 does not appear to be installed! Please install\n"
+ "The XFree86 distribution before attempting to configure it.");
return DITEM_FAILURE | DITEM_RESTORE;
}
}
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 d54d7df9a525..2987f528a17c 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.49.2.26 1998/07/16 10:35:21 jkh Exp $
+ * $Id: devices.c,v 1.49.2.27 1998/07/18 09:35:21 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
diff --git a/release/sysinstall/disks.c b/release/sysinstall/disks.c
index 399396e4e5d9..deb932090b68 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.70.2.27 1998/03/23 08:33:32 jkh Exp $
+ * $Id: disks.c,v 1.70.2.28 1998/07/16 10:35:23 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
diff --git a/release/sysinstall/dispatch.c b/release/sysinstall/dispatch.c
index de05b5076c22..71e9b50df9e7 100644
--- a/release/sysinstall/dispatch.c
+++ b/release/sysinstall/dispatch.c
@@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
- * $Id: dispatch.c,v 1.5.2.18 1997/09/17 16:35:34 pst Exp $
+ * $Id: dispatch.c,v 1.5.2.19 1998/07/18 09:35:23 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
diff --git a/release/sysinstall/dist.c b/release/sysinstall/dist.c
index b9a79f3aab80..d9777b89beb5 100644
--- a/release/sysinstall/dist.c
+++ b/release/sysinstall/dist.c
@@ -197,8 +197,6 @@ distVerifyFlags(void)
XF86Dists |= DIST_XF86_SERVER;
if (XF86FontDists)
XF86Dists |= DIST_XF86_FONTS;
- if (XF86Dists || XF86ServerDists || XF86FontDists)
- Dists |= DIST_XF86;
if (isDebug())
msgDebug("Dist Masks: Dists: %0x, DES: %0x, Srcs: %0x\nXServer: %0x, XFonts: %0x, XDists: %0x\n",
Dists, DESDists, SrcDists, XF86ServerDists, XF86FontDists, XF86Dists);
@@ -262,12 +260,13 @@ distSetXDeveloper(dialogMenuItem *self)
{
int i;
- i = distSetDeveloper(self);
- Dists |= DIST_XF86;
+ distReset(NULL);
+ Dists = _DIST_DEVELOPER | DIST_XF86;
+ SrcDists = DIST_SRC_ALL;
XF86Dists = DIST_XF86_BIN | DIST_XF86_SET | DIST_XF86_CFG | DIST_XF86_LIB | DIST_XF86_PROG | DIST_XF86_MAN | DIST_XF86_SERVER | DIST_XF86_FONTS;
XF86ServerDists = DIST_XF86_SERVER_SVGA | DIST_XF86_SERVER_VGA16;
XF86FontDists = DIST_XF86_FONTS_MISC;
- i |= distSetXF86(NULL);
+ i = distSetXF86(NULL) | distMaybeSetDES(self) | distMaybeSetPorts(self);
distVerifyFlags();
return i;
}
@@ -302,12 +301,12 @@ distSetXUser(dialogMenuItem *self)
{
int i;
- i = distSetUser(self);
- Dists |= DIST_XF86;
+ distReset(NULL);
+ Dists = _DIST_USER | DIST_XF86;
XF86ServerDists = DIST_XF86_SERVER_SVGA | DIST_XF86_SERVER_VGA16;
XF86Dists = DIST_XF86_BIN | DIST_XF86_SET | DIST_XF86_CFG | DIST_XF86_LIB | DIST_XF86_MAN | DIST_XF86_SERVER | DIST_XF86_FONTS;
XF86FontDists = DIST_XF86_FONTS_MISC;
- i |= distSetXF86(NULL);
+ i = distSetXF86(NULL) | distMaybeSetDES(self) | distMaybeSetPorts(self);
distVerifyFlags();
return i;
}
@@ -325,7 +324,7 @@ distSetEverything(dialogMenuItem *self)
{
int i;
- Dists = DIST_ALL | DIST_XF86;
+ Dists = DIST_ALL;
SrcDists = DIST_SRC_ALL;
XF86Dists = DIST_XF86_ALL;
XF86ServerDists = DIST_XF86_SERVER_ALL;
@@ -775,7 +774,6 @@ distExtractAll(dialogMenuItem *self)
if (!mediaVerify() || !mediaDevice->init(mediaDevice))
return DITEM_FAILURE;
- distVerifyFlags();
dialog_clear_norefresh();
msgNotify("Attempting to install all selected distributions..");
/* Try for 3 times around the loop, then give up. */
diff --git a/release/sysinstall/dist.h b/release/sysinstall/dist.h
index 9418a5cdd013..c281d4203f95 100644
--- a/release/sysinstall/dist.h
+++ b/release/sysinstall/dist.h
@@ -85,7 +85,7 @@
#define DIST_XF86_SERVER_9WEP 0x0000800
#define DIST_XF86_SERVER_9WS 0x0001000
#define DIST_XF86_SERVER_9WSN 0x0002000
-#define DIST_XF86_SERVER_8514 0x0004000
+#define DIST_XF86_SERVER_8514 0x0004001
#define DIST_XF86_SERVER_AGX 0x0008000
#define DIST_XF86_SERVER_I128 0x0010000
#define DIST_XF86_SERVER_MACH8 0x0020000
diff --git a/release/sysinstall/dmenu.c b/release/sysinstall/dmenu.c
index 272bd36f61bf..55bcec37ee66 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.25.2.9 1998/03/10 17:24:27 jkh Exp $
+ * $Id: dmenu.c,v 1.25.2.10 1998/03/15 19:31:08 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
diff --git a/release/sysinstall/doc.c b/release/sysinstall/doc.c
index 586cabd9866f..6cf7d95d9e19 100644
--- a/release/sysinstall/doc.c
+++ b/release/sysinstall/doc.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: doc.c,v 1.19.2.1 1997/01/19 09:59:27 jkh Exp $
+ * $Id: doc.c,v 1.19.2.2 1997/02/15 13:21:18 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
diff --git a/release/sysinstall/dos.c b/release/sysinstall/dos.c
index 8d92d2a389a7..4f00f0a6a65c 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.14.2.1 1996/12/12 11:18:15 jkh Exp $
+ * $Id: dos.c,v 1.14.2.2 1997/01/19 09:59:27 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
diff --git a/release/sysinstall/floppy.c b/release/sysinstall/floppy.c
index 36a128a284a8..813983f30249 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.16.2.7 1998/02/11 15:43:14 jkh Exp $
+ * $Id: floppy.c,v 1.16.2.8 1998/07/18 09:35:23 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
diff --git a/release/sysinstall/ftp.c b/release/sysinstall/ftp.c
index a5f7dd4d0849..4d345d2f2119 100644
--- a/release/sysinstall/ftp.c
+++ b/release/sysinstall/ftp.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.c,v 1.18.2.13 1997/10/03 03:32:20 jkh Exp $
+ * $Id: ftp.c,v 1.18.2.14 1997/10/03 14:00:40 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
diff --git a/release/sysinstall/globals.c b/release/sysinstall/globals.c
index 937ba86ca341..00c59f320553 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.14.2.2 1997/01/24 21:05:53 jkh Exp $
+ * $Id: globals.c,v 1.14.2.3 1997/04/19 06:55:07 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
diff --git a/release/sysinstall/index.c b/release/sysinstall/index.c
index 498e717889fb..301404b4de2a 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.38.2.16 1998/07/23 19:33:05 jkh Exp $
+ * $Id: index.c,v 1.38.2.15 1998/03/24 08:38:59 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -43,7 +43,7 @@
#include "sysinstall.h"
/* Macros and magic values */
-#define MAX_MENU 8
+#define MAX_MENU 12
#define _MAX_DESC 55
static int index_extract_one(Device *dev, PkgNodePtr top, PkgNodePtr who, Boolean depended);
@@ -60,10 +60,7 @@ static char *descrs[] = {
"already marked, it will be unmarked or deleted (if installed).\n"
"To search for a package by name, press ESC. To select a category,\n"
"press RETURN. NOTE: The All category selection creates a very large\n"
- "submenu. If you select it, please be patient while it comes up.\n\n"
- "If a package you're looking for is not listed here and you are\n"
- "installing from CD, please check the other CD(s) after installation\n"
- "since the sheer number of packages means they no longer all fit on one.\n",
+ "submenu. If you select it, please be patient while it comes up.",
"Package Targets", "These are the packages you've selected for extraction.\n\n"
"If you're sure of these choices, select OK.\n"
"If not, select Cancel to go back to the package selection menu.\n",
@@ -103,7 +100,6 @@ static char *descrs[] = {
"networking", "Networking utilities.",
"news", "USENET News support software.",
"numeric", "Mathematical computation software.",
- "offix", "An office automation suite of sorts.",
"orphans", "Packages without a home elsewhere.",
"perl5", "Utilities/modules for the PERL5 language..",
"pilot", "Software support for the USR Palm Pilot(tm).",
@@ -111,7 +107,6 @@ static char *descrs[] = {
"print", "Utilities for dealing with printing.",
"printing", "Utilities for dealing with printing.",
"programming", "Software development utilities and libraries.",
- "python", "Software related to the python language.",
"russian", "Ported software for the Russian market.",
"security", "System security software.",
"shells", "Various shells (tcsh, bash, etc).",
diff --git a/release/sysinstall/install.c b/release/sysinstall/install.c
index ba58b9c58058..9206fa105002 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.134.2.68 1998/03/24 05:14:07 jkh Exp $
+ * $Id: install.c,v 1.134.2.69 1998/07/18 09:35:23 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
diff --git a/release/sysinstall/installUpgrade.c b/release/sysinstall/installUpgrade.c
index 4827d5530fc3..d32cf3bb2e1f 100644
--- a/release/sysinstall/installUpgrade.c
+++ b/release/sysinstall/installUpgrade.c
@@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
- * $Id: installUpgrade.c,v 1.33.2.20 1998/03/23 23:41:13 jkh Exp $
+ * $Id: installUpgrade.c,v 1.33.2.21 1998/05/24 19:50:18 steve Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
diff --git a/release/sysinstall/keymap.c b/release/sysinstall/keymap.c
index 459f4cbe2860..2b17b16cb926 100644
--- a/release/sysinstall/keymap.c
+++ b/release/sysinstall/keymap.c
@@ -21,7 +21,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id$
+ * $Id: keymap.c,v 1.1.2.3 1997/01/15 04:50:10 jkh Exp $
*
*/
diff --git a/release/sysinstall/label.c b/release/sysinstall/label.c
index b27275c24b9c..a93c9725b4cb 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.63.2.17 1998/03/13 11:08:06 jkh Exp $
+ * $Id: label.c,v 1.63.2.18 1998/07/18 09:35:25 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
diff --git a/release/sysinstall/lang.c b/release/sysinstall/lang.c
index 0d6963b1b4a0..304e931a1865 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.7 1995/06/11 19:30:01 rgrimes Exp $
+ * $Id: lang.c,v 1.8 1996/04/13 13:31:46 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
diff --git a/release/sysinstall/list.h b/release/sysinstall/list.h
index 05a9fd56b78d..e9bfd7af3ccf 100644
--- a/release/sysinstall/list.h
+++ b/release/sysinstall/list.h
@@ -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: list.h,v 1.1 1997/09/16 17:03:58 pst Exp $
+ * $Id: list.h,v 1.1 1997/09/16 18:57:47 jkh Exp $
*
* Copyright (c) 1997 FreeBSD, Inc.
* All rights reserved.
diff --git a/release/sysinstall/main.c b/release/sysinstall/main.c
index fbcb386f854e..49fa0e7c4c9f 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.28.2.16 1998/02/22 09:54:39 jkh Exp $
+ * $Id: main.c,v 1.28.2.17 1998/03/10 13:32:25 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
diff --git a/release/sysinstall/media.c b/release/sysinstall/media.c
index 6ed95722b558..07b68018d922 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.62.2.18 1997/08/11 13:15:25 jkh Exp $
+ * $Id: media.c,v 1.62.2.19 1998/02/19 02:22:03 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
diff --git a/release/sysinstall/menus.c b/release/sysinstall/menus.c
index eb6ad3fb5bf5..3dc9f8ea41f3 100644
--- a/release/sysinstall/menus.c
+++ b/release/sysinstall/menus.c
@@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
- * $Id: menus.c,v 1.89.2.75 1998/07/21 04:03:06 jkh Exp $
+ * $Id: menus.c,v 1.89.2.76 1998/07/21 05:42:34 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
diff --git a/release/sysinstall/misc.c b/release/sysinstall/misc.c
index eec6b54f9286..3165c76c03a5 100644
--- a/release/sysinstall/misc.c
+++ b/release/sysinstall/misc.c
@@ -1,7 +1,7 @@
/*
* Miscellaneous support routines..
*
- * $Id: misc.c,v 1.22.2.12 1998/03/19 15:02:55 jkh Exp $
+ * $Id: misc.c,v 1.22.2.13 1998/03/24 05:15:32 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
diff --git a/release/sysinstall/mouse.c b/release/sysinstall/mouse.c
index 4097666d47f3..815c39e3c900 100644
--- a/release/sysinstall/mouse.c
+++ b/release/sysinstall/mouse.c
@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: mouse.c,v 1.1.2.2 1998/03/23 05:58:10 jkh Exp $
+ * $Id: mouse.c,v 1.1.2.3 1998/03/23 06:12:59 yokota Exp $
*/
#include "sysinstall.h"
diff --git a/release/sysinstall/msg.c b/release/sysinstall/msg.c
index 2d9f118afc00..4210a86e2828 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.41.2.3 1997/09/09 16:28:25 jkh Exp $
+ * $Id: msg.c,v 1.41.2.4 1997/09/20 02:49:14 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
diff --git a/release/sysinstall/network.c b/release/sysinstall/network.c
index 74114f432f56..7f52d95f2afe 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.16.2.11 1998/07/12 17:23:21 brian Exp $
+ * $Id: network.c,v 1.16.2.12 1998/07/16 10:35:24 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
diff --git a/release/sysinstall/nfs.c b/release/sysinstall/nfs.c
index e81bcbd270fd..ffc8e4081d4b 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.11.2.4 1997/01/22 00:28:58 jkh Exp $
+ * $Id: nfs.c,v 1.11.2.5 1997/01/24 21:06:00 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
diff --git a/release/sysinstall/options.c b/release/sysinstall/options.c
index d5349e35e9fd..52b419debc3c 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.44.2.9 1997/06/18 05:12:00 jkh Exp $
+ * $Id: options.c,v 1.44.2.10 1997/07/16 05:23:23 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
diff --git a/release/sysinstall/package.c b/release/sysinstall/package.c
index debd22397846..44d208e3b35b 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.48.2.12 1997/09/17 16:35:37 pst Exp $
+ * $Id: package.c,v 1.48.2.13 1997/10/15 04:34:41 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
diff --git a/release/sysinstall/register.c b/release/sysinstall/register.c
index af164a73558c..28ab1f7e5986 100644
--- a/release/sysinstall/register.c
+++ b/release/sysinstall/register.c
@@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
- * $Id: register.c,v 1.1.2.6 1997/05/26 04:57:42 jkh Exp $
+ * $Id: register.c,v 1.1.2.7 1997/08/18 21:48:07 jkh Exp $
*
* Copyright (c) 1997
* Jordan Hubbard. All rights reserved.
diff --git a/release/sysinstall/sysinstall.8 b/release/sysinstall/sysinstall.8
index 8c97edb6c7fa..92fe89a328cb 100644
--- a/release/sysinstall/sysinstall.8
+++ b/release/sysinstall/sysinstall.8
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $Id: sysinstall.8,v 1.1.2.8 1998/07/20 11:33:03 jkh Exp $
+.\" $Id: sysinstall.8,v 1.1.2.9 1998/07/21 04:03:14 jkh Exp $
.\"
.Dd August 9, 1997
.Dt SYSINSTALL 8
diff --git a/release/sysinstall/sysinstall.h b/release/sysinstall/sysinstall.h
index 210ef916080f..5cb49a71e44f 100644
--- a/release/sysinstall/sysinstall.h
+++ b/release/sysinstall/sysinstall.h
@@ -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: sysinstall.h,v 1.82.2.51 1998/03/23 20:27:37 jkh Exp $
+ * $Id: sysinstall.h,v 1.82.2.52 1998/07/18 09:35:27 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
diff --git a/release/sysinstall/system.c b/release/sysinstall/system.c
index 55485930e640..738b8542b3ab 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.66.2.12 1997/05/27 18:56:16 jkh Exp $
+ * $Id: system.c,v 1.66.2.13 1997/07/31 11:11:38 jkh Exp $
*
* Jordan Hubbard
*
diff --git a/release/sysinstall/tape.c b/release/sysinstall/tape.c
index 26e792731c9f..189c05153ffc 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.13.2.2 1997/01/19 09:59:41 jkh Exp $
+ * $Id: tape.c,v 1.13.2.3 1997/01/22 00:29:00 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
diff --git a/release/sysinstall/tcpip.c b/release/sysinstall/tcpip.c
index 05ed048e1c3c..184ff5d989aa 100644
--- a/release/sysinstall/tcpip.c
+++ b/release/sysinstall/tcpip.c
@@ -1,5 +1,5 @@
/*
- * $Id: tcpip.c,v 1.48.2.21 1997/09/17 13:33:36 jkh Exp $
+ * $Id: tcpip.c,v 1.48.2.22 1997/09/17 16:35:38 pst Exp $
*
* Copyright (c) 1995
* Gary J Palmer. All rights reserved.
diff --git a/release/sysinstall/uc_eisa.c b/release/sysinstall/uc_eisa.c
index 11f199bc234c..def07511d9bf 100644
--- a/release/sysinstall/uc_eisa.c
+++ b/release/sysinstall/uc_eisa.c
@@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: uc_eisa.c,v 1.1 1996/10/03 06:01:37 jkh Exp $
+ * $Id: uc_eisa.c,v 1.2 1996/10/12 20:23:08 erich Exp $
*/
#include <sys/types.h>
diff --git a/release/sysinstall/uc_isa.c b/release/sysinstall/uc_isa.c
index 8562af447f15..65f0b02881a1 100644
--- a/release/sysinstall/uc_isa.c
+++ b/release/sysinstall/uc_isa.c
@@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: uc_isa.c,v 1.1 1996/10/03 06:01:38 jkh Exp $
+ * $Id: uc_isa.c,v 1.2 1996/10/12 20:23:12 erich Exp $
*/
#include <sys/types.h>
diff --git a/release/sysinstall/uc_kmem.c b/release/sysinstall/uc_kmem.c
index e0df87209a69..9e5908ca0fcb 100644
--- a/release/sysinstall/uc_kmem.c
+++ b/release/sysinstall/uc_kmem.c
@@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id$
+ * $Id: uc_kmem.c,v 1.1 1996/10/03 06:01:39 jkh Exp $
*/
#include <sys/types.h>
diff --git a/release/sysinstall/uc_list.c b/release/sysinstall/uc_list.c
index 6506c5eb6b1e..50de4bed990d 100644
--- a/release/sysinstall/uc_list.c
+++ b/release/sysinstall/uc_list.c
@@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id$
+ * $Id: uc_list.c,v 1.1 1996/10/03 06:01:40 jkh Exp $
*/
#include <sys/types.h>
diff --git a/release/sysinstall/uc_main.c b/release/sysinstall/uc_main.c
index c9c1c25a272a..62fcf217246a 100644
--- a/release/sysinstall/uc_main.c
+++ b/release/sysinstall/uc_main.c
@@ -24,7 +24,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* library functions for userconfig library
*
- * $Id: uc_main.c,v 1.13.4.4 1997/01/19 10:59:06 jkh Exp $
+ * $Id: uc_main.c,v 1.13.4.5 1998/02/19 02:22:08 jkh Exp $
*/
#include <sys/types.h>
diff --git a/release/sysinstall/uc_main.h b/release/sysinstall/uc_main.h
index e67d61d85305..bbfa7e7a8f7f 100644
--- a/release/sysinstall/uc_main.h
+++ b/release/sysinstall/uc_main.h
@@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: uc_main.h,v 1.1 1996/10/03 06:01:42 jkh Exp $
+ * $Id: uc_main.h,v 1.2 1996/10/12 20:23:21 erich Exp $
*/
#define ISA_BIOTAB 0
diff --git a/release/sysinstall/uc_pci.c b/release/sysinstall/uc_pci.c
index ec74e8ea545f..273c549b41bb 100644
--- a/release/sysinstall/uc_pci.c
+++ b/release/sysinstall/uc_pci.c
@@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: uc_pci.c,v 1.1 1996/10/03 06:01:43 jkh Exp $
+ * $Id: uc_pci.c,v 1.2 1996/10/12 20:23:23 erich Exp $
*/
#include <sys/types.h>
diff --git a/release/sysinstall/uc_scsi.c b/release/sysinstall/uc_scsi.c
index fea3fff2b217..df0d1424841f 100644
--- a/release/sysinstall/uc_scsi.c
+++ b/release/sysinstall/uc_scsi.c
@@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: uc_scsi.c,v 1.3 1996/10/12 20:23:26 erich Exp $
+ * $Id: uc_scsi.c,v 1.3.4.1 1997/02/20 07:22:43 jkh Exp $
*/
#include <sys/types.h>
diff --git a/release/sysinstall/ufs.c b/release/sysinstall/ufs.c
index 9bbea03cbd65..7c857aaee773 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.9 1996/08/23 07:56:01 jkh Exp $
+ * $Id: ufs.c,v 1.9.2.1 1996/12/12 11:18:29 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
diff --git a/release/sysinstall/user.c b/release/sysinstall/user.c
index 91e11308c53c..25f1b81f40ef 100644
--- a/release/sysinstall/user.c
+++ b/release/sysinstall/user.c
@@ -1,5 +1,5 @@
/*
- * $Id: user.c,v 1.1.2.9 1997/02/18 04:39:18 jkh Exp $
+ * $Id: user.c,v 1.1.2.10 1997/03/09 22:38:01 jkh Exp $
*
* Copyright (c) 1996
* Jörg Wunsch. All rights reserved.
diff --git a/release/sysinstall/variable.c b/release/sysinstall/variable.c
index c89b113acec3..a75b0594aa01 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.11.2.9 1998/03/15 17:11:01 jkh Exp $
+ * $Id: variable.c,v 1.11.2.10 1998/07/18 09:35:29 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
diff --git a/release/sysinstall/version.h b/release/sysinstall/version.h
index b42c26e8937d..c3b022358dea 100644
--- a/release/sysinstall/version.h
+++ b/release/sysinstall/version.h
@@ -1 +1 @@
-#define RELEASE_NAME "__RELEASE"
+#define RELEASE_NAME "2.2.7-RELEASE"
diff --git a/release/sysinstall/wizard.c b/release/sysinstall/wizard.c
index 59831ea92fc5..469062ce179b 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$
+ * $Id: wizard.c,v 1.8.2.1 1997/01/15 04:50:23 jkh Exp $
*
*/