diff options
| author | Colin Watson <cjwatson@canonical.com> | 2011-05-16 15:03:56 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-05-16 22:11:15 +0200 |
| commit | 454043122d452e67535a249076fd17c007644b27 (patch) | |
| tree | fd1a9d010f26f9585b032b4a4fad8b70a19209d4 /scripts | |
| parent | c5df1371f8e5f092522de8c5fd0c4b282520baac (diff) | |
| download | vyos-live-build-454043122d452e67535a249076fd17c007644b27.tar.gz vyos-live-build-454043122d452e67535a249076fd17c007644b27.zip | |
Allow installing tasks using apt-get, and do so by default for Ubuntu (Closes: #626940).
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/build/lb_chroot_tasks | 13 | ||||
| -rwxr-xr-x | scripts/build/lb_config | 2 |
2 files changed, 14 insertions, 1 deletions
diff --git a/scripts/build/lb_chroot_tasks b/scripts/build/lb_chroot_tasks index 72db9f6c0..477d75556 100755 --- a/scripts/build/lb_chroot_tasks +++ b/scripts/build/lb_chroot_tasks @@ -45,6 +45,10 @@ then # Checking depends case "${LB_TASKSEL}" in + apt) + Check_package chroot/usr/bin/apt-get apt + ;; + aptitude) Check_package chroot/usr/bin/aptitude aptitude ;; @@ -59,6 +63,15 @@ then # Installing tasks case "${LB_TASKSEL}" in + apt) + APT_TASKS= + for TASK in ${LB_TASKS} + do + APT_TASKS="${APT_TASKS:+$APT_TASKS }$TASK^" + done + Chroot chroot "apt-get ${APT_OPTIONS} install ${APT_TASKS}" + ;; + aptitude) Chroot chroot "aptitude ${APTITUDE_OPTIONS} install ${LB_TASKS}" ;; diff --git a/scripts/build/lb_config b/scripts/build/lb_config index c3ae0eb06..0e3624062 100755 --- a/scripts/build/lb_config +++ b/scripts/build/lb_config @@ -135,7 +135,7 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\ \t [--source true|false]\n\ \t [-s|--source-images iso|net|tar|usb-hdd]\n\ \t [--syslinux-theme THEME_SUFFIX]\n\ -\t [--tasksel aptitude|tasksel]\n\ +\t [--tasksel apt|aptitude|tasksel]\n\ \t [--tasks TASK|\"TASKS\"]\n\ \t [--templates PATH]\n\ \t [--virtual-root-size MB]\n\ |