diff options
author | jkh <jkh@FreeBSD.org> | 1998-05-24 20:01:33 +0000 |
---|---|---|
committer | jkh <jkh@FreeBSD.org> | 1998-05-24 20:01:33 +0000 |
commit | b376a65a134f72b4e664c9a7a7aa15a4478e9027 (patch) | |
tree | 3e374201ecaa214378a238e86c8b270bfadfbcbf /usr.sbin | |
parent | b5fb0aed2787b1af5aabd2d3a684d1b464b873fa (diff) | |
download | FreeBSD-src-b376a65a134f72b4e664c9a7a7aa15a4478e9027.zip FreeBSD-src-b376a65a134f72b4e664c9a7a7aa15a4478e9027.tar.gz |
Merge updates from 2.2
Diffstat (limited to 'usr.sbin')
-rw-r--r-- | usr.sbin/sade/devices.c | 3 | ||||
-rw-r--r-- | usr.sbin/sade/menus.c | 12 | ||||
-rw-r--r-- | usr.sbin/sade/sade.8 | 6 | ||||
-rw-r--r-- | usr.sbin/sade/sade.h | 6 | ||||
-rw-r--r-- | usr.sbin/sysinstall/devices.c | 3 | ||||
-rw-r--r-- | usr.sbin/sysinstall/menus.c | 12 | ||||
-rw-r--r-- | usr.sbin/sysinstall/sysinstall.8 | 6 | ||||
-rw-r--r-- | usr.sbin/sysinstall/sysinstall.h | 6 |
8 files changed, 28 insertions, 26 deletions
diff --git a/usr.sbin/sade/devices.c b/usr.sbin/sade/devices.c index bec3e65..bf4fe24 100644 --- a/usr.sbin/sade/devices.c +++ b/usr.sbin/sade/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.76 1998/05/11 00:45:06 jkh Exp $ + * $Id: devices.c,v 1.77 1998/05/11 00:47:27 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -201,6 +201,7 @@ deviceGetAll(void) char buffer[INTERFACE_MAX * sizeof(struct ifreq)]; char **names; + msgNotify("Probing devices, please wait (this can take awhile)..."); /* First go for the network interfaces. Stolen shamelessly from ifconfig! */ ifc.ifc_len = sizeof(buffer); ifc.ifc_buf = buffer; diff --git a/usr.sbin/sade/menus.c b/usr.sbin/sade/menus.c index 376375f..838159e 100644 --- a/usr.sbin/sade/menus.c +++ b/usr.sbin/sade/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.164 1998/04/16 13:55:11 ache Exp $ + * $Id: menus.c,v 1.165 1998/05/06 12:01:16 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -215,6 +215,7 @@ DMenu MenuIndex = { { "Configure", "The system configuration menu.", NULL, dmenuSubmenu, NULL, &MenuConfigure }, { "Defaults, Load", "Load default settings.", NULL, dispatch_load_floppy }, { "Device, Mouse", "The mouse configuration menu.", NULL, dmenuSubmenu, NULL, &MenuMouse }, + { "Disklabel", "The disk Label editor", NULL, diskLabelEditor }, { "Dists, All", "Root of the distribution tree.", NULL, dmenuSubmenu, NULL, &MenuDistributions }, { "Dists, Basic", "Basic FreeBSD distribution menu.", NULL, dmenuSubmenu, NULL, &MenuSubDistributions }, { "Dists, DES", "DES distribution menu.", NULL, dmenuSubmenu, NULL, &MenuDESDistributions }, @@ -234,6 +235,7 @@ DMenu MenuIndex = { { "Doc, Release", "The distribution release notes.", NULL, dmenuDisplayFile, NULL, "relnotes" }, { "Doc, HTML", "The HTML documentation menu.", NULL, docBrowser }, { "Emergency shell", "Start an Emergency Holographic shell.", NULL, installFixitHoloShell }, + { "Fdisk", "The disk Partition Editor", NULL, diskPartitionEditor }, { "Fixit", "Repair mode with CDROM or fixit floppy.", NULL, dmenuSubmenu, NULL, &MenuFixit }, { "FTP sites", "The FTP mirror site listing.", NULL, dmenuSubmenu, NULL, &MenuMediaFTP }, { "Gateway", "Set flag to route packets between interfaces.", dmenuVarCheck, dmenuToggleVariable, NULL, "gateway=YES" }, @@ -878,12 +880,10 @@ DMenu MenuXF86SelectCore = { dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_MAN }, { "prog", "Programmer's header and library files", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_PROG }, - { "ps", "Postscript documentation", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_PS }, { "set", "XFree86 Setup Utility", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_SET }, - { "9set", "XFree86 Setup Utility (PC98)", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_9SET }, + { "9set", "XFree86 Setup Utility for PC98 machines", + dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_9SET }, { "sources", "XFree86 3.3.2 standard sources", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_SRC }, { "csources", "XFree86 3.3.2 contrib sources", @@ -1337,7 +1337,7 @@ DMenu MenuSysconsKeymap = { { "Icelandic (accent)", "Icelandic ISO keymap (accent keys)", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=icelandic.iso.acc" }, { "Icelandic", "Icelandic ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=icelandic.iso" }, { "Italian", "Italian ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=it.iso" }, - { "Latin American", "Latin American ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=lat-amer" }, + { "Latin American", "Latin American ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=lat-amer.iso" }, { "Japanese 106", "Japanese 106 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=jp.106" }, { "Norway ISO", "Norwegian ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=norwegian.iso" }, { "Russia CP866", "Russian CP866 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=ru.cp866" }, diff --git a/usr.sbin/sade/sade.8 b/usr.sbin/sade/sade.8 index cbe2688..4820775b 100644 --- a/usr.sbin/sade/sade.8 +++ b/usr.sbin/sade/sade.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.7 1998/03/19 07:40:27 charnier Exp $ +.\" $Id: sysinstall.8,v 1.8 1998/05/06 12:01:20 jkh Exp $ .\" .Dd August 9, 1997 .Dt SYSINSTALL 8 @@ -795,8 +795,8 @@ for a sample installation script. .Sh BUGS This utility is a prototype which lasted approximately 2 years past its expiration date and is greatly in need of death. -.Sh AUTHORS -.An Jordan K. Hubbard Aq jkh@FreeBSD.org +.Sh AUTHOR +Jordan K. Hubbard <jkh@FreeBSD.org> .Sh HISTORY This version of .Nm diff --git a/usr.sbin/sade/sade.h b/usr.sbin/sade/sade.h index bd6b1d7..c0b3314 100644 --- a/usr.sbin/sade/sade.h +++ b/usr.sbin/sade/sade.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.144 1998/03/07 08:59:32 jkh Exp $ + * $Id: sysinstall.h,v 1.145 1998/03/23 06:08:55 yokota Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -55,10 +55,10 @@ /*** Defines ***/ /* Different packages we depend on - update this when package version change! */ -#define PACKAGE_GATED "gated-3.5b3" +#define PACKAGE_GATED "gated-3.5.8" #define PACKAGE_NETCON "commerce/netcon/bsd61" #define PACKAGE_PCNFSD "pcnfsd-93.02.16" -#define PACKAGE_LYNX "lynx-2.7.1" +#define PACKAGE_LYNX "lynx-2.7.2" /* device limits */ #define DEV_NAME_MAX 64 /* The maximum length of a device name */ diff --git a/usr.sbin/sysinstall/devices.c b/usr.sbin/sysinstall/devices.c index bec3e65..bf4fe24 100644 --- a/usr.sbin/sysinstall/devices.c +++ b/usr.sbin/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.76 1998/05/11 00:45:06 jkh Exp $ + * $Id: devices.c,v 1.77 1998/05/11 00:47:27 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -201,6 +201,7 @@ deviceGetAll(void) char buffer[INTERFACE_MAX * sizeof(struct ifreq)]; char **names; + msgNotify("Probing devices, please wait (this can take awhile)..."); /* First go for the network interfaces. Stolen shamelessly from ifconfig! */ ifc.ifc_len = sizeof(buffer); ifc.ifc_buf = buffer; diff --git a/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c index 376375f..838159e 100644 --- a/usr.sbin/sysinstall/menus.c +++ b/usr.sbin/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.164 1998/04/16 13:55:11 ache Exp $ + * $Id: menus.c,v 1.165 1998/05/06 12:01:16 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -215,6 +215,7 @@ DMenu MenuIndex = { { "Configure", "The system configuration menu.", NULL, dmenuSubmenu, NULL, &MenuConfigure }, { "Defaults, Load", "Load default settings.", NULL, dispatch_load_floppy }, { "Device, Mouse", "The mouse configuration menu.", NULL, dmenuSubmenu, NULL, &MenuMouse }, + { "Disklabel", "The disk Label editor", NULL, diskLabelEditor }, { "Dists, All", "Root of the distribution tree.", NULL, dmenuSubmenu, NULL, &MenuDistributions }, { "Dists, Basic", "Basic FreeBSD distribution menu.", NULL, dmenuSubmenu, NULL, &MenuSubDistributions }, { "Dists, DES", "DES distribution menu.", NULL, dmenuSubmenu, NULL, &MenuDESDistributions }, @@ -234,6 +235,7 @@ DMenu MenuIndex = { { "Doc, Release", "The distribution release notes.", NULL, dmenuDisplayFile, NULL, "relnotes" }, { "Doc, HTML", "The HTML documentation menu.", NULL, docBrowser }, { "Emergency shell", "Start an Emergency Holographic shell.", NULL, installFixitHoloShell }, + { "Fdisk", "The disk Partition Editor", NULL, diskPartitionEditor }, { "Fixit", "Repair mode with CDROM or fixit floppy.", NULL, dmenuSubmenu, NULL, &MenuFixit }, { "FTP sites", "The FTP mirror site listing.", NULL, dmenuSubmenu, NULL, &MenuMediaFTP }, { "Gateway", "Set flag to route packets between interfaces.", dmenuVarCheck, dmenuToggleVariable, NULL, "gateway=YES" }, @@ -878,12 +880,10 @@ DMenu MenuXF86SelectCore = { dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_MAN }, { "prog", "Programmer's header and library files", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_PROG }, - { "ps", "Postscript documentation", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_PS }, { "set", "XFree86 Setup Utility", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_SET }, - { "9set", "XFree86 Setup Utility (PC98)", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_9SET }, + { "9set", "XFree86 Setup Utility for PC98 machines", + dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_9SET }, { "sources", "XFree86 3.3.2 standard sources", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_SRC }, { "csources", "XFree86 3.3.2 contrib sources", @@ -1337,7 +1337,7 @@ DMenu MenuSysconsKeymap = { { "Icelandic (accent)", "Icelandic ISO keymap (accent keys)", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=icelandic.iso.acc" }, { "Icelandic", "Icelandic ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=icelandic.iso" }, { "Italian", "Italian ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=it.iso" }, - { "Latin American", "Latin American ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=lat-amer" }, + { "Latin American", "Latin American ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=lat-amer.iso" }, { "Japanese 106", "Japanese 106 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=jp.106" }, { "Norway ISO", "Norwegian ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=norwegian.iso" }, { "Russia CP866", "Russian CP866 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=ru.cp866" }, diff --git a/usr.sbin/sysinstall/sysinstall.8 b/usr.sbin/sysinstall/sysinstall.8 index cbe2688..4820775b 100644 --- a/usr.sbin/sysinstall/sysinstall.8 +++ b/usr.sbin/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.7 1998/03/19 07:40:27 charnier Exp $ +.\" $Id: sysinstall.8,v 1.8 1998/05/06 12:01:20 jkh Exp $ .\" .Dd August 9, 1997 .Dt SYSINSTALL 8 @@ -795,8 +795,8 @@ for a sample installation script. .Sh BUGS This utility is a prototype which lasted approximately 2 years past its expiration date and is greatly in need of death. -.Sh AUTHORS -.An Jordan K. Hubbard Aq jkh@FreeBSD.org +.Sh AUTHOR +Jordan K. Hubbard <jkh@FreeBSD.org> .Sh HISTORY This version of .Nm diff --git a/usr.sbin/sysinstall/sysinstall.h b/usr.sbin/sysinstall/sysinstall.h index bd6b1d7..c0b3314 100644 --- a/usr.sbin/sysinstall/sysinstall.h +++ b/usr.sbin/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.144 1998/03/07 08:59:32 jkh Exp $ + * $Id: sysinstall.h,v 1.145 1998/03/23 06:08:55 yokota Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -55,10 +55,10 @@ /*** Defines ***/ /* Different packages we depend on - update this when package version change! */ -#define PACKAGE_GATED "gated-3.5b3" +#define PACKAGE_GATED "gated-3.5.8" #define PACKAGE_NETCON "commerce/netcon/bsd61" #define PACKAGE_PCNFSD "pcnfsd-93.02.16" -#define PACKAGE_LYNX "lynx-2.7.1" +#define PACKAGE_LYNX "lynx-2.7.2" /* device limits */ #define DEV_NAME_MAX 64 /* The maximum length of a device name */ |