FreeBSD: Fix dtlogin failsafe session
authorMarcin Cieslak <saper@saper.info>
Fri, 7 Sep 2012 21:04:44 +0000 (23:04 +0200)
committerJon Trulson <jon@radscan.com>
Fri, 7 Sep 2012 23:32:52 +0000 (17:32 -0600)
We need to have /usr/local as the proper
X11 prefix to start mwm and xterm

cde/programs/dtlogin/config/Xfailsafe.src
cde/programs/dtlogin/session.c

index b0c60ca63d0e4950dc5663a46998f496da8469f3..45f46957bae93a6c1fe138db3aba48c1e194a1b7 100644 (file)
@@ -44,6 +44,7 @@ XCOMM  emulator.
    $XDIR/xterm -C -ls
 #else
 
+
 XCOMM
 XCOMM  Global variables
 XCOMM
@@ -56,6 +57,9 @@ XCOMM
 #if defined(linux)
    XDIR=/usr/bin
 #endif
+#if defined(__FreeBSD__)
+   XDIR=/usr/local/bin
+#endif
 
 $XDIR/xsetroot -default &
 
index 57e73948ed75de478a2615ee205af9acd6bb1c82..41cf26d680da6ad76590cbd4e235df921088c292 100644 (file)
@@ -1652,6 +1652,8 @@ StartClient( struct verify_info *verify, struct display *d, int *pidp )
             failsafeArgv[i++] = "/usr/X/bin/xterm";
 #elif defined(__hpux)
            failsafeArgv[i++] = "/usr/bin/X11/hpterm";
+#elif defined(CSRG_BASED)
+           failsafeArgv[i++] = "/usr/local/bin/xterm";
 #else
            failsafeArgv[i++] = "/usr/bin/X11/xterm";
 #endif