From f1a5ce38602b29e28c8ff6e14b29e950021f41e1 Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Tue, 31 Dec 2024 20:34:46 -0600 Subject: [PATCH 1/3] Update to shadow-4.17.1. --- chapter01/changelog.xml | 4 ++-- packages.ent | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index c378309de..8e43698fc 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -64,8 +64,8 @@ #5615. - [bdubbs] - Update to shadow-4.17.0. Fixes - #5617. + [bdubbs] - Update to shadow-4.17.1. Fixes + #5617. [bdubbs] - Update to procps-ng-4.0.5. Fixes diff --git a/packages.ent b/packages.ent index b88852d20..d5f69deab 100644 --- a/packages.ent +++ b/packages.ent @@ -645,10 +645,10 @@ - - + + - + From 8e8be5f129e67b01aff3c958aab56c48aa603101 Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Thu, 26 Dec 2024 18:39:39 +0800 Subject: [PATCH 2/3] Use lfs-user entity in commands I still think it's cleaner for jhalfs to just use a different user name (for example "lfs1") if the user lfs already exists. This will allow jhalfs to easily use a different user name. --- chapter04/addinguser.xml | 12 ++++++------ chapter07/changingowner.xml | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/chapter04/addinguser.xml b/chapter04/addinguser.xml index e10a884b3..e33fbbf38 100644 --- a/chapter04/addinguser.xml +++ b/chapter04/addinguser.xml @@ -20,8 +20,8 @@ the installation process. As root, issue the following commands to add the new user: -groupadd lfs -useradd -s /bin/bash -g lfs -m -k /dev/null lfs +groupadd &lfs-user; +useradd -s /bin/bash -g &lfs-user; -m -k /dev/null &lfs-user; This is what the command line options mean: @@ -74,15 +74,15 @@ useradd -s /bin/bash -g lfs -m -k /dev/null lfs have a password), you need to set a password for &lfs-user;. Issue the following command as the &root; user to set the password: -passwd lfs +passwd &lfs-user; Grant lfs full access to all the directories under $LFS by making lfs the owner: -chown -v lfs $LFS/{usr{,/*},lib,var,etc,bin,sbin,tools} +chown -v &lfs-user; $LFS/{usr{,/*},lib,var,etc,bin,sbin,tools} case $(uname -m) in - x86_64) chown -v lfs $LFS/lib64 ;; + x86_64) chown -v &lfs-user; $LFS/lib64 ;; esac In some host systems, the following su command does not complete @@ -94,7 +94,7 @@ esac logging in as &lfs-user; on a virtual console, or with the following substitute/switch user command: -su - lfs +su - &lfs-user; The - instructs su to start a login shell as opposed to a non-login shell. diff --git a/chapter07/changingowner.xml b/chapter07/changingowner.xml index 16c052b39..b2e0ad9d5 100644 --- a/chapter07/changingowner.xml +++ b/chapter07/changingowner.xml @@ -33,9 +33,9 @@ user root by running the following command: -chown --from lfs -R root:root $LFS/{usr,lib,var,etc,bin,sbin,tools} +chown --from &lfs-user; -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-user; -R root:root $LFS/lib64 ;; esac From 6528f7572074201a9cd3152b4e028fc117e138e5 Mon Sep 17 00:00:00 2001 From: Pierre Labastie Date: Sun, 29 Dec 2024 15:57:31 +0100 Subject: [PATCH 3/3] Use as elements for lfs user and group The preceding commit uses elements to mark the lfs user and group in commands. Unfortunately, this change the rendering in html, because now lfs appears in an italic font. Using or allows parsing the XML for jhalfs, but does not change the html rendering. --- chapter04/addinguser.xml | 12 ++++++------ chapter07/changingowner.xml | 4 ++-- general.ent | 2 ++ 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/chapter04/addinguser.xml b/chapter04/addinguser.xml index e33fbbf38..e1d130b95 100644 --- a/chapter04/addinguser.xml +++ b/chapter04/addinguser.xml @@ -20,8 +20,8 @@ the installation process. As root, issue the following commands to add the new user: -groupadd &lfs-user; -useradd -s /bin/bash -g &lfs-user; -m -k /dev/null &lfs-user; +groupadd &lfs-groupname; +useradd -s /bin/bash -g &lfs-groupname; -m -k /dev/null &lfs-username; This is what the command line options mean: @@ -74,15 +74,15 @@ useradd -s /bin/bash -g &lfs-user; -m -k /dev/null &lfs-user; -passwd &lfs-user; +passwd &lfs-username; Grant lfs full access to all the directories under $LFS by making lfs the owner: -chown -v &lfs-user; $LFS/{usr{,/*},lib,var,etc,bin,sbin,tools} +chown -v &lfs-username; $LFS/{usr{,/*},lib,var,etc,bin,sbin,tools} case $(uname -m) in - x86_64) chown -v &lfs-user; $LFS/lib64 ;; + x86_64) chown -v &lfs-username; $LFS/lib64 ;; esac In some host systems, the following su command does not complete @@ -94,7 +94,7 @@ esac logging in as &lfs-user; on a virtual console, or with the following substitute/switch user command: -su - &lfs-user; +su - &lfs-username; The - instructs su to start a login shell as opposed to a non-login shell. diff --git a/chapter07/changingowner.xml b/chapter07/changingowner.xml index b2e0ad9d5..178c7836e 100644 --- a/chapter07/changingowner.xml +++ b/chapter07/changingowner.xml @@ -33,9 +33,9 @@ user root by running the following command: -chown --from &lfs-user; -R root:root $LFS/{usr,lib,var,etc,bin,sbin,tools} +chown --from &lfs-username; -R root:root $LFS/{usr,lib,var,etc,bin,sbin,tools} case $(uname -m) in - x86_64) chown --from &lfs-user; -R root:root $LFS/lib64 ;; + x86_64) chown --from &lfs-username; -R root:root $LFS/lib64 ;; esac diff --git a/general.ent b/general.ent index 4e1480324..b3bce5ae8 100644 --- a/general.ent +++ b/general.ent @@ -134,6 +134,8 @@ root"> lfs"> +lfs"> +lfs"> devtmpfs"> /etc/fstab"> /boot">