[lfs] 01/03: Automatic merge of trunk into multilib

This is an automated email from the git hooks/post-receive script.

git pushed a commit to branch multilib_linux-patch
in repository lfs.

commit b06f452753ce244e62baca342662be332815ae3a
Merge: c186c16e0 6528f7572
Author: Thomas Trepl <[email protected]>
AuthorDate: Fri Jan 3 00:30:11 2025 +0100

    Automatic merge of trunk into multilib

 chapter04/addinguser.xml    | 12 ++++++------
 chapter07/changingowner.xml |  4 ++--
 general.ent                 |  2 ++
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --cc chapter04/addinguser.xml
index 3f4d07645,e1d130b95..1a2068680
--- a/chapter04/addinguser.xml
+++ b/chapter04/addinguser.xml
@@@ -80,13 -80,10 +80,13 @@@ useradd -s /bin/bash -g &lfs-groupname
    all the directories under <filename class="directory">$LFS</filename> by making
    <systemitem class="username">lfs</systemitem> the owner:</para>
  
- <screen><userinput>chown -v lfs $LFS/{usr{,/*},lib,var,etc,bin,sbin,tools}
+ <screen><userinput>chown -v &lfs-username; $LFS/{usr{,/*},lib,var,etc,bin,sbin,tools}
  case $(uname -m) in
-   x86_64) chown -v lfs $LFS/lib64 ;;
+   x86_64) chown -v &lfs-username; $LFS/lib64 ;;
  esac</userinput></screen>
 +<screen arch="ml_32"  ><userinput>chown -v lfs $LFS/lib32</userinput></screen>
 +<screen arch="ml_x32" ><userinput>chown -v lfs $LFS/libx32</userinput></screen>
 +<screen arch="ml_all" ><userinput>chown -v lfs $LFS/{lib32,libx32}</userinput></screen>
  
  <note><para>In some host systems, the following <command>su</command> command does not complete
    properly and suspends the login for the &lfs-user; user to the background.
diff --cc chapter07/changingowner.xml
index 38f9d9db1,178c7836e..838532025
--- a/chapter07/changingowner.xml
+++ b/chapter07/changingowner.xml
@@@ -33,14 -33,9 +33,14 @@@
    user <systemitem class="username">root</systemitem> by running the following
    command:</para>
  
- <screen><userinput>chown --from lfs -R root:root $LFS/{usr,lib,var,etc,bin,sbin,tools}
+ <screen><userinput>chown --from &lfs-username; -R root:root $LFS/{usr,lib,var,etc,bin,sbin,tools}
  case $(uname -m) in
-   x86_64) chown --from lfs -R root:root $LFS/lib64 ;;
+   x86_64) chown --from &lfs-username; -R root:root $LFS/lib64 ;;
  esac</userinput></screen>
  
 +  <para arch="ml_32,ml_x32,ml_all">Some more directories exists for
 +  multilib support. Change their ownership, too:</para>
 +<screen arch="ml_32,ml_x32,ml_all"><userinput arch="ml_32,ml_all">chown -R root:root $LFS/lib32</userinput>
 +<userinput arch="ml_x32,ml_all">chown -R root:root $LFS/libx32</userinput></screen>
 +  
  </sect1>

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.

-- 
http://lists.linuxfromscratch.org/sympa/info/lfs-book
Unsubscribe: See the above information page