diff options
author | kensmith <kensmith@FreeBSD.org> | 2008-12-16 01:18:10 +0000 |
---|---|---|
committer | kensmith <kensmith@FreeBSD.org> | 2008-12-16 01:18:10 +0000 |
commit | 6e48c23840e6402634cbff6a82b98b314e221dd3 (patch) | |
tree | c1c16ed5fd391e0486c53206ae156fc1e7e7f3dd /usr.sbin/sysinstall/menus.c | |
parent | 871c5d3475a8d3d0e0c935b8e53eb3ed030f9ccc (diff) | |
download | FreeBSD-src-6e48c23840e6402634cbff6a82b98b314e221dd3.zip FreeBSD-src-6e48c23840e6402634cbff6a82b98b314e221dd3.tar.gz |
Stop treating Xorg as a distribution in the mainline portion of sysinstall
and leave it to be handled in the packages section (or post-install
completely) along with all the other packages.
Diffstat (limited to 'usr.sbin/sysinstall/menus.c')
-rw-r--r-- | usr.sbin/sysinstall/menus.c | 48 |
1 files changed, 4 insertions, 44 deletions
diff --git a/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c index a600da1..3406580 100644 --- a/usr.sbin/sysinstall/menus.c +++ b/usr.sbin/sysinstall/menus.c @@ -87,36 +87,18 @@ checkDistDeveloper(dialogMenuItem *self) } static int -checkDistXDeveloper(dialogMenuItem *self) -{ - return IS_DEVELOPER(Dists, DIST_XORG) && _IS_SET(SrcDists, DIST_SRC_ALL); -} - -static int checkDistKernDeveloper(dialogMenuItem *self) { return IS_DEVELOPER(Dists, 0) && _IS_SET(SrcDists, DIST_SRC_SYS); } static int -checkDistXKernDeveloper(dialogMenuItem *self) -{ - return IS_DEVELOPER(Dists, DIST_XORG) && _IS_SET(SrcDists, DIST_SRC_SYS); -} - -static int checkDistUser(dialogMenuItem *self) { return IS_USER(Dists, 0); } static int -checkDistXUser(dialogMenuItem *self) -{ - return IS_USER(Dists, DIST_XORG); -} - -static int checkDistMinimum(dialogMenuItem *self) { return Dists == (DIST_BASE | DIST_KERNEL); @@ -127,7 +109,6 @@ checkDistEverything(dialogMenuItem *self) { return Dists == DIST_ALL && _IS_SET(SrcDists, DIST_SRC_ALL) && - _IS_SET(XOrgDists, DIST_XORG_ALL) && _IS_SET(KernelDists, DIST_KERNEL_ALL); } @@ -138,17 +119,6 @@ srcFlagCheck(dialogMenuItem *item) } static int -x11FlagCheck(dialogMenuItem *item) -{ - if (XOrgDists != 0) - Dists |= DIST_XORG; - else - Dists &= ~DIST_XORG; - - return Dists & DIST_XORG; -} - -static int kernelFlagCheck(dialogMenuItem *item) { return KernelDists; @@ -191,10 +161,8 @@ DMenu MenuIndex = { { " Dists, Basic", "Basic FreeBSD distribution menu.", NULL, dmenuSubmenu, NULL, &MenuSubDistributions }, { " Dists, Developer", "Select developer's distribution.", checkDistDeveloper, distSetDeveloper }, { " Dists, Src", "Src distribution menu.", NULL, dmenuSubmenu, NULL, &MenuSrcDistributions }, - { " Dists, X Developer", "Select X developer's distribution.", checkDistXDeveloper, distSetXDeveloper }, { " Dists, Kern Developer", "Select kernel developer's distribution.", checkDistKernDeveloper, distSetKernDeveloper }, { " Dists, User", "Select average user distribution.", checkDistUser, distSetUser }, - { " Dists, X User", "Select average X user distribution.", checkDistXUser, distSetXUser }, { " Distributions, Adding", "Installing additional distribution sets", NULL, distExtractAll }, { " Documentation", "Installation instructions, README, etc.", NULL, dmenuSubmenu, NULL, &MenuDocumentation }, { " Doc, README", "The distribution README file.", NULL, dmenuDisplayFile, NULL, "README" }, @@ -904,22 +872,16 @@ DMenu MenuDistributions = { "distributions", { { "X Exit", "Exit this menu (returning to previous)", checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' }, - { "All", "All system sources, binaries and X Window System", + { "All", "All system sources and binaries", checkDistEverything, distSetEverything, NULL, NULL, ' ', ' ', ' ' }, { "Reset", "Reset selected distribution list to nothing", NULL, distReset, NULL, NULL, ' ', ' ', ' ' }, { "4 Developer", "Full sources, binaries and doc but no games", checkDistDeveloper, distSetDeveloper }, - { "5 X-Developer", "Same as above + X Window System", - checkDistXDeveloper, distSetXDeveloper }, - { "6 Kern-Developer", "Full binaries and doc, kernel sources only", + { "5 Kern-Developer", "Full binaries and doc, kernel sources only", checkDistKernDeveloper, distSetKernDeveloper }, - { "7 X-Kern-Developer", "Same as above + X Window System", - checkDistXKernDeveloper, distSetXKernDeveloper }, - { "8 User", "Average user - binaries and doc only", + { "6 User", "Average user - binaries and doc only", checkDistUser, distSetUser }, - { "9 X-User", "Same as above + X Window System", - checkDistXUser, distSetXUser }, { "A Minimal", "The smallest configuration possible", checkDistMinimum, distSetMinimum }, { "B Custom", "Specify your own distribution set", @@ -936,7 +898,7 @@ DMenu MenuSubDistributions = { NULL, { { "X Exit", "Exit this menu (returning to previous)", checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' }, - { "All", "All system sources, binaries and X Window System", + { "All", "All system sources and binaries", NULL, distSetEverything, NULL, NULL, ' ', ' ', ' ' }, { "Reset", "Reset all of the below", NULL, distReset, NULL, NULL, ' ', ' ', ' ' }, @@ -968,8 +930,6 @@ DMenu MenuSubDistributions = { dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_PORTS }, { " local", "Local additions collection", dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_LOCAL}, - { " X.Org", "The X.Org distribution", - dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_XORG }, { NULL } }, }; |