Removing ubuntu support.
This commit is contained in:
parent
29cbc991eb
commit
979cd28cc4
|
@ -16,26 +16,7 @@ Set_defaults ()
|
||||||
# Setting mode
|
# Setting mode
|
||||||
if [ -z "${LH_MODE}" ]
|
if [ -z "${LH_MODE}" ]
|
||||||
then
|
then
|
||||||
if [ -x /usr/bin/lsb_release ]
|
LH_MODE="debian"
|
||||||
then
|
|
||||||
case "$(lsb_release --short --id)" in
|
|
||||||
Debian)
|
|
||||||
LH_MODE="debian"
|
|
||||||
;;
|
|
||||||
|
|
||||||
Ubuntu)
|
|
||||||
LH_MODE="ubuntu"
|
|
||||||
;;
|
|
||||||
|
|
||||||
*)
|
|
||||||
Echo_verbose "Unexpected output from lsb_release"
|
|
||||||
Echo_verbose "Setting mode to debian."
|
|
||||||
LH_MODE="debian"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
else
|
|
||||||
LH_MODE="debian"
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Setting distribution name
|
# Setting distribution name
|
||||||
|
@ -49,10 +30,6 @@ Set_defaults ()
|
||||||
debian-edu)
|
debian-edu)
|
||||||
LH_DISTRIBUTION="etch"
|
LH_DISTRIBUTION="etch"
|
||||||
;;
|
;;
|
||||||
|
|
||||||
ubuntu)
|
|
||||||
LH_DISTRIBUTION="feisty"
|
|
||||||
;;
|
|
||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -104,33 +81,16 @@ Set_defaults ()
|
||||||
# Setting bootstrap program
|
# Setting bootstrap program
|
||||||
if [ -z "${LH_BOOTSTRAP}" ] || [ ! -x "$(which ${LH_BOOTSTRAP})" ]
|
if [ -z "${LH_BOOTSTRAP}" ] || [ ! -x "$(which ${LH_BOOTSTRAP})" ]
|
||||||
then
|
then
|
||||||
case "${LH_MODE}" in
|
if [ -x "/usr/sbin/debootstrap" ]
|
||||||
debian|debian-edu)
|
then
|
||||||
if [ -x "/usr/sbin/debootstrap" ]
|
LH_BOOTSTRAP="debootstrap"
|
||||||
then
|
elif [ -x "/usr/bin/cdebootstrap" ]
|
||||||
LH_BOOTSTRAP="debootstrap"
|
then
|
||||||
elif [ -x "/usr/bin/cdebootstrap" ]
|
LH_BOOTSTRAP="cdebootstrap"
|
||||||
then
|
else
|
||||||
LH_BOOTSTRAP="cdebootstrap"
|
echo "E: Can't process file /usr/sbin/debootstrap or /usr/bin/cdebootstrap (FIXME)"
|
||||||
else
|
exit 1
|
||||||
echo "E: Can't process file /usr/sbin/debootstrap or /usr/bin/cdebootstrap (FIXME)"
|
fi
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
|
|
||||||
ubuntu)
|
|
||||||
if [ -x "/usr/sbin/debootstrap" ] && [ -f /usr/lib/debootstrap/scripts/feisty ]
|
|
||||||
then
|
|
||||||
LH_BOOTSTRAP="debootstrap"
|
|
||||||
elif [ -x "/usr/bin/cdebootstrap" ] && [ -d /usr/share/cdebootstrap/generic-ubuntu ]
|
|
||||||
then
|
|
||||||
LH_BOOTSTRAP="cdebootstrap"
|
|
||||||
else
|
|
||||||
echo "E: Your version of debootstrap or cdebootstrap is outdated and does not support ubuntu."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Setting cache option
|
# Setting cache option
|
||||||
|
@ -157,15 +117,7 @@ Set_defaults ()
|
||||||
# Setting genisoimage
|
# Setting genisoimage
|
||||||
if [ -z "${LH_GENISOIMAGE}" ]
|
if [ -z "${LH_GENISOIMAGE}" ]
|
||||||
then
|
then
|
||||||
case "${LH_MODE}" in
|
LH_GENISOIMAGE="genisoimage"
|
||||||
debian|debian-edu)
|
|
||||||
LH_GENISOIMAGE="genisoimage"
|
|
||||||
;;
|
|
||||||
|
|
||||||
ubuntu)
|
|
||||||
LH_GENISOIMAGE="mkisofs"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Setting initramfs hook
|
# Setting initramfs hook
|
||||||
|
@ -188,10 +140,6 @@ Set_defaults ()
|
||||||
debian-edu)
|
debian-edu)
|
||||||
LH_INITRAMFS="live-initramfs"
|
LH_INITRAMFS="live-initramfs"
|
||||||
;;
|
;;
|
||||||
|
|
||||||
ubuntu)
|
|
||||||
LH_INITRAMFS="live-initramfs"
|
|
||||||
;;
|
|
||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
@ -238,10 +186,6 @@ Set_defaults ()
|
||||||
debian-edu)
|
debian-edu)
|
||||||
LH_ROOT="edu-live"
|
LH_ROOT="edu-live"
|
||||||
;;
|
;;
|
||||||
|
|
||||||
ubuntu)
|
|
||||||
LH_ROOT="ubuntu-live"
|
|
||||||
;;
|
|
||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -312,50 +256,13 @@ Set_defaults ()
|
||||||
debian-edu)
|
debian-edu)
|
||||||
LH_MIRROR_BOOTSTRAP="http://ftp.skolelinux.no/debian/"
|
LH_MIRROR_BOOTSTRAP="http://ftp.skolelinux.no/debian/"
|
||||||
;;
|
;;
|
||||||
|
|
||||||
ubuntu)
|
|
||||||
case "${LH_ARCHITECTURE}" in
|
|
||||||
amd64|i386|powerpc|sparc)
|
|
||||||
LH_MIRROR_BOOTSTRAP="http://archive.ubuntu.com/ubuntu/"
|
|
||||||
;;
|
|
||||||
|
|
||||||
hppa|ia64)
|
|
||||||
LH_MIRROR_BOOTSTRAP="http://ports.ubuntu.com/"
|
|
||||||
;;
|
|
||||||
|
|
||||||
*)
|
|
||||||
Echo_error "There is no port of Ubuntu available for your architecture."
|
|
||||||
exit 1
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
;;
|
|
||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Setting security mirror to fetch packages from
|
# Setting security mirror to fetch packages from
|
||||||
if [ -z "${LH_MIRROR_BOOTSTRAP_SECURITY}" ]
|
if [ -z "${LH_MIRROR_BOOTSTRAP_SECURITY}" ]
|
||||||
then
|
then
|
||||||
case "${LH_MODE}" in
|
LH_MIRROR_BOOTSTRAP_SECURITY="http://security.debian.org/"
|
||||||
debian|debian-edu)
|
|
||||||
LH_MIRROR_BOOTSTRAP_SECURITY="http://security.debian.org/"
|
|
||||||
;;
|
|
||||||
|
|
||||||
ubuntu)
|
|
||||||
case "${LH_ARCHITECTURE}" in
|
|
||||||
amd64|i386|powerpc|sparc)
|
|
||||||
LH_MIRROR_BOOTSTRAP_SECURITY="http://archive.ubuntu.com/ubuntu/"
|
|
||||||
;;
|
|
||||||
|
|
||||||
hppa|ia64)
|
|
||||||
LH_MIRROR_BOOTSTRAP_SECURITY="http://ports.ubuntu.com/"
|
|
||||||
;;
|
|
||||||
|
|
||||||
*)
|
|
||||||
LH_MIRROR_BOOTSTRAP_SECURITY="none"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Setting mirror which ends up in the image
|
# Setting mirror which ends up in the image
|
||||||
|
@ -377,60 +284,19 @@ Set_defaults ()
|
||||||
debian-edu)
|
debian-edu)
|
||||||
LH_MIRROR_BINARY="http://ftp.skolelinux.no/debian/"
|
LH_MIRROR_BINARY="http://ftp.skolelinux.no/debian/"
|
||||||
;;
|
;;
|
||||||
|
|
||||||
ubuntu)
|
|
||||||
case "${LH_ARCHITECTURE}" in
|
|
||||||
amd64|i386|powerpc|sparc)
|
|
||||||
LH_MIRROR_BINARY="http://archive.ubuntu.com/ubuntu/"
|
|
||||||
;;
|
|
||||||
|
|
||||||
hppa|ia64)
|
|
||||||
LH_MIRROR_BINARY="http://ports.ubuntu.com/"
|
|
||||||
;;
|
|
||||||
|
|
||||||
*)
|
|
||||||
Echo_error "There is no port of Ubuntu available for your architecture."
|
|
||||||
exit 1
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
;;
|
|
||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Setting security mirror which ends up in the image
|
# Setting security mirror which ends up in the image
|
||||||
if [ -z "${LH_MIRROR_BINARY_SECURITY}" ]
|
if [ -z "${LH_MIRROR_BINARY_SECURITY}" ]
|
||||||
then
|
then
|
||||||
case "${LH_MODE}" in
|
LH_MIRROR_BINARY_SECURITY="http://security.debian.org/"
|
||||||
debian|debian-edu)
|
|
||||||
LH_MIRROR_BINARY_SECURITY="http://security.debian.org/"
|
|
||||||
;;
|
|
||||||
|
|
||||||
ubuntu)
|
|
||||||
case "${LH_ARCHITECTURE}" in
|
|
||||||
amd64|i386|powerpc|sparc)
|
|
||||||
LH_MIRROR_BINARY_SECURITY="http://security.ubuntu.com/ubuntu/"
|
|
||||||
;;
|
|
||||||
|
|
||||||
*)
|
|
||||||
LH_MIRROR_BINARY_SECURITY="none"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Setting sections value
|
# Setting sections value
|
||||||
if [ -z "${LH_SECTIONS}" ]
|
if [ -z "${LH_SECTIONS}" ]
|
||||||
then
|
then
|
||||||
case "${LH_MODE}" in
|
LH_SECTIONS="main"
|
||||||
debian|debian-edu)
|
|
||||||
LH_SECTIONS="main"
|
|
||||||
;;
|
|
||||||
|
|
||||||
ubuntu)
|
|
||||||
LH_SECTIONS="main restricted"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
## config/chroot
|
## config/chroot
|
||||||
|
@ -465,15 +331,7 @@ Set_defaults ()
|
||||||
;;
|
;;
|
||||||
|
|
||||||
amd64)
|
amd64)
|
||||||
case "${LH_MODE}" in
|
LH_LINUX_FLAVOURS="amd64"
|
||||||
debian|debian-edu)
|
|
||||||
LH_LINUX_FLAVOURS="amd64"
|
|
||||||
;;
|
|
||||||
|
|
||||||
ubuntu)
|
|
||||||
LH_LINUX_FLAVOURS="amd64-generic"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
;;
|
;;
|
||||||
|
|
||||||
arm)
|
arm)
|
||||||
|
@ -486,15 +344,7 @@ Set_defaults ()
|
||||||
;;
|
;;
|
||||||
|
|
||||||
i386)
|
i386)
|
||||||
case "${LH_MODE}" in
|
LH_LINUX_FLAVOURS="486"
|
||||||
debian|debian-edu)
|
|
||||||
LH_LINUX_FLAVOURS="486"
|
|
||||||
;;
|
|
||||||
|
|
||||||
ubuntu)
|
|
||||||
LH_LINUX_FLAVOURS="386"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
;;
|
;;
|
||||||
|
|
||||||
ia64)
|
ia64)
|
||||||
|
@ -515,20 +365,12 @@ Set_defaults ()
|
||||||
;;
|
;;
|
||||||
|
|
||||||
sparc)
|
sparc)
|
||||||
case "${LH_MODE}" in
|
if [ "${LH_DISTRIBUTION}" = "etch" ]
|
||||||
debian|debian-edu)
|
then
|
||||||
if [ "${LH_DISTRIBUTION}" = "etch" ]
|
LH_LINUX_FLAVOURS="sparc32"
|
||||||
then
|
else
|
||||||
LH_LINUX_FLAVOURS="sparc32"
|
LH_LINUX_FLAVOURS="sparc64"
|
||||||
else
|
fi
|
||||||
LH_LINUX_FLAVOURS="sparc64"
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
|
|
||||||
ubuntu)
|
|
||||||
LH_LINUX_FLAVOURS="sparc64"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
;;
|
;;
|
||||||
|
|
||||||
*)
|
*)
|
||||||
|
@ -540,20 +382,12 @@ Set_defaults ()
|
||||||
# Set linux packages
|
# Set linux packages
|
||||||
if [ -z "${LH_LINUX_PACKAGES}" ]
|
if [ -z "${LH_LINUX_PACKAGES}" ]
|
||||||
then
|
then
|
||||||
case "${LH_MODE}" in
|
LH_LINUX_PACKAGES="linux-image-2.6 \${LH_UNION_FILESYSTEM}-modules-2.6"
|
||||||
debian|debian-edu)
|
|
||||||
LH_LINUX_PACKAGES="linux-image-2.6 \${LH_UNION_FILESYSTEM}-modules-2.6"
|
|
||||||
|
|
||||||
if [ "${LH_CHROOT_FILESYSTEM}" = "squashfs" ]
|
if [ "${LH_CHROOT_FILESYSTEM}" = "squashfs" ]
|
||||||
then
|
then
|
||||||
LH_LINUX_PACKAGES="${LH_LINUX_PACKAGES} squashfs-modules-2.6"
|
LH_LINUX_PACKAGES="${LH_LINUX_PACKAGES} squashfs-modules-2.6"
|
||||||
fi
|
fi
|
||||||
;;
|
|
||||||
|
|
||||||
ubuntu)
|
|
||||||
LH_LINUX_PACKAGES="linux-image"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
if [ -n "${LH_ENCRYPTION}" ]
|
if [ -n "${LH_ENCRYPTION}" ]
|
||||||
then
|
then
|
||||||
|
@ -656,15 +490,7 @@ Set_defaults ()
|
||||||
# Setting hostname
|
# Setting hostname
|
||||||
if [ -z "${LH_HOSTNAME}" ]
|
if [ -z "${LH_HOSTNAME}" ]
|
||||||
then
|
then
|
||||||
case "${LH_MODE}" in
|
LH_HOSTNAME="debian"
|
||||||
debian|debian-edu)
|
|
||||||
LH_HOSTNAME="debian"
|
|
||||||
;;
|
|
||||||
|
|
||||||
ubuntu)
|
|
||||||
LH_HOSTNAME="ubuntu"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Setting iso author
|
# Setting iso author
|
||||||
|
@ -678,10 +504,6 @@ Set_defaults ()
|
||||||
debian-edu)
|
debian-edu)
|
||||||
LH_ISO_APPLICATION="Debian Edu Live"
|
LH_ISO_APPLICATION="Debian Edu Live"
|
||||||
;;
|
;;
|
||||||
|
|
||||||
ubuntu)
|
|
||||||
LH_ISO_APPLICATION="Ubuntu Live"
|
|
||||||
;;
|
|
||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -702,10 +524,6 @@ Set_defaults ()
|
||||||
debian-edu)
|
debian-edu)
|
||||||
LH_ISO_VOLUME="Debian Edu Live \$(date +%Y%m%d-%H:%M)"
|
LH_ISO_VOLUME="Debian Edu Live \$(date +%Y%m%d-%H:%M)"
|
||||||
;;
|
;;
|
||||||
|
|
||||||
ubuntu)
|
|
||||||
LH_ISO_VOLUME="Ubuntu Live \$(date +%Y%m%d-%H:%M)"
|
|
||||||
;;
|
|
||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -726,10 +544,6 @@ Set_defaults ()
|
||||||
debian-edu)
|
debian-edu)
|
||||||
LH_NET_PATH="/srv/debian-edu-live"
|
LH_NET_PATH="/srv/debian-edu-live"
|
||||||
;;
|
;;
|
||||||
|
|
||||||
ubuntu)
|
|
||||||
LH_NET_PATH="/srv/ubuntu-live"
|
|
||||||
;;
|
|
||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
|
@ -13,11 +13,3 @@ set -e
|
||||||
VERSION_etch="4.0 r1"
|
VERSION_etch="4.0 r1"
|
||||||
VERSION_lenny="testing"
|
VERSION_lenny="testing"
|
||||||
VERSION_sid="unstable"
|
VERSION_sid="unstable"
|
||||||
|
|
||||||
# Ubuntu releases
|
|
||||||
VERSION_hoary="5.04"
|
|
||||||
VERSION_breezy="5.10"
|
|
||||||
VERSION_dapper="6.06 LTS"
|
|
||||||
VERSION_edgy="6.10"
|
|
||||||
VERSION_feisty="7.04"
|
|
||||||
VERSION_gutsy="7.10"
|
|
||||||
|
|
|
@ -64,58 +64,48 @@ then
|
||||||
ARCHITECTURE="Snapshot ${ARCHITECTURE}"
|
ARCHITECTURE="Snapshot ${ARCHITECTURE}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
case "${LH_MODE}" in
|
case "${LH_DEBIAN_INSTALLER}" in
|
||||||
debian)
|
cdrom)
|
||||||
case "${LH_DEBIAN_INSTALLER}" in
|
echo "main" > binary/.disk/base_components
|
||||||
cdrom)
|
|
||||||
echo "main" > binary/.disk/base_components
|
|
||||||
|
|
||||||
touch binary/.disk/base_installable
|
touch binary/.disk/base_installable
|
||||||
|
|
||||||
echo "full_cd" > binary/.disk/cd_type
|
echo "full_cd" > binary/.disk/cd_type
|
||||||
|
|
||||||
echo "Debian GNU/Linux ${VERSION} \"${DISTRIBUTION}\" - Official ${ARCHITECTURE} CD Binary $(date +%Y%m%d-%H:%M)" > binary/.disk/info
|
echo "Debian GNU/Linux ${VERSION} \"${DISTRIBUTION}\" - Official ${ARCHITECTURE} CD Binary $(date +%Y%m%d-%H:%M)" > binary/.disk/info
|
||||||
|
|
||||||
cp "${LH_BASE}"/data/debian-cd/${LH_DISTRIBUTION}/${LH_ARCHITECTURE}_udeb_include binary/.disk/udeb_include
|
cp "${LH_BASE}"/data/debian-cd/${LH_DISTRIBUTION}/${LH_ARCHITECTURE}_udeb_include binary/.disk/udeb_include
|
||||||
;;
|
|
||||||
|
|
||||||
enabled|netinst|live)
|
|
||||||
echo "main" > binary/.disk/base_components
|
|
||||||
|
|
||||||
touch binary/.disk/base_installable
|
|
||||||
|
|
||||||
echo "not_complete" > binary/.disk/cd_type
|
|
||||||
|
|
||||||
echo "Debian GNU/Linux ${VERSION} \"${DISTRIBUTION}\" - Official ${ARCHITECTURE} NETINST Binary $(date +%Y%m%d-%H:%M)" > binary/.disk/info
|
|
||||||
|
|
||||||
cp "${LH_BASE}"/data/debian-cd/${LH_DISTRIBUTION}/${LH_ARCHITECTURE}_netinst_udeb_include binary/.disk/udeb_include
|
|
||||||
|
|
||||||
if [ "${LH_DEBIAN_INSTALLER}" = "live" ]
|
|
||||||
then
|
|
||||||
echo "live-installer" >> binary/.disk/udeb_include
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
|
|
||||||
businesscard)
|
|
||||||
echo "main" > binary/.disk/base_components
|
|
||||||
|
|
||||||
echo "not_complete" > binary/.disk/cd_type
|
|
||||||
|
|
||||||
echo "Debian GNU/Linux ${VERSION} \"${DISTRIBUTION}\" - Official ${ARCHITECTURE} BC Binary $(date +%Y%m%d-%H:%M)" > binary/.disk/info
|
|
||||||
|
|
||||||
cp "${LH_BASE}"/data/debian-cd/${LH_DISTRIBUTION}/${LH_ARCHITECTURE}_businesscard_udeb_include binary/.disk/udeb_include
|
|
||||||
;;
|
|
||||||
|
|
||||||
disabled)
|
|
||||||
echo "Debian GNU/Linux ${VERSION} \"${DISTRIBUTION}\" - Official ${ARCHITECTURE} LIVE Binary $(date +%Y%m%d-%H:%M)" > binary/.disk/info
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
;;
|
;;
|
||||||
|
|
||||||
ubuntu)
|
enabled|netinst|live)
|
||||||
# FIXME
|
echo "main" > binary/.disk/base_components
|
||||||
echo "Ubuntu Linux ${VERSION} \"${DISTRIBUTION}\" - Unofficial ${ARCHITECTURE} LIVE/NETINST Binary $(date +%Y%m%d-%H:%M)" > binary/.disk/info
|
|
||||||
# Ubuntu 7.04 "Feisty Fawn" - Release i386 (20070418)
|
touch binary/.disk/base_installable
|
||||||
|
|
||||||
|
echo "not_complete" > binary/.disk/cd_type
|
||||||
|
|
||||||
|
echo "Debian GNU/Linux ${VERSION} \"${DISTRIBUTION}\" - Official ${ARCHITECTURE} NETINST Binary $(date +%Y%m%d-%H:%M)" > binary/.disk/info
|
||||||
|
|
||||||
|
cp "${LH_BASE}"/data/debian-cd/${LH_DISTRIBUTION}/${LH_ARCHITECTURE}_netinst_udeb_include binary/.disk/udeb_include
|
||||||
|
|
||||||
|
if [ "${LH_DEBIAN_INSTALLER}" = "live" ]
|
||||||
|
then
|
||||||
|
echo "live-installer" >> binary/.disk/udeb_include
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
|
||||||
|
businesscard)
|
||||||
|
echo "main" > binary/.disk/base_components
|
||||||
|
|
||||||
|
echo "not_complete" > binary/.disk/cd_type
|
||||||
|
|
||||||
|
echo "Debian GNU/Linux ${VERSION} \"${DISTRIBUTION}\" - Official ${ARCHITECTURE} BC Binary $(date +%Y%m%d-%H:%M)" > binary/.disk/info
|
||||||
|
|
||||||
|
cp "${LH_BASE}"/data/debian-cd/${LH_DISTRIBUTION}/${LH_ARCHITECTURE}_businesscard_udeb_include binary/.disk/udeb_include
|
||||||
|
;;
|
||||||
|
|
||||||
|
disabled)
|
||||||
|
echo "Debian GNU/Linux ${VERSION} \"${DISTRIBUTION}\" - Official ${ARCHITECTURE} LIVE Binary $(date +%Y%m%d-%H:%M)" > binary/.disk/info
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
|
|
@ -59,28 +59,15 @@ case "${1}" in
|
||||||
|
|
||||||
if [ "${LH_SECURITY}" = "enabled" ]
|
if [ "${LH_SECURITY}" = "enabled" ]
|
||||||
then
|
then
|
||||||
case "${LH_MODE}" in
|
if [ "${LH_DISTRIBUTION}" != "sid" ] && [ "${LH_DISTRIBUTION}" != "unstable" ]
|
||||||
debian)
|
then
|
||||||
if [ "${LH_DISTRIBUTION}" != "sid" ] && [ "${LH_DISTRIBUTION}" != "unstable" ]
|
echo "deb ${LH_MIRROR_BOOTSTRAP_SECURITY} ${LH_DISTRIBUTION}/updates ${LH_SECTIONS}" >> chroot/etc/apt/sources.list
|
||||||
then
|
|
||||||
echo "deb ${LH_MIRROR_BOOTSTRAP_SECURITY} ${LH_DISTRIBUTION}/updates ${LH_SECTIONS}" >> chroot/etc/apt/sources.list
|
|
||||||
|
|
||||||
if [ "${LH_SOURCE}" = "enabled" ]
|
if [ "${LH_SOURCE}" = "enabled" ]
|
||||||
then
|
then
|
||||||
echo "deb-src ${LH_MIRROR_BOOTSTRAP_SECURITY} ${LH_DISTRIBUTION}/updates ${LH_SECTIONS}" >> chroot/etc/apt/sources.list
|
echo "deb-src ${LH_MIRROR_BOOTSTRAP_SECURITY} ${LH_DISTRIBUTION}/updates ${LH_SECTIONS}" >> chroot/etc/apt/sources.list
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
;;
|
|
||||||
|
|
||||||
ubuntu)
|
|
||||||
echo "deb ${LH_MIRROR_BOOTSTRAP_SECURITY} ${LH_DISTRIBUTION}-security ${LH_SECTIONS}" >> chroot/etc/apt/sources.list
|
|
||||||
|
|
||||||
if [ "${LH_SOURCE}" = "enabled" ]
|
|
||||||
then
|
|
||||||
echo "deb-src ${LH_MIRROR_BOOTSTRAP_SECURITY} ${LH_DISTRIBUTION}-security ${LH_SECTIONS}" >> chroot/etc/apt/sources.list
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Check local sources.list
|
# Check local sources.list
|
||||||
|
@ -237,28 +224,15 @@ case "${1}" in
|
||||||
|
|
||||||
if [ "${LH_SECURITY}" = "enabled" ]
|
if [ "${LH_SECURITY}" = "enabled" ]
|
||||||
then
|
then
|
||||||
case "${LH_MODE}" in
|
if [ "${LH_DISTRIBUTION}" != "sid" ] && [ "${LH_DISTRIBUTION}" != "unstable" ]
|
||||||
debian)
|
then
|
||||||
if [ "${LH_DISTRIBUTION}" != "sid" ] && [ "${LH_DISTRIBUTION}" != "unstable" ]
|
echo "deb ${LH_MIRROR_BINARY_SECURITY} ${LH_DISTRIBUTION}/updates ${LH_SECTIONS}" >> chroot/etc/apt/sources.list
|
||||||
then
|
|
||||||
echo "deb ${LH_MIRROR_BINARY_SECURITY} ${LH_DISTRIBUTION}/updates ${LH_SECTIONS}" >> chroot/etc/apt/sources.list
|
|
||||||
|
|
||||||
if [ "${LH_SOURCE}" = "enabled" ]
|
if [ "${LH_SOURCE}" = "enabled" ]
|
||||||
then
|
then
|
||||||
echo "deb-src ${LH_MIRROR_BINARY_SECURITY} ${LH_DISTRIBUTION}/updates ${LH_SECTIONS}" >> chroot/etc/apt/sources.list
|
echo "deb-src ${LH_MIRROR_BINARY_SECURITY} ${LH_DISTRIBUTION}/updates ${LH_SECTIONS}" >> chroot/etc/apt/sources.list
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
;;
|
|
||||||
|
|
||||||
ubuntu)
|
|
||||||
echo "deb ${LH_MIRROR_BINARY_SECURITY} ${LH_DISTRIBUTION}-security ${LH_SECTIONS}" >> chroot/etc/apt/sources.list
|
|
||||||
|
|
||||||
if [ "${LH_SOURCE}" = "enabled" ]
|
|
||||||
then
|
|
||||||
echo "deb-src ${LH_MIRROR_BINARY_SECURITY} ${LH_DISTRIBUTION}-security ${LH_SECTIONS}" >> chroot/etc/apt/sources.list
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Check local sources.list
|
# Check local sources.list
|
||||||
|
|
|
@ -75,7 +75,7 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
|
||||||
\t [--mirror-binary URL]\n\
|
\t [--mirror-binary URL]\n\
|
||||||
\t [--mirror-bootstrap-security URL]\n\
|
\t [--mirror-bootstrap-security URL]\n\
|
||||||
\t [--mirror-bootstrap URL]\n\
|
\t [--mirror-bootstrap URL]\n\
|
||||||
\t [--mode debian|debian-edu|ubuntu]\n\
|
\t [--mode debian|debian-edu]\n\
|
||||||
\t [--net-filesystem nfs|cfs]\n\
|
\t [--net-filesystem nfs|cfs]\n\
|
||||||
\t [--net-mountoptions OPTIONS]\n\
|
\t [--net-mountoptions OPTIONS]\n\
|
||||||
\t [--net-path PATH]\n\
|
\t [--net-path PATH]\n\
|
||||||
|
|
|
@ -59,27 +59,19 @@ DISTRIBUTION="$(echo ${LH_DISTRIBUTION} | cut -b 1 | tr '[a-z]' '[A-Z]')"
|
||||||
DISTRIBUTION="${DISTRIBUTION}$(echo ${LH_DISTRIBUTION} | cut -b 2-)"
|
DISTRIBUTION="${DISTRIBUTION}$(echo ${LH_DISTRIBUTION} | cut -b 2-)"
|
||||||
eval VERSION="$`echo VERSION_${LH_DISTRIBUTION}`"
|
eval VERSION="$`echo VERSION_${LH_DISTRIBUTION}`"
|
||||||
|
|
||||||
case "${LH_MODE}" in
|
if [ -d binary/pool/main/b/base-installer ]
|
||||||
debian)
|
then
|
||||||
if [ -d binary/pool/main/b/base-installer ]
|
if [ -d binary/pool/main/l/live-installer ]
|
||||||
then
|
then
|
||||||
if [ -d binary/pool/main/l/live-installer ]
|
TYPE="LIVE/INSTALL"
|
||||||
then
|
fi
|
||||||
TYPE="LIVE/INSTALL"
|
|
||||||
fi
|
|
||||||
|
|
||||||
TYPE="LIVE/NETINST"
|
TYPE="LIVE/NETINST"
|
||||||
else
|
else
|
||||||
TYPE="LIVE"
|
TYPE="LIVE"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "Debian GNU/Linux ${VERSION} \"${DISTRIBUTION}\" - Official ${ARCHITECTURE} ${TYPE} Source $(date +%Y%m%d-%H:%M)" > source/.disk/info
|
echo "Debian GNU/Linux ${VERSION} \"${DISTRIBUTION}\" - Official ${ARCHITECTURE} ${TYPE} Source $(date +%Y%m%d-%H:%M)" > source/.disk/info
|
||||||
;;
|
|
||||||
|
|
||||||
ubuntu)
|
|
||||||
echo "Ubuntu Linux ${VERSION} \"${DISTRIBUTION}\" - Unofficial ${ARCHITECTURE} LIVE/NETINST Source $(date +%Y%m%d-%H:%M)" > source/.disk/info
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
# Creating stage file
|
# Creating stage file
|
||||||
Create_stagefile .stage/source_disk
|
Create_stagefile .stage/source_disk
|
||||||
|
|
|
@ -111,7 +111,7 @@ Hier ist eine vollst\[:a]ndige Liste aller verf\[:u]gbaren Optionen f\[:u]r lh_c
|
||||||
|
|
||||||
.IP "\fB\-\-mirror\-bootstrap\fR \fIURL\fR" 4
|
.IP "\fB\-\-mirror\-bootstrap\fR \fIURL\fR" 4
|
||||||
|
|
||||||
.IP "\fB\-\-mode\fR debian|debian\-edu|ubuntu" 4
|
.IP "\fB\-\-mode\fR debian|debian\-edu" 4
|
||||||
|
|
||||||
.IP "\fB\-\-net\-filesystem\fR nfs|cfs" 4
|
.IP "\fB\-\-net\-filesystem\fR nfs|cfs" 4
|
||||||
|
|
||||||
|
|
|
@ -111,7 +111,7 @@ Here is the complete list of available options for lh_config.
|
||||||
|
|
||||||
.IP "\fB\-\-mirror\-bootstrap\fR \fIURL\fR" 4
|
.IP "\fB\-\-mirror\-bootstrap\fR \fIURL\fR" 4
|
||||||
|
|
||||||
.IP "\fB\-\-mode\fR debian|debian\-edu|ubuntu" 4
|
.IP "\fB\-\-mode\fR debian|debian\-edu" 4
|
||||||
|
|
||||||
.IP "\fB\-\-net\-filesystem\fR nfs|cfs" 4
|
.IP "\fB\-\-net\-filesystem\fR nfs|cfs" 4
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue