sig_cloud/diskimage-builder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Debian: Support additional debootstrap arguments"

Browse Source
This commit is contained in:
Jenkins 2014-06-12 05:31:35 +00:00 committed by Gerrit Code Review
commit 2a1c189069
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
elements/debian/README.md
View File

@ -7,6 +7,11 @@ not handle changing Packages files well across multiple out of sync
mirrors, it is recommended that you choose a single mirror of debian, mirrors, it is recommended that you choose a single mirror of debian,
and pass it in via `DIB_DISTRIBUTION_MIRROR`. and pass it in via `DIB_DISTRIBUTION_MIRROR`.
If necessary, a custom apt keyring and debootstrap script can be
supplied to the `debootstrap` command via `DIB_DEBIAN_KEYRING` and
`DIB_DEBIAN_DEBOOTSTRAP_SCRIPT` respectively. Both options require the
use of absolute rather than relative paths.
Use of this element will also require the tool 'debootstrap' to be Use of this element will also require the tool 'debootstrap' to be
available on your system. It should be available on Ubuntu, Debian, available on your system. It should be available on Ubuntu, Debian,
and Fedora. and Fedora.

10
elements/debian/root.d/08-debootstrap
View File

@ -38,12 +38,20 @@ if [ -n "$DIB_OFFLINE" -o -n "${DIB_DEBIAN_USE_DEBOOTSTRAP_CACHE:-}" ] && [ -f $
else else
echo Building new tarball for Debian $DIB_RELEASE ARCH=$ARCH echo Building new tarball for Debian $DIB_RELEASE ARCH=$ARCH
ADD_PACKAGES=sudo,adduser,locales,openssh-server,file,less,kbd,curl,rsync,bash-completion,linux-image-amd64 ADD_PACKAGES=sudo,adduser,locales,openssh-server,file,less,kbd,curl,rsync,bash-completion,linux-image-amd64
KEYRING_OPT=
if [ -n "${DIB_DEBIAN_KEYRING:-}" ] ; then
KEYRING_OPT="--keyring=${DIB_DEBIAN_KEYRING}"
fi
sudo sh -c "http_proxy=$http_proxy debootstrap --verbose \ sudo sh -c "http_proxy=$http_proxy debootstrap --verbose \
--arch=${ARCH} \ --arch=${ARCH} \
--include=${ADD_PACKAGES} \ --include=${ADD_PACKAGES} \
$KEYRING_OPT \
$DIB_RELEASE \ $DIB_RELEASE \
$TARGET_ROOT \ $TARGET_ROOT \
$DIB_DISTRIBUTION_MIRROR" $DIB_DISTRIBUTION_MIRROR \
${DIB_DEBIAN_DEBOOTSTRAP_SCRIPT:-}"
echo "Customizing result for cloud use" echo "Customizing result for cloud use"
apt_get_bp_extra_opts= apt_get_bp_extra_opts=