summaryrefslogtreecommitdiff
path: root/helpers
diff options
context:
space:
mode:
Diffstat (limited to 'helpers')
-rwxr-xr-xhelpers/lh_chroot1
-rwxr-xr-xhelpers/lh_chroot_local-packageslists56
-rwxr-xr-xhelpers/lh_config1
3 files changed, 1 insertions, 57 deletions
diff --git a/helpers/lh_chroot b/helpers/lh_chroot
index 7a527be..6bd4e90 100755
--- a/helpers/lh_chroot
+++ b/helpers/lh_chroot
@@ -49,7 +49,6 @@ lh_chroot_local-preseed ${*}
lh_chroot_tasks ${*}
lh_chroot_packageslists ${*}
lh_chroot_packages ${*}
-lh_chroot_local-packageslists ${*}
lh_chroot_local-packages ${*}
lh_chroot_install-packages ${*}
lh_chroot_localization ${*}
diff --git a/helpers/lh_chroot_local-packageslists b/helpers/lh_chroot_local-packageslists
deleted file mode 100755
index ab88282..0000000
--- a/helpers/lh_chroot_local-packageslists
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/sh
-
-# lh_chroot_local-packageslists(1) - queue install of local packages lists into chroot
-# Copyright (C) 2006-2008 Daniel Baumann <daniel@debian.org>
-#
-# live-helper 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
-LH_BASE="${LH_BASE:-/usr/share/live-helper}"
-
-for FUNCTION in "${LH_BASE}"/functions/*.sh
-do
- . "${FUNCTION}"
-done
-
-# Setting static variables
-DESCRIPTION="queue install of local packages lists into chroot"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-Echo_message "Begin queueing installation of local packages lists..."
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/chroot_local-packageslists
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-if Find_files config/chroot_local-packageslists/*
-then
- for PACKAGES_LIST in config/chroot_local-packageslists/*
- do
- # Generate package list
- Expand_packagelist "${PACKAGES_LIST}" "config/chroot_local-packageslists" \
- >> chroot/root/chroot_packages
- done
-
- # Creating stage file
- Create_stagefile .stage/chroot_local-packageslists
-fi
diff --git a/helpers/lh_config b/helpers/lh_config
index 0e2b00c..d8a44e0 100755
--- a/helpers/lh_config
+++ b/helpers/lh_config
@@ -1140,6 +1140,7 @@ if [ "${CONFIG}" = "clone" ] # FIXME
then
# Read package selection
echo $(dpkg --get-selections | awk '{ print $1 }') > config/chroot_local-packageslists/local-system
+ LH_PACKAGES_LISTS="${LH_PACKAGES_LISTS} local-system"
# Read debconf questions
if [ ! -f /usr/bin/debconf-get-selections ]