Adding live-helper 1.0~a16-1.

This commit is contained in:
Daniel Baumann 2007-09-23 10:05:12 +02:00
parent ce2db1b609
commit b88a20b5dd
66 changed files with 332 additions and 625 deletions

View File

@ -91,15 +91,15 @@ uninstall:
update:
set -e; for MANPAGE in manpages/*.de.* manpages/*.en.*; \
do \
sed -i -e 's/2007\\-06\\-11/2007\\-06\\-18/' \
-e 's/11.06.2007/18.06.2007/' \
-e 's/1.0~a14/1.0~a15/' \
sed -i -e 's/2007\\-06\\-25/2007\\-07\\-02/' \
-e 's/25.06.2007/02.07.2007/' \
-e 's/1.0~a16/1.0~a17/' \
$$MANPAGE; \
done
set -e; for SCRIPT in functions/*.sh examples/cron/*.sh; \
do \
sed -i -e 's/1.0~a14/1.0~a15/' $$SCRIPT; \
sed -i -e 's/1.0~a16/1.0~a17/' $$SCRIPT; \
done
clean:

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
live-helper (1.0~a16-1) unstable; urgency=medium
* New upstream release:
- Caches also linux-image packages (Closes: #430511).
-- Daniel Baumann <daniel@debian.org> Mon, 25 Jun 2007 00:00:00 +0200
live-helper (1.0~a15-1) unstable; urgency=medium
* New upstream release:

View File

@ -19,6 +19,7 @@ Patches (alphabetical order):
* Sebastian Raveau <sebastien.raveau@epita.fr>
* Thomas Lange <lange@informatik.uni-koeln.de>
* Trent Buck <trentbuck@gmail.com>
* Vladimir Stavrinov <vs@inist.ru>
Donations (alphaetical order):

View File

@ -1,3 +1,28 @@
2007-06-25 Daniel Baumann <daniel@debian.org>
* helpers/lh_binary_local-hooks:
- Added.
* helpers/lh_chroot_linux-image:
- Caching downloaded packages.
* examples/hooks/qemu-launcher.sh:
- Added.
* Uploaded 1.0~a16-1.
2007-06-18 Chris Lamb <chris@chris-lamb.co.uk>
* helpers/lh_chroot_packageslists, lh_chroot_local-packageslists:
- Added support for '#<include>' pragma to include other list files.
* functions/packagelists.sh:
- Added.
* lists/*:
- Translated existing lists to be include-based, added a few missing
lists.
2007-06-18 Daniel Baumann <daniel@debian.org>
* helpers/*:
- All cache operations use hardlinks now.
2007-06-16 Daniel Baumann <daniel@debian.org>
* helpers/lh_bootstrap_clone, lh_bootstrap_copy:

View File

@ -14,8 +14,6 @@ FIXME
* grub (i386/amd64) boot support on net binary images
* multi-{binary,architecture,distribution} builds in one shot
* check unset variables
* include capability for package lists
* add descriptions in package lists
* signal handlers
* parsable descriptions in helpers
* add lilo support? :)

View File

@ -7,7 +7,7 @@ BUILD="etch+beryl"
# Begin custom defaults
AUTOBUILD="enabled"
DATE="r0_1.0~a15-1"
DATE="r0_1.0~a16-1"
DESTDIR="/srv/debian-unofficial/ftp/debian-live"
TEMPDIR="/srv/tmp/live-helper"

View File

@ -7,7 +7,7 @@ BUILD="etch"
# Begin custom defaults
AUTOBUILD="enabled"
DATE="r0_1.0~a15-1"
DATE="r0_1.0~a16-1"
DESTDIR="/srv/debian-unofficial/ftp/debian-live"
TEMPDIR="/srv/tmp/live-helper"

View File

@ -3,7 +3,7 @@
# Needs: build-essential fakeroot lsb-release svn [...]
# Static variables
PACKAGES="live-helper live-initramfs live-sysvinit live-webhelper"
PACKAGES="live-helper live-initramfs live-magic live-sysvinit live-webhelper"
DEBEMAIL="debian-live-devel@lists.alioth.debian.org"
EMAIL="debian-live-devel@lists.alioth.debian.org"

View File

@ -0,0 +1,9 @@
#!/bin/sh
# This is a hook for live-helper(7) to install autorun4linuxCD.
# autorun4linuxCD was written by Franklin Piat <fpiat@bigfoot.com>.
#
# To enable it, copy this hook into your config/binary_local-hooks directory.
cd binary
wget http://www.klabs.be/~fpiat/projects/autorun4linuxCD/autorun4linuxCD.tar.gz

View File

@ -10,4 +10,4 @@
set -e
PROGRAM="`basename ${0}`"
VERSION="1.0~a15"
VERSION="1.0~a16"

42
functions/packagelists.sh Executable file
View File

@ -0,0 +1,42 @@
#!/bin/sh
# packagelists.sh - expands package list includes
# Copyright (C) 2006-2007 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
Expand_packagelist ()
{
# ${1} List name
# ${2} Default path to search
# ${3} Fallback path to search (optional)
# Does list exist in default path?
if [ -e "${2}/${1}" ];
then
Expand_packagelist_file "${2}/${1}" "${@}"
else
# If list exists in fallback, include it.
if [ -n "${3}" ] && [ -e "${3}/${1}" ]
then
Expand_packagelist_file "${3}/${1}" "${@}"
fi
fi
}
Expand_packagelist_file ()
{
local FILE="${1}"
shift
shift
for INCLUDE in `sed -ne 's/^#<include> \(.*\)/\1/gp' "${FILE}"`;
do
Expand_packagelist "${INCLUDE}" "${@}"
done
sed -ne 's/^\([^#].*\)/\1\n/gp' "${FILE}"
}

View File

@ -42,13 +42,13 @@ lh_binary_encryption ${*}
# Prepare images
lh_binary_linux-image ${*}
lh_binary_debian-installer ${*}
lh_binary_live-installer ${*}
lh_binary_memtest ${*}
lh_binary_grub ${*}
lh_binary_syslinux ${*}
lh_binary_yaboot ${*}
lh_binary_includes ${*}
lh_binary_local-includes ${*}
lh_binary_local-hooks ${*}
lh_binary_md5sum ${*}
# Building images

View File

@ -125,15 +125,47 @@ fi
# Downloading debian-installer
mkdir -p "${DESTDIR_DI}"
wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_DI}" "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DI}"/vmlinuz
wget --no-clobber -O "${DESTDIR}"/"${INITRD_DI}" "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DI}"/initrd.gz
if [ "${LIVE_DISTRIBUTION}" = "sid" ] # FIXME arch
then
case "${LIVE_ARCHITECTURE}" in
amd64)
wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_DI}" http://people.debian.org/~aba/d-i/images/daily/cdrom/vmlinuz
wget --no-clobber -O "${DESTDIR}"/"${INITRD_DI}" http://people.debian.org/~aba/d-i/images/daily/cdrom/initrd.gz
;;
i386)
wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_DI}" http://people.debian.org/~joeyh/d-i/images/daily/cdrom/vmlinuz
wget --no-clobber -O "${DESTDIR}"/"${INITRD_DI}" http://people.debian.org/~joeyh/d-i/images/daily/cdrom/initrd.gz
;;
esac
else
wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_DI}" "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DI}"/vmlinuz
wget --no-clobber -O "${DESTDIR}"/"${INITRD_DI}" "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DI}"/initrd.gz
fi
# Downloading graphical-installer
if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
then
mkdir -p "${DESTDIR_GI}"
if [ "${LIVE_DISTRIBUTION}" = "sid" ] # FIXME arch
then
case "${LIVE_ARCHITECTURE}" in
amd64)
wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_GI}" http://people.debian.org/~aba/d-i/images/daily/cdrom/gtk/vmlinuz
wget --no-clobber -O "${DESTDIR}"/"${INITRD_GI}" http://people.debian.org/~aba/d-i/images/daily/cdrom/gtk/initrd.gz
;;
i386)
wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_GI}" http://people.debian.org/~joeyh/d-i/images/daily/cdrom/gtk/vmlinuz
wget --no-clobber -O "${DESTDIR}"/"${INITRD_GI}" http://people.debian.org/~joeyh/d-i/images/daily/cdrom/gtk/initrd.gz
;;
esac
else
wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_GI}" "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DI}"/gtk/vmlinuz
wget --no-clobber -O "${DESTDIR}"/"${INITRD_GI}" "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DI}"/gtk/initrd.gz
fi
fi
# Downloading additional packages
@ -143,11 +175,11 @@ touch chroot/var/lib/dpkg/status
case "${LIVE_ARCHITECTURE}" in
amd64)
DI_PACKAGES="linux-image-2.6-amd64 lilo grub"
DI_PACKAGES="linux-image-2.6-amd64 elilo lilo grub"
;;
i386)
DI_PACKAGES="linux-image-2.6-486 linux-image-2.6-686 lilo grub"
DI_PACKAGES="linux-image-2.6-486 linux-image-2.6-686 elilo lilo grub"
;;
powerpc)
@ -199,15 +231,8 @@ gzip -9 -c dists/${LIVE_DISTRIBUTION}/main/binary-${LIVE_ARCHITECTURE}/Packages
#gzip -9 -c dists/${LIVE_DISTRIBUTION}/main/source/Sources > dists/${LIVE_DISTRIBUTION}/main/source/Sources
cd "${OLDPWD}"
# Writing release
cat > binary/dists/${LIVE_DISTRIBUTION}/main/binary-${LIVE_ARCHITECTURE}/Release << EOF
Archive: stable
Version: 4.0r0
Component: main
Origin: Debian
Label: Debian
Architecture: ${LIVE_ARCHITECTURE}
EOF
# Fetching release
wget "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/binary-"${LIVE_ARCHITECTURE}"/Release -O binary/dists/${LIVE_DISTRIBUTION}/main/binary-${LIVE_ARCHITECTURE}/Release
#cat > binary/dists/${LIVE_DISTRIBUTION}/main/source/Release << EOF
#Archive: stable
@ -229,12 +254,43 @@ gunzip -c Packages.gz > Packages
UDEBS="`awk '/Filename: / { print $2 }' Packages`"
# Downloading udebs
DOWNLOAD=""
for UDEB in ${UDEBS}
do
DOWNLOAD="$DOWNLOAD ${LIVE_MIRROR_BOOTSTRAP}/${UDEB}"
wget "${LIVE_MIRROR_BOOTSTRAP}"/${UDEB}
done
echo $DOWNLOAD | xargs wget
# Including local udebs
if ls ../config/binary_local-udebs/* &> /dev/null
then
for FILE in ../config/binary_local-udebs/*.udeb
do
SOURCE="`dpkg -f ${FILE} Source | awk '{ print $1 }'`"
if [ -z "${SOURCE}" ]
then
SOURCE="`basename ${FILE} | awk -F_ '{ print $1 }'`"
fi
case "${SOURCE}" in
lib?*)
LETTER="`echo ${SOURCE} | sed 's/\(....\).*/\1/'`"
;;
*)
LETTER="`echo ${SOURCE} | sed 's/\(.\).*/\1/'`"
;;
esac
# Install directory
mkdir -p pool/main/"${LETTER}"/"${SOURCE}"
# Copy files
cp "${FILE}" pool/main/"${LETTER}"/"${SOURCE}"
# Prefere local udebs over downloaded udebs
rm -f "`basename ${FILE} | awk -F_ '{ print $1 }'`"_*.udeb
done
fi
# Excluding udebs
grep -v "^#" ${LH_BASE:-/usr/share/live-helper}/data/debian-cd/"${LIVE_DISTRIBUTION}"/udeb_exclude > exclude
@ -304,5 +360,10 @@ pcmciautils-udeb
wireless-tools-udeb
EOF
if [ -d binary/pool/main/l/live-installer ]
then
echo "live-installer" >> binary/.disk/udeb_include
fi
# Creating stage file
Create_stagefile .stage/binary_debian-installer

