diff options
| author | Daniel Baumann <daniel@debian.org> | 2009-11-22 14:40:20 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 19:16:26 +0100 |
| commit | 5e4952e8a796851369073d47e375e97c072e040f (patch) | |
| tree | 102412a488c35606ad867bbfa468d21366078ea6 /helpers/lh_bootstrap_debootstrap | |
| parent | af64109b622dd1a33cb9052d33a58557bef44503 (diff) | |
| download | vyos-live-build-5e4952e8a796851369073d47e375e97c072e040f.tar.gz vyos-live-build-5e4952e8a796851369073d47e375e97c072e040f.zip | |
Adding debian version 2.0~a1-1.
Diffstat (limited to 'helpers/lh_bootstrap_debootstrap')
| -rwxr-xr-x | helpers/lh_bootstrap_debootstrap | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/helpers/lh_bootstrap_debootstrap b/helpers/lh_bootstrap_debootstrap index d9fcdd0ca..b347a6b92 100755 --- a/helpers/lh_bootstrap_debootstrap +++ b/helpers/lh_bootstrap_debootstrap @@ -10,7 +10,7 @@ set -e # Including common functions -. "${LH_BASE:-/usr/share/live-helper}"/functions.sh +. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh # Setting static variables DESCRIPTION="$(Echo 'bootstrap a Debian system with debootstrap(8)')" @@ -57,10 +57,10 @@ then DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --arch ${LH_ARCHITECTURE}" fi -if [ "${LH_CATEGORIES}" != "main" ] +if [ "${LH_ARCHIVE_AREAS}" != "main" ] then - # Modify categories to remove leading/trailing whitespaces and replace other whitepspace with commas - DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --components $(echo ${LH_ARCHIVE_AREAS} | sed -e 's| |,|g')" + # Modify archive areas to remove leading/trailing whitespaces and replace other whitepspace with commas + DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --components $(echo ${LH_ARCHIVE_AREAS} | sed -E -e 's/^[ \t]*//;s/[ \t]*$//' -e 's/[ \t]+/,/g')" fi if [ -n "${LH_BOOTSTRAP_CONFIG}" ] |