diff options
| author | Pierre Labastie <pierre@linuxfromscratch.org> | 2017-03-05 08:38:09 +0000 |
|---|---|---|
| committer | Pierre Labastie <pierre@linuxfromscratch.org> | 2017-03-05 08:38:09 +0000 |
| commit | 85506da325f2ef0fb533a741e2be8a23cce4485e (patch) | |
| tree | 4a866581dbb621b6611a7640dcedb48532b753f8 /common/libs/func_install_blfs | |
| parent | df97e687b5d31bd3fe672a693edf2f5f9c8cfda9 (diff) | |
Merge new_features branch at r3901; Fixes:
when the user fstab and/or kernel config are the same as the ones in
$BUILDDIR/sources: avoid to cp on itself
- set SRC_ARCHIVE=/dev/null in BLFS tools download script if SRC_ARCHIVE is
empty
Diffstat (limited to 'common/libs/func_install_blfs')
| -rw-r--r-- | common/libs/func_install_blfs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/libs/func_install_blfs b/common/libs/func_install_blfs index 8bdef13e46..aa71d4bf1d 100644 --- a/common/libs/func_install_blfs +++ b/common/libs/func_install_blfs @@ -140,7 +140,7 @@ pushd $BUILDDIR/sources sudo find . -name unpacked -exec rm \{\} \; if [ "$GETPKG" = "y" ]; then FTP_SERVER=$SERVER/pub/blfs/ \ - SRC_ARCHIVE=$SRC_ARCHIVE \ + SRC_ARCHIVE=${SRC_ARCHIVE:-/dev/null} \ $BUILDDIR$BLFS_ROOT/download_script else # Save the download script in case the user wants to run it later cp $BUILDDIR$BLFS_ROOT/download_script . |