View File

@ -194,7 +194,7 @@ fi
LINUX="`echo ${LINUX} | sed -e 's#//#/#g'`"
# Assembling debian-installer configuration
if [ "${LIVE_DEBIAN_INSTALLER}" = "enabled" ] || [ "${LIVE_LIVE_INSTALLER}" = "enabled" ]
if [ "${LIVE_DEBIAN_INSTALLER}" = "enabled" ]
then
LINUX="title\t\tLive:\nroot\n\n${LINUX}"

View File

@ -1,333 +0,0 @@
#!/bin/sh
# lh_binary_live-installer(1) - install live-installer into binary
# Copyright (C) 2006-2007 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="install live-installer into binary"
HELP=""
USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
Read_conffile config/common
Read_conffile config/bootstrap
Read_conffile config/chroot
Read_conffile config/binary
Read_conffile config/source
Set_defaults
if [ "${LIVE_LIVE_INSTALLER}" != "enabled" ]
then
exit 0
fi
Echo_message "Begin installing live-installer..."
# Requiring stage file
Require_stagefile .stage/bootstrap
# Checking stage file
Check_stagefile .stage/binary_live-installer
# Checking lock file
Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
# Setting destination directory
case "${LIVE_BINARY_IMAGES}" in
iso)
DESTDIR="binary/install"
DI="cdrom"
;;
net)
DESTDIR="tftpboot"
DI="netboot"
Echo_error "Not supported yet (FIXME)"
exit 1
;;
tar|usb-hdd)
DESTDIR="binary/install"
DI="hd-media"
# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
if [ "${LIVE_DISTRIBUTION}" = "etch" ] && [ "${LIVE_BOOTLOADER}" = "syslinux" ]
then
DESTDIR="binary"
fi
;;
esac
# Temporary check for broken syslinux
if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
then
# Assemble multi-arch
if [ -n "${MULTIARCH}" ]
then
case "${LIVE_ARCHITECTURE}" in
amd64)
DESTDIR="${DESTDIR}.amd"
;;
i386)
DESTDIR="${DESTDIR}.386"
;;
powerpc)
DESTDIR="${DESTDIR}.ppc"
;;
esac
fi
fi
VMLINUZ_DI="vmlinuz"
INITRD_DI="initrd.gz"
DESTDIR_DI="${DESTDIR}"
VMLINUZ_GI="gtk/vmlinuz"
INITRD_GI="gtk/initrd.gz"
DESTDIR_GI="${DESTDIR}/gtk"
# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
if [ "${LIVE_DISTRIBUTION}" = "etch" ]
then
if [ "${LIVE_BINARY_IMAGES}" = "tar" ] || [ "${LIVE_BINARY_IMAGES}" = "usb-hdd" ]
then
VMLINUZ_DI="vmlinuz.di"
INITRD_DI="initrddi.gz"
DESTDIR_DI="${DESTDIR}"
VMLINUZ_GI="vmlinuz.gi"
INITRD_GI="initrdgi.gz"
DESTDIR_GI="${DESTDIR}"
fi
fi
# Downloading debian-installer
mkdir -p "${DESTDIR_DI}"
wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_DI}" "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DI}"/vmlinuz
wget --no-clobber -O "${DESTDIR}"/"${INITRD_DI}" "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DI}"/initrd.gz
# Downloading graphical-installer
if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
then
mkdir -p "${DESTDIR_GI}"
wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_GI}" "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DI}"/gtk/vmlinuz
wget --no-clobber -O "${DESTDIR}"/"${INITRD_GI}" "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DI}"/gtk/initrd.gz
fi
# Downloading additional packages
mkdir -p chroot/binary.deb/archives/partial
mv chroot/var/lib/dpkg/status chroot/var/lib/dpkg/status.tmp
touch chroot/var/lib/dpkg/status
case "${LIVE_ARCHITECTURE}" in
amd64)
DI_PACKAGES="linux-image-2.6-amd64 lilo grub"
;;
i386)
DI_PACKAGES="linux-image-2.6-486 linux-image-2.6-686 lilo grub"
;;
powerpc)
DI_PACKAGES="linux-image-2.6-powerpc linux-image-2.6-powerpc64 linux-image-2.6-powerpc-smp linux-image-2.6-prep yaboot" # FIXME bootloader?
;;
esac
Chroot "apt-get -o Dir::Cache=/binary.deb --download-only install --yes ${DI_PACKAGES}"
mv chroot/binary.deb ./
mv chroot/var/lib/dpkg/status.tmp chroot/var/lib/dpkg/status
# Including base debian packages
if [ -d cache/packages_bootstrap ]
then
for FILE in cache/packages_bootstrap/*.deb binary.deb/archives/*.deb
do
SOURCE="`dpkg -f ${FILE} Source | awk '{ print $1 }'`"
if [ -z "${SOURCE}" ]
then
SOURCE="`basename ${FILE} | awk -F_ '{ print $1 }'`"
fi
case "${SOURCE}" in
lib?*)
LETTER="`echo ${SOURCE} | sed 's/\(....\).*/\1/'`"
;;
*)
LETTER="`echo ${SOURCE} | sed 's/\(.\).*/\1/'`"
;;
esac
# Install directory
mkdir -p binary/pool/main/"${LETTER}"/"${SOURCE}"
# Move files
cp "${FILE}" binary/pool/main/"${LETTER}"/"${SOURCE}"
done
fi
# Generating deb indices
mkdir -p binary/dists/${LIVE_DISTRIBUTION}/main/binary-${LIVE_ARCHITECTURE}
cd binary
apt-ftparchive packages pool/main > dists/${LIVE_DISTRIBUTION}/main/binary-${LIVE_ARCHITECTURE}/Packages
gzip -9 -c dists/${LIVE_DISTRIBUTION}/main/binary-${LIVE_ARCHITECTURE}/Packages > dists/${LIVE_DISTRIBUTION}/main/binary-${LIVE_ARCHITECTURE}/Packages.gz
#apt-ftparchive sources pool/main > dists/${LIVE_DISTRIBUTION}/main/source/Sources
#gzip -9 -c dists/${LIVE_DISTRIBUTION}/main/source/Sources > dists/${LIVE_DISTRIBUTION}/main/source/Sources
cd "${OLDPWD}"
# Fetching release
wget http://"${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/binary-"${LIVE_ARCHITECTURE}"/Release -O binary/dists/${LIVE_DISTRIBUTION}/main/binary-${LIVE_ARCHITECTURE}/Release
#cat > binary/dists/${LIVE_DISTRIBUTION}/main/source/Release << EOF
#Archive: stable
#Version: 4.0r0
#Component: main
#Origin: Debian
#Label: Debian
#Architecture: source
#EOF
mkdir binary.udeb
cd binary.udeb
# Downloading udeb indices
wget "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}"/Packages.gz
gunzip -c Packages.gz > Packages
# Sorting udebs
UDEBS="`awk '/Filename: / { print $2 }' Packages`"
# Downloading udebs
for UDEB in ${UDEBS}
do
wget "${LIVE_MIRROR_BOOTSTRAP}"/${UDEB}
done
# Including local udebs
if ls ../config/binary_local-udebs/* &> /dev/null
then
for FILE in ../config/binary_local-udebs/*.udeb
do
SOURCE="`dpkg -f ${FILE} Source | awk '{ print $1 }'`"
if [ -z "${SOURCE}" ]
then
SOURCE="`basename ${FILE} | awk -F_ '{ print $1 }'`"
fi
case "${SOURCE}" in
lib?*)
LETTER="`echo ${SOURCE} | sed 's/\(....\).*/\1/'`"
;;
*)
LETTER="`echo ${SOURCE} | sed 's/\(.\).*/\1/'`"
;;
esac
# Install directory
mkdir -p pool/main/"${LETTER}"/"${SOURCE}"
# Copy files
cp "${FILE}" pool/main/"${LETTER}"/"${SOURCE}"
# Prefere local udebs over downloaded udebs
rm -f "`basename ${FILE} | awk -F_ '{ print $1 }'`"_*.udeb
done
fi
# Excluding udebs
grep -v "^#" ${LH_BASE:-/usr/share/live-helper}/data/debian-cd/"${LIVE_DISTRIBUTION}"/udeb_exclude > exclude
grep -v "^#" ${LH_BASE:-/usr/share/live-helper}/data/debian-cd/"${LIVE_DISTRIBUTION}"/exclude-udebs > exclude
grep -v "^#" ${LH_BASE:-/usr/share/live-helper}/data/debian-cd/"${LIVE_DISTRIBUTION}"/exclude-udebs-${LIVE_ARCHITECTURE} >> exclude
for EXCLUDE in `cat exclude`
do
rm -f "${EXCLUDE}"_*.udeb
done
# Moving udebs
for UDEB in ${UDEBS}
do
if [ -f "`basename ${UDEB}`" ]
then
mkdir -p `dirname ${UDEB}`
mv "`basename ${UDEB}`" "`dirname ${UDEB}`"
fi
done
# Creating udeb indices
mkdir -p dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}"
apt-ftparchive packages pool/main > dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}"/Packages
gzip -9 -c dists/${LIVE_DISTRIBUTION}/main/debian-installer/binary-${LIVE_ARCHITECTURE}/Packages > dists/${LIVE_DISTRIBUTION}/main/debian-installer/binary-${LIVE_ARCHITECTURE}/Packages.gz
rm -f Packages* exclude
find . | cpio -dmpu "${OLDPWD}"/binary
cd "${OLDPWD}"
rm -rf binary.udeb
rm -rf binary.deb
# Generating release file
apt-ftparchive \
-o APT::FTPArchive::Release::Origin="Debian" \
-o APT::FTPArchive::Release::Label="Debian" \
-o APT::FTPArchive::Release::Suite="${LIVE_DISTRIBUTION}" \
-o APT::FTPArchive::Release::Version="4.0" \
-o APT::FTPArchive::Release::Codename="${LIVE_DISTRIBUTION}" \
-o APT::FTPArchive::Release::Date="`date -R`" \
-o APT::FTPArchive::Release::Architectures="${LIVE_ARCHITECTURE}" \
-o APT::FTPArchive::Release::Components="main" \
-o APT::FTPArchive::Release::Description="Last updated: `date -R`" \
release binary/dists/${LIVE_DISTRIBUTION} > binary/dists/${LIVE_DISTRIBUTION}/Release
# Creating dist symlinks
for DISTRIBUTION in frozen stable testing unstable
do
ln -s ${LIVE_DISTRIBUTION} binary/dists/${DISTRIBUTION}
done
ln -s . binary/debian
# Creating disk info
mkdir binary/.disk
echo "main" > binary/.disk/base_components
touch binary/.disk/base_installable
echo "not_complete" > binary/.disk/cd_type
echo "Debian GNU/Linux ${LIVE_DISTRIBUTION} - Unofficial ${LIVE_ARCHITECTURE} LIVE Binary `date +%Y%m%d-%H:%M`" > binary/.disk/info
touch binary/.disk/mkisofs
cat > binary/.disk/udeb_include << EOF
netcfg
ethdetect
pcmcia-cs-udeb
pcmciautils-udeb
wireless-tools-udeb
live-installer
EOF
# Creating stage file
Create_stagefile .stage/binary_debian-installer

