components/bash/patches/solaris-001.config-top.h.patch
author Stefan Teleman <stefan.teleman@oracle.com>
Wed, 24 Sep 2014 14:44:19 -0700
branchs11u2-sru-backport
changeset 3333 4af2ab639479
parent 115 c360825c3a3f
child 5518 c47fe0edc204
child 7627 4758b76d5ad5
permissions -rw-r--r--
19678459 problem in UTILITY/BASH
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
110
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
     1
--- config-top.h	2009-12-22 12:29:39.000000000 -0800
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
     2
+++ config-top.h	2010-09-01 10:24:03.070928602 -0700
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
     3
@@ -54,14 +54,14 @@
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
     4
 /* The default value of the PATH variable. */
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
     5
 #ifndef DEFAULT_PATH_VALUE
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
     6
 #define DEFAULT_PATH_VALUE \
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
     7
-  "/usr/gnu/bin:/usr/local/bin:/bin:/usr/bin:."
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
     8
+  "/usr/gnu/bin:/bin:/usr/bin:/sbin:/usr/sbin:."
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
     9
 #endif
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    10
 
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    11
 /* The value for PATH when invoking `command -p'.  This is only used when
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    12
    the Posix.2 confstr () function, or CS_PATH define are not present. */
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    13
 #ifndef STANDARD_UTILS_PATH
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    14
 #define STANDARD_UTILS_PATH \
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    15
-  "/bin:/usr/bin:/sbin:/usr/sbin:/etc:/usr/etc"
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    16
+  "/usr/gnu/bin:/bin:/usr/bin:/sbin:/usr/sbin:/etc:/etc/bash"
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    17
 #endif
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    18
 
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    19
 /* Default primary and secondary prompt strings. */
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    20
@@ -75,14 +75,14 @@
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    21
 #define KSH_COMPATIBLE_SELECT
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    22
 
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    23
 /* System-wide .bashrc file for interactive shells. */
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    24
-/* #define SYS_BASHRC "/etc/bash.bashrc" */
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    25
+#define SYS_BASHRC "/etc/bash/bashrc"
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    26
 
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    27
 /* System-wide .bash_logout for login shells. */
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    28
-/* #define SYS_BASH_LOGOUT "/etc/bash.bash_logout" */
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    29
+#define SYS_BASH_LOGOUT "/etc/bash/bash_logout"
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    30
 
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    31
 /* Define this to make non-interactive shells begun with argv[0][0] == '-'
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    32
    run the startup files when not in posix mode. */
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    33
-/* #define NON_INTERACTIVE_LOGIN_SHELLS */
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    34
+#define NON_INTERACTIVE_LOGIN_SHELLS 1
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    35
 
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    36
 /* Define this if you want bash to try to check whether it's being run by
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    37
    sshd and source the .bashrc if so (like the rshd behavior).  This checks