From ef87eed02e4fe242818dbe19a6ba3478f979adf1 Mon Sep 17 00:00:00 2001
From: Manuel Canales Esparcia <manuel@linuxfromscratch.org>
Date: Sun, 6 Aug 2006 10:17:24 +0000
Subject: [PATCH] Merged missed LFS fix from trunk.

---
 LFS/lfs.xsl   | 6 ++++++
 LFS/master.sh | 3 ---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/LFS/lfs.xsl b/LFS/lfs.xsl
index f8f6df5..b05ebe1 100644
--- a/LFS/lfs.xsl
+++ b/LFS/lfs.xsl
@@ -147,6 +147,12 @@
         <xsl:value-of select="substring-after(string(),'patch')"/>
         <xsl:text>&#xA;</xsl:text>
       </xsl:when>
+      <!-- Fix Udev reinstallation after a build failure -->
+      <xsl:when test="contains(string(),'firmware,udev')">
+        <xsl:text>if [[ ! -d /lib/udev/devices ]] ; then&#xA;</xsl:text>
+        <xsl:apply-templates/>
+        <xsl:text>&#xA;fi&#xA;</xsl:text>
+      </xsl:when>
       <!-- Setting $LANG for /etc/profile -->
       <xsl:when test="ancestor::sect1[@id='ch-scripts-profile'] and
                 contains(string(),'export LANG=')">
diff --git a/LFS/master.sh b/LFS/master.sh
index b4f654c..efbe8bf 100755
--- a/LFS/master.sh
+++ b/LFS/master.sh
@@ -165,9 +165,6 @@ chapter6_Makefiles() {
     done
     # Remove Bzip2 binaries before make install
     sed -e 's@make install@rm -vf /usr/bin/bz*\n&@' -i chapter06$N/*-bzip2
-    # Let some Udev pre-installation commands to fail
-    sed -e 's@/lib/udev/devices/fd@& || true@' \
-        -e 's/mknod -m.*/& || true/' -i chapter06$N/*-udev
   fi
 
   echo "${tab_}${GREEN}Processing... ${L_arrow}Chapter6$N${R_arrow}"