manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adding debian version 2.0~a1-1.

This commit is contained in:
Daniel Baumann 2009-11-22 14:40:20 +01:00
parent af64109b62
commit 5e4952e8a7
87 changed files with 139 additions and 154 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Makefile
View File

@ -8,7 +8,7 @@ all: test install
test:
# Checking for syntax errors
for SCRIPT in functions.sh functions/* examples/*/*.sh helpers/* hooks/*; \
for SCRIPT in live-helper.sh functions/* examples/*/*.sh helpers/* hooks/*; \
do \
sh -n $$SCRIPT; \
done
@ -16,7 +16,7 @@ test:
# Checking for bashisms
if [ -x /usr/bin/checkbashisms ]; \
then \
checkbashisms functions.sh functions/* examples/*/*.sh helpers/* hooks/*; \
checkbashisms live-helper.sh functions/* examples/*/*.sh helpers/* hooks/*; \
else \
echo "WARNING: skipping bashism test - you need to install devscripts."; \
fi
@ -25,13 +25,13 @@ build:
@echo "Nothing to build."
install:
# Installing executables
mkdir -p $(DESTDIR)/usr/bin
cp helpers/* $(DESTDIR)/usr/bin
# Installing shared data
mkdir -p $(DESTDIR)/usr/share/live-helper
cp -r data examples functions.sh functions hooks includes lists templates $(DESTDIR)/usr/share/live-helper
cp -r data examples live-helper.sh functions helpers hooks includes lists templates $(DESTDIR)/usr/share/live-helper
# Installing executables
mkdir -p $(DESTDIR)/usr/bin
mv $(DESTDIR)/usr/share/live-helper/helpers/lh $(DESTDIR)/usr/share/live-helper/helpers/live-helper $(DESTDIR)/usr/bin
# Installing documentation
mkdir -p $(DESTDIR)/usr/share/doc/live-helper
@ -64,15 +64,12 @@ install:
mkdir -p $(DESTDIR)/var/log
uninstall:
# Uninstalling executables
for HELPER in helpers/*; \
do \
rm -f $(DESTDIR)/usr/bin/$$(basename $$HELPER); \
done
# Uninstalling shared data
rm -rf $(DESTDIR)/usr/share/live-helper
# Uninstalling executables
rm -f $(DESTDIR)/usr/bin/lh $(DESTDIR)/usr/bin/live-helper
# Uninstalling documentation
rm -rf $(DESTDIR)/usr/share/doc/live-helper

11
debian/changelog vendored
View File

@ -1,9 +1,12 @@
live-helper (1.0.6-2) unstable; urgency=high
live-helper (2.0~a1-1) experimental; urgency=low
* Replacing sed 4.2 command to assemble debootstraps components option
with a less advanced one, in order to work on legacy distributions.
* Renaming categories to archive areas (Closes: #519690).
* Renaming functions.sh to live-helper.sh.
* Installing helpers to /usr/share/live-helper/helpers instead of
/usr/bin.
* Removing legacy function for dashed commands.
-- Daniel Baumann <daniel@debian.org> Sun, 22 Nov 2009 13:35:50 +0100
-- Daniel Baumann <daniel@debian.org> Sun, 15 Nov 2009 22:42:59 +0100
live-helper (1.0.6-1) unstable; urgency=medium

2
functions/common.sh
View File

@ -9,7 +9,7 @@
PROGRAM="$(basename ${0})"
PACKAGE="live-helper"
VERSION="1.0.6-1"
VERSION="2.0~a1-1"
CONFIG_VERSION="$(echo ${VERSION} | awk -F- '{ print $1 }')"
PATH="${PWD}/scripts:${PATH}"

8
functions/defaults.sh
View File

@ -405,16 +405,16 @@ Set_defaults ()
esac
fi
# Setting categories value
if [ -z "${LH_CATEGORIES}" ]
# Setting archive areas value
if [ -z "${LH_ARCHIVE_AREAS}" ]
then
case "${LH_MODE}" in
ubuntu)
LH_CATEGORIES="main restricted"
LH_ARCHIVE_AREAS="main restricted"
;;
*)
LH_CATEGORIES="main"
LH_ARCHIVE_AREAS="main"
;;
esac
fi

18
functions/legacy.sh
View File

@ -1,18 +0,0 @@
#!/bin/sh
# legacy.sh - handle live-helper 2.x warnigns
# Copyright (C) 2006-2009 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.
# Obsoleting 'lh_foo_bar' calls in favour for 'lh foo_bar'
BASENAME="$(basename ${0})"
if [ -z "${LH}" ] && [ "$(echo ${BASENAME} | awk '{ print $1 }')" != "lh" ]
then
Echo_warning "live-helper 2.0 will deprecate all dashed forms of commands."
Echo_warning "Please use \'$(echo ${BASENAME} | sed -e 's|lh_|lh |')\' instead of \'${BASENAME}\'."
fi

7
helpers/lh
View File

@ -10,7 +10,7 @@
set -e
# Including common functions
. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
# Setting static variables
DESCRIPTION="$(Echo 'utility to build Debian Live systems')"
@ -34,7 +34,10 @@ case "${1}" in
COMMAND="${1}"
shift
if [ -x "$(which lh_${COMMAND} 2>/dev/null)" ]
if [ -x /usr/share/live-helper/helpers/lh_${COMMAND} ]
then
LH=1 exec /usr/share/live-helper/helpers/lh_"${COMMAND}" "${@}"
elif [ -x "$(which lh_${COMMAND} 2>/dev/null)" ]
then
LH=1 exec lh_"${COMMAND}" "${@}"
else

2
helpers/lh_binary
View File

@ -10,7 +10,7 @@
set -e
# Including common functions
. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
# Setting static variables
DESCRIPTION="$(Echo 'build binary images')"

2
helpers/lh_binary_chroot
View File

@ -10,7 +10,7 @@
set -e
# Including common functions
. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
# Setting static variables
DESCRIPTION="$(Echo 'copy chroot into chroot')"

2
helpers/lh_binary_debian-installer
View File

@ -10,7 +10,7 @@
set -e
# Including common functions
. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
# Setting static variables
DESCRIPTION="$(Echo 'install debian-installer into binary')"

2
helpers/lh_binary_disk
View File

@ -10,7 +10,7 @@
set -e
# Including common functions
. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
# Setting static variables
DESCRIPTION="$(Echo 'install disk information into binary')"

2
helpers/lh_binary_encryption
View File

@ -10,7 +10,7 @@
set -e
# Including common functions
. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
# Setting static variables
DESCRIPTION="$(Echo 'encrypts rootfs')"

2
helpers/lh_binary_grub
View File

@ -10,7 +10,7 @@
set -e
# Including common functions
. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
# Setting static variables
DESCRIPTION="$(Echo 'installs grub into binary')"

2
helpers/lh_binary_grub2
View File

@ -10,7 +10,7 @@
set -e
# Including common functions
. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
# Setting static variables
DESCRIPTION="$(Echo 'installs grub2 into binary')"

2
helpers/lh_binary_includes
View File

@ -10,7 +10,7 @@
set -e
# Including common functions
. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
# Setting static variables
DESCRIPTION="$(Echo 'copy files into binary')"

2
helpers/lh_binary_iso
View File

@ -10,7 +10,7 @@
set -e
# Including common functions
. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
# Setting static variables
DESCRIPTION="$(Echo 'build iso binary image')"

2
helpers/lh_binary_linux-image
View File

@ -10,7 +10,7 @@
set -e
# Including common functions
. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
# Setting static variables
DESCRIPTION="$(Echo 'install linux-image into binary')"

2
helpers/lh_binary_local-hooks
View File

@ -10,7 +10,7 @@
set -e
# Including common functions
. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
# Setting static variables
DESCRIPTION="$(Echo 'execute local hooks in binary')"

2
helpers/lh_binary_local-includes
View File

@ -10,7 +10,7 @@
set -e
# Including common functions
. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
# Setting static variables
DESCRIPTION="$(Echo 'copy files into binary')"

2
helpers/lh_binary_local-packageslists
View File

@ -10,7 +10,7 @@
set -e
# Including common functions
. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
# Setting static variables
DESCRIPTION="$(Echo 'install local packages into binary')"

2
helpers/lh_binary_manifest
View File

@ -10,7 +10,7 @@
set -e
# Including common functions
. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
# Setting static variables
DESCRIPTION="$(Echo 'create manifest')"

2
helpers/lh_binary_md5sum
View File

@ -10,7 +10,7 @@
set -e
# Including common functions
. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
# Setting static variables
DESCRIPTION="$(Echo 'create binary md5sums')"

2
helpers/lh_binary_memtest
View File

@ -10,7 +10,7 @@
set -e
# Including common functions
. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
# Setting static variables
DESCRIPTION="$(Echo 'installs a memtest into binary')"

2
helpers/lh_binary_net
View File

@ -10,7 +10,7 @@
set -e
# Including common functions
. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
# Setting static variables
DESCRIPTION="$(Echo 'build netboot binary image')"

2
helpers/lh_binary_rootfs
View File

@ -10,7 +10,7 @@
set -e
# Including common functions
. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
# Setting static variables
DESCRIPTION="$(Echo 'build rootfs image')"

2
helpers/lh_binary_silo
View File

@ -10,7 +10,7 @@
set -e
# Including common functions
. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
# Setting static variables
DESCRIPTION="$(Echo 'installs silo into binary')"

2
helpers/lh_binary_syslinux
View File

@ -10,7 +10,7 @@
set -e
# Including common functions
. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
# Setting static variables
DESCRIPTION="$(Echo 'installs syslinux into binary')"

2
helpers/lh_binary_tar
View File

@ -10,7 +10,7 @@
set -e
# Including common functions
. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
# Setting static variables
DESCRIPTION="$(Echo 'build harddisk binary image')"

2
helpers/lh_binary_usb-hdd
View File

@ -10,7 +10,7 @@
set -e
# Including common functions
. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
# Setting static variables
DESCRIPTION="$(Echo 'build binary image')"

2
helpers/lh_binary_virtual-hdd
View File

@ -10,7 +10,7 @@
set -e
# Including common functions
. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
# Setting static variables
DESCRIPTION="$(Echo 'build binary image')"

2
helpers/lh_binary_win32-loader
View File

@ -10,7 +10,7 @@
set -e
# Including common functions
. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
# Setting static variables
DESCRIPTION="$(Echo 'copy win32-loader into binary')"

2
helpers/lh_binary_yaboot
View File

@ -10,7 +10,7 @@
set -e
# Including common functions
. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
# Setting static variables
DESCRIPTION="$(Echo 'installs yaboot into binary')"

2
helpers/lh_bootstrap
View File

@ -10,7 +10,7 @@
set -e
# Including common functions
. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
# Setting static variables
DESCRIPTION="$(Echo 'bootstrap a Debian system')"

2
helpers/lh_bootstrap_cache
View File

@ -10,7 +10,7 @@
set -e
# Including common functions
. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
# Setting static variables
DESCRIPTION="$(Echo 'cache bootstrap stage')"

2
helpers/lh_bootstrap_cdebootstrap
View File

@ -10,7 +10,7 @@
set -e
# Including common functions
. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
# Setting static variables
DESCRIPTION="$(Echo 'bootstrap a Debian system with cdebootstrap(1)')"

2
helpers/lh_bootstrap_copy
View File

@ -10,7 +10,7 @@
set -e
# Including common functions
. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
# Setting static variables
DESCRIPTION="$(Echo 'bootstrap by copying the host system')"

8
helpers/lh_bootstrap_debootstrap
View File

@ -10,7 +10,7 @@
set -e
# Including common functions
. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
# Setting static variables
DESCRIPTION="$(Echo 'bootstrap a Debian system with debootstrap(8)')"
@ -57,10 +57,10 @@ then
DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --arch ${LH_ARCHITECTURE}"
fi
if [ "${LH_CATEGORIES}" != "main" ]
if [ "${LH_ARCHIVE_AREAS}" != "main" ]
then
# Modify categories to remove leading/trailing whitespaces and replace other whitepspace with commas
DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --components $(echo ${LH_ARCHIVE_AREAS} | sed -e 's| |,|g')"
# Modify archive areas to remove leading/trailing whitespaces and replace other whitepspace with commas
DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --components $(echo ${LH_ARCHIVE_AREAS} | sed -E -e 's/^[ \t]*//;s/[ \t]*$//' -e 's/[ \t]+/,/g')"
fi
if [ -n "${LH_BOOTSTRAP_CONFIG}" ]

