From 37002aec07aac26a1a0114a5cc72de3e15827e63 Mon Sep 17 00:00:00 2001
From: Manuel Canales Esparcia <manuel@linuxfromscratch.org>
Date: Sun, 10 Dec 2006 10:43:20 +0000
Subject: [PATCH] HLFS: Fixed MAKEDEV download. Solved /dev/console and
 /dev/null issue. Removed a hardcoded script number.

---
 HLFS/hlfs.xsl   |  4 ++++
 HLFS/master.sh  | 12 +++++++++---
 common/urls.xsl |  4 ++--
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/HLFS/hlfs.xsl b/HLFS/hlfs.xsl
index 4b01972..4d1c7ab 100644
--- a/HLFS/hlfs.xsl
+++ b/HLFS/hlfs.xsl
@@ -175,6 +175,10 @@
       <xsl:when test="ancestor::sect1[@id='ch-system-kernfs'] and
                 contains(string(),'sysctl')
                 and $grsecurity_host ='n'"/>
+      <!-- We need to have /dev/console and /dev/null availables before
+           entering to the chroot -->
+      <xsl:when test="ancestor::sect1[@id='ch-system-devices'] and
+                contains(string(),'600 /dev/console')"/>
       <!-- Fix MAKEDEV installation in 2.4-branch -->
       <xsl:when test="ancestor::sect1[@id='ch-system-devices'] and
                 contains(string(),'bzcat MAKEDEV')">
diff --git a/HLFS/master.sh b/HLFS/master.sh
index 42438ca..a151803 100644
--- a/HLFS/master.sh
+++ b/HLFS/master.sh
@@ -557,12 +557,18 @@ mk_SUDO: mk_LUSER
 
 mk_CHROOT: mk_SUDO
 	@if [ ! -e \$(MOUNT_PT)/bin ]; then \\
-	  mkdir \$(MOUNT_PT)/bin; \\
+	  mkdir \$(MOUNT_PT)/bin && \\
 	  cd \$(MOUNT_PT)/bin && \\
-	  ln -sf /tools/bin/bash bash; ln -sf bash sh; \\
+	  ln -sf /tools/bin/bash bash; ln -sf bash sh && \\
 	  sudo chown -R 0:0 \$(MOUNT_PT)/bin; \\
 	fi;
-	@sudo sed -e 's|^ln -sv |ln -svf |' -i \$(CMDSDIR)/chapter06/064-createfiles
+	@if [ ! -e \$(MOUNT_PT)/dev ]; then \\
+	  mkdir \$(MOUNT_PT)/dev && \\
+	  sudo mknod -m 666 \$(MOUNT_PT)/dev/null c 1 3 && \\
+	  sudo mknod -m 666 \$(MOUNT_PT)/dev/console c 5 1 && \\
+	  sudo chown -R 0:0 \$(MOUNT_PT)/dev;
+	fi;
+	@sudo sed -e 's|^ln -.. |ln -svf |' -i \$(CMDSDIR)/chapter06/*-createfiles
 	@\$(call echo_CHROOT_request)
 	@( sudo \$(CHROOT1) "cd \$(SCRIPT_ROOT) && make CHROOT")
 	@touch \$@
diff --git a/common/urls.xsl b/common/urls.xsl
index 3455915..3ffcebc 100644
--- a/common/urls.xsl
+++ b/common/urls.xsl
@@ -23,8 +23,8 @@
       duplicated URLs due that may be splitted for PDF output -->
     <xsl:if test="(ancestor::varlistentry[@condition=$model]
                   or not(ancestor::varlistentry[@condition])) and
-                  (contains(@url, '.tar.') or contains(@url, '.tgz')
-                  or contains(@url, '.patch')) and
+                  (contains(@url, '.bz2') or contains(@url, '.tar.gz') or
+                  contains(@url, '.tgz') or contains(@url, '.patch')) and
                   not(ancestor-or-self::*/@condition = 'pdf')">
       <!-- Extract the package name -->
       <xsl:variable name="package">