shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-23 21:35:11 +03:00
Code

main: use a shorter default $PATH if /usr is merged

Browse Source
This commit is contained in:
Lennart Poettering 2012-02-07 15:56:28 +01:00
parent e9c06c79f2
commit 2c6db6fb9b
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
configure.ac
View File

@ -612,6 +612,12 @@ AC_ARG_WITH([pamlibdir],
[], [],
[with_pamlibdir=${with_rootlibdir}/security]) [with_pamlibdir=${with_rootlibdir}/security])
have_split_usr=no
if test "x${ac_default_prefix}" != "x${with_rootprefix}" ; then
AC_DEFINE(HAVE_SPLIT_USR, 1, [Define if /bin, /sbin aren't symlinks into /usr])
have_split_usr=yes
fi
AC_SUBST([dbuspolicydir], [$with_dbuspolicydir]) AC_SUBST([dbuspolicydir], [$with_dbuspolicydir])
AC_SUBST([dbussessionservicedir], [$with_dbussessionservicedir]) AC_SUBST([dbussessionservicedir], [$with_dbussessionservicedir])
AC_SUBST([dbussystemservicedir], [$with_dbussystemservicedir]) AC_SUBST([dbussystemservicedir], [$with_dbussystemservicedir])
@ -654,10 +660,11 @@ AC_MSG_RESULT([
libexec dir: ${libexecdir} libexec dir: ${libexecdir}
lib dir: ${libdir} lib dir: ${libdir}
rootlib dir: ${with_rootlibdir} rootlib dir: ${with_rootlibdir}
pam modules dir: ${with_pamlibdir} PAM modules dir: ${with_pamlibdir}
udev rules dir: ${with_udevrulesdir} udev rules dir: ${with_udevrulesdir}
dbus policy dir: ${with_dbuspolicydir} D-Bus policy dir: ${with_dbuspolicydir}
dbus session dir: ${with_dbussessionservicedir} D-Bus session dir: ${with_dbussessionservicedir}
dbus system dir: ${with_dbussystemservicedir} D-Bus system dir: ${with_dbussystemservicedir}
dbus interfaces dir: ${with_dbusinterfacedir} D-Bus interfaces dir: ${with_dbusinterfacedir}
Split /usr: ${have_split_usr}
]) ])

4
src/main.c
View File

@ -1292,7 +1292,11 @@ int main(int argc, char *argv[]) {
/* Set up PATH unless it is already set */ /* Set up PATH unless it is already set */
setenv("PATH", setenv("PATH",
#ifdef HAVE_SPLIT_USR
"/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin", "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
#else
"/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin",
#endif
arg_running_as == MANAGER_SYSTEM); arg_running_as == MANAGER_SYSTEM);
if (arg_running_as == MANAGER_SYSTEM) { if (arg_running_as == MANAGER_SYSTEM) {