2
helpers/lh_build
View File

@ -10,7 +10,7 @@
set -e
# Including common functions
. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
# Read meta config
if [ "${1}" != "noautoconfig" ] && [ -x scripts/build ]

2
helpers/lh_chroot
View File

@ -10,7 +10,7 @@
set -e
# Including common functions
. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
# Setting static variables
DESCRIPTION="$(Echo 'customize the Debian system')"

2
helpers/lh_chroot_apt
View File

@ -10,7 +10,7 @@
set -e
# Including common functions
. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
# Setting static variables
DESCRIPTION="$(Echo 'manage /etc/apt/apt.conf')"

2
helpers/lh_chroot_cache
View File

@ -10,7 +10,7 @@
set -e
# Including common functions
. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
# Setting static variables
DESCRIPTION="$(Echo 'cache chroot stage')"

2
helpers/lh_chroot_debianchroot
View File

@ -10,7 +10,7 @@
set -e
# Including common functions
. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
# Setting static variables
DESCRIPTION="$(Echo 'manage /etc/debian_chroot')"

2
helpers/lh_chroot_devpts
View File

@ -10,7 +10,7 @@
set -e
# Including common functions
. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
# Setting static variables
DESCRIPTION="$(Echo 'mount /dev/pts')"

2
helpers/lh_chroot_dpkg
View File

