diff options
author | jkh <jkh@FreeBSD.org> | 1999-09-08 04:48:26 +0000 |
---|---|---|
committer | jkh <jkh@FreeBSD.org> | 1999-09-08 04:48:26 +0000 |
commit | 35f6a59e980baa7932fb06e0fdce36305afb046b (patch) | |
tree | a1f027f2ad434a82f06e8c64302d9bc1332137df /release/sysinstall | |
parent | fde57b038682db7ada3416bddf0e17923af2c919 (diff) | |
download | FreeBSD-src-35f6a59e980baa7932fb06e0fdce36305afb046b.zip FreeBSD-src-35f6a59e980baa7932fb06e0fdce36305afb046b.tar.gz |
Provide another installation option for GNOME so we have the more "classic
GNOME" desktop that Debian does as an option.
Diffstat (limited to 'release/sysinstall')
-rw-r--r-- | release/sysinstall/config.c | 17 | ||||
-rw-r--r-- | release/sysinstall/menus.c | 12 |
2 files changed, 16 insertions, 13 deletions
diff --git a/release/sysinstall/config.c b/release/sysinstall/config.c index 9eaa21d..8ae2226 100644 --- a/release/sysinstall/config.c +++ b/release/sysinstall/config.c @@ -514,6 +514,14 @@ configXDesktop(dialogMenuItem *self) write_root_xprofile("gnome-session &\nexec afterstep"); } } + else if (!strcmp(desk, "enlightenment")) { + ret = package_add("gnomecore"); + if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("gnome-session")) { + ret = package_add("enlightenment"); + if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("enlightenment")) + write_root_xprofile("gnome-session &\nexec enlightenment\n"); + } + } else if (!strcmp(desk, "afterstep")) { ret = package_add("afterstep"); if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("afterstep")) @@ -525,13 +533,8 @@ configXDesktop(dialogMenuItem *self) write_root_xprofile("xterm &\n[ ! -d $HOME/GNUstep/Library/WindowMaker ] && /usr/X11R6/bin/wmaker.inst\nexec /usr/X11R6/bin/wmaker\n"); } } - else if (!strcmp(desk, "enlightenment")) { - ret = package_add("enlightenment"); - if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("enlightenment")) - write_root_xprofile("xterm &\nexec enlightenment\n"); - } - else if (!strcmp(desk, "fvwm")) { - ret = package_add("fvwm"); + else if (!strcmp(desk, "fvwm2")) { + ret = package_add("fvwm2"); if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("fvwm2")) write_root_xprofile("xterm &\nexec fvwm2\n"); } diff --git a/release/sysinstall/menus.c b/release/sysinstall/menus.c index 684f6b5..0c99aad 100644 --- a/release/sysinstall/menus.c +++ b/release/sysinstall/menus.c @@ -476,15 +476,15 @@ DMenu MenuXDesktops = { NULL, { { "KDE", "The K Desktop Environment.", NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=kde" }, - { "GNOME", "The GNOME desktop environment.", + { "GNOME + Afterstep", "GNOME + Afterstep window manager.", NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=gnome" }, - { "Afterstep", "The Afterstep Window manager", + { "GNOME + Enlightenment","GNOME + The E window manager", + NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=enlightenment" }, + { "Afterstep", "The Afterstep window manager", NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=afterstep" }, - { "Windowmaker", "The Windowmaker Window manager", + { "Windowmaker", "The Windowmaker window manager", NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=windowmaker" }, - { "Enlightenment","The E Window manager (24 bit recommended)", - NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=enlightenment" }, - { "fvwm", "The fvwm Window manager", + { "fvwm2", "The fvwm2 window manager", NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=fvwm" }, { NULL } }, }; |