manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adding support for debian-volatile archive.

This commit is contained in:
Daniel Baumann 2010-03-06 17:23:59 +01:00
parent 54518852c8
commit 17c5ed64b2
3 changed files with 99 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
functions/defaults.sh
View File

@ -333,6 +333,22 @@ Set_defaults ()
esac
fi
# Setting volatile mirror to fetch packages from
if [ -z "${LH_MIRROR_CHROOT_VOLATILE}" ]
then
case "${LH_MODE}" in
debian|debian-release)
case "${LH_DISTRIBUTION}" in
lenny)
LH_MIRROR_CHROOT_VOLATILE="http://volatile.debian.org/debian-volatile/"
;;
esac
;;
esac
LH_MIRROR_CHROOT_VOLATILE="${LH_MIRROR_CHROOT_VOLATILE:-none}"
fi
# Setting mirror which ends up in the image
if [ -z "${LH_MIRROR_BINARY}" ]
then
@ -385,6 +401,22 @@ Set_defaults ()
esac
fi
# Setting volatile mirror which ends up in the image
if [ -z "${LH_MIRROR_BINARY_VOLATILE}" ]
then
case "${LH_MODE}" in
debian|debian-release)
case "${LH_DISTRIBUTION}" in
lenny)
LH_MIRROR_BINARY_VOLATILE="http://volatile.debian.org/debian-volatile/"
;;
esac
;;
esac
LH_MIRROR_BINARY_VOLATILE="${LH_MIRROR_BINARY_VOLATILE:-none}"
fi
LH_MIRROR_DEBIAN_INSTALLER="${LH_MIRROR_DEBIAN_INSTALLER:-${LH_MIRROR_BOOTSTRAP}}"
# Setting archive areas value
@ -685,6 +717,14 @@ Set_defaults ()
LH_SECURITY="${LH_SECURITY:-true}"
# Setting volatile updates option
if [ "${LH_MIRROR_CHROOT_VOLATILE}" = "none" ] || [ "${LH_MIRROR_BINARY_VOLATILE}" = "none" ]
then
LH_VOLATILE="false"
fi
LH_VOLATILE="${LH_VOLATILE:-true}"
# Setting symlink convertion option
LH_SYMLINKS="${LH_SYMLINKS:-false}"

26
helpers/chroot_sources
View File

