From e0d18a70caed39d29a50317d1a857ad771117dad Mon Sep 17 00:00:00 2001
From: Thomas Balu Walter <tw@itreff.de>
Date: Tue, 13 Mar 2001 17:19:45 +0000
Subject: [PATCH] Changed all "rm file && ln -s dest file" into "ln -sf file".

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@312 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml    | 5 +++++
 chapter06/bzip2-inst.xml   | 3 +--
 chapter06/config-glibc.xml | 3 +--
 chapter06/gzip-inst.xml    | 4 ++--
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index af167ff82..6fa7a953e 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -122,6 +122,11 @@ Chapter 6: Merged the different sulogin lines from the inittab file
 into one line.
 </para></listitem>
 
+<listitem><para>
+Chapter 6: Changed all "rm file && ln -s dest file" into 
+"ln -sf file" (in glibc, bzip2 and gzip installation). 
+</para></listitem>
+
 <listitem><para>
 Chapter 7: Fixed the delays in the killproc function in the functions
 script. Now after kill, first check PIDs, then sleep 2 if needed. More
diff --git a/chapter06/bzip2-inst.xml b/chapter06/bzip2-inst.xml
index 580643476..a2977a367 100644
--- a/chapter06/bzip2-inst.xml
+++ b/chapter06/bzip2-inst.xml
@@ -16,8 +16,7 @@ Install Bzip2 by running the following commands:
 	<userinput>cp -a libbz2.so* libbz2.a /lib &amp;&amp;</userinput>
 	<userinput>rm /usr/lib/libbz2.a &amp;&amp;</userinput>
 	<userinput>cd /bin &amp;&amp;</userinput>
-	<userinput>rm bunzip2 &amp;&amp; ln -s bzip2 bunzip2
-		&amp;&amp;</userinput>
+	<userinput>ln -sf bzip2 bunzip2 &amp;&amp;</userinput>
 	<userinput>rm bzcat &amp;&amp; ln -s bzip2 bzcat
 		&amp;&amp;</userinput>
 	<userinput>cd /usr/share/man/man1 &amp;&amp;</userinput>
diff --git a/chapter06/config-glibc.xml b/chapter06/config-glibc.xml
index 5272c536e..4377c40e9 100644
--- a/chapter06/config-glibc.xml
+++ b/chapter06/config-glibc.xml
@@ -52,8 +52,7 @@ by running:
 <blockquote><literallayout>
 
 	<userinput>cd /etc &amp;&amp;</userinput>
-	<userinput>rm localtime &amp;&amp;</userinput>
-	<userinput>ln -s ../usr/share/zoneinfo/&lt;tzselect's output&gt; 
+	<userinput>ln -sf ../usr/share/zoneinfo/&lt;tzselect's output&gt; 
 		localtime</userinput>
 
 </literallayout></blockquote>
diff --git a/chapter06/gzip-inst.xml b/chapter06/gzip-inst.xml
index 9eb3acdeb..32147581c 100644
--- a/chapter06/gzip-inst.xml
+++ b/chapter06/gzip-inst.xml
@@ -12,9 +12,9 @@ Install Gzip by running the following commands:
 	<userinput>make install &amp;&amp;</userinput>
 	<userinput>cd /usr/bin &amp;&amp;</userinput>
 	<userinput>mv gzip /bin &amp;&amp;</userinput>
-	<userinput>rm gunzip /bin/gunzip &amp;&amp;</userinput>
+	<userinput>rm gunzip &amp;&amp;</userinput>
 	<userinput>cd /bin &amp;&amp;</userinput>
-	<userinput>ln -s gzip gunzip &amp;&amp;</userinput>
+	<userinput>ln -sf gzip gunzip &amp;&amp;</userinput>
 	<userinput>ln -s gzip compress &amp;&amp;</userinput>
 	<userinput>ln -s gunzip uncompress</userinput>