diff options
Diffstat (limited to 'functions')
| -rwxr-xr-x | functions/defaults.sh | 63 | ||||
| -rwxr-xr-x | functions/releases.sh | 1 |
2 files changed, 6 insertions, 58 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh index d179a7e1e..102380514 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -36,12 +36,7 @@ Set_defaults () fi # Setting package manager - if [ "${LH_DISTRIBUTION}" = "etch" ] - then - LH_APT="${LH_APT:-aptitude}" - else - LH_APT="${LH_APT:-apt}" - fi + LH_APT="${LH_APT:-apt}" # Setting apt ftp proxy if [ -z "${LH_APT_FTP_PROXY}" ] && [ -n "${ftp_proxy}" ] @@ -142,15 +137,6 @@ Set_defaults () if [ "${LH_INITRAMFS}" = "auto" ] then case "${LH_MODE}" in - debian|debian-release) - if [ "${LH_DISTRIBUTION}" = "etch" ] - then - LH_INITRAMFS="casper" - else - LH_INITRAMFS="live-initramfs" - fi - ;; - ubuntu) LH_INITRAMFS="casper" ;; @@ -431,15 +417,7 @@ Set_defaults () LH_EXPOSED_ROOT="${LH_EXPOSED_ROOT:-disabled}" # Setting union filesystem - if [ -z "${LH_UNION_FILESYSTEM}" ] - then - if [ "${LH_DISTRIBUTION}" = "etch" ] - then - LH_UNION_FILESYSTEM="unionfs" - else - LH_UNION_FILESYSTEM="aufs" - fi - fi + LH_UNION_FILESYSTEM="${LH_UNION_FILESYSTEM:-aufs}" # LH_HOOKS @@ -568,12 +546,7 @@ Set_defaults () ;; sparc) - if [ "${LH_DISTRIBUTION}" = "etch" ] - then - LH_LINUX_FLAVOURS="sparc32" - else - LH_LINUX_FLAVOURS="sparc64" - fi + LH_LINUX_FLAVOURS="sparc64" ;; arm|armel|m68k) @@ -594,7 +567,7 @@ Set_defaults () case "${LH_MODE}" in debian|debian-release|embedian) case "${LH_DISTRIBUTION}" in - etch|lenny|squeeze) + lenny|squeeze) LH_LINUX_PACKAGES="linux-image-2.6 \${LH_UNION_FILESYSTEM}-modules-2.6" ;; @@ -606,7 +579,7 @@ Set_defaults () if [ "${LH_CHROOT_FILESYSTEM}" = "squashfs" ] then case "${LH_DISTRIBUTION}" in - etch|lenny) + lenny) LH_LINUX_PACKAGES="${LH_LINUX_PACKAGES} squashfs-modules-2.6" ;; esac @@ -969,15 +942,7 @@ Set_defaults () LH_SYSLINUX_TIMEOUT="${LH_SYSLINUX_TIMEOUT:-0}" # Setting syslinux menu - case "${LH_DISTRIBUTION}" in - etch) - LH_SYSLINUX_MENU="${LH_SYSLINUX_MENU:-disabled}" - ;; - - *) - LH_SYSLINUX_MENU="${LH_SYSLINUX_MENU:-enabled}" - ;; - esac + LH_SYSLINUX_MENU="${LH_SYSLINUX_MENU:-enabled}" # Setting syslinux menu live entries case "${LH_MODE}" in @@ -1047,22 +1012,6 @@ Check_defaults () fi fi - if [ "${LH_DISTRIBUTION}" = "etch" ] - then - # etch + live-initramfs - if [ "${LH_INITRAMFS}" = "live-initramfs" ] - then - Echo_warning "You selected LH_DISTRIBUTION='etch' and LH_INITRAMFS='live-initramfs'. This configuration is potentially unsafe as live-initramfs is not part of the etch distribution. Either make sure that live-initramfs is installable (e.g. through setting up etch-backports repository as third-party source or putting a valid live-initramfs deb into config/chroot_local-packages) or change your config to the etch default (casper)." - fi - - # etch + aufs - if [ "${LH_UNION_FILESYSTEM}" = "aufs" ] - then - Echo_warning "You selected LH_DISTRIBUTION='etch' and LH_UNION_FILESYSTEM='aufs'. This configuration is potentially unsafe as live-initramfs is not part of the etch distribution. Either make sure that live-initramfs is installable (e.g. through setting up etch-backports repository as third-party source or putting a valid live-initramfs deb into config/chroot_local-packages) or change your config to the etch default (casper)." - - fi - fi - if echo ${LH_PACKAGES_LISTS} | grep -qs -E "(stripped|minimal)\b" then # aptitude + stripped|minimal diff --git a/functions/releases.sh b/functions/releases.sh index c383c0864..a70509735 100755 --- a/functions/releases.sh +++ b/functions/releases.sh @@ -8,7 +8,6 @@ # under certain conditions; see COPYING for details. # Debian releases -RELEASE_etch="4.0 r8" RELEASE_lenny="5.0.3" RELEASE_squeeze="6" RELEASE_sid="unstable" |