View File

@ -1,6 +1,6 @@
#!/bin/sh
# lh_bootstrap_clone(1) - bootstrap by cloning the host system
# lh_binary_local-hooks(1) - execute local hooks in binary
# Copyright (C) 2006-2007 Daniel Baumann <daniel@debian.org>
#
# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
@ -18,7 +18,7 @@ do
done
# Setting static variables
DESCRIPTION="bootstrap by cloning the host system"
DESCRIPTION="execute local hooks in binary"
HELP=""
USAGE="${PROGRAM} [--force]"
@ -32,18 +32,13 @@ Read_conffile config/binary
Read_conffile config/source
Set_defaults
if [ "${LH_BOOTSTRAP}" != "clone" ]
then
exit 0
fi
Echo_message "Begin executing local hooks..."
Echo_message "Begin bootstrapping system..."
# Ensure that a system is built as root
lh_testroot
# Requiring stage file
Require_stagefile .stage/bootstrap
# Checking stage file
Check_stagefile .stage/bootstrap
Check_stagefile .stage/binary_local-hooks
# Checking lock file
Check_lockfile .lock
@ -51,11 +46,15 @@ Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
# Read package selection
dpkg --get-selections
# Processing local-hooks
if ls config/binary_local-hooks/* > /dev/null 2>&1
then
for HOOK in config/binary_local-hooks/*
do
# Executing hook
./"${HOOK}"
done
# Read debconf values
> preseed
# Creating stage file
Create_stagefile .stage/bootstrap
# Creating stage file
Create_stagefile .stage/binary_local-hooks
fi

View File

@ -79,7 +79,7 @@ do
# Restoring old cache
mkdir -p binary/"${INITFS}"
${LH_ROOT_COMMAND} cp -a cache/stages_rootfs/filesystem.* binary/"${INITFS}"
${LH_ROOT_COMMAND} cp -al cache/stages_rootfs/filesystem.* binary/"${INITFS}"
if [ -n "${LH_ROOT_COMMAND}" ]
then
@ -187,7 +187,7 @@ do
mkdir -p cache/stages_rootfs
${LH_ROOT_COMMAND} cp -a binary/"${INITFS}"/filesystem.* cache/stages_rootfs
${LH_ROOT_COMMAND} cp -al binary/"${INITFS}"/filesystem.* cache/stages_rootfs
if [ -n "${LH_ROOT_COMMAND}" ]
then

View File

@ -190,16 +190,16 @@ then
# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
if [ "`basename ${DESTDIR_LIVE}`" = "binary" ]
then
LINUX="LABEL live\n\tkernel `basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tappend initrd=initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
LINUX="${LINUX}\n\nLABEL live-failsafe\n\tkernel `basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tappend initrd=initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}"
LINUX="# Debian GNU/Linux - live\nLABEL live\n\tkernel `basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tappend initrd=initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
LINUX="${LINUX}\n\n# Debian GNU/Linux - live-failsafe\nLABEL live-failsafe\n\tkernel `basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tappend initrd=initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}"
else
LINUX="LABEL live\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
LINUX="${LINUX}\n\nLABEL live-failsafe\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}"
LINUX="# Debian GNU/Linux - live\nLABEL live\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
LINUX="${LINUX}\n\n# Debian GNU/Linux - live-failsafe\nLABEL live-failsafe\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}"
fi
else
DEFAULT_FLAVOUR="`echo ${LIVE_LINUX_FLAVOURS} | awk '{ print $1 }'`"
LINUX="LABEL live\n\tkernel `basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tappend initrd=initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
LINUX="${LINUX}\n\nLABEL live-failsafe\n\tkernel `basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tappend initrd=initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}"
LINUX="# Debian GNU/Linux - live\nLABEL live\n\tkernel `basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tappend initrd=initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
LINUX="${LINUX}\n\n# Debian GNU/Linux - live-failsafe\nLABEL live-failsafe\n\tkernel `basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tappend initrd=initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}"
fi
if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
@ -210,20 +210,20 @@ then
then
if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
then
LINUX="LABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
LINUX="${LINUX}\n\nLABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`-failsafe\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}"
LINUX="# Debian GNU/Linux - live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\nLABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
LINUX="${LINUX}\n\n# Debian GNU/Linux - live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`-failsafe\nLABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`-failsafe\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}"
else
LINUX="LABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n\tkernel `basename ${KERNEL}`\n\tappend initrd=initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} live_BOOTAPPEND"
LINUX="${LINUX}\n\nLABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n\tkernel `basename ${KERNEL}`\n\tappend initrd=initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}"
LINUX="# Debian GNU/Linux - live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\nLABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n\tkernel `basename ${KERNEL}`\n\tappend initrd=initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} live_BOOTAPPEND"
LINUX="${LINUX}\n\n# Debian GNU/Linux - live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\nLABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n\tkernel `basename ${KERNEL}`\n\tappend initrd=initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}"
fi
else
if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
then
LINUX="${LINUX}\n\nLABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
LINUX="${LINUX}\n\nLABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`-failsafe\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}"
LINUX="${LINUX}\n\n# Debian GNU/Linux - live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\nLABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
LINUX="${LINUX}\n\n# Debian GNU/Linux - live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`-failsafe\nLABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`-failsafe\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}"
else
LINUX="${LINUX}\n\nLABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n\tkernel `basename ${KERNEL}`\n\tappend initrd=initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
LINUX="${LINUX}\n\nLABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n\tkernel `basename ${KERNEL}`\n\tappend initrd=initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}"
LINUX="${LINUX}\n\n# Debian GNU/Linux - live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\nLABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n\tkernel `basename ${KERNEL}`\n\tappend initrd=initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
LINUX="${LINUX}\n\n# Debian GNU/Linux - live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\nLABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n\tkernel `basename ${KERNEL}`\n\tappend initrd=initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}"
fi
fi
done
@ -233,7 +233,7 @@ fi
LINUX="`echo ${LINUX} | sed -e 's#//#/#g'`"
# Assembling debian-installer configuration
if [ "${LIVE_DEBIAN_INSTALLER}" = "enabled" ] || [ "${LIVE_LIVE_INSTALLER}" = "enabled" ]
if [ "${LIVE_DEBIAN_INSTALLER}" = "enabled" ]
then
VMLINUZ_DI="vmlinuz"
INITRD_DI="initrd.gz"
@ -331,7 +331,7 @@ case "${LIVE_BINARY_IMAGES}" in
fi
# Configure syslinux templates
sed -i -e "s#LIVE_LINUX_LIVE#${LINUX}#" -e "s#LIVE_LINUX_INSTALL#${LIVE_LINUX_INSTALL}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" binary/isolinux/isolinux.cfg
sed -i -e "s@LIVE_LINUX_LIVE@${LINUX}@" -e "s@LIVE_LINUX_INSTALL@${LIVE_LINUX_INSTALL}@" -e "s@LIVE_MEMTEST@${MEMTEST}@" binary/isolinux/isolinux.cfg
sed -i -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" binary/isolinux/isolinux.cfg
sed -i -e "s/LIVE_DATE/`date +%Y%m%d`/" binary/isolinux/f1.txt
sed -i -e "s/LIVE_VERSION/${VERSION}/" binary/isolinux/f10.txt
@ -385,7 +385,7 @@ case "${LIVE_BINARY_IMAGES}" in
fi
# Configure syslinux templates
sed -i -e "s#LIVE_LINUX_LIVE#${LINUX}#" -e "s#LIVE_LINUX_INSTALL#${LIVE_LINUX_INSTALL}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" tftpboot/pxelinux.cfg/default
sed -i -e "s@LIVE_LINUX_LIVE@${LINUX}@" -e "s@LIVE_LINUX_INSTALL@${LIVE_LINUX_INSTALL}@" -e "s@LIVE_MEMTEST@${MEMTEST}@" tftpboot/pxelinux.cfg/default
sed -i -e "s/LIVE_NET_SERVER/${LIVE_NET_SERVER}/" -e "s#LIVE_NET_PATH#${LIVE_NET_PATH}#" -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" tftpboot/pxelinux.cfg/default
sed -i -e "s/LIVE_DATE/`date +%Y%m%d`/" tftpboot/pxelinux.cfg/f1.txt
sed -i -e "s/LIVE_VERSION/${VERSION}/" tftpboot/pxelinux.cfg/f10.txt
@ -424,7 +424,7 @@ case "${LIVE_BINARY_IMAGES}" in
mkdir -p "${DESTDIR}"
cp chroot/usr/lib/syslinux/isolinux.bin "${DESTDIR}"/syslinux.bin
cp -r "${LIVE_TEMPLATES}"/syslinux/* "${DESTDIR}"
mv binary/isolinux.cfg "${DESTDIR}"/syslinux.cfg
mv "${DESTDIR}"/isolinux.cfg "${DESTDIR}"/syslinux.cfg
# Copying splash screen
if [ -f config/binary_syslinux/splash.rle ]
@ -444,7 +444,7 @@ case "${LIVE_BINARY_IMAGES}" in
fi
# Configure syslinux templates
sed -i -e "s#LIVE_LINUX_LIVE#${LINUX}#" -e "s#LIVE_LINUX_INSTALL#${LIVE_LINUX_INSTALL}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" "${DESTDIR}"/syslinux.cfg
sed -i -e "s@LIVE_LINUX_LIVE@${LINUX}@" -e "s@LIVE_LINUX_INSTALL@${LIVE_LINUX_INSTALL}@" -e "s@LIVE_MEMTEST@${MEMTEST}@" "${DESTDIR}"/syslinux.cfg
sed -i -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" "${DESTDIR}"/syslinux.cfg
sed -i -e "s/LIVE_DATE/`date +%Y%m%d`/" "${DESTDIR}"/f1.txt
sed -i -e "s/LIVE_VERSION/${VERSION}/" "${DESTDIR}"/f10.txt
@ -453,14 +453,11 @@ case "${LIVE_BINARY_IMAGES}" in
rm -f "${DESTDIR}"/pxelinux.cfg
# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
if [ "${LIVE_DISTRIBUTION}" = "etch" ]
then
if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
if [ "${LIVE_DISTRIBUTION}" = "etch" ] && [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
then
for FLAVOUR in ${LIVE_LINUX_FLAVOURS}
do
NUMBER=$(($NUMBER + 1))
mv "${DESTDIR_LIVE}"/vmlinuz-*-${FLAVOUR} "${DESTDIR_LIVE}"/vmlinuz${NUMBER}
mv "${DESTDIR_LIVE}"/initrd.img-*-${FLAVOUR} "${DESTDIR_LIVE}"/initrd${NUMBER}.img
sed -i -e "s/vmlinuz-.*-${FLAVOUR}/vmlinuz${NUMBER}/g" -e "s/initrd.img-.*-${FLAVOUR}/initrd${NUMBER}.img/g" "${DESTDIR}"/syslinux.cfg
@ -470,7 +467,6 @@ case "${LIVE_BINARY_IMAGES}" in
mv "${DESTDIR_LIVE}"/initrd.img-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/initrd.img
sed -i -e "s/vmlinuz-.*-${LIVE_LINUX_FLAVOURS}/vmlinuz/g" -e "s/initrd.img-.*-${LIVE_LINUX_FLAVOURS}/initrd.img/g" "${DESTDIR}"/syslinux.cfg
fi
fi
;;
esac

View File

@ -202,7 +202,7 @@ fi
LINUX="`echo ${LINUX} | sed -e 's#//#/#g'`"
# Assembling debian-installer configuration
if [ "${LIVE_DEBIAN_INSTALLER}" = "enabled" ] || [ "${LIVE_LIVE_INSTALLER}" = "enabled" ]
if [ "${LIVE_DEBIAN_INSTALLER}" = "enabled" ]
then
VMLINUZ_DI="vmlinuz"
INITRD_DI="initrd.gz"

View File

@ -53,7 +53,7 @@ do
rm -rf chroot
# Restoring old cache
${LH_ROOT_COMMAND} cp -a cache/stages_bootstrap chroot
${LH_ROOT_COMMAND} cp -al cache/stages_bootstrap chroot
if [ -n "${LH_ROOT_COMMAND}" ]
then
@ -83,7 +83,7 @@ do
mkdir -p cache
${LH_ROOT_COMMAND} cp -a chroot cache/stages_bootstrap
${LH_ROOT_COMMAND} cp -al chroot cache/stages_bootstrap
if [ -n "${LH_ROOT_COMMAND}" ]
then

View File

@ -53,7 +53,7 @@ do
rm -rf chroot
# Restoring old cache
${LH_ROOT_COMMAND} cp -a cache/stages_chroot chroot
${LH_ROOT_COMMAND} cp -al cache/stages_chroot chroot
if [ -n "${LH_ROOT_COMMAND}" ]
then
@ -83,7 +83,7 @@ do
mkdir -p cache
${LH_ROOT_COMMAND} cp -a chroot cache/stages_chroot
${LH_ROOT_COMMAND} cp -al chroot cache/stages_chroot
if [ -n "${LH_ROOT_COMMAND}" ]
then

View File

@ -37,6 +37,9 @@ Require_stagefile .stage/bootstrap
case "${1}" in
install)
# Restoring cache
Restore_cache cache/packages_linux-image
Echo_message "Configuring file /etc/kernel-img.conf"
# Checking stage file
@ -85,6 +88,9 @@ EOF
;;
esac
# Saving cache
Save_cache cache/packages_linux-image
# Creating stage file
Create_stagefile .stage/chroot_linux-image
;;

View File

@ -53,8 +53,8 @@ then
for PACKAGESLIST in config/chroot_local-packageslists/*
do
# Copying package list
grep -v "^#" "${PACKAGESLIST}" > chroot/root/"`basename ${PACKAGESLIST}`"
# Generate package list
Expand_packagelist "`basename ${PACKAGESLIST}`" "config/chroot_local-packageslists" "${LH_BASE:-/usr/share/live-helper/lists}/lists" > chroot/root/"`basename ${PACKAGESLIST}`"
# Installing package list
case "${LH_APT}" in

View File

@ -55,8 +55,8 @@ then
do
if [ -f ${LH_BASE:-/usr/share/live-helper}/lists/"${LIST}" ]
then
# Copying package list
grep -v "^#" ${LH_BASE:-/usr/share/live-helper}/lists/"${LIST}" > chroot/root/"${LIST}"
# Generating package list
Expand_packagelist "${LIST}" "config/chroot_local-packageslists" "${LH_BASE:-/usr/share/live-helper}/lists" > chroot/root/${LIST}
# Installing package list
case "${LH_APT}" in

View File

@ -65,7 +65,7 @@ case "${1}" in
if [ "${PURGE}" != "true" ] && [ -d cache/stages_bootstrap ]
then
${LH_ROOT_COMMAND} cp -a cache/stages_bootstrap chroot
${LH_ROOT_COMMAND} cp -al cache/stages_bootstrap chroot
mkdir -p .stage
touch .stage/bootstrap
fi

View File

@ -291,6 +291,7 @@ EOF
# Creating lh_binary_* configuration
mkdir -p "${LIVE_ROOT}"/config/binary_grub
mkdir -p "${LIVE_ROOT}"/config/binary_local-hooks
mkdir -p "${LIVE_ROOT}"/config/binary_local-includes
mkdir -p "${LIVE_ROOT}"/config/binary_local-udebs
mkdir -p "${LIVE_ROOT}"/config/binary_rootfs
@ -319,10 +320,6 @@ LIVE_BOOTLOADER="${LIVE_BOOTLOADER}"
# (Default: ${LIVE_DEBIAN_INSTALLER})
LIVE_DEBIAN_INSTALLER="${LIVE_DEBIAN_INSTALLER}"
# \$LIVE_LIVE_INSTALLER: set debian-installer + live-installer
# (Default: ${LIVE_LIVE_INSTALLER})
LIVE_LIVE_INSTALLER="${LIVE_LIVE_INSTALLER}"
# \$LIVE_ENCRYPTION: set encrytion
# (Default: empty)
LIVE_ENCRYPTION="${LIVE_ENCRYPTION}"
@ -347,7 +344,7 @@ LIVE_ISO_PREPARER="${LIVE_ISO_PREPARER}"
# (Default: ${LIVE_ISO_PUBLISHER})
LIVE_ISO_PUBLISHER="${LIVE_ISO_PUBLISHER}"
# \$LIVE_ISO_VOLUME: set iso volume
# \$LIVE_ISO_VOLUME: set iso volume (max 32 chars)
# (Default: ${LIVE_ISO_VOLUME})
LIVE_ISO_VOLUME="${LIVE_ISO_VOLUME}"
@ -384,3 +381,17 @@ LIVE_SOURCE="${LIVE_SOURCE}"
# (Default: ${LIVE_SOURCE_IMAGES})
LIVE_SOURCE_IMAGES="${LIVE_SOURCE_IMAGES}"
EOF
if [ "${CONFIG}" = "clone" ]
then
# Read package selection
echo `dpkg --get-selections | awk '{ print $1 }'` > config/chroot_local-packageslists/local-system
# Read debconf questions
if [ ! -f /usr/bin/debconf-get-selections ]
then
Echo_warning "Please install 'debconf-utils' in order to use this feature."
else
debconf-get-selections | grep -v deinstall | cut -f1 > config/chroot_local-preseed/local-system
fi
fi

View File

@ -59,7 +59,7 @@ fi
# Copy system configuration
mkdir -p source/debian-live
cp -a config source/debian-live
cp -al config source/debian-live
# Create tarball
cd source

View File

@ -1,17 +1,9 @@
# /usr/share/live-helper/lists/gnome - package list for live-helper(7)
# Minimal
eject file sudo vim-tiny
## LH: GNOME Desktop
#<include> gnome-core
# Standard
console-common kbd locales
# GNOME
gdm gdm-themes gnome-desktop-environment gnome-cups-manager gnome-screensaver
gdm-themes gnome-desktop-environment gnome-cups-manager gnome-screensaver
gnome-themes-extras
desktop-base
rhythmbox synaptic
xorg xresprobe discover menu
alsa-base alsa-oss alsa-utils

View File

@ -1,14 +1,7 @@
# /usr/share/live-helper/lists/gnome-core - package list for live-helper(7)
# Minimal
eject file sudo vim-tiny
## LH: GNOME Core
#<include> standard-x11
# Standard
console-common kbd locales
# GNOME Core
gdm gnome-core
desktop-base
xorg xresprobe discover menu
alsa-base alsa-oss alsa-utils

View File

@ -1,14 +1,7 @@
# /usr/share/live-helper/lists/gnome-full - package list for live-helper(7)
# Minimal
eject file sudo vim-tiny
## LH: GNOME full
#<include> gnome
# Standard
console-common kbd locales
# GNOME Full
gdm gnome
desktop-base
xorg xresprobe discover menu
alsa-base alsa-oss alsa-utils

View File

@ -1,23 +1,7 @@
# /usr/share/live-helper/lists/gnome - package list for live-helper(7)
# /usr/share/live-helper/lists/gnome-junior - package list for live-helper(7)
# Minimal
eject file sudo vim-tiny
## LH: Debian Junior (Gnome)
#<include> gnome
#<include> junior-pkgs
# Standard
console-common kbd locales
# GNOME
gdm gdm-themes gnome-desktop-environment gnome-cups-manager gnome-screensaver
gnome-themes-extras
desktop-base
rhythmbox synaptic
xorg xresprobe discover menu
alsa-base alsa-oss alsa-utils
# Debian Junior
junior-sound junior-typing junior-internet junior-gnome junior-toys
junior-games-net junior-games-sim junior-games-gl junior-puzzle junior-arcade
junior-math junior-writing junior-games-card junior-programming junior-system
junior-art junior-doc junior-games-text
junior-gnome

View File

@ -1,15 +1,8 @@
# /usr/share/live-helper/lists/gnustep - package list for live-helper(7)
# Minimal
eject file sudo vim-tiny
## LH: GNUstep desktop
#<include> standard-x11
# Standard
console-common kbd locales
# X11
xorg xresprobe discover menu
# GNUstep
wdm
gnustep gnumail.app talksoup.app viewpdf.app wmaker gnustep-icons

8
lists/junior-pkgs Normal file
View File

@ -0,0 +1,8 @@
# /usr/share/live-helper/lists/junior-pkgs - package list for live-helper(7)
## LH: Desktop agnostic packages for Debian Junior
junior-sound junior-typing junior-internet junior-toys junior-games-net
junior-games-sim junior-games-gl junior-puzzle junior-arcade junior-math
junior-writing junior-games-card junior-programming junior-system junior-art
junior-doc junior-games-text

View File

@ -1,14 +1,7 @@
# /usr/share/live-helper/lists/kde - package list for live-helper(7)
# Minimal
eject file sudo vim-tiny
## LH: KDE
#<include> kde-core
# Standard
console-common kbd locales
# KDE
kde kdm
desktop-base
xorg xresprobe discover menu
alsa-base alsa-oss alsa-utils

View File

@ -1,14 +1,7 @@
# /usr/share/live-helper/lists/kde-core - package list for live-helper(7)
# Minimal
eject file sudo vim-tiny
## LH: KDE Core
#<include> standard-x11
# Standard
console-common kbd locales
# KDE Core
kde-core kdm
desktop-base
xorg xresprobe discover menu
alsa-base alsa-oss alsa-utils

View File

@ -1,20 +1,6 @@
# /usr/share/live-helper/lists/kde-extra - package list for live-helper(7)
# Minimal
eject file sudo vim-tiny
## LH: KDE Extra
#<include> kde-full
# Standard
console-common kbd locales
# KDE
kde kdm
desktop-base
xorg xresprobe discover menu
alsa-base alsa-oss alsa-utils
# KDE Full
koffice
# KDE Extra
kde-extras

View File

@ -1,17 +1,6 @@
# /usr/share/live-helper/lists/kde-full - package list for live-helper(7)
# Minimal
eject file sudo vim-tiny
## LH: KDE Full
#<include> kde
# Standard
console-common kbd locales
# KDE
kde kdm
desktop-base
xorg xresprobe discover menu
alsa-base alsa-oss alsa-utils
# KDE Full
koffice

View File

@ -1,20 +1,7 @@
# /usr/share/live-helper/lists/kde - package list for live-helper(7)
# /usr/share/live-helper/lists/kde-junior - package list for live-helper(7)
# Minimal
eject file sudo vim-tiny
## LH: KDE Junior
#<include> kde
#<include> junior-pkgs
# Standard
console-common kbd locales
# KDE
kde kdm
desktop-base
xorg xresprobe discover menu
alsa-base alsa-oss alsa-utils
# Debian Junior
junior-sound junior-typing junior-internet junior-toys junior-games-net
junior-games-sim junior-games-gl junior-puzzle junior-arcade junior-math
junior-writing junior-games-card junior-programming junior-system junior-art
junior-doc junior-games-text junior-kde
junior-kde

5
lists/minimal Normal file
View File

@ -0,0 +1,5 @@
# /usr/share/live-helper/lists/minimal - package list for live-helper(7)
## LH: Minimal
eject file sudo vim-tiny

View File

@ -1,15 +1,9 @@
# /usr/share/live-helper/lists/rescue - package list for live-helper(7)
# Minimal
eject file sudo vim-tiny
# Standard
console-common kbd locales
##### Rescue
## LH: Rescue
#<include> standard
## System
gnupg dash discover gawk grub htop lilo ltrace pstack screen strace units
## Editors

View File

@ -1,7 +1,6 @@
# /usr/share/live-helper/lists/standard - package list for live-helper(7)
# Minimal
eject file sudo vim-tiny
## LH: Standard
#<include> minimal
# Standard
console-common kbd locales

View File

@ -1,11 +1,7 @@
# /usr/share/live-helper/lists/standard-x11 - package list for live-helper(7)
# Minimal
eject file sudo vim-tiny
## LH: Standard X11
#<include> standard
# Standard
console-common kbd locales
# X11
xorg xresprobe discover menu
alsa-base alsa-oss alsa-utils

View File

@ -1,14 +1,7 @@
# /usr/share/live-helper/lists/xfce - package list for live-helper(7)
# Minimal
eject file sudo vim-tiny
## LH: Xfce
#<include> standard-x11
# Standard
console-common kbd locales
# Xfce
xfce4 gdm
desktop-base
xorg xresprobe discover menu
alsa-base alsa-oss alsa-utils

View File

@ -1,20 +1,7 @@
# /usr/share/live-helper/lists/xfce - package list for live-helper(7)
# /usr/share/live-helper/lists/xfce-junior - package list for live-helper(7)
# Minimal
eject file sudo vim-tiny
## LH: Xfce Debian Junior
#<include> xfce
#<include> junior-pkgs
# Standard
console-common kbd locales
# Xfce
xfce4 gdm
desktop-base
xorg xresprobe discover menu
alsa-base alsa-oss alsa-utils
# Debian Junior
junior-sound junior-typing junior-internet junior-gnome junior-toys
junior-games-net junior-games-sim junior-games-gl junior-puzzle junior-arcade
junior-math junior-writing junior-games-card junior-programming junior-system
junior-art junior-doc junior-games-text junior-kde
junior-kde junior-gnome

View File

@ -1,4 +1,4 @@
.TH LH_BINARY 1 "18.06.2007" "1.0~a15" "live\-helper"
.TH LH_BINARY 1 "25.06.2007" "1.0~a16" "live\-helper"
.SH NAME
lh_binary \- Meta\-Helper f\[:u]r lh_binary_*

View File

@ -1,4 +1,4 @@
.TH LH_BINARY 1 "2007\-06\-18" "1.0~a15" "live\-helper"
.TH LH_BINARY 1 "2007\-06\-25" "1.0~a16" "live\-helper"
.SH NAME
lh_binary \- meta\-helper for lh_binary_*

View File

@ -1,4 +1,4 @@
.TH LH_BOOTSTRAP 1 "18.06.2007" "1.0~a15" "live\-helper"
.TH LH_BOOTSTRAP 1 "25.06.2007" "1.0~a16" "live\-helper"
.SH NAME
lh_bootstrap \- Meta\-Helper f\[:u]r lh_bootstrap_*

View File

@ -1,4 +1,4 @@
.TH LH_BOOTSTRAP 1 "2007\-06\-18" "1.0~a15" "live\-helper"
.TH LH_BOOTSTRAP 1 "2007\-06\-25" "1.0~a16" "live\-helper"
.SH NAME
lh_bootstrap \- meta\-helper for lh_bootstrap_*

View File

@ -1,4 +1,4 @@
.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "18.06.2007" "1.0~a15" "live\-helper"
.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "25.06.2007" "1.0~a16" "live\-helper"
.SH NAME
lh_bootstrap_cdebootstrap \- erstellt ein Debian-System mit \fIcdebootstrap\fR(1)

View File

@ -1,4 +1,4 @@
.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "2007\-06\-18" "1.0~a15" "live\-helper"
.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "2007\-06\-25" "1.0~a16" "live\-helper"
.SH NAME
lh_bootstrap_cdebootstrap \- bootstrap a Debian system with \fIcdebootstrap\fR(1)

View File

@ -1,4 +1,4 @@
.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "18.06.2007" "1.0~a15" "live\-helper"
.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "25.06.2007" "1.0~a16" "live\-helper"
.SH NAME
lh_bootstrap_debootstrap \- erstellt ein Debian-System mit \fIdebootstrap\fR(8)

View File

@ -1,4 +1,4 @@
.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "2007\-06\-18" "1.0~a15" "live\-helper"
.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "2007\-06\-25" "1.0~a16" "live\-helper"
.SH NAME
lh_bootstrap_debootstrap \- bootstrap a Debian system with \fIdebootstrap\fR(8)

View File

@ -1,4 +1,4 @@
.TH LH_BUILD 1 "18.06.2007" "1.0~a15" "live\-helper"
.TH LH_BUILD 1 "25.06.2007" "1.0~a16" "live\-helper"
.SH NAME
lh_build \- erstellen eines Live-Systemes

View File

@ -1,4 +1,4 @@
.TH LH_BUILD 1 "2007\-06\-18" "1.0~a15" "live\-helper"
.TH LH_BUILD 1 "2007\-06\-25" "1.0~a16" "live\-helper"
.SH NAME
lh_build \- building a live system

View File

@ -1,4 +1,4 @@
.TH LH_CHROOT 1 "18.06.2007" "1.0~a15" "live\-helper"
.TH LH_CHROOT 1 "25.06.2007" "1.0~a16" "live\-helper"
.SH NAME
lh_chroot \- Meta\-Helper f\[:u]r lh_chroot_*

View File

@ -1,4 +1,4 @@
.TH LH_CHROOT 1 "2007\-06\-18" "1.0~a15" "live\-helper"
.TH LH_CHROOT 1 "2007\-06\-25" "1.0~a16" "live\-helper"
.SH NAME
lh_chroot \- meta\-helper for lh_chroot_*

View File

@ -1,4 +1,4 @@
.TH LH_CLEAN 1 "18.06.2007" "1.0~a15" "live\-helper"
.TH LH_CLEAN 1 "25.06.2007" "1.0~a16" "live\-helper"
.SH NAME
lh_clean \- r\[:a]umt das Build-Verzeichnis auf

View File

@ -1,4 +1,4 @@
.TH LH_CLEAN 1 "2007\-06\-18" "1.0~a15" "live\-helper"
.TH LH_CLEAN 1 "2007\-06\-25" "1.0~a16" "live\-helper"
.SH NAME
lh_clean \- clean up system build directories

View File

@ -1,4 +1,4 @@
.TH LH_SOURCE 1 "18.06.2007" "1.0~a15" "live\-helper"
.TH LH_SOURCE 1 "25.06.2007" "1.0~a16" "live\-helper"
.SH NAME
lh_source \- Meta\-Helper f\[:u]r lh_source_*

View File

@ -1,4 +1,4 @@
.TH LH_SOURCE 1 "2007\-06\-18" "1.0~a15" "live\-helper"
.TH LH_SOURCE 1 "2007\-06\-25" "1.0~a16" "live\-helper"
.SH NAME
lh_source \- meta\-helper for lh_source_*

View File

@ -1,4 +1,4 @@
.TH LH_TESTROOT 1 "18.06.2007" "1.0~a15" "live\-helper"
.TH LH_TESTROOT 1 "25.06.2007" "1.0~a16" "live\-helper"
.SH NAME
lh_testroot \- stellt sicher dass das System als root gebaut wird

View File

@ -1,4 +1,4 @@
.TH LH_TESTROOT 1 "2007\-06\-18" "1.0~a15" "live\-helper"
.TH LH_TESTROOT 1 "2007\-06\-25" "1.0~a16" "live\-helper"
.SH NAME
lh_testroot \- ensure that a system is built as root

View File

@ -1,4 +1,4 @@
.TH LIVE\-HELPER 7 "18.06.2007" "1.0~a15" "live\-helper"
.TH LIVE\-HELPER 7 "25.06.2007" "1.0~a16" "live\-helper"
.SH NAME
live\-helper \- Debian Live Helper-Programme

View File

@ -1,4 +1,4 @@
.TH LIVE\-HELPER 7 "2007\-06\-18" "1.0~a15" "live\-helper"
.TH LIVE\-HELPER 7 "2007\-06\-25" "1.0~a16" "live\-helper"
.SH NAME
live\-helper \- Debian Live helper programs

View File

@ -1,4 +1,4 @@
.TH MAKE\-LIVE 1 "18.06.2007" "1.0~a15" "live\-helper"
.TH MAKE\-LIVE 1 "25.06.2007" "1.0~a16" "live\-helper"
.SH NAME
make\-live \- erstellt ein Debian Live-System

View File

@ -1,4 +1,4 @@
.TH MAKE\-LIVE 1 "2007\-06\-18" "1.0~a15" "live\-helper"
.TH MAKE\-LIVE 1 "2007\-06\-25" "1.0~a16" "live\-helper"
.SH NAME
make\-live \- build a Debian Live system