From abecc2288124aa2793ad89e7bfab844c0624540f Mon Sep 17 00:00:00 2001 From: sos Date: Thu, 5 Aug 1999 20:04:56 +0000 Subject: Add a local distribution under the "costum distribution" menu. This allows to add local additions on install time.. --- usr.sbin/sade/menus.c | 4 +++- usr.sbin/sysinstall/dist.c | 3 ++- usr.sbin/sysinstall/dist.h | 5 +++-- usr.sbin/sysinstall/menus.c | 4 +++- 4 files changed, 11 insertions(+), 5 deletions(-) (limited to 'usr.sbin') diff --git a/usr.sbin/sade/menus.c b/usr.sbin/sade/menus.c index f60e88b..db15e9b 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.217 1999/07/29 06:23:17 jkh Exp $ + * $Id: menus.c,v 1.218 1999/07/29 21:15:10 billf Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -838,6 +838,8 @@ DMenu MenuSubDistributions = { srcFlagCheck, distSetSrc }, { "ports", "The FreeBSD Ports collection", dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_PORTS }, + { "local", "Local additions collection", + dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_LOCAL}, { "XFree86", "The XFree86 3.3.4 distribution", x11FlagCheck, distSetXF86 }, { "All", "All sources, binaries and X Window System binaries", diff --git a/usr.sbin/sysinstall/dist.c b/usr.sbin/sysinstall/dist.c index 17e5301..7f73109 100644 --- a/usr.sbin/sysinstall/dist.c +++ b/usr.sbin/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.143 1999/07/19 11:58:01 jkh Exp $ + * $Id: dist.c,v 1.144 1999/07/23 03:42:23 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -83,6 +83,7 @@ static Distribution DistTable[] = { #endif #endif { "ports", "/usr", &Dists, DIST_PORTS, NULL }, +{ "local", "/", &Dists, DIST_LOCAL, NULL }, { "XF86334", "/usr", &Dists, DIST_XF86, XF86DistTable }, { NULL }, }; diff --git a/usr.sbin/sysinstall/dist.h b/usr.sbin/sysinstall/dist.h index 16d7c60..53c95ee 100644 --- a/usr.sbin/sysinstall/dist.h +++ b/usr.sbin/sysinstall/dist.h @@ -1,4 +1,4 @@ -/* $Id: dist.h,v 1.37 1999/07/16 22:03:26 jkh Exp $ */ +/* $Id: dist.h,v 1.38 1999/07/23 03:42:23 jkh Exp $ */ #ifndef _DIST_H_INCLUDE #define _DIST_H_INCLUDE @@ -23,7 +23,8 @@ #define DIST_DES 0x04000 #define DIST_CATPAGES 0x08000 #define DIST_PORTS 0x10000 -#define DIST_ALL 0x1FFFF +#define DIST_LOCAL 0x20000 +#define DIST_ALL 0x3FFFF /* Canned distribution sets */ #define _DIST_DEVELOPER \ diff --git a/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c index f60e88b..db15e9b 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.217 1999/07/29 06:23:17 jkh Exp $ + * $Id: menus.c,v 1.218 1999/07/29 21:15:10 billf Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -838,6 +838,8 @@ DMenu MenuSubDistributions = { srcFlagCheck, distSetSrc }, { "ports", "The FreeBSD Ports collection", dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_PORTS }, + { "local", "Local additions collection", + dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_LOCAL}, { "XFree86", "The XFree86 3.3.4 distribution", x11FlagCheck, distSetXF86 }, { "All", "All sources, binaries and X Window System binaries", -- cgit v1.1