From 46b05a0832adca10a2afe5474642ad38521cf0d5 Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Thu, 15 Sep 2022 18:22:44 +0800 Subject: gawk: remove duplicated "-i" in a sed command --- chapter08/gawk.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chapter08/gawk.xml b/chapter08/gawk.xml index 244d7004f..9979e32de 100644 --- a/chapter08/gawk.xml +++ b/chapter08/gawk.xml @@ -46,7 +46,7 @@ Now fix a programming error identified upstream: -sed -i -i '241i UPREF(m);' interpret.h +sed -i '241i UPREF(m);' interpret.h Prepare Gawk for compilation: -- cgit v1.2.3-54-g00ecf From 59350d1c7b902e47c30cc12520b105c04a38d826 Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Sat, 17 Sep 2022 20:36:13 +0800 Subject: afterlfs: remove trailing spaces, and fix two obvious "- -" --- chapter11/afterlfs.xml | 60 +++++++++++++++++++++++++------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/chapter11/afterlfs.xml b/chapter11/afterlfs.xml index d2779b563..ce18b3aab 100644 --- a/chapter11/afterlfs.xml +++ b/chapter11/afterlfs.xml @@ -24,28 +24,28 @@ A server is the simpler category. Generally this consists of a web - server such as the + server such as the Apache HTTP Server and a database server such as - MariaDB. + MariaDB. However other services are possible. The operating system embedded in a single use device falls into this category. On the other hand, a workstation is much more complex. It generally - requires a graphical user environment such as - LXDE, - XFCE, - KDE, or + requires a graphical user environment such as + LXDE, + XFCE, + KDE, or Gnome - based on the + based on the X Window graphical environment and several graphical based applications such as the - Firefox web browser, + Firefox web browser, Thunderbird email client, - or - LibreOffice office suite. + or + LibreOffice office suite. These applications require many (several hundred depending on desired capabilities) more packages of support applications and libraries. @@ -55,10 +55,10 @@ In addition to the above, there is a set of applications that are suitable for all systems for system management. These applications are all in the full BLFS book. Not - all packages are needed in all environments. For example - dhcpcd, - is not appropriate for a server and - wireless_tools, + all packages are needed in all environments. For example + dhcpcd, + is not appropriate for a server and + wireless_tools, are normally only useful for a laptop system. If you are not sure if a package presented here is needed or not, it can either be installed now or later as the @@ -73,7 +73,7 @@ When you initially boot into LFS, you have all the internal tools to build additional packages. Unfortunately, the user environment is quite sparse. - There are a couple of ways to improve this: + There are a couple of ways to improve this: @@ -90,7 +90,7 @@ In order to properly build packages in chroot, you will also need to remember to mount the virtual file systems if they are not already - mounted. One way to do this is to create a script on the + mounted. One way to do this is to create a script on the HOST system: @@ -100,7 +100,7 @@ function mountbind { if ! mountpoint $LFS/$1 >/dev/null; then - $SUDO mount - -bind /$1 $LFS/$1 + $SUDO mount --bind /$1 $LFS/$1 echo $LFS/$1 mounted else echo $LFS/$1 already mounted @@ -110,7 +110,7 @@ function mountbind function mounttype { if ! mountpoint $LFS/$1 >/dev/null; then - $SUDO mount -t $2 $3 $4 $5 $LFS/$1 + $SUDO mount -t $2 $3 $4 $5 $LFS/$1 echo $LFS/$1 mounted else echo $LFS/$1 already mounted @@ -128,7 +128,7 @@ if [ x$LFS == x ]; then exit 1 fi -mountbind dev +mountbind dev mounttype dev/pts devpts devpts -o gid=5,mode=620 mounttype proc proc proc mounttype sys sysfs sysfs @@ -142,7 +142,7 @@ EOF Note that the last three commands in the script are commented out. These are useful if those directories are mounted as separate partitions on the - host system and will be mounted when booting the completed LFS/BLFS system. + host system and will be mounted when booting the completed LFS/BLFS system. @@ -166,8 +166,8 @@ EOF placed in a user's ~/.bashrc file on the host system: -alias lfs='sudo /usr/sbin/chroot /mnt/lfs /usr/bin/env -i HOME=/root TERM="$TERM" PS1="\u:\w\\\\$ " -PATH=/bin:/usr/bin:/sbin:/usr/sbin /bin/bash - -login' +alias lfs='sudo /usr/sbin/chroot /mnt/lfs /usr/bin/env -i HOME=/root TERM="$TERM" PS1="\u:\w\\\\$ " +PATH=/bin:/usr/bin:/sbin:/usr/sbin /bin/bash --login' This alias is a little tricky because of the quoting and levels of @@ -182,14 +182,14 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin /bin/bash - -login' This method also provides a full graphical environment, but first - requires installing + requires installing sshd and - wget + wget on the LFS system, usually in chroot. It also requires a second computer. This method has the advantage of being simple by not requiring the complexity of the chroot environment. It also uses your LFS built kernel for all additional packages and still provides a complete system - for installing packages. + for installing packages. @@ -198,18 +198,18 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin /bin/bash - -login' Work from the LFS command line - This method requiures installing + This method requiures installing make-ca, - wget, + wget, gpm, and links - in chroot and then rebooting into the new LFS system. At this - point the default system has six virtual consoles. Switching + in chroot and then rebooting into the new LFS system. At this + point the default system has six virtual consoles. Switching consoles is as easy as using the Alt-Fn key combinations where Fn is between F1 and F6. The Alt-LeftArrow and Alt-RightArrow key combinations also will change the console. - + At this point you can log into two different virtual consoles and run the links browser in one console and bash in the other. GPM then allows -- cgit v1.2.3-54-g00ecf From afd19ad54a4dd4aff8a17df48e79b8f502feee8e Mon Sep 17 00:00:00 2001 From: Pierre Labastie Date: Sat, 17 Sep 2022 14:52:38 +0200 Subject: afterlfs: typo and add dependencies of make-ca --- chapter11/afterlfs.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/chapter11/afterlfs.xml b/chapter11/afterlfs.xml index ce18b3aab..8b5fe6824 100644 --- a/chapter11/afterlfs.xml +++ b/chapter11/afterlfs.xml @@ -198,7 +198,9 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin /bin/bash --login' Work from the LFS command line - This method requiures installing + This method requires installing + libtasn1, + p11-kit, make-ca, wget, gpm, and -- cgit v1.2.3-54-g00ecf From 226784a1cba31a103826f1be680abb14201f3db8 Mon Sep 17 00:00:00 2001 From: Pierre Labastie Date: Sat, 17 Sep 2022 14:57:01 +0200 Subject: afterlfs: Fix blfs "links" url --- chapter11/afterlfs.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chapter11/afterlfs.xml b/chapter11/afterlfs.xml index 8b5fe6824..0a125d711 100644 --- a/chapter11/afterlfs.xml +++ b/chapter11/afterlfs.xml @@ -204,7 +204,7 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin /bin/bash --login' make-ca, wget, gpm, and - links + links in chroot and then rebooting into the new LFS system. At this point the default system has six virtual consoles. Switching consoles is as easy as using the Alt-Fn key combinations where Fn is -- cgit v1.2.3-54-g00ecf From 9f8335ee8dba07552a1615e7753d021654c1636c Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Sat, 17 Sep 2022 21:06:14 +0800 Subject: afterlfs: several fixes - Use for bold, instead of . - Remove "X window" as some graphical environments are Wayland-based. - "Full BLFS" -> "BLFS", and "partial BLFS" -> "basic LFS" (I guess some content is copied from Basic BLFS). --- chapter11/afterlfs.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/chapter11/afterlfs.xml b/chapter11/afterlfs.xml index 0a125d711..fd863f76b 100644 --- a/chapter11/afterlfs.xml +++ b/chapter11/afterlfs.xml @@ -39,8 +39,8 @@ XFCE, KDE, or Gnome - based on the - X Window graphical environment + based on a basic + graphical environment and several graphical based applications such as the Firefox web browser, Thunderbird email client, @@ -54,7 +54,7 @@ In addition to the above, there is a set of applications that are suitable for all systems for system management. These applications are - all in the full BLFS book. Not + all in the BLFS book. Not all packages are needed in all environments. For example dhcpcd, is not appropriate for a server and @@ -68,7 +68,7 @@ - Working in a partial BLFS environment + Working in a basic LFS environment When you initially boot into LFS, you have all the internal tools to build @@ -91,7 +91,7 @@ In order to properly build packages in chroot, you will also need to remember to mount the virtual file systems if they are not already mounted. One way to do this is to create a script on the - HOST system: + HOST system: cat > ~/mount-virt.sh << "EOF" -- cgit v1.2.3-54-g00ecf From 9bbfbeabc9f3b5d348f3076e791340328684020c Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Sun, 18 Sep 2022 00:13:14 +0800 Subject: afterlfs: tweak key combination description Use DocBook to decorate the keys. Change "Fn" to "Fx" because some small keyboards have a "Fn" (function) key to multiplex keys. --- chapter11/afterlfs.xml | 38 ++++++++++++++++++++++++++++++++------ 1 file changed, 32 insertions(+), 6 deletions(-) diff --git a/chapter11/afterlfs.xml b/chapter11/afterlfs.xml index fd863f76b..db2f21bc3 100644 --- a/chapter11/afterlfs.xml +++ b/chapter11/afterlfs.xml @@ -207,8 +207,23 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin /bin/bash --login' links in chroot and then rebooting into the new LFS system. At this point the default system has six virtual consoles. Switching - consoles is as easy as using the Alt-Fn key combinations where Fn is - between F1 and F6. The Alt-LeftArrow and Alt-RightArrow key + consoles is as easy as using the + + Alt + Fx + + key combinations where Fx is + between F1 and F6. + The + + Alt + + + and + + Alt + + combinations also will change the console. @@ -222,10 +237,21 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin /bin/bash --login' As a side note, switching of virtual consoles can also be done from - an X Window instance with the Ctrl-Alt-Fn key combination, but the - mouse copy operation does not work between the graphical interface - and a virtual console. You can return to the X Window display with - the Ctrl-Alt-Fn conbination where Fn is usually F7. + an X Window instance with the + + Ctrl + Alt + Fx + + key combination, but the mouse copy operation does not work + between the graphical interface and a virtual console. You can + return to the X Window display with the + + Ctrl + Alt + Fx + + combination, where Fx may be F7. -- cgit v1.2.3-54-g00ecf From 43e486193639096eb9d7e57dc52e889a58434cc8 Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Sun, 18 Sep 2022 00:16:00 +0800 Subject: afterlfs: "links" -> "links or lynx" Lynx has a slight advantage: no recommended dependencies. --- chapter11/afterlfs.xml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/chapter11/afterlfs.xml b/chapter11/afterlfs.xml index db2f21bc3..89ff1de57 100644 --- a/chapter11/afterlfs.xml +++ b/chapter11/afterlfs.xml @@ -205,6 +205,7 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin /bin/bash --login' wget, gpm, and links + (or lynx) in chroot and then rebooting into the new LFS system. At this point the default system has six virtual consoles. Switching consoles is as easy as using the @@ -229,9 +230,9 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin /bin/bash --login' At this point you can log into two different virtual consoles and run - the links browser in one console and bash in the other. GPM then allows - copying commands from the browser with the left mouse button, switching - consoles, and pasting into the other console. + the links or lynx browser in one console and bash in the other. GPM + then allows copying commands from the browser with the left mouse + button, switching consoles, and pasting into the other console. -- cgit v1.2.3-54-g00ecf From b6a6f6c791002082132d98f410c58bb6a8532ea6 Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Sun, 18 Sep 2022 00:17:12 +0800 Subject: afterlfs: use entity for root user --- chapter11/afterlfs.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chapter11/afterlfs.xml b/chapter11/afterlfs.xml index 89ff1de57..4052ccdd6 100644 --- a/chapter11/afterlfs.xml +++ b/chapter11/afterlfs.xml @@ -147,7 +147,7 @@ EOF The script can be run with bash ~/mount-virt.sh as - either a regular user (recommended) or as root. If run as a regular + either a regular user (recommended) or as &root;. If run as a regular user, sudo is required on the host system. -- cgit v1.2.3-54-g00ecf