diff options
| author | Daniel Baumann <daniel@debian.org> | 2007-09-23 10:04:36 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2007-09-23 10:04:36 +0200 |
| commit | b7d07a269e4a2d1bac730e177bc6826a7cd450d5 (patch) | |
| tree | 62003f7571c98e4dab5e1ed2628e98164b98a914 /src/scripts/02defaults.sh | |
| parent | 03c8a20c280c6888b4d274a3095013064b94e99b (diff) | |
| download | vyos-live-build-b7d07a269e4a2d1bac730e177bc6826a7cd450d5.tar.gz vyos-live-build-b7d07a269e4a2d1bac730e177bc6826a7cd450d5.zip | |
Adding live-package 0.99.14-1.
Diffstat (limited to 'src/scripts/02defaults.sh')
| -rw-r--r-- | src/scripts/02defaults.sh | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/scripts/02defaults.sh b/src/scripts/02defaults.sh index f0ef328c5..410332c68 100644 --- a/src/scripts/02defaults.sh +++ b/src/scripts/02defaults.sh @@ -86,7 +86,8 @@ Defaults () ;; amd64) - if [ "${LIVE_DISTRIBUTION}" = "unstable" ] || [ "${LIVE_DISTRIBUTION}" = "testing" ] + if [ "${LIVE_DISTRIBUTION}" = "unstable" ] || [ "${LIVE_DISTRIBUTION}" = "${CODENAME_UNSTABLE}" ] || \ + [ "${LIVE_DISTRIBUTION}" = "testing" ] || [ "${LIVE_DISTRIBUTION}" = "${CODENAME_TESTING}" ] then LIVE_KERNEL="amd64" else @@ -104,7 +105,8 @@ Defaults () ;; i386) - if [ "${LIVE_DISTRIBUTION}" = "oldstable" ] || [ "${LIVE_DISTRIBUTION}" = "stable" ] + if [ "${LIVE_DISTRIBUTION}" = "oldstable" ] || [ "${LIVE_DISTRIBUTION}" = "${CODENAME_OLDSTABLE}" ] || \ + [ "${LIVE_DISTRIBUTION}" = "stable" ] || [ "${LIVE_DISTRIBUTION}" = "${CODENAME_STABLE}" ] then LIVE_KERNEL="386" else @@ -235,6 +237,12 @@ Defaults () LIVE_GENERIC_INDICES="yes" fi + # Set recommends + if [ -z "${LIVE_RECOMMENDS}" ] + then + LIVE_RECOMMENDS="no" + fi + # Set source image if [ -z "${LIVE_SOURCE}" ] then |