@ -10,7 +10,7 @@
set -e
# Including common functions
. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
# Setting static variables
DESCRIPTION="$(Echo 'manage /sbin/dpkg')"

2
helpers/lh_chroot_hacks
View File

@ -10,7 +10,7 @@
set -e
# Including common functions
. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
# Setting static variables
DESCRIPTION="$(Echo 'execute hacks in chroot')"

2
helpers/lh_chroot_hooks
View File

@ -10,7 +10,7 @@
set -e
# Including common functions
. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
# Setting static variables
DESCRIPTION="$(Echo 'execute hooks in chroot')"

2
helpers/lh_chroot_hostname
View File

@ -10,7 +10,7 @@
set -e
# Including common functions
. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
# Setting static variables
DESCRIPTION="$(Echo 'manage /bin/hostname')"

2
helpers/lh_chroot_hosts
View File

@ -10,7 +10,7 @@
set -e
# Including common functions
. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
# Setting static variables
DESCRIPTION="$(Echo 'manage /etc/hosts')"

2
helpers/lh_chroot_install-packages
View File

@ -10,7 +10,7 @@
set -e
# Including common functions
. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
# Setting static variables
DESCRIPTION="$(Echo 'install queued packages into chroot')"

2
helpers/lh_chroot_interactive
View File

