From 24ae50590b533a53cbc254854ec7159c5e02c804 Mon Sep 17 00:00:00 2001 From: William Harrington Date: Mon, 29 Mar 2021 20:43:11 -0500 Subject: Add TESTUSERID when chrooting and use 'id -u' commnd to get user id. Use when adding tester user to passwd. --- insidechroot.sh | 3 +-- lfs.sh | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/insidechroot.sh b/insidechroot.sh index 88a5d26..57951ab 100644 --- a/insidechroot.sh +++ b/insidechroot.sh @@ -131,7 +131,7 @@ nogroup:x:99: users:x:999: EOF - echo "tester:x:$(ls -n "$(tty)" | cut -d" " -f3):101::/home/tester:/bin/bash" >> /etc/passwd + echo "tester:x:${TESTERUID}:101::/home/tester:/bin/bash" >> /etc/passwd echo "tester:x:101:" >> /etc/group install -o tester -d /home/tester @@ -162,4 +162,3 @@ EOF else printf "%b" "Do Chapter 8, 9 and 10 stuff here.\n" fi - diff --git a/lfs.sh b/lfs.sh index d1b23a5..fedf71a 100755 --- a/lfs.sh +++ b/lfs.sh @@ -116,6 +116,7 @@ sudo chroot "${LFS}" /usr/bin/env \ PATH=/bin:/usr/bin:/sbin:/usr/sbin \ NUMPROCS="${NUMPROCS}" \ MAKEFLAGS="${MAKEFLAGS}" \ + TESTERUID="$(id -u)" \ /bin/bash --login +h -c "/sources/insidechroot.sh 7" retval=$? @@ -147,6 +148,7 @@ sudo chroot "${LFS}" /usr/bin/env \ PATH=/bin:/usr/bin:/sbin:/usr/sbin \ NUMPROCS="${NUMPROCS}" \ MAKEFLAGS="${MAKEFLAGS}" \ + TESTERUID="$(id -u)" \ /bin/bash --login +h -c "/sources/insidechroot.sh 8" printf "%b" "${CYN}EXITED ${RED}CHROOT${RST} ENVIRONMENT...${RST}\n" -- cgit v1.2.3-54-g00ecf