@ -75,6 +75,19 @@ case "${1}" in
esac
fi
if [ "${LH_VOLATILE}" = "true" ]
then
if [ "${LH_DISTRIBUTION}" != "sid" ] && [ "${LH_DISTRIBUTION}" != "unstable" ]
then
echo "deb ${LH_MIRROR_CHROOT_VOLATILE} ${LH_DISTRIBUTION}/volatile ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
if [ "${LH_SOURCE}" = "true" ]
then
echo "deb-src ${LH_MIRROR_CHROOT_VOLATILE} ${LH_DISTRIBUTION}/volatile ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
fi
fi
fi
# Check local sources.list
if Find_files config/chroot_sources/*.chroot
then
@ -401,6 +414,19 @@ case "${1}" in
esac
fi
if [ "${LH_VOLATILE}" = "true" ]
then
if [ "${LH_DISTRIBUTION}" != "sid" ] && [ "${LH_DISTRIBUTION}" != "unstable" ]
then
echo "deb ${LH_MIRROR_BINARY_VOLATILE} ${LH_DISTRIBUTION}/volatile ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
if [ "${LH_SOURCE}" = "true" ]
then
echo "deb-src ${LH_MIRROR_BINARY_VOLATILE} ${LH_DISTRIBUTION}/volatile ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
fi
fi
fi
# Check local sources.list
if Find_files config/chroot_sources/*.binary
then

36
helpers/config
View File

@ -91,8 +91,10 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
\t [-m|--mirror-bootstrap URL]\n\
\t [--mirror-chroot URL]\n\
\t [--mirror-chroot-security URL]\n\
\t [--mirror-chroot-volatile URL]\n\
\t [--mirror-binary URL]\n\
\t [--mirror-binary-security URL]\n\
\t [--mirror-binary-volatile URL]\n\
\t [--mirror-debian-installer URL]\n\
\t [--mode debian|emdebian]\n\
\t [--net-root-filesystem nfs|cfs]\n\
@ -122,6 +124,7 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
\t [--tasks TASK]\n\
\t [--templates PATH]\n\
\t [--virtual-root-size MB]\n\
\t [--volatile true|false]\n\
\t [--exposed-root true|false]\n\
\t [--username NAME]\n\
\t [--verbose]\n\
@ -134,10 +137,10 @@ Local_arguments ()
cache-stages:,debconf-frontend:,debconf-nowarnings:,debconf-priority:,dump,
initramfs:,fdisk:,losetup:,mode:,root-command:,use-fakeroot:,tasksel:,includes:,
templates:,architecture:,bootstrap-config:,bootstrap-flavour:,bootstrap-keyring:,clean,
distribution:,mirror-bootstrap:,mirror-chroot:,mirror-chroot-security:,mirror-binary:,
mirror-binary-security:,mirror-debian-installer:,archive-areas:,chroot-filesystem:,exposed-root:,virtual-root-size:,
distribution:,mirror-bootstrap:,mirror-chroot:,mirror-chroot-security:,mirror-chroot-volatile:,mirror-binary:,
mirror-binary-security:,mirror-binary-volatile:,mirror-debian-installer:,archive-areas:,chroot-filesystem:,exposed-root:,virtual-root-size:,
gzip-options:,hooks:,interactive:,keyring-packages:,language:,linux-flavours:,linux-packages:,
packages:,packages-lists:,tasks:,security:,symlinks:,sysvinit:,binary-filesystem:,binary-images:,
packages:,packages-lists:,tasks:,security:,volatile:,symlinks:,sysvinit:,binary-filesystem:,binary-images:,
binary-indices:,bootappend-install:,bootappend-live:,bootloader:,checksums:,chroot-build:,
debian-installer:,debian-installer-distribution:,debian-installer-preseedfile:,debian-installer-gui:,
encryption:,grub-splash:,hostname:,iso-application:,iso-preparer:,iso-publisher:,
@ -406,6 +409,11 @@ Local_arguments ()
shift 2
;;
--mirror-chroot-volatile)
LH_MIRROR_CHROOT_VOLATILE="${2}"
shift 2
;;
--mirror-binary)
LH_MIRROR_BINARY="${2}"
shift 2
@ -416,6 +424,11 @@ Local_arguments ()
shift 2
;;
--mirror-binary-volatile)
LH_MIRROR_BINARY_VOLATILE="${2}"
shift 2
;;
--mirror-debian-installer)
LH_MIRROR_DEBIAN_INSTALLER="${2}"
shift 2
@ -497,6 +510,11 @@ Local_arguments ()
shift 2
;;
--volatile)
LH_VOLATILE="${2}"
shift 2
;;
--symlinks)
LH_SYMLINKS="${2}"
shift 2
@ -976,6 +994,10 @@ LH_MIRROR_CHROOT="${LH_MIRROR_CHROOT}"
# (Default: ${LH_MIRROR_CHROOT_SECURITY})
LH_MIRROR_CHROOT_SECURITY="${LH_MIRROR_CHROOT_SECURITY}"
# \$LH_MIRROR_CHROOT_VOLATILE: set volatile mirror to fetch packages from
# (Default: ${LH_MIRROR_CHROOT_VOLATILE})
LH_MIRROR_CHROOT_VOLATILE="${LH_MIRROR_CHROOT_VOLATILE}"
# \$LH_MIRROR_BINARY: set mirror which ends up in the image
# (Default: ${LH_MIRROR_BINARY})
LH_MIRROR_BINARY="${LH_MIRROR_BINARY}"
@ -984,6 +1006,10 @@ LH_MIRROR_BINARY="${LH_MIRROR_BINARY}"
# (Default: ${LH_MIRROR_BINARY_SECURITY})
LH_MIRROR_BINARY_SECURITY="${LH_MIRROR_BINARY_SECURITY}"
# \$LH_MIRROR_BINARY_VOLATILE: set volatile mirror which ends up in the image
# (Default: ${LH_MIRROR_BINARY_VOLATILE})
LH_MIRROR_BINARY_VOLATILE="${LH_MIRROR_BINARY_VOLATILE}"
# \$LH_MIRROR_DEBIAN_INSTALLER: set debian-installer mirror
# (Default: ${LH_MIRROR_BOOTSTRAP})
LH_MIRROR_DEBIAN_INSTALLER="${LH_MIRROR_DEBIAN_INSTALLER}"
@ -1062,6 +1088,10 @@ LH_TASKS="${LH_TASKS}"
# (Default: ${LH_SECURITY})
LH_SECURITY="${LH_SECURITY}"
# \$LH_VOLATILE: enable volatile updates
# (Default: ${LH_VOLATILE})
LH_VOLATILE="${LH_VOLATILE}"
# \$LH_SYMLINKS: enable symlink convertion
# (Default: ${LH_SYMLINKS})
LH_SYMLINKS="${LH_SYMLINKS}"