zeroday0619/MahiroOS-jhalfs
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

LFS: Copy /etc/resolv.conf to where it should be during chroot, for

Browse source 
systemd: this allows using the network in chroot.
Also add a chroot1 target, and update the teardown target to what is
in the book.
This commit is contained in:
Pierre Labastie 2019-03-09 07:15:41 +00:00
parent 399058f718
commit d39252b7ca
1 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
LFS/master.sh
View file

@ -541,21 +541,28 @@ devices: ck_UID
if [ -h \$(MOUNT_PT)/dev/shm ]; then \\
sudo mkdir -p \$(MOUNT_PT)/\$\$(readlink \$(MOUNT_PT)/dev/shm); \\
fi
EOF
) >> $MKFILE
if [ "$INITSYS" = systemd ]; then
(
cat << EOF
sudo mkdir -pv \$(MOUNT_PT)/run/systemd/resolve
sudo cp -v /etc/resolv.conf \$(MOUNT_PT)}/run/systemd/resolve
EOF
) >> $MKFILE
fi
(
cat << EOF
teardown:
sudo umount -v \$(MOUNT_PT)/sys
sudo umount -v \$(MOUNT_PT)/proc
sudo umount -v \$(MOUNT_PT)/dev/pts
if mountpoint -q \$(MOUNT_PT)/run; then \\
sudo umount -v \$(MOUNT_PT)/run; \\
elif [ -h \$(MOUNT_PT)/dev/shm ]; then \\
link=\$\$(readlink \$(MOUNT_PT)/dev/shm); \\
sudo umount -v \$(MOUNT_PT)/\$\$link; \\
unset link; \\
else \\
sudo umount -v \$(MOUNT_PT)/dev/shm; \\
fi
sudo umount -v \$(MOUNT_PT)/dev
sudo umount -v \$(MOUNT_PT)/run
sudo umount -v \$(MOUNT_PT)/proc
sudo umount -v \$(MOUNT_PT)/sys
chroot1: devices
sudo \$(CHROOT1)
\$(MAKE) teardown
chroot: devices
sudo \$(CHROOT2)