diff options
| author | Daniel Baumann <daniel@debian.org> | 2007-09-23 10:05:19 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 18:22:26 +0100 |
| commit | 8c3178682beafb9c71df5310b3f975728359b833 (patch) | |
| tree | 533e84eb34925b8104ec99f4590da0954ee57f49 /functions | |
| parent | 9eac19deb8a47f75285d223c2f93c310815401a3 (diff) | |
| download | vyos-live-build-8c3178682beafb9c71df5310b3f975728359b833.tar.gz vyos-live-build-8c3178682beafb9c71df5310b3f975728359b833.zip | |
Adding live-helper 1.0~a25-1.
Diffstat (limited to 'functions')
| -rwxr-xr-x | functions/common.sh | 2 | ||||
| -rwxr-xr-x | functions/defaults.sh | 16 | ||||
| -rwxr-xr-x | functions/help.sh | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/functions/common.sh b/functions/common.sh index e56b80fc7..efd7922c6 100755 --- a/functions/common.sh +++ b/functions/common.sh @@ -10,4 +10,4 @@ set -e PROGRAM="`basename ${0}`" -VERSION="1.0~a24" +VERSION="1.0~a25" diff --git a/functions/defaults.sh b/functions/defaults.sh index 29633de0c..e54874435 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -102,12 +102,12 @@ Set_defaults () then case "${LH_MODE}" in debian|debian-edu) - if [ -x "/usr/bin/cdebootstrap" ] - then - LH_BOOTSTRAP="cdebootstrap" - elif [ -x "/usr/sbin/debootstrap" ] + if [ -x "/usr/sbin/debootstrap" ] then LH_BOOTSTRAP="debootstrap" + elif [ -x "/usr/bin/cdebootstrap" ] + then + LH_BOOTSTRAP="cdebootstrap" else echo "E: Can't process file /usr/bin/cdebootstrap or /usr/sbin/debootstrap (FIXME)" exit 1 @@ -115,12 +115,12 @@ Set_defaults () ;; ubuntu) - if [ -x "/usr/bin/cdebootstrap" ] && [ -d /usr/share/cdebootstrap/generic-ubuntu ] - then - LH_BOOTSTRAP="cdebootstrap" - elif [ -x "/usr/sbin/debootstrap" ] && [ -f /usr/lib/debootstrap/scripts/gutsy ] + if [ -x "/usr/sbin/debootstrap" ] && [ -f /usr/lib/debootstrap/scripts/gutsy ] then LH_BOOTSTRAP="debootstrap" + elif [ -x "/usr/bin/cdebootstrap" ] && [ -d /usr/share/cdebootstrap/generic-ubuntu ] + then + LH_BOOTSTRAP="cdebootstrap" else echo "E: Your version of debootstrap or cdebootstrap is outdated and does not support ubuntu." exit 1 diff --git a/functions/help.sh b/functions/help.sh index 6427639e7..0748ab201 100755 --- a/functions/help.sh +++ b/functions/help.sh @@ -18,7 +18,7 @@ Help () if [ -n "${USAGE}" ] then - echo " ${USAGE}" + echo -e "${USAGE}" echo fi |