diff options
Diffstat (limited to 'functions/defaults.sh')
| -rwxr-xr-x | functions/defaults.sh | 54 |
1 files changed, 21 insertions, 33 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh index a0df640a4..546224957 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -21,7 +21,7 @@ Set_defaults () # Setting system type LB_SYSTEM="${LB_SYSTEM:-live}" - # Setting mode (currently: debian, emdebian, progress-linux, ubuntu and kubuntu) + # Setting mode (currently: debian, emdebian, progress-linux, and ubuntu) if [ -x /usr/bin/lsb_release ] then _DISTRIBUTOR="$(lsb_release -is | tr [A-Z] [a-z])" @@ -54,7 +54,7 @@ Set_defaults () LB_DERIVATIVE="true" ;; - ubuntu|kubuntu) + ubuntu) LB_DISTRIBUTION="${LB_DISTRIBUTION:-precise}" LB_DERIVATIVE="false" ;; @@ -171,7 +171,7 @@ Set_defaults () case "${LB_SYSTEM}" in live) case "${LB_MODE}" in - ubuntu|kubuntu) + ubuntu) LB_INITRAMFS="${LB_INITRAMFS:-casper}" ;; @@ -190,7 +190,7 @@ Set_defaults () # Setting initsystem case "${LB_MODE}" in - ubuntu|kubuntu) + ubuntu) case "${LB_INITRAMFS}" in live-boot) LB_INITSYSTEM="${LB_INITSYSTEM:-upstart}" @@ -344,7 +344,7 @@ Set_defaults () LB_MIRROR_BOOTSTRAP="${LB_MIRROR_BOOTSTRAP:-http://cdn.archive.progress-linux.org/progress/}" ;; - ubuntu|kubuntu) + ubuntu) case "${LB_ARCHITECTURES}" in amd64|i386) LB_MIRROR_BOOTSTRAP="${LB_MIRROR_BOOTSTRAP:-http://archive.ubuntu.com/ubuntu/}" @@ -379,7 +379,7 @@ Set_defaults () LB_MIRROR_CHROOT_SECURITY="${LB_MIRROR_CHROOT_SECURITY:-${LB_MIRROR_CHROOT}}" ;; - ubuntu|kubuntu) + ubuntu) case "${LB_ARCHITECTURES}" in amd64|i386) LB_MIRROR_CHROOT_SECURITY="${LB_MIRROR_CHROOT_SECURITY:-http://security.ubuntu.com/ubuntu/}" @@ -401,7 +401,7 @@ Set_defaults () LB_MIRROR_CHROOT_UPDATES="${LB_MIRROR_CHROOT_UPDATES:-${LB_MIRROR_CHROOT}}" ;; - ubuntu|kubuntu) + ubuntu) case "${LB_ARCHITECTURES}" in amd64|i386) LB_MIRROR_CHROOT_UPDATES="${LB_MIRROR_CHROOT_UPDATES:-http://archive.ubuntu.com/ubuntu/}" @@ -455,7 +455,7 @@ Set_defaults () LB_PARENT_MIRROR_BINARY="${LB_PARENT_MIRROR_BINARY:-${LB_MIRROR_BINARY}}" ;; - ubuntu|kubuntu) + ubuntu) case "${LB_ARCHITECTURES}" in amd64|i386) LB_MIRROR_BINARY="${LB_MIRROR_BINARY:-http://archive.ubuntu.com/ubuntu/}" @@ -487,7 +487,7 @@ Set_defaults () LB_MIRROR_BINARY_SECURITY="${LB_MIRROR_BINARY_SECURITY:-${LB_MIRROR_CHROOT}}" ;; - ubuntu|kubuntu) + ubuntu) case "${LB_ARCHITECTURES}" in amd64|i386) LB_MIRROR_BINARY_SECURITY="${LB_MIRROR_BINARY_SECURITY:-http://security.ubuntu.com/ubuntu/}" @@ -514,7 +514,7 @@ Set_defaults () LB_MIRROR_BINARY_UPDATES="${LB_MIRROR_BINARY_UPDATES:-${LB_MIRROR_BINARY}}" ;; - ubuntu|kubuntu) + ubuntu) case "${LB_ARCHITECTURES}" in amd64|i386) LB_MIRROR_BINARY_UPDATES="${LB_MIRROR_BINARY_UPDATES:-http://archive.ubuntu.com/ubuntu/}" @@ -569,7 +569,7 @@ Set_defaults () LB_PARENT_ARCHIVE_AREAS="${LB_PARENT_ARCHIVE_AREAS:-${LB_ARCHIVE_AREAS}}" ;; - ubuntu|kubuntu) + ubuntu) LB_ARCHIVE_AREAS="${LB_ARCHIVE_AREAS:-main restricted}" LB_PARENT_ARCHIVE_AREAS="${LB_PARENT_ARCHIVE_AREAS:-${LB_ARCHIVE_AREAS}}" ;; @@ -615,7 +615,7 @@ Set_defaults () # Setting keyring packages case "${LB_MODE}" in - ubuntu|kubuntu) + ubuntu) LB_KEYRING_PACKAGES="${LB_KEYRING_PACKAGES:-ubuntu-keyring}" ;; @@ -628,7 +628,7 @@ Set_defaults () case "${LB_ARCHITECTURES}" in armel) case "${LB_MODE}" in - ubuntu|kubuntu) + ubuntu) LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-omap}" ;; *) @@ -647,7 +647,7 @@ Set_defaults () amd64) case "${LB_MODE}" in - ubuntu|kubuntu) + ubuntu) LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-generic}" ;; @@ -663,7 +663,7 @@ Set_defaults () LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-686-pae}" ;; - ubuntu|kubuntu) + ubuntu) case "${LB_DISTRIBUTION}" in precise) LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-generic-pae}" @@ -701,7 +701,7 @@ Set_defaults () exit 1 ;; - ubuntu|kubuntu) + ubuntu) LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-powerpc-smp powerpc64-smp e500 powerpc-e500mc}" ;; @@ -713,7 +713,7 @@ Set_defaults () s390) case "${LB_MODE}" in - progress-linux|ubuntu|kubuntu) + progress-linux|ubuntu) Echo_error "Architecture ${LB_ARCHITECTURES} not supported in the ${LB_MODE} mode." exit 1 ;; @@ -745,7 +745,7 @@ Set_defaults () # Set linux packages case "${LB_MODE}" in - ubuntu|kubuntu) + ubuntu) LB_LINUX_PACKAGES="${LB_LINUX_PACKAGES:-linux}" ;; @@ -908,7 +908,7 @@ Set_defaults () hdd*) case "${LB_MODE}" in - ubuntu|kubuntu) + ubuntu) if [ "${LB_DEBIAN_INSTALLER}" = "live" ] then _LB_BOOTAPPEND_PRESEED="file=/cdrom/install/${LB_DEBIAN_INSTALLER_PRESEEDFILE}" @@ -964,10 +964,6 @@ Set_defaults () ubuntu) LB_ISO_APPLICATION="${LB_ISO_APPLICATION:-Ubuntu Live}" ;; - - kubuntu) - LB_ISO_APPLICATION="${LB_ISO_APPLICATION:-Kubuntu Live}" - ;; esac # Set iso preparer @@ -1001,10 +997,6 @@ Set_defaults () ubuntu) LB_HDD_LABEL="${LB_HDD_LABEL:-UBUNTU}" ;; - - kubuntu) - LB_HDD_LABEL="${LB_HDD_LABEL:-KUBUNTU}" - ;; esac # Setting hdd size @@ -1027,10 +1019,6 @@ Set_defaults () ubuntu) LB_ISO_VOLUME="${LB_ISO_VOLUME:-Ubuntu ${LB_DISTRIBUTION} \$(date +%Y%m%d-%H:%M)}" ;; - - kubuntu) - LB_ISO_VOLUME="${LB_ISO_VOLUME:-Ubuntu ${LB_DISTRIBUTION} \$(date +%Y%m%d-%H:%M)}" - ;; esac # Setting memtest option @@ -1038,7 +1026,7 @@ Set_defaults () # Setting loadlin option case "${LB_MODE}" in - progress-linux|ubuntu|kubuntu) + progress-linux|ubuntu) ;; @@ -1062,7 +1050,7 @@ Set_defaults () # Setting win32-loader option case "${LB_MODE}" in - progress-linux|ubuntu|kubuntu) + progress-linux|ubuntu) ;; |