From: Isaac Dunham <ibid.ag@gmail.com>
Date: Mon, 23 Sep 2013 00:15:06 +0000 (-0700)
Subject: dtlogin: use proper path to getty and /usr/local/bin in path on Linux
X-Git-Tag: 2.2.1~21
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e3973a9320b03bcd7d513e56593d94f364d3f35b;p=oweals%2Fcde.git

dtlogin: use proper path to getty and /usr/local/bin in path on Linux
---

diff --git a/cde/programs/dtlogin/config/Xconfig.src b/cde/programs/dtlogin/config/Xconfig.src
index 57f0ec9f..ad6ba472 100644
--- a/cde/programs/dtlogin/config/Xconfig.src
+++ b/cde/programs/dtlogin/config/Xconfig.src
@@ -135,9 +135,7 @@ XCOMM  To specify a default user PATH environment variable.
 XCOMM
 XCOMM  Dtlogin*userPath:          <path>
 
-#if defined(linux)
-Dtlogin*userPath:          /bin:/usr/bin:/sbin:/usr/sbin:CDE_INSTALLATION_TOP/bin
-#elif defined(CSRG_BASED)
+#if defined(linux) || defined(CSRG_BASED)
 Dtlogin*userPath:          /bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:CDE_INSTALLATION_TOP/bin
 #endif
 
diff --git a/cde/programs/dtlogin/dm.c b/cde/programs/dtlogin/dm.c
index ca5c21c2..59b99cff 100644
--- a/cde/programs/dtlogin/dm.c
+++ b/cde/programs/dtlogin/dm.c
@@ -1496,6 +1496,8 @@ SetTitle( char *name, char *ptr )
 #define GETTYPATH "/usr/sbin/getty"
 #elif defined(__OpenBSD__)
 #define GETTYPATH "/usr/libexec/getty"
+#elif defined(__linux)
+#define GETTYPATH "/sbin/getty"
 #elif !defined (__apollo)
 #define GETTYPATH "/etc/getty"
 #endif