@ -10,7 +10,7 @@
set -e
# Including common functions
. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
# Setting static variables
DESCRIPTION="$(Echo 'make build interactive')"

2
helpers/lh_chroot_linux-image
View File

@ -10,7 +10,7 @@
set -e
# Including common functions
. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
# Setting static variables
DESCRIPTION="$(Echo 'manage /etc/kernel-img.conf')"

2
helpers/lh_chroot_local-hooks
View File

@ -10,7 +10,7 @@
set -e
# Including common functions
. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
# Setting static variables
DESCRIPTION="$(Echo 'execute local hooks in chroot')"

2
helpers/lh_chroot_local-includes
View File

@ -10,7 +10,7 @@
set -e
# Including common functions
. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
# Setting static variables
DESCRIPTION="$(Echo 'copy local files into chroot')"

2
helpers/lh_chroot_local-packages
View File

@ -10,7 +10,7 @@
set -e
# Including common functions
. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
# Setting static variables
DESCRIPTION="$(Echo 'queue install of local packages into chroot')"

2
helpers/lh_chroot_local-patches
View File

@ -10,7 +10,7 @@
set -e
# Including common functions
. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
# Setting static variables
DESCRIPTION="$(Echo 'apply local patches against chroot')"

2
helpers/lh_chroot_local-preseed
View File

@ -10,7 +10,7 @@
set -e
# Including common functions
. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
# Setting static variables
DESCRIPTION="$(Echo 'execute local preseed in chroot')"

2
helpers/lh_chroot_localization
View File

@ -10,7 +10,7 @@
set -e
# Including common functions
. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
# Setting static variables
DESCRIPTION="$(Echo 'install localization packages into chroot')"

2
helpers/lh_chroot_packages
View File

@ -10,7 +10,7 @@
set -e
# Including common functions
. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
# Setting static variables
DESCRIPTION="$(Echo 'queue install of packages into chroot')"

2
helpers/lh_chroot_packageslists
View File

@ -10,7 +10,7 @@
set -e
# Including common functions
. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
# Setting static variables
DESCRIPTION="$(Echo 'queue install of packages lists into chroot')"

2
helpers/lh_chroot_preseed
View File

@ -10,7 +10,7 @@
set -e
# Including common functions
. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
# Setting static variables
DESCRIPTION="$(Echo 'execute preseed in chroot')"

2
helpers/lh_chroot_proc
View File

@ -10,7 +10,7 @@
set -e
# Including common functions
. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
# Setting static variables
DESCRIPTION="$(Echo 'mount /proc')"

