aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXi Ruoyao <xry111@mengyan1223.wang>2021-05-09 03:39:02 +0800
committerXi Ruoyao <xry111@mengyan1223.wang>2021-05-09 03:39:02 +0800
commit2fcfa27ef615901f9375bc08301cbd660bfd4ecd (patch)
tree79e6004f8e7f0c17ca55495beb8699af3af3e5b7
parent4bcd65c281d798880a1afde5a7467a5063f68c96 (diff)
Revert "usr-move: configure shadow not to include /bin or /sbin in PATH"
This reverts commit 4bcd65c281d798880a1afde5a7467a5063f68c96. Distros with merged usr configuration are still using /bin and /sbin in PATH, so we will keep them as well (at least for now). Note that /bin in PATH may cause some issue building packages (observed in WebKitGTK with bwrap). Some workarounds may be needed.
-rw-r--r--chapter08/shadow.xml6
1 files changed, 0 insertions, 6 deletions
diff --git a/chapter08/shadow.xml b/chapter08/shadow.xml
index daec787cb..354fcbdff 100644
--- a/chapter08/shadow.xml
+++ b/chapter08/shadow.xml
@@ -119,12 +119,6 @@ find man -name Makefile.in -exec sed -i 's/passwd\.5 / /' {} \;</userinput></s
<screen><userinput remap="install">make install</userinput></screen>
- <para>Adjust the configuration file <filename>login.defs</filename> to
- set up <envar>PATH</envar> correctly for the merged
- <filename class="directory">/usr</filename> hierarchy of LFS:</para>
-
-<screen><userinput remap="install">sed 's@/sbin:@@; s@/bin:@@' -i /etc/login.defs</userinput></screen>
-
</sect2>
<sect2 id="conf-shadow" role="configuration">