diff options
| author | Daniel Baumann <mail@daniel-baumann.ch> | 2013-03-21 17:37:16 +0100 |
|---|---|---|
| committer | Daniel Baumann <mail@daniel-baumann.ch> | 2013-05-06 14:50:07 +0200 |
| commit | a00211e9c62d8c7ae2e4b934e26fa293f89ec2a9 (patch) | |
| tree | a36b963c0fb0a69f4373c19f46fb7a55a03dc609 /functions/defaults.sh | |
| parent | 60739bfbd8ffe3baea5a9e2efec848226b4f83b3 (diff) | |
| download | vyos-live-build-a00211e9c62d8c7ae2e4b934e26fa293f89ec2a9.tar.gz vyos-live-build-a00211e9c62d8c7ae2e4b934e26fa293f89ec2a9.zip | |
Removing dedicated emdebian mode, this can entirely be handled with different defaults.
Diffstat (limited to 'functions/defaults.sh')
| -rwxr-xr-x | functions/defaults.sh | 36 |
1 files changed, 2 insertions, 34 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh index f48f3684c..64a02c4e7 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -96,7 +96,7 @@ Set_defaults () # Setting system type LB_SYSTEM="${LB_SYSTEM:-live}" - # Setting mode (currently: debian, emdebian, progress-linux, and ubuntu) + # Setting mode (currently: debian, progress-linux, and ubuntu) if [ -x /usr/bin/lsb_release ] then _DISTRIBUTOR="$(lsb_release -is | tr [A-Z] [a-z])" @@ -197,7 +197,7 @@ Set_defaults () # Setting apt recommends case "${LB_MODE}" in - emdebian|progress-linux) + progress-linux) LB_APT_RECOMMENDS="${LB_APT_RECOMMENDS:-false}" ;; @@ -369,11 +369,6 @@ Set_defaults () LB_PARENT_MIRROR_BOOTSTRAP="${LB_PARENT_MIRROR_BOOTSTRAP:-${LB_MIRROR_BOOTSTRAP}}" ;; - emdebian) - LB_MIRROR_BOOTSTRAP="${LB_MIRROR_BOOTSTRAP:-http://www.emdebian.org/grip/}" - LB_PARENT_MIRROR_BOOTSTRAP="${LB_PARENT_MIRROR_BOOTSTRAP:-${LB_MIRROR_BOOTSTRAP}}" - ;; - progress-linux) LB_PARENT_MIRROR_BOOTSTRAP="${LB_PARENT_MIRROR_BOOTSTRAP:-http://ftp.debian.org/debian/}" LB_MIRROR_BOOTSTRAP="${LB_MIRROR_BOOTSTRAP:-http://cdn.archive.progress-linux.org/progress/}" @@ -404,11 +399,6 @@ Set_defaults () LB_PARENT_MIRROR_CHROOT_SECURITY="${LB_PARENT_MIRROR_CHROOT_SECURITY:-${LB_MIRROR_CHROOT_SECURITY}}" ;; - emdebian) - LB_MIRROR_CHROOT_SECURITY="${LB_MIRROR_CHROOT_SECURITY:-none}" - LB_PARENT_MIRROR_CHROOT_SECURITY="${LB_PARENT_MIRROR_CHROOT_SECURITY:-${LB_MIRROR_CHROOT_SECURITY}}" - ;; - progress-linux) LB_PARENT_MIRROR_CHROOT_SECURITY="${LB_PARENT_MIRROR_CHROOT_SECURITY:-http://security.debian.org/}" LB_MIRROR_CHROOT_SECURITY="${LB_MIRROR_CHROOT_SECURITY:-${LB_MIRROR_CHROOT}}" @@ -441,11 +431,6 @@ Set_defaults () LB_MIRROR_BINARY="${LB_MIRROR_BINARY:-${LB_MIRROR_CHROOT}}" ;; - emdebian) - LB_MIRROR_BINARY="${LB_MIRROR_BINARY:-http://www.emdebian.org/grip/}" - LB_PARENT_MIRROR_BINARY="${LB_PARENT_MIRROR_BINARY:-${LB_MIRROR_BINARY}}" - ;; - ubuntu) case "${LIVE_IMAGE_ARCHITECTURE}" in amd64|i386) @@ -468,11 +453,6 @@ Set_defaults () LB_PARENT_MIRROR_BINARY_SECURITY="${LB_PARENT_MIRROR_BINARY_SECURITY:-${LB_MIRROR_BINARY_SECURITY}}" ;; - emdebian) - LB_MIRROR_BINARY_SECURITY="${LB_MIRROR_BINARY_SECURITY:-none}" - LB_PARENT_MIRROR_BINARY_SECURITY="${LB_PARENT_MIRROR_BINARY_SECURITY:-${LB_MIRROR_BINARY_SECURITY}}" - ;; - progress-linux) LB_PARENT_MIRROR_BINARY_SECURITY="${LB_PARENT_MIRROR_BINARY_SECURITY:-http://security.debian.org/}" LB_MIRROR_BINARY_SECURITY="${LB_MIRROR_BINARY_SECURITY:-${LB_MIRROR_CHROOT}}" @@ -871,10 +851,6 @@ Set_defaults () LB_ISO_APPLICATION="${LB_ISO_APPLICATION:-Debian Live}" ;; - emdebian) - LB_ISO_APPLICATION="${LB_ISO_APPLICATION:-Emdebian Live}" - ;; - progress-linux) LB_ISO_APPLICATION="${LB_ISO_APPLICATION:-Progress Linux}" ;; @@ -904,10 +880,6 @@ Set_defaults () LB_HDD_LABEL="${LB_HDD_LABEL:-DEBIAN_LIVE}" ;; - emdebian) - LB_HDD_LABEL="${LB_HDD_LABEL:-EMDEBIAN_LIVE}" - ;; - progress-linux) LB_HDD_LABEL="${LB_HDD_LABEL:-PROGRESS_$(echo ${LB_DISTRIBUTION} | tr [a-z] [A-Z])}" ;; @@ -926,10 +898,6 @@ Set_defaults () LB_ISO_VOLUME="${LB_ISO_VOLUME:-Debian ${LB_DISTRIBUTION} \$(date +%Y%m%d-%H:%M)}" ;; - emdebian) - LB_ISO_VOLUME="${LB_ISO_VOLUME:-Emdebian ${LB_DISTRIBUTION} \$(date +%Y%m%d-%H:%M)}" - ;; - progress-linux) LB_ISO_VOLUME="${LB_ISO_VOLUME:-Progress ${LB_DISTRIBUTION}}" ;; |