blob: 8a334b830a47b34b178a2590bd338d4366b0cbf7 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
|
commit bc596e56ff93ca121317a12d7033c5a5f5440046
Author: William Hubbs <williamh@gentoo.org>
Commit: William Hubbs <williamh@gentoo.org>
Fix installation of .keep files
This partially reverts commit c4887e88316e2176dc99c173ccc6af825c10f745.
We need these .keep files.
commit 9bbb700a3bfeaca7307a154564db00feff201e6e
Author: William Hubbs <williamh@gentoo.org>
Commit: William Hubbs <williamh@gentoo.org>
Makefile: layout-usrmerge should do nothing on non-Linux systems
commit c4887e88316e2176dc99c173ccc6af825c10f745
Author: William Hubbs <williamh@gentoo.org>
Commit: William Hubbs <williamh@gentoo.org>
Do not install .keep files
commit 77e9c6f275399cdef64d432a19da51bc9c9cd0bf
Author: William Hubbs <williamh@gentoo.org>
Commit: William Hubbs <williamh@gentoo.org>
add layout-usrmerge to optionally support the /usr merge
commit 9cac4dd130637fa2c1f1a64bf3c9d2509284e6dd
Author: William Hubbs <williamh@gentoo.org>
Commit: William Hubbs <williamh@gentoo.org>
Drop support for ROOTPATH
The following is taken from /etc/profile:
> Set up PATH depending on whether we're root or a normal user.
> There's no real reason to exclude sbin paths from the normal user,
> but it can make tab-completion easier when they aren't in the
> user's PATH to pollute the executable namespace.
This seems like a minor inconvenience, and excluding sbin paths for the
normal user can cause bigger issues which will offset this inconvenience.
commit ac52b58e7a8a7f8085de9f806645881740b22c5e
Author: William Hubbs <williamh@gentoo.org>
Date: Wed Oct 4 17:12:33 2017 -0500
Drop support for ROOTPATH
The following is taken from /etc/profile:
This seems like a minor inconvenience, and not having *sbin in the path
can cause bigger compatibility issues which offset this inconvenience.
diff --git a/etc/env.d/50baselayout b/etc/env.d/50baselayout
index e8662e0e..b10a2c4d 100644
--- a/etc/env.d/50baselayout
+++ b/etc/env.d/50baselayout
@@ -1,8 +1,7 @@
# /etc/env.d/50baselayout
# Do not edit this file
-PATH="/usr/local/bin:/usr/bin:/bin:/opt/bin"
-ROOTPATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin"
+PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin"
MANPATH="/usr/local/share/man:/usr/share/man"
INFOPATH="/usr/share/info"
CONFIG_PROTECT_MASK="/etc/gentoo-release"
diff --git a/etc/profile b/etc/profile
index 8e92e824..4579bd17 100644
--- a/etc/profile
+++ b/etc/profile
@@ -18,16 +18,6 @@ export PAGER=${PAGER:-/usr/bin/less}
# 077 would be more secure, but 022 is generally quite realistic
umask 022
-# Set up PATH depending on whether we're root or a normal user.
-# There's no real reason to exclude sbin paths from the normal user,
-# but it can make tab-completion easier when they aren't in the
-# user's PATH to pollute the executable namespace.
-if [ "${EUID-}" = "0" ] || [ "${USER-}" = "root" ] ; then
- PATH="${ROOTPATH}"
-fi
-export PATH
-unset ROOTPATH
-
# process *.sh files in /etc/profiled.d
for sh in /etc/profile.d/*.sh ; do
[ -r "$sh" ] && . "$sh"
commit 3d46659bf88caf23cfb631671dbece20bfdf8572
Author: William Hubbs <williamh@gentoo.org>
Commit: William Hubbs <williamh@gentoo.org>
process files in /etc/profile.d before /etc/bash/bashrc for consistency
Bug: https://bugs.gentoo.org/show_bug.cgi?id=610898
commit 38a5b8a104616a720296f15fa6c1e67f7faee6c8
Author: William Hubbs <williamh@gentoo.org>
Commit: William Hubbs <williamh@gentoo.org>
version 2.5
commit 266f213bfedaba6fdedb581df6f0cd1e6c365aae
Author: William Hubbs <williamh@gentoo.org>
Commit: William Hubbs <williamh@gentoo.org>
makefile: do not set DESTDIR
commit 0aacdc243b40f3bd5a651fb50a0043e9650af1c4
Author: William Hubbs <williamh@gentoo.org>
Commit: William Hubbs <williamh@gentoo.org>
update ChangeLog
commit 8b91d77f9ec7431f8d9eca9f6bf918fce78646b8
Author: William Hubbs <williamh@gentoo.org>
Commit: William Hubbs <williamh@gentoo.org>
version 2.4.1
commit ec3d9fb5d4f9252bc524ad4c1fc901867cb3bb63
Author: William Hubbs <williamh@gentoo.org>
Commit: William Hubbs <williamh@gentoo.org>
etc/profile: replace PATH with ROOTPATH if the user is root
This is part of the following bug.
X-Gentoo-Bug: 255695
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=255695
commit a3cd4d5b362239f4d9104c2a9e3af9ba0eec421c
Author: David Michael <david.michael@coreos.com>
Commit: William Hubbs <williamh@gentoo.org>
etc/services: add etcd services
X-Gentoo-Bug: 604704
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=604704
commit ef383418788f2ed46f5f4ad7b26fbe5b5b25707f
Author: William Hubbs <williamh@gentoo.org>
Commit: William Hubbs <williamh@gentoo.org>
etc/env.d: move default settings to 50bbaselayout instead of 00basic
This allows other packages to append or pre-pend any of our defaults.
X-Gentoo-Bug: 255695
X-Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=255695
commit 0af4f400f3edb8e840df1cb9e9df0165961b432f
Author: William Hubbs <williamh@gentoo.org>
Commit: William Hubbs <williamh@gentoo.org>
version 2.4
|
GitWeb