diff options
| author | Daniel Baumann <daniel@debian.org> | 2007-09-23 10:04:23 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2007-09-23 10:04:23 +0200 |
| commit | 4a992637066b9cb25b57b9122707e5e5ecfcaf0d (patch) | |
| tree | 946aa6d8ad15700885f3960b5cb5cf5eb2eef866 /src/scripts/02defaults.sh | |
| parent | d80c8552b60d499dbec7fb37e09ab8fc4145ce2d (diff) | |
| download | vyos-live-build-4a992637066b9cb25b57b9122707e5e5ecfcaf0d.tar.gz vyos-live-build-4a992637066b9cb25b57b9122707e5e5ecfcaf0d.zip | |
Adding live-package 0.99.7-1.
Diffstat (limited to 'src/scripts/02defaults.sh')
| -rw-r--r-- | src/scripts/02defaults.sh | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/src/scripts/02defaults.sh b/src/scripts/02defaults.sh index 6e54c137b..fd58883ee 100644 --- a/src/scripts/02defaults.sh +++ b/src/scripts/02defaults.sh @@ -107,7 +107,7 @@ Defaults () ;; amd64) - if [ "${LIVE_DISTRIBUTION}" = "unstable" ] + if [ "${LIVE_DISTRIBUTION}" = "unstable" ] || [ "${LIVE_DISTRIBUTION}" = "testing" ] then LIVE_KERNEL="amd64" else @@ -176,19 +176,22 @@ Defaults () # Check for package lists if [ -z "${LIVE_PACKAGE_LIST}" ] then - LIVE_PACKAGE_LIST="${BASE}/lists/standard" - else if [ "${LIVE_FLAVOUR}" = "minimal" ] then LIVE_PACKAGE_LIST="${BASE}/lists/minimal" - fi - - if [ -r "${BASE}/lists/${LIVE_PACKAGE_LIST}" ] - then - LIVE_PACKAGE_LIST="${BASE}/lists/${LIVE_PACKAGE_LIST}" else LIVE_PACKAGE_LIST="${BASE}/lists/standard" fi + else + if [ ! -r "${LIVE_PACKAGE_LIST}" ] + then + if [ -r "${BASE}/lists/${LIVE_PACKAGE_LIST}" ] + then + LIVE_PACKAGE_LIST="${BASE}/lists/${LIVE_PACKAGE_LIST}" + else + LIVE_PACKAGE_LIST="${BASE}/lists/standard" + fi + fi fi # Set debian sections |