diff options
Diffstat (limited to 'chapter06')
| -rw-r--r-- | chapter06/bash-inst.xml | 2 | ||||
| -rw-r--r-- | chapter06/bzip2-inst.xml | 18 | ||||
| -rw-r--r-- | chapter06/e2fsprogs-inst.xml | 2 | ||||
| -rw-r--r-- | chapter06/ed-inst.xml | 2 | ||||
| -rw-r--r-- | chapter06/flex-inst.xml | 2 | ||||
| -rw-r--r-- | chapter06/glibc-exp.xml | 6 | ||||
| -rw-r--r-- | chapter06/glibc-inst.xml | 6 | ||||
| -rw-r--r-- | chapter06/gzip-inst.xml | 10 | ||||
| -rw-r--r-- | chapter06/kbd-exp.xml | 2 | ||||
| -rw-r--r-- | chapter06/kbd-inst.xml | 2 | ||||
| -rw-r--r-- | chapter06/man-inst.xml | 2 | ||||
| -rw-r--r-- | chapter06/mawk-inst.xml | 2 | ||||
| -rw-r--r-- | chapter06/ncurses-inst.xml | 2 | ||||
| -rw-r--r-- | chapter06/netkitbase-inst.xml | 2 | ||||
| -rw-r--r-- | chapter06/procps-inst.xml | 2 | ||||
| -rw-r--r-- | chapter06/removeoldnss.xml | 2 | ||||
| -rw-r--r-- | chapter06/shadowpwd-exp.xml | 2 | ||||
| -rw-r--r-- | chapter06/shadowpwd-inst.xml | 6 | ||||
| -rw-r--r-- | chapter06/shellutils-inst.xml | 6 | ||||
| -rw-r--r-- | chapter06/sysvinit-inst.xml | 2 | ||||
| -rw-r--r-- | chapter06/textutils-inst.xml | 2 | ||||
| -rw-r--r-- | chapter06/utillinux-inst.xml | 2 | ||||
| -rw-r--r-- | chapter06/vim-inst.xml | 4 |
23 files changed, 44 insertions, 44 deletions
diff --git a/chapter06/bash-inst.xml b/chapter06/bash-inst.xml index 6ca2e5600..ee2ee88f6 100644 --- a/chapter06/bash-inst.xml +++ b/chapter06/bash-inst.xml @@ -7,7 +7,7 @@ <userinput>make &&</userinput> <userinput>make install &&</userinput> <userinput>logout</userinput> -<userinput>mv $LFS/usr/bin/bash $LFS/usr/bin/bashbug $LFS/bin &&</userinput> +<userinput>mv -f $LFS/usr/bin/bash $LFS/usr/bin/bashbug $LFS/bin &&</userinput> &c6-chrootcmd;</screen></para> <para>The static bash is replaced with the dynamic bash after we exit diff --git a/chapter06/bzip2-inst.xml b/chapter06/bzip2-inst.xml index 7f4ce03a0..ba92ead24 100644 --- a/chapter06/bzip2-inst.xml +++ b/chapter06/bzip2-inst.xml @@ -5,19 +5,19 @@ <para><screen><userinput>make -f Makefile-libbz2_so &&</userinput> <userinput>make bzip2recover libbz2.a &&</userinput> -<userinput>cp bzip2-shared /bin/bzip2 &&</userinput> -<userinput>cp bzip2recover /bin &&</userinput> -<userinput>cp bzip2.1 /usr/share/man/man1 &&</userinput> -<userinput>cp bzlib.h /usr/include &&</userinput> -<userinput>cp -a libbz2.so* libbz2.a /lib &&</userinput> -<userinput>rm /usr/lib/libbz2.a &&</userinput> +<userinput>cp -f bzip2-shared /bin/bzip2 &&</userinput> +<userinput>cp -f bzip2recover /bin &&</userinput> +<userinput>cp -f bzip2.1 /usr/share/man/man1 &&</userinput> +<userinput>cp -f bzlib.h /usr/include &&</userinput> +<userinput>cp -af libbz2.so* libbz2.a /lib &&</userinput> +<userinput>rm -f /usr/lib/libbz2.a &&</userinput> <userinput>cd /bin &&</userinput> <userinput>ln -sf bzip2 bunzip2 &&</userinput> <userinput>ln -sf bzip2 bzcat &&</userinput> <userinput>cd /usr/share/man/man1 &&</userinput> -<userinput>ln -s bzip2.1 bunzip2.1 &&</userinput> -<userinput>ln -s bzip2.1 bzcat.1 &&</userinput> -<userinput>ln -s bzip2.1 bzip2recover.1</userinput></screen></para> +<userinput>ln -sf bzip2.1 bunzip2.1 &&</userinput> +<userinput>ln -sf bzip2.1 bzcat.1 &&</userinput> +<userinput>ln -sf bzip2.1 bzip2recover.1</userinput></screen></para> <para>Although it's not strictly a part of a basic LFS system it's worth mentioning that a patch for Tar can be downloaded which enables the tar diff --git a/chapter06/e2fsprogs-inst.xml b/chapter06/e2fsprogs-inst.xml index e5399db99..2bba4eb80 100644 --- a/chapter06/e2fsprogs-inst.xml +++ b/chapter06/e2fsprogs-inst.xml @@ -11,7 +11,7 @@ to be like that. We did not forget to supply a value there.</para> <userinput>make &&</userinput> <userinput>make install &&</userinput> <userinput>make install-libs &&</userinput> -<userinput>mv /usr/sbin/mklost+found /sbin</userinput></screen></para> +<userinput>mv -f /usr/sbin/mklost+found /sbin</userinput></screen></para> </sect2> diff --git a/chapter06/ed-inst.xml b/chapter06/ed-inst.xml index 41f2545bc..698f0d299 100644 --- a/chapter06/ed-inst.xml +++ b/chapter06/ed-inst.xml @@ -11,7 +11,7 @@ <userinput>./configure --prefix=/usr &&</userinput> <userinput>make &&</userinput> <userinput>make install &&</userinput> -<userinput>mv /usr/bin/ed /usr/bin/red /bin</userinput></screen></para> +<userinput>mv -f /usr/bin/ed /usr/bin/red /bin</userinput></screen></para> </sect2> diff --git a/chapter06/flex-inst.xml b/chapter06/flex-inst.xml index fedd2dc5e..abea4ae41 100644 --- a/chapter06/flex-inst.xml +++ b/chapter06/flex-inst.xml @@ -7,7 +7,7 @@ <userinput>make &&</userinput> <userinput>make install &&</userinput> <userinput>cd /usr/bin &&</userinput> -<userinput>ln -s flex lex</userinput></screen></para> +<userinput>ln -sf flex lex</userinput></screen></para> </sect2> diff --git a/chapter06/glibc-exp.xml b/chapter06/glibc-exp.xml index dfb3bae3c..d49215c64 100644 --- a/chapter06/glibc-exp.xml +++ b/chapter06/glibc-exp.xml @@ -21,7 +21,7 @@ file <filename>tmp~</filename>. This is done because Glibc can't autodetect perl since it's not installed yet at the time when we install Glibc.</para> -<para><userinput>mv tmp~ ../glibc-&glibc-version;/malloc/Makefile:</userinput> The file +<para><userinput>mv -f tmp~ ../glibc-&glibc-version;/malloc/Makefile:</userinput> The file <filename>tmp~</filename> is now moved back to <filename>../glibc-&glibc-version;/malloc/Makefile</filename>. We do this because when using sed, we can't write straight back to this file so we need to @@ -35,7 +35,7 @@ because as we don't have glibc on the LFS system yet, usernames can't be resolved to their user id's. Therefore, we replace the username root with the id 0. </para> -<para><userinput>mv tmp~ ../glibc-&glibc-version;/login/Makefile:</userinput> Asabove, we are using a temporary file (<filename>tmp~</filename>) to store the +<para><userinput>mv -f tmp~ ../glibc-&glibc-version;/login/Makefile:</userinput> Asabove, we are using a temporary file (<filename>tmp~</filename>) to store the edited Makefile and then copying it back over the original.</para> <para><userinput>--enable-add-ons:</userinput> This enables the add-on that @@ -52,7 +52,7 @@ test program to determine this, so it automatically defaults to a cross-compiler. The reason for the failed program is because Glibc hasn't been installed yet.</para> -<para><userinput>mv config.make~ config.make:</userinput> Again, we are moving +<para><userinput>mv -f config.make~ config.make:</userinput> Again, we are moving the temporary file over the original.</para> </sect2> diff --git a/chapter06/glibc-inst.xml b/chapter06/glibc-inst.xml index 0b52729e9..95ad570cb 100644 --- a/chapter06/glibc-inst.xml +++ b/chapter06/glibc-inst.xml @@ -14,15 +14,15 @@ would do.</para> <userinput>cd ../glibc-build &&</userinput> <userinput>sed 's|$(PERL)|/usr/bin/perl|' \</userinput> <userinput> ../glibc-&glibc-version;/malloc/Makefile > tmp~ &&</userinput> -<userinput>mv tmp~ ../glibc-&glibc-version;/malloc/Makefile &&</userinput> +<userinput>mv -f tmp~ ../glibc-&glibc-version;/malloc/Makefile &&</userinput> <userinput>sed 's/root/0/' ../glibc-&glibc-version;/login/Makefile > tmp~ &&</userinput> -<userinput>mv tmp~ ../glibc-&glibc-version;/login/Makefile &&</userinput> +<userinput>mv -f tmp~ ../glibc-&glibc-version;/login/Makefile &&</userinput> <userinput>../glibc-&glibc-version;/configure \</userinput> <userinput> --prefix=/usr --enable-add-ons \</userinput> <userinput> --libexecdir=/usr/bin &&</userinput> <userinput>sed 's/cross-compiling = yes/cross-compiling = no/' \</userinput> <userinput> config.make > config.make~ &&</userinput> -<userinput>mv config.make~ config.make &&</userinput> +<userinput>mv -f config.make~ config.make &&</userinput> <userinput>make &&</userinput> <userinput>make install &&</userinput> <userinput>make localedata/install-locales &&</userinput> diff --git a/chapter06/gzip-inst.xml b/chapter06/gzip-inst.xml index 5c59c88c1..2763417e2 100644 --- a/chapter06/gzip-inst.xml +++ b/chapter06/gzip-inst.xml @@ -7,13 +7,13 @@ <userinput>make &&</userinput> <userinput>make install &&</userinput> <userinput>cd /usr/bin &&</userinput> -<userinput>mv gzip /bin &&</userinput> -<userinput>rm gunzip zcat &&</userinput> +<userinput>mv -f gzip /bin &&</userinput> +<userinput>rm -f gunzip zcat &&</userinput> <userinput>cd /bin &&</userinput> <userinput>ln -sf gzip gunzip &&</userinput> -<userinput>ln -s gzip zcat &&</userinput> -<userinput>ln -s gzip compress &&</userinput> -<userinput>ln -s gunzip uncompress</userinput></screen></para> +<userinput>ln -sf gzip zcat &&</userinput> +<userinput>ln -sf gzip compress &&</userinput> +<userinput>ln -sf gunzip uncompress</userinput></screen></para> </sect2> diff --git a/chapter06/kbd-exp.xml b/chapter06/kbd-exp.xml index a4260d5db..2cd5c9cba 100644 --- a/chapter06/kbd-exp.xml +++ b/chapter06/kbd-exp.xml @@ -5,7 +5,7 @@ data files (fonts, keymaps, and such) in the /usr/share/kbd directory, as the FHS suggests.</para> -<para><userinput>rm +<para><userinput>rm -f /usr/share/kbd/keymaps/i386/qwerty/defkeymap.map.gz:</userinput> We remove this file because we don't know which keymap you need to use. We will be defining the default keymap in diff --git a/chapter06/kbd-inst.xml b/chapter06/kbd-inst.xml index 27799dd47..f6211bddd 100644 --- a/chapter06/kbd-inst.xml +++ b/chapter06/kbd-inst.xml @@ -6,7 +6,7 @@ <para><screen><userinput>./configure --datadir=/usr/share/kbd &&</userinput> <userinput>make &&</userinput> <userinput>make install &&</userinput> -<userinput>rm /usr/share/kbd/keymaps/i386/qwerty/defkeymap.map.gz</userinput></screen></para> +<userinput>rm -f /usr/share/kbd/keymaps/i386/qwerty/defkeymap.map.gz</userinput></screen></para> </sect2> diff --git a/chapter06/man-inst.xml b/chapter06/man-inst.xml index ef36275a8..1c457fc90 100644 --- a/chapter06/man-inst.xml +++ b/chapter06/man-inst.xml @@ -5,7 +5,7 @@ <para><screen><userinput>for i in configure src/Makefile.in src/makewhatis.sh</userinput> <userinput>do sed s/gawk/awk/g $i > $i.fixed</userinput> -<userinput>mv $i.fixed $i</userinput> +<userinput>mv -f $i.fixed $i</userinput> <userinput>done</userinput> <userinput>chmod 700 configure &&</userinput> <userinput>./configure -default &&</userinput> diff --git a/chapter06/mawk-inst.xml b/chapter06/mawk-inst.xml index 87380832b..3ae513357 100644 --- a/chapter06/mawk-inst.xml +++ b/chapter06/mawk-inst.xml @@ -8,7 +8,7 @@ <userinput>make BINDIR=/usr/bin \</userinput> <userinput> MANDIR=/usr/share/man/man1 install &&</userinput> <userinput>cd /usr/bin &&</userinput> -<userinput>ln -s mawk awk</userinput></screen></para> +<userinput>ln -sf mawk awk</userinput></screen></para> </sect2> diff --git a/chapter06/ncurses-inst.xml b/chapter06/ncurses-inst.xml index 0b610591c..03782abe6 100644 --- a/chapter06/ncurses-inst.xml +++ b/chapter06/ncurses-inst.xml @@ -10,6 +10,6 @@ <userinput>cd /lib &&</userinput> <userinput>mv libncurses.a libncurses_g.a libncurses++.a /usr/lib &&</userinput> <userinput>cd /usr/lib &&</userinput> -<userinput>ln -s libncurses.a libcurses.a</userinput></screen></para> +<userinput>ln -sf libncurses.a libcurses.a</userinput></screen></para> </sect2> diff --git a/chapter06/netkitbase-inst.xml b/chapter06/netkitbase-inst.xml index c4cc5d3ce..36f546600 100644 --- a/chapter06/netkitbase-inst.xml +++ b/chapter06/netkitbase-inst.xml @@ -7,7 +7,7 @@ <userinput>make &&</userinput> <userinput>make install &&</userinput> <userinput>cd etc.sample &&</userinput> -<userinput>cp services protocols /etc</userinput></screen></para> +<userinput>cp -f services protocols /etc</userinput></screen></para> <para>There are other files in the <filename class="directory">etc.sample</filename> directory which might be of diff --git a/chapter06/procps-inst.xml b/chapter06/procps-inst.xml index 29ff3d5f6..0b86b02fa 100644 --- a/chapter06/procps-inst.xml +++ b/chapter06/procps-inst.xml @@ -5,7 +5,7 @@ <para><screen><userinput>make &&</userinput> <userinput>make XSCPT='' install &&</userinput> -<userinput>mv /usr/bin/kill /bin</userinput></screen></para> +<userinput>mv -f /usr/bin/kill /bin</userinput></screen></para> </sect2> diff --git a/chapter06/removeoldnss.xml b/chapter06/removeoldnss.xml index 3d2214870..2edf07397 100644 --- a/chapter06/removeoldnss.xml +++ b/chapter06/removeoldnss.xml @@ -5,7 +5,7 @@ to the LFS system (because the normal system runs glibc-2.0) it's time to remove them now by running:</para> -<para><screen><userinput>rm /lib/libnss*.so.1 /lib/libnss*2.0*</userinput></screen></para> +<para><screen><userinput>rm -f /lib/libnss*.so.1 /lib/libnss*2.0*</userinput></screen></para> </sect1> diff --git a/chapter06/shadowpwd-exp.xml b/chapter06/shadowpwd-exp.xml index f9c311362..5a2684570 100644 --- a/chapter06/shadowpwd-exp.xml +++ b/chapter06/shadowpwd-exp.xml @@ -6,7 +6,7 @@ compilation bug which occurs due to a variable (nflg), being used but not defined.</para> -<para><userinput>cp limits login.access and others:</userinput> These files +<para><userinput>cp -f limits login.access and others:</userinput> These files were not installed during the installation of the package so we copy them manually as those files are used to configure authentication details on the system.</para> diff --git a/chapter06/shadowpwd-inst.xml b/chapter06/shadowpwd-inst.xml index 839eb7811..aa95add10 100644 --- a/chapter06/shadowpwd-inst.xml +++ b/chapter06/shadowpwd-inst.xml @@ -6,13 +6,13 @@ following commands:</para> <para><screen><userinput>sed 's/\(.*\) (nflg || \(.*\))\(.*\)/\1\2\3/' \</userinput> -<userinput> src/useradd.c > useradd.c.temp &&</userinput> -<userinput>mv useradd.c.temp src/useradd.c &&</userinput> +<userinput> src/useradd.c > useradd.c.temp &&</userinput> +<userinput>mv -f useradd.c.temp src/useradd.c &&</userinput> <userinput>./configure --prefix=/usr &&</userinput> <userinput>make &&</userinput> <userinput>make install &&</userinput> <userinput>cd etc &&</userinput> -<userinput>cp limits login.access /etc &&</userinput> +<userinput>cp -f limits login.access /etc &&</userinput> <userinput>sed "s|/var/spool/mail|/var/mail|" login.defs.linux > /etc/login.defs</userinput></screen></para> </sect2> diff --git a/chapter06/shellutils-inst.xml b/chapter06/shellutils-inst.xml index 7b0ac4122..4c4a5255d 100644 --- a/chapter06/shellutils-inst.xml +++ b/chapter06/shellutils-inst.xml @@ -7,8 +7,8 @@ <userinput>make &&</userinput> <userinput>make install &&</userinput> <userinput>cd /usr/bin &&</userinput> -<userinput>mv date echo false pwd stty /bin &&</userinput> -<userinput>mv su true uname hostname /bin</userinput></screen></para> +<userinput>mv -f date echo false pwd stty /bin &&</userinput> +<userinput>mv -f su true uname hostname /bin</userinput></screen></para> </sect2> @@ -22,7 +22,7 @@ are built into the bash interpreter, but the FHS dictates that there should be a <filename>[</filename> binary. We create that in this way, while still in the <filename>/usr/bin</filename> directory:</para> -<para><screen><userinput>ln -s test [</userinput></screen></para> +<para><screen><userinput>ln -sf test [</userinput></screen></para> </sect2> diff --git a/chapter06/sysvinit-inst.xml b/chapter06/sysvinit-inst.xml index 80fb6b2f3..5174d4601 100644 --- a/chapter06/sysvinit-inst.xml +++ b/chapter06/sysvinit-inst.xml @@ -15,7 +15,7 @@ processes started by init the TERM signal".</para> <para><screen><userinput>sed \</userinput> <userinput> 's/\(.*\)\(Sending processes\)\(.*\)/\1\2 started by init\3/' \</userinput> <userinput> src/init.c > init.c.temp &&</userinput> -<userinput>mv init.c.temp src/init.c &&</userinput> +<userinput>mv -f init.c.temp src/init.c &&</userinput> <userinput>make -C src &&</userinput> <userinput>make -C src install</userinput></screen></para> diff --git a/chapter06/textutils-inst.xml b/chapter06/textutils-inst.xml index c22802455..6fe4e525d 100644 --- a/chapter06/textutils-inst.xml +++ b/chapter06/textutils-inst.xml @@ -6,7 +6,7 @@ <para><screen><userinput>./configure --prefix=/usr &&</userinput> <userinput>make &&</userinput> <userinput>make install &&</userinput> -<userinput>mv /usr/bin/cat /bin</userinput></screen></para> +<userinput>mv -f /usr/bin/cat /bin</userinput></screen></para> </sect2> diff --git a/chapter06/utillinux-inst.xml b/chapter06/utillinux-inst.xml index eb9d7e579..9bad2860e 100644 --- a/chapter06/utillinux-inst.xml +++ b/chapter06/utillinux-inst.xml @@ -7,7 +7,7 @@ util-linux package, FHS-compliant, run the following.</para> <para><screen><userinput>sed 's|etc/adjtime|var/lib/hwclock/adjtime|' \</userinput> <userinput> hwclock/hwclock.c > hwclock~ &&</userinput> -<userinput>mv hwclock~ hwclock/hwclock.c &&</userinput> +<userinput>mv -f hwclock~ hwclock/hwclock.c &&</userinput> <userinput>mkdir /var/lib/hwclock</userinput></screen></para> </sect2> diff --git a/chapter06/vim-inst.xml b/chapter06/vim-inst.xml index 382404739..f75753935 100644 --- a/chapter06/vim-inst.xml +++ b/chapter06/vim-inst.xml @@ -18,7 +18,7 @@ in which order it is done. Install Vim by running the following commands:</para> <userinput>make &&</userinput> <userinput>make install &&</userinput> <userinput>cd /usr/bin &&</userinput> -<userinput>ln -s vim vi</userinput></screen></para> +<userinput>ln -sf vim vi</userinput></screen></para> <para>If you plan on installing the X Window system on your LFS system, you might want to re-compile Vim after you have installed X. Vim @@ -42,7 +42,7 @@ instead of the one presented above:</para> <userinput>make &&</userinput> <userinput>make install &&</userinput> <userinput>cd /usr/bin &&</userinput> -<userinput>ln -s vim vi &&</userinput> +<userinput>ln -sf vim vi &&</userinput> <userinput>mkdir /var/lib/vim</userinput></screen></para> </sect2> |