aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorManuel Canales Esparcia <manuel@linuxfromscratch.org>2007-07-29 12:06:35 +0000
committerManuel Canales Esparcia <manuel@linuxfromscratch.org>2007-07-29 12:06:35 +0000
commit06a612914bb178b8ecd274e24b04b7f6a15c11b0 (patch)
tree3c640a74f0b87496261e5d3d9760da84190f8b63
parentbfc3db78266ad579b4e686f93c182b28f7edafaf (diff)
Ported r3428 from 2.3.x branch.2.3
-rw-r--r--CLFS/master.sh2
-rwxr-xr-xjhalfs1
2 files changed, 1 insertions, 2 deletions
diff --git a/CLFS/master.sh b/CLFS/master.sh
index 0c79135452..1b96a46067 100644
--- a/CLFS/master.sh
+++ b/CLFS/master.sh
@@ -293,7 +293,7 @@ boot_Makefiles() { #
# A little housekeeping on the scripts
case $this_script in
- *grub | *aboot | *colo | *silo | *arcload | *lilo ) continue ;;
+ *grub | *aboot | *colo | *silo | *arcload | *lilo | *introduction ) continue ;;
*whatnext*) continue ;;
*fstab) [[ ! -z ${FSTAB} ]] && cp ${FSTAB} $BUILDDIR/sources/fstab ;;
*kernel) # if there is no kernel config file do not build the kernel
diff --git a/jhalfs b/jhalfs
index b933d8aa2e..7403019501 100755
--- a/jhalfs
+++ b/jhalfs
@@ -397,7 +397,6 @@ if [[ "$REBUILD_MAKEFILE" = "n" ]] ; then
cp -r BLFS/* ${BUILDDIR}${BLFS_ROOT}
cp -r menu ${BUILDDIR}${BLFS_ROOT}
cp $COMMON_DIR/progress_bar.sh ${BUILDDIR}${BLFS_ROOT}
- chmod 777 ${BUILDDIR}${BLFS_ROOT}/progress_bar.sh
cp README.BLFS ${BUILDDIR}${BLFS_ROOT}
# Clean-up
rm -rf ${BUILDDIR}${BLFS_ROOT}/libs/.svn