diff options
author | Daniel Baumann <daniel@debian.org> | 2012-08-27 15:59:56 +0200 |
---|---|---|
committer | Daniel Baumann <daniel@debian.org> | 2012-08-27 16:05:49 +0200 |
commit | a0a5bbfd1c9b6fc58d1b102ee56fb7d3b8b7bfcf (patch) | |
tree | 584a8f8174bdcbafddb6652e469c5ae5381ce3da /scripts/build/lb_chroot_install-packages | |
parent | d6e45a34376c9c80d1488ad4f3c9c1f85bedb338 (diff) | |
download | vyos-live-build-a0a5bbfd1c9b6fc58d1b102ee56fb7d3b8b7bfcf.tar.gz vyos-live-build-a0a5bbfd1c9b6fc58d1b102ee56fb7d3b8b7bfcf.zip |
Dropping lb prefix from live-build scripts, not needed anymore.
Previously, we needed to keep the lb_* prefix as the scripts
could also be executed standalone. Since the lb wrapper is
mandatory since squeeze, we can drop this now.
Diffstat (limited to 'scripts/build/lb_chroot_install-packages')
-rwxr-xr-x | scripts/build/lb_chroot_install-packages | 70 |
1 files changed, 0 insertions, 70 deletions
diff --git a/scripts/build/lb_chroot_install-packages b/scripts/build/lb_chroot_install-packages deleted file mode 100755 index d7d916496..000000000 --- a/scripts/build/lb_chroot_install-packages +++ /dev/null @@ -1,70 +0,0 @@ -#!/bin/sh - -## live-build(7) - System Build Scripts -## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org> -## -## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. -## This is free software, and you are welcome to redistribute it -## under certain conditions; see COPYING for details. - - -set -e - -# Including common functions -[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh - -# Setting static variables -DESCRIPTION="$(Echo 'install queued packages into chroot')" -HELP="" -USAGE="${PROGRAM} [--force]" -USAGE="${PROGRAM} {install|live} [--force]" - -_PASS="${1}" -shift - -Arguments "${@}" - -# Reading configuration files -Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source -Set_defaults - -Echo_message "Begin installing packages (${_PASS} pass)..." - -# Requiring stage file -Require_stagefile .build/config .build/bootstrap - -# Checking stage file -Check_stagefile .build/chroot_install-packages.${PASS} - -# Checking lock file -Check_lockfile .lock - -# Creating lock file -Create_lockfile .lock - -if [ -e chroot/root/packages.chroot ] && [ -s chroot/root/packages.chroot ] -then - # Restoring cache - Restore_cache cache/packages.chroot - - # Installing packages - case "${LB_APT}" in - apt|apt-get) - Chroot chroot "xargs --arg-file=/root/packages.chroot apt-get ${APT_OPTIONS} install" - ;; - - aptitude) - Chroot chroot "xargs --arg-file=/root/packages.chroot aptitude ${APTITUDE_OPTIONS} install" - ;; - esac - - # Tidying up - rm -f chroot/root/packages.chroot - - # Saving cache - Save_cache cache/packages.chroot - -fi - -# Creating stage file -Create_stagefile .build/chroot_install-packages.${_PASS} |