From 7dafac1afc8bc0f3d8227ec383eced032539c1bd Mon Sep 17 00:00:00 2001
From: jkh <jkh@FreeBSD.org>
Date: Wed, 7 Jul 1999 09:47:41 +0000
Subject: [PATCH] invoke fvwm properly

---
 release/sysinstall/config.c  | 6 +++---
 usr.sbin/sade/config.c       | 6 +++---
 usr.sbin/sysinstall/config.c | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/release/sysinstall/config.c b/release/sysinstall/config.c
index 3551d61e4957..9adb70097e10 100644
--- a/release/sysinstall/config.c
+++ b/release/sysinstall/config.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: config.c,v 1.136 1999/05/18 00:44:27 jkh Exp $
+ * $Id: config.c,v 1.137 1999/07/06 08:45:35 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -532,8 +532,8 @@ configXDesktop(dialogMenuItem *self)
     }
     else if (!strcmp(desk, "fvwm")) {
 	ret = package_add("fvwm");
-	if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("fvwm"))
-	    write_root_xprofile("xterm &\nexec fvwm\n");
+	if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("fvwm2"))
+	    write_root_xprofile("xterm &\nexec fvwm2\n");
     }
     if (DITEM_STATUS(ret) == DITEM_FAILURE)
 	msgConfirm("An error occurred while adding the package(s) required\n"
diff --git a/usr.sbin/sade/config.c b/usr.sbin/sade/config.c
index 3551d61e4957..9adb70097e10 100644
--- a/usr.sbin/sade/config.c
+++ b/usr.sbin/sade/config.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: config.c,v 1.136 1999/05/18 00:44:27 jkh Exp $
+ * $Id: config.c,v 1.137 1999/07/06 08:45:35 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -532,8 +532,8 @@ configXDesktop(dialogMenuItem *self)
     }
     else if (!strcmp(desk, "fvwm")) {
 	ret = package_add("fvwm");
-	if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("fvwm"))
-	    write_root_xprofile("xterm &\nexec fvwm\n");
+	if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("fvwm2"))
+	    write_root_xprofile("xterm &\nexec fvwm2\n");
     }
     if (DITEM_STATUS(ret) == DITEM_FAILURE)
 	msgConfirm("An error occurred while adding the package(s) required\n"
diff --git a/usr.sbin/sysinstall/config.c b/usr.sbin/sysinstall/config.c
index 3551d61e4957..9adb70097e10 100644
--- a/usr.sbin/sysinstall/config.c
+++ b/usr.sbin/sysinstall/config.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: config.c,v 1.136 1999/05/18 00:44:27 jkh Exp $
+ * $Id: config.c,v 1.137 1999/07/06 08:45:35 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -532,8 +532,8 @@ configXDesktop(dialogMenuItem *self)
     }
     else if (!strcmp(desk, "fvwm")) {
 	ret = package_add("fvwm");
-	if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("fvwm"))
-	    write_root_xprofile("xterm &\nexec fvwm\n");
+	if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("fvwm2"))
+	    write_root_xprofile("xterm &\nexec fvwm2\n");
     }
     if (DITEM_STATUS(ret) == DITEM_FAILURE)
 	msgConfirm("An error occurred while adding the package(s) required\n"