From 6adb5976b6b238a19326f8a3f423bcc8898eee8d Mon Sep 17 00:00:00 2001 From: jnqnfe Date: Wed, 7 Jan 2015 22:44:14 +0000 Subject: [PATCH] remove another redundant file Originally removed in 42fb1e197607ac8920b3f8f3a583d1d540c5ae05 Accidentally restored in bc50443cf043616c7087f383e11bf85cd233c54e (Closes #952835) --- manpages/en/live-build.7 | 2 - scripts/build/chroot_live-packages | 87 ------------------------------ 2 files changed, 89 deletions(-) delete mode 100755 scripts/build/chroot_live-packages diff --git a/manpages/en/live-build.7 b/manpages/en/live-build.7 index fd1dff2e5..fa5d0c935 100644 --- a/manpages/en/live-build.7 +++ b/manpages/en/live-build.7 @@ -107,8 +107,6 @@ installs into the live OS root filesystem any packages listed in local package l pauses the build process and starts an interactive shell from the live OS root filesystem, providing an oportunity for manual modifications or testing; note that this is (currently) usually executed with several chroot prep modifications applied (see description of these further down) .IP "\fBlb chroot_linux\-image\fR(1)" 4 compiles a list of kernel images to be installed in the live OS root filesystem -.IP "\fBlb chroot_live\-packages\fR(1)" 4 -installs a set of live system specific packages to the live OS root filesystem .IP "\fBlb chroot_package\-lists\fR(1)" 4 compiles a list of packages provided in the user\' local config to be installed in the live OS root filesystem .IP "\fBlb chroot_preseed\fR(1)" 4 diff --git a/scripts/build/chroot_live-packages b/scripts/build/chroot_live-packages deleted file mode 100755 index a04e37667..000000000 --- a/scripts/build/chroot_live-packages +++ /dev/null @@ -1,87 +0,0 @@ -#!/bin/sh - -## live-build(7) - System Build Scripts -## Copyright (C) 2006-2015 Daniel Baumann -## -## 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 'schedule live packages for installation')" -HELP="" -USAGE="${PROGRAM} [--force]" - -Arguments "${@}" - -# Reading configuration files -Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source -Set_defaults - -# Requiring stage file -Require_stagefile .build/config .build/bootstrap - -# Checking stage file -Check_stagefile .build/chroot_live-packages - -# Checking lock file -Check_lockfile .lock - -# Creating lock file -Create_lockfile .lock - -# Queue installation of live-boot -if [ -n "${LB_INITRAMFS}" ] && [ "${LB_INITRAMFS}" != "none" ] -then - _PACKAGES="${LB_INITRAMFS}" -fi - -# Queue installation of live-config -if [ -n "${LB_INITSYSTEM}" ] && [ "${LB_INITSYSTEM}" != "none" ] -then - _PACKAGES="${_PACKAGES} live-config live-config-${LB_INITSYSTEM}" -fi - -# Do initsystem specific hacks -case "${LB_INITSYSTEM}" in - systemd) - _PACKAGES="${_PACKAGES} systemd-sysv" - - if Chroot_has_package sysvinit - then - Chroot chroot "dpkg --force-remove-essential --purge sysvinit" - fi - ;; - - sysvinit) - _PACKAGES="${_PACKAGES} sysvinit" - - if Chroot_has_package systemd-sysv - then - Chroot chroot "dpkg --force-remove-essential --purge systemd systemd-sysv" - fi - ;; -esac - -# Install live packages -if [ -n "${_PACKAGES}" ] -then - case "${LB_APT}" in - apt|apt-get) - Chroot chroot "apt-get ${APT_OPTIONS} install ${_PACKAGES}" - ;; - - aptitude) - Chroot chroot "aptitude ${APTITUDE_OPTIONS} install ${_PACKAGES}" - ;; - esac - - # Creating stage file - Create_stagefile .build/chroot_live-packages -fi