| author | Vladimir Marek <Vladimir.Marek@oracle.com> |
| Thu, 26 Jan 2017 12:24:45 +0100 | |
| branch | s11u3-sru |
| changeset 7627 | 4758b76d5ad5 |
| parent 115 | c360825c3a3f |
| permissions | -rw-r--r-- |
|
7627
4758b76d5ad5
25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
115
diff
changeset
|
1 |
# Define defaults for Solaris. |
|
4758b76d5ad5
25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
115
diff
changeset
|
2 |
# Solaris-specific patch. |
|
4758b76d5ad5
25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
115
diff
changeset
|
3 |
# |
|
4758b76d5ad5
25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
115
diff
changeset
|
4 |
# Not for upstream. |
|
4758b76d5ad5
25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
115
diff
changeset
|
5 |
|
|
4758b76d5ad5
25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
115
diff
changeset
|
6 |
--- config-top.h 2012-08-18 17:51:30.000000000 -0700 |
|
4758b76d5ad5
25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
115
diff
changeset
|
7 |
+++ config-top.h 2015-04-02 10:08:29.143843829 -0700 |
|
4758b76d5ad5
25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
115
diff
changeset
|
8 |
@@ -63,14 +63,14 @@ |
|
110
77641682ba6f
7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
9 |
/* The default value of the PATH variable. */ |
|
77641682ba6f
7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
10 |
#ifndef DEFAULT_PATH_VALUE |
|
77641682ba6f
7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
11 |
#define DEFAULT_PATH_VALUE \ |
|
7627
4758b76d5ad5
25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
115
diff
changeset
|
12 |
- "/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin:." |
|
110
77641682ba6f
7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
13 |
+ "/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
|
14 |
#endif |
|
77641682ba6f
7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
15 |
|
|
77641682ba6f
7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
16 |
/* 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
|
17 |
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
|
18 |
#ifndef STANDARD_UTILS_PATH |
|
77641682ba6f
7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
19 |
#define STANDARD_UTILS_PATH \ |
|
77641682ba6f
7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
20 |
- "/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
|
21 |
+ "/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
|
22 |
#endif |
|
77641682ba6f
7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
23 |
|
|
77641682ba6f
7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
24 |
/* Default primary and secondary prompt strings. */ |
|
7627
4758b76d5ad5
25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
115
diff
changeset
|
25 |
@@ -87,14 +87,14 @@ |
|
4758b76d5ad5
25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
115
diff
changeset
|
26 |
#define DEFAULT_BASHRC "~/.bashrc" |
|
110
77641682ba6f
7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
27 |
|
|
77641682ba6f
7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
28 |
/* System-wide .bashrc file for interactive shells. */ |
|
77641682ba6f
7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
29 |
-/* #define SYS_BASHRC "/etc/bash.bashrc" */ |
|
77641682ba6f
7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
30 |
+#define SYS_BASHRC "/etc/bash/bashrc" |
|
77641682ba6f
7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
31 |
|
|
77641682ba6f
7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
32 |
/* System-wide .bash_logout for login shells. */ |
|
77641682ba6f
7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
33 |
-/* #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
|
34 |
+#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
|
35 |
|
|
77641682ba6f
7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
36 |
/* 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
|
37 |
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
|
38 |
-/* #define NON_INTERACTIVE_LOGIN_SHELLS */ |
|
77641682ba6f
7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
39 |
+#define NON_INTERACTIVE_LOGIN_SHELLS 1 |
|
77641682ba6f
7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
40 |
|
|
77641682ba6f
7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
41 |
/* 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
|
42 |
sshd and source the .bashrc if so (like the rshd behavior). This checks |