2
helpers/lh_chroot_resolv
View File

@ -10,7 +10,7 @@
set -e
# Including common functions
. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
# Setting static variables
DESCRIPTION="$(Echo 'manage /etc/resolv.conf')"

2
helpers/lh_chroot_selinuxfs
View File

@ -10,7 +10,7 @@
set -e
# Including common functions
. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
# Setting static variables
DESCRIPTION="$(Echo 'mount /selinux')"

26
helpers/lh_chroot_sources
View File

@ -10,7 +10,7 @@
set -e
# Including common functions
. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
# Setting static variables
DESCRIPTION="$(Echo 'manage /etc/apt/sources.list')"
@ -42,33 +42,33 @@ case "${1}" in
Create_lockfile .lock
# Configure custom sources.list
echo "deb ${LH_MIRROR_CHROOT} ${LH_DISTRIBUTION} ${LH_CATEGORIES}" > chroot/etc/apt/sources.list
echo "deb ${LH_MIRROR_CHROOT} ${LH_DISTRIBUTION} ${LH_ARCHIVE_AREAS}" > chroot/etc/apt/sources.list
if [ "${LH_SOURCE}" = "enabled" ]
then
echo "deb-src ${LH_MIRROR_CHROOT} ${LH_DISTRIBUTION} ${LH_CATEGORIES}" >> chroot/etc/apt/sources.list
echo "deb-src ${LH_MIRROR_CHROOT} ${LH_DISTRIBUTION} ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
fi
if [ "${LH_SECURITY}" = "enabled" ]
then
case "${LH_MODE}" in
ubuntu)
echo "deb ${LH_MIRROR_CHROOT_SECURITY} ${LH_DISTRIBUTION}-security ${LH_CATEGORIES}" >> chroot/etc/apt/sources.list
echo "deb ${LH_MIRROR_CHROOT_SECURITY} ${LH_DISTRIBUTION}-security ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
if [ "${LH_SOURCE}" = "enabled" ]
then
echo "deb-src ${LH_MIRROR_CHROOT_SECURITY} ${LH_DISTRIBUTION}-security ${LH_CATEGORIES}" >> chroot/etc/apt/sources.list
echo "deb-src ${LH_MIRROR_CHROOT_SECURITY} ${LH_DISTRIBUTION}-security ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
fi
;;
*)
if [ "${LH_DISTRIBUTION}" != "sid" ] && [ "${LH_DISTRIBUTION}" != "unstable" ]
then
echo "deb ${LH_MIRROR_CHROOT_SECURITY} ${LH_DISTRIBUTION}/updates ${LH_CATEGORIES}" >> chroot/etc/apt/sources.list
echo "deb ${LH_MIRROR_CHROOT_SECURITY} ${LH_DISTRIBUTION}/updates ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
if [ "${LH_SOURCE}" = "enabled" ]
then
echo "deb-src ${LH_MIRROR_CHROOT_SECURITY} ${LH_DISTRIBUTION}/updates ${LH_CATEGORIES}" >> chroot/etc/apt/sources.list
echo "deb-src ${LH_MIRROR_CHROOT_SECURITY} ${LH_DISTRIBUTION}/updates ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
fi
fi
;;
@ -365,33 +365,33 @@ case "${1}" in
rm -rf chroot/var/lib/apt/lists
mkdir -p chroot/var/lib/apt/lists/partial
echo "deb ${LH_MIRROR_BINARY} ${LH_DISTRIBUTION} ${LH_CATEGORIES}" > chroot/etc/apt/sources.list
echo "deb ${LH_MIRROR_BINARY} ${LH_DISTRIBUTION} ${LH_ARCHIVE_AREAS}" > chroot/etc/apt/sources.list
if [ "${LH_SOURCE}" = "enabled" ]
then
echo "deb-src ${LH_MIRROR_BINARY} ${LH_DISTRIBUTION} ${LH_CATEGORIES}" >> chroot/etc/apt/sources.list
echo "deb-src ${LH_MIRROR_BINARY} ${LH_DISTRIBUTION} ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
fi
if [ "${LH_SECURITY}" = "enabled" ]
then
case "${LH_MODE}" in
ubuntu)
echo "deb ${LH_MIRROR_BINARY_SECURITY} ${LH_DISTRIBUTION}-security ${LH_CATEGORIES}" >> chroot/etc/apt/sources.list
echo "deb ${LH_MIRROR_BINARY_SECURITY} ${LH_DISTRIBUTION}-security ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
if [ "${LH_SOURCE}" = "enabled" ]
then
echo "deb-src ${LH_MIRROR_BINARY_SECURITY} ${LH_DISTRIBUTION}-security ${LH_CATEGORIES}" >> chroot/etc/apt/sources.list
echo "deb-src ${LH_MIRROR_BINARY_SECURITY} ${LH_DISTRIBUTION}-security ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
fi
;;
*)
if [ "${LH_DISTRIBUTION}" != "sid" ] && [ "${LH_DISTRIBUTION}" != "unstable" ]
then
echo "deb ${LH_MIRROR_BINARY_SECURITY} ${LH_DISTRIBUTION}/updates ${LH_CATEGORIES}" >> chroot/etc/apt/sources.list
echo "deb ${LH_MIRROR_BINARY_SECURITY} ${LH_DISTRIBUTION}/updates ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
if [ "${LH_SOURCE}" = "enabled" ]
then
echo "deb-src ${LH_MIRROR_BINARY_SECURITY} ${LH_DISTRIBUTION}/updates ${LH_CATEGORIES}" >> chroot/etc/apt/sources.list
echo "deb-src ${LH_MIRROR_BINARY_SECURITY} ${LH_DISTRIBUTION}/updates ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
fi
fi
;;

