diff options
| author | Jordan K. Hubbard <jkh@FreeBSD.org> | 2001-03-12 22:50:04 +0000 |
|---|---|---|
| committer | Jordan K. Hubbard <jkh@FreeBSD.org> | 2001-03-12 22:50:04 +0000 |
| commit | 8363123c055ee944425a19e65d9de27578f930cf (patch) | |
| tree | ed9993392ea32157463a4c423d353fc99c12908c /release/sysinstall | |
| parent | aa5d0a20777ad9b0ac72c64b4b9dad90d2acafba (diff) | |
Notes
Diffstat (limited to 'release/sysinstall')
| -rw-r--r-- | release/sysinstall/config.c | 6 | ||||
| -rw-r--r-- | release/sysinstall/install.c | 10 | ||||
| -rw-r--r-- | release/sysinstall/menus.c | 2 |
3 files changed, 14 insertions, 4 deletions
diff --git a/release/sysinstall/config.c b/release/sysinstall/config.c index 9a15299221d4..3a5f9dfcf74c 100644 --- a/release/sysinstall/config.c +++ b/release/sysinstall/config.c @@ -668,10 +668,10 @@ 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, "fvwm2")) { + else if (!strcmp(desk, "fvwm")) { ret = package_add("fvwm"); - if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("fvwm2")) - write_root_xprofile("xterm &\nexec fvwm2\n"); + if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("fvwm")) + write_root_xprofile("xterm &\nexec fvwm\n"); } if (DITEM_STATUS(ret) == DITEM_FAILURE) msgConfirm("An error occurred while adding the package(s) required\n" diff --git a/release/sysinstall/install.c b/release/sysinstall/install.c index 4c51dac1f30e..318c7bab80c0 100644 --- a/release/sysinstall/install.c +++ b/release/sysinstall/install.c @@ -748,6 +748,16 @@ installFixupBin(dialogMenuItem *self) /* All of this is done only as init, just to be safe */ if (RunningAsInit) { + /* Fix up kernel first */ + if (!file_readable("/kernel")) { + char *generic_kernel = "/kernel.GENERIC"; + if (file_readable(generic_kernel)) { + if (vsystem("cp -p %s /kernel", generic_kernel)) { + msgConfirm("Unable to copy /kernel into place!"); + return DITEM_FAILURE; + } + } + } #ifdef __i386__ /* Snapshot any boot -c changes back to the new kernel */ cp = variable_get(VAR_KGET); diff --git a/release/sysinstall/menus.c b/release/sysinstall/menus.c index a8030554675c..7f08dc030b4c 100644 --- a/release/sysinstall/menus.c +++ b/release/sysinstall/menus.c @@ -918,7 +918,7 @@ DMenu MenuXDesktops = { NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=afterstep" }, { "6 Windowmaker", "The Windowmaker window manager", NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=windowmaker" }, - { "7 fvwm2", "The fvwm2 window manager", + { "7 fvwm", "The fvwm window manager", NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=fvwm2" }, { NULL } }, }; |