summaryrefslogtreecommitdiffstats
path: root/usr.sbin/sysinstall
diff options
context:
space:
mode:
authorjhb <jhb@FreeBSD.org>2007-06-28 18:27:29 +0000
committerjhb <jhb@FreeBSD.org>2007-06-28 18:27:29 +0000
commit6533925808b189b68ae4b9cc04c702bf9e965147 (patch)
treeccb76cbbffa3b45843d68b43c2cc5541e48c8133 /usr.sbin/sysinstall
parentc0296918a09b0f063d318f1e9f563fe820d27a1a (diff)
downloadFreeBSD-src-6533925808b189b68ae4b9cc04c702bf9e965147.zip
FreeBSD-src-6533925808b189b68ae4b9cc04c702bf9e965147.tar.gz
Teach sysinstall about the 'scddl' source dist.
Approved by: re (kensmith)
Diffstat (limited to 'usr.sbin/sysinstall')
-rw-r--r--usr.sbin/sysinstall/dist.c1
-rw-r--r--usr.sbin/sysinstall/dist.h3
-rw-r--r--usr.sbin/sysinstall/menus.c2
3 files changed, 5 insertions, 1 deletions
diff --git a/usr.sbin/sysinstall/dist.c b/usr.sbin/sysinstall/dist.c
index 01308b0..37f210f 100644
--- a/usr.sbin/sysinstall/dist.c
+++ b/usr.sbin/sysinstall/dist.c
@@ -108,6 +108,7 @@ static Distribution KernelDistTable[] = {
/* The /usr/src distribution */
static Distribution SrcDistTable[] = {
DTE_TARBALL("sbase", &SrcDists, SRC_BASE, "/usr/src"),
+ DTE_TARBALL("scddl", &SrcDists, SRC_CDDL, "/usr/src"),
DTE_TARBALL("scontrib", &SrcDists, SRC_CONTRIB, "/usr/src"),
DTE_TARBALL("scrypto", &SrcDists, SRC_SCRYPTO, "/usr/src"),
DTE_TARBALL("sgnu", &SrcDists, SRC_GNU, "/usr/src"),
diff --git a/usr.sbin/sysinstall/dist.h b/usr.sbin/sysinstall/dist.h
index b2af31e..20ee45a 100644
--- a/usr.sbin/sysinstall/dist.h
+++ b/usr.sbin/sysinstall/dist.h
@@ -43,7 +43,8 @@
#define DIST_SRC_SSECURE 0x20000
#define DIST_SRC_SKERBEROS5 0x40000
#define DIST_SRC_RESCUE 0x80000
-#define DIST_SRC_ALL 0xFFFFF
+#define DIST_SRC_CDDL 0x100000
+#define DIST_SRC_ALL 0x1FFFFF
/* Subtypes for X.Org packages */
#define DIST_XORG_CLIENTS 0x000001
diff --git a/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c
index 60b2638..524f829 100644
--- a/usr.sbin/sysinstall/menus.c
+++ b/usr.sbin/sysinstall/menus.c
@@ -1066,6 +1066,8 @@ DMenu MenuSrcDistributions = {
NULL, clearSrc, NULL, NULL, ' ', ' ', ' ' },
{ " base", "top-level files in /usr/src",
dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_BASE },
+ { " cddl", "/usr/src/cddl (software from Sun)",
+ dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_CDDL },
{ " contrib", "/usr/src/contrib (contributed software)",
dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_CONTRIB },
{ " crypto", "/usr/src/crypto (contrib encryption sources)",
OpenPOWER on IntegriCloud