2
helpers/lh_chroot_symlinks
View File

@ -10,7 +10,7 @@
set -e
# Including common functions
. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
# Setting static variables
DESCRIPTION="$(Echo 'convert symlinks')"

2
helpers/lh_chroot_sysfs
View File

@ -10,7 +10,7 @@
set -e
# Including common functions
. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
# Setting static variables
DESCRIPTION="$(Echo 'mount /sys')"

2
helpers/lh_chroot_sysv-rc
View File

@ -10,7 +10,7 @@
set -e
# Including common functions
. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
# Setting static variables
DESCRIPTION="$(Echo 'manage /usr/sbin/policy-rc.d')"

2
helpers/lh_chroot_sysvinit
View File

@ -10,7 +10,7 @@
set -e
# Including common functions
. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
# Setting static variables
DESCRIPTION="$(Echo 'configure sysvinit')"

2
helpers/lh_chroot_tasks
View File

@ -10,7 +10,7 @@
set -e
# Including common functions
. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
# Setting static variables
DESCRIPTION="$(Echo 'install tasks into chroot')"

2
helpers/lh_clean
View File

@ -21,7 +21,7 @@ then
fi
# Including common functions
. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
# Setting static variables
DESCRIPTION="$(Echo 'clean up system build directories')"

16
helpers/lh_config
View File

@ -21,7 +21,7 @@ then
fi
# Including common functions
. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
# Setting static variables
SYSTEM_LH_CONFFILE="/etc/default/live-helper"
@ -109,7 +109,7 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
\t [--quiet]\n\
\t [--root-command sudo]\n\
\t [--use-fakeroot enabled|disabled]\n\
\t [--categories CATEGORY|\"CATEGORIES\"]\n\
\t [--archive-areas ARCHIVE_AREA|\"ARCHIVE_AREAS\"]\n\
\t [--security enabled|disabled]\n\
\t [--source enabled|disabled]\n\
\t [-s|--source-images iso|net|tar|usb-hdd]\n\
@ -136,7 +136,7 @@ Local_arguments ()
initramfs:,fdisk:,losetup:,mode:,root-command:,use-fakeroot:,tasksel:,includes:,
templates:,architecture:,bootstrap-config:,bootstrap-flavour:,bootstrap-keyring:,clean,
distribution:,mirror-bootstrap:,mirror-chroot:,mirror-chroot-security:,mirror-binary:,
mirror-binary-security:,categories:,chroot-filesystem:,union-filesystem:,exposed-root:,virtual-root-size:,
mirror-binary-security:,archive-areas:,chroot-filesystem:,union-filesystem:,exposed-root:,virtual-root-size:,
gzip-options:,hooks:,interactive:,keyring-packages:,language:,linux-flavours:,linux-packages:,
packages:,packages-lists:,tasks:,security:,symlinks:,sysvinit:,binary-filesystem:,binary-images:,
binary-indices:,bootappend-install:,bootappend-live:,bootloader:,checksums:,chroot-build:,
@ -409,8 +409,8 @@ Local_arguments ()
shift 2
;;
--categories)
LH_CATEGORIES="${2}"
--archive-areas)
LH_ARCHIVE_AREAS="${2}"
shift 2
;;
@ -977,9 +977,9 @@ LH_MIRROR_BINARY="${LH_MIRROR_BINARY}"
# (Default: ${LH_MIRROR_BINARY_SECURITY})
LH_MIRROR_BINARY_SECURITY="${LH_MIRROR_BINARY_SECURITY}"
# \$LH_CATEGORIES: select categories to use
# (Default: ${LH_CATEGORIES})
LH_CATEGORIES="${LH_CATEGORIES}"
# \$LH_ARCHIVE_AREAS: select archive areas to use
# (Default: ${LH_ARCHIVE_AREAS})
LH_ARCHIVE_AREAS="${LH_ARCHIVE_AREAS}"
EOF
# Creating lh_chroot_* configuration

2
helpers/lh_source
View File

@ -10,7 +10,7 @@
set -e
# Including common functions
. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
# Setting static variables
DESCRIPTION="$(Echo 'build source images')"

2
helpers/lh_source_debian
View File

@ -10,7 +10,7 @@
set -e
# Including common functions
. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
# Setting static variables
DESCRIPTION="$(Echo 'debian sources')"

2
helpers/lh_source_debian-live
View File

@ -10,7 +10,7 @@
set -e
# Including common functions
. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
# Setting static variables
DESCRIPTION="$(Echo 'copy debian-live config into source')"

2
helpers/lh_source_disk
View File

@ -10,7 +10,7 @@
set -e
# Including common functions
. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
# Setting static variables
DESCRIPTION="$(Echo 'install disk information into source')"

2
helpers/lh_source_iso
View File

@ -10,7 +10,7 @@
set -e
# Including common functions
. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
# Setting static variables
DESCRIPTION="$(Echo 'build iso source image')"

2
helpers/lh_source_md5sum
View File

@ -10,7 +10,7 @@
set -e
# Including common functions
. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
# Setting static variables
DESCRIPTION="$(Echo 'create source md5sums')"

2
helpers/lh_source_net
View File

@ -10,7 +10,7 @@
set -e
# Including common functions
. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
# Setting static variables
DESCRIPTION="$(Echo 'build source net image')"

2
helpers/lh_source_tar
View File

@ -10,7 +10,7 @@
set -e
# Including common functions
. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
# Setting static variables
DESCRIPTION="$(Echo 'build source tarball')"

2
helpers/lh_source_usb-hdd
View File

@ -10,7 +10,7 @@
set -e
# Including common functions
. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
# Setting static variables
DESCRIPTION="$(Echo 'build source image')"

2
helpers/lh_source_virtual-hdd
View File

@ -10,7 +10,7 @@
set -e
# Including common functions
. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
# Setting static variables
DESCRIPTION="$(Echo 'build source image')"

2
helpers/lh_testroot
View File

@ -10,7 +10,7 @@
set -e
# Including common functions
. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
# Setting static variables
DESCRIPTION="$(Echo 'ensure that a system is built as root')"

2
helpers/live-helper
View File

@ -22,7 +22,7 @@
set -e
# Including common functions
. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
if [ -x "$(which man 2>/dev/null)" ]
then

0
functions.sh → live-helper.sh
View File

6
manpages/lh_config.en.1
View File

@ -164,7 +164,7 @@ lh_config \- create configuration for live\-helper
.br
[\fB\-\-use-fakeroot\fR enabled|disabled]
.br
[\fB\-\-categories\fR \fICATEGORY\fR|\fI"CATEGORIES"\fR]
[\fB\-\-archive\-areas\fR \fIARCHIVE_AREA\fR|\fI"ARCHIVE_AREAS"\fR]
.br
[\fB\-\-security\fR enabled|disabled]
.br
@ -375,8 +375,8 @@ defines one or more packages to be installed in the live system. This is a quick
controls if live-helper should use sudo internally to build the live image. Note that this is not well tested and that you should, when relying on sudo, call the individual live\-helper command with sudo itself.
.IP "\fB\-\-use-fakeroot\fR enabled|disabled" 4
controls if live-helper should utilize fakeroot and fakechroot to try and avoid requiring root privillages where possible. By default, this option is disabled.
.IP "\fB\-\-categories\fR \fICATEGORY\fR|\fI""CATEGORIES""\fR" 4
defines which package categories of a debian packages archive should be used for configured debian package mirrors. By default, this is set to main. Remember to check the licenses of each packages with respect to their redistributability in your juristiction when enabling contrib or non-free with this mechanism.
.IP "\fB\-\-archive\-areas\fR \fIARCHIVE_AREA\fR|\fI""ARCHIVE_AREAS""\fR" 4
defines which package archive areas of a debian packages archive should be used for configured debian package mirrors. By default, this is set to main. Remember to check the licenses of each packages with respect to their redistributability in your juristiction when enabling contrib or non-free with this mechanism.
.IP "\fB\-\-security\fR enabled|disabled" 4
defines if the security repositories specified in the security mirror options should be used or not.
.IP "\fB\-\-source\fR enabled|disabled" 4

10
manpages/po4a/de/lh_config.en.1.po
View File

@ -565,8 +565,8 @@ msgstr " [B<--use-fakeroot> enabled|disabled]"
# type: Plain text
#: lh_config.en.1:164
msgid " [B<--categories> I<CATEGORY>|I<\"CATEGORIES\">]"
msgstr " [B<--categories> I<KATEGORIE>|I<\"KATEGORIEN\">]"
msgid " [B<--archive-areas> I<ARCHIVE_AREA>|I<\"ARCHIVE_AREAS\">]"
msgstr " [B<--archive-areas> I<KATEGORIE>|I<\"KATEGORIEN\">]"
# type: Plain text
#: lh_config.en.1:166
@ -2136,13 +2136,13 @@ msgstr "B<--use-fakeroot> enabled|disabled"
# type: IP
#: lh_config.en.1:370
#, no-wrap
msgid "B<--categories> I<CATEGORY>|I<\"CATEGORIES\">"
msgstr "B<--categories> I<KATEGORIE>|I<\"KATEGORIEN\">"
msgid "B<--archive-areas> I<ARCHIVE_AREA>|I<\"ARCHIVE_AREAS\">"
msgstr "B<--archive-areas> I<KATEGORIE>|I<\"KATEGORIEN\">"
# type: Plain text
#: lh_config.en.1:372
msgid ""
"defines which package categories of a debian packages archive should be used "
"defines which package archive areas of a debian packages archive should be used "
"for configured debian package mirrors. By default, this is set to main. "
"Remember to check the licenses of each packages with respect to their "
"redistributability in your juristiction when enabling contrib or non-free "

6
manpages/po4a/fr/lh_config.en.1.po
View File

@ -557,7 +557,7 @@ msgstr ""
# type: Plain text
#: lh_config.en.1:164
msgid " [B<--categories> I<CATEGORY>|I<\"CATEGORIES\">]"
msgid " [B<--archive-areas> I<ARCHIVE_AREA>|I<\"ARCHIVE_AREAS\">]"
msgstr ""
# type: Plain text
@ -1797,13 +1797,13 @@ msgstr ""
# type: IP
#: lh_config.en.1:370
#, no-wrap
msgid "B<--categories> I<CATEGORY>|I<\"CATEGORIES\">"
msgid "B<--archive-areas> I<ARCHIVE_AREA>|I<\"ARCHIVE_AREAS\">"
msgstr ""
# type: Plain text
#: lh_config.en.1:372
msgid ""
"defines which package categories of a debian packages archive should be used "
"defines which package archive areas of a debian packages archive should be used "
"for configured debian package mirrors. By default, this is set to main. "
"Remember to check the licenses of each packages with respect to their "
"redistributability in your juristiction when enabling contrib or non-free "

6
manpages/po4a/pot/lh_config.en.1.pot
View File

@ -550,7 +550,7 @@ msgstr ""
# type: Plain text
#: lh_config.en.1:164
msgid " [B<--categories> I<CATEGORY>|I<\"CATEGORIES\">]"
msgid " [B<--archive-areas> I<ARCHIVE_AREA>|I<\"ARCHIVE_AREAS\">]"
msgstr ""
# type: Plain text
@ -1789,13 +1789,13 @@ msgstr ""
# type: IP
#: lh_config.en.1:370
#, no-wrap
msgid "B<--categories> I<CATEGORY>|I<\"CATEGORIES\">"
msgid "B<--archive-areas> I<ARCHIVE_AREA>|I<\"ARCHIVE_AREAS\">"
msgstr ""
# type: Plain text
#: lh_config.en.1:372
msgid ""
"defines which package categories of a debian packages archive should be used "
"defines which package archive areas of a debian packages archive should be used "
"for configured debian package mirrors. By default, this is set to main. "
"Remember to check the licenses of each packages with respect to their "
"redistributability in your juristiction when enabling contrib or non-free "