Adding live-helper 1.0~a27-1.

This commit is contained in:
Daniel Baumann 2007-09-23 10:05:21 +02:00
parent c7f53a9af5
commit e871d8d6a7
83 changed files with 615 additions and 216 deletions

View File

@ -91,9 +91,9 @@ uninstall:
update:
set -e; for FILE in functions/*.sh examples/cron/*.sh manpages/*.de.* manpages/*.en.*; \
do \
sed -i -e 's/2007\\-09\\-03/2007\\-09\\-10/' \
-e 's/03.09.2007/10.09.2007/' \
-e 's/1.0~a26/1.0~a27/' \
sed -i -e 's/2007\\-09\\-10/2007\\-09\\-17/' \
-e 's/10.09.2007/17.09.2007/' \
-e 's/1.0~a27/1.0~a28/' \
$$FILE; \
done

View File

@ -1 +0,0 @@
etch

View File

@ -0,0 +1,4 @@
choose-mirror
netcfg
ethdetect
fdisk-udeb

View File

@ -0,0 +1,3 @@
netcfg
ethdetect
fdisk-udeb

View File

@ -0,0 +1,3 @@
netcfg
ethdetect
fdisk-udeb

View File

@ -0,0 +1,5 @@
choose-mirror
netcfg
ethdetect
pcmciautils-udeb
wireless-tools-udeb

View File

@ -0,0 +1,4 @@
netcfg
ethdetect
pcmciautils-udeb
wireless-tools-udeb

View File

@ -0,0 +1,4 @@
netcfg
ethdetect
pcmciautils-udeb
wireless-tools-udeb

View File

@ -0,0 +1,3 @@
choose-mirror
netcfg
ethdetect

View File

@ -0,0 +1,2 @@
netcfg
ethdetect

View File

@ -0,0 +1,2 @@
netcfg
ethdetect

View File

@ -0,0 +1,125 @@
# These udebs build the d-i cdrom initrd. As such, there is no reason
# to keep another copy of them on the CD in udeb form.
#
# This duplicates data found in the file build/pkg-lists/kernel, in d-i svn
kernel-image-*
# build/pkg-lists/base in d-i svn
rootskel
main-menu
cdebconf-udeb
udpkg
anna
di-utils-shell
di-utils-reboot
lowmemcheck
# build/pkg-lists/cdrom/common, in d-i svn (also included in the
# root+cd-drivers floppies)
busybox-udeb
installation-locale
localechooser
iso-3166-udeb
hw-detect
cdrom-detect
cdrom-retriever
load-cdrom
cdrom-checker
bogl-bterm-udeb
di-utils-terminfo
cdebconf-priority
cdebconf-newt-udeb
usb-discover
preseed-common
initrd-preseed
file-preseed
nano-udeb
floppy-retriever
libfribidi0-udeb
# Already on the initrd, thanks to library reduction.
libdebconfclient0-udeb
libdebian-installer-extra4-udeb
# These udebs are only useful in building the boot floppy image.
busybox-floppy-udeb
rootskel-bootfloppy
# gtk stuff
cdebconf-gtk-udeb
fontconfig-udeb
libatk1.0-udeb
libcairo-directfb2-udeb
libdirectfb-0.9-22-udeb
libdirectfb-0.9-25-udeb
libexpat1-udeb
libfreetype6-udeb
libglib2.0-udeb
libgtk-directfb-2.0-0-udeb
libgtk2-engines-udeb
libpango1.0-udeb
libpng12-0-udeb
libsdl1.2debian-udeb
mouse-modules-*
ttf-*
fbset-udeb
# We're currently using busybox's own shell, and do not need this one.
dash-udeb
# Not currently used
cdebootstrap-udeb
hdparm-udeb
laptop-detect-udeb
# These dhcp clients are not the currently preferred one.
# Exclusion disabled during switchover from DHCP v2 to v3.
#dhcp3-client-udeb
# This package is only useful in the d-i-demo.
di-utils-exit-installer
# No need for these loaders.
download-installer
load-floppy
# Only useful in the hd-media initrd.
iso-scan
load-iso
# We're using busybox's modutils these days.
modutils-basic
modutils-full
# Nothing currently depends on this, and it seems not useful on its own.
reiserfsprogs-udeb
# reiser4 is not in the Debian kernel.
mkreiser4-udeb
reiser4progs-udeb
# No longer used by parted.
libreiserfs0.3-udeb
# These are not really needed, the regular netcfg subsumes them.
netcfg-static
# skolelinux stuff, not for the stock CDs
debian-edu-install-udeb
debian-edu-profile-udeb
debian-edu-archive-keyring-udeb
ltsp-client-builder
autopartkit
lvm10-udeb
# live CD stuff
live-installer
simple-cdd-profiles
# If needed, will be on the initrd already.
modutils-full
module-init-tools-udeb
env-preseed
rescue-check
rootskel-gtk
cdebconf-text-udeb
brltty-udeb
klibc-utils-udeb
libklibc-udeb
udev-udeb
ai-choosers
auto-install
# Currently unused
nbd-client-udeb
pwgen-udeb
# Obsolete
libslang1-utf8-udeb
discover-udeb
discover-data-udeb
discover1-udeb
discover1-data-udeb
libdiscover1-udeb
# Eh?
gnumach-udeb
# Exclude apt-setup components; they will be included

View File

@ -0,0 +1,28 @@
# These udebs are in the d-i cdrom initrd and the hd-media initrd.
# As such, there is no reason to keep another copy of them on the CD
# in udeb form.
isa-pnp-modules-*
socket-modules-*
console-keymaps-at
console-keymaps-usb
fat-modules-*
cdrom-core-modules-*
cdrom-modules-*
ide-modules-*
ide-core-modules-*
input-modules-*
fb-modules-*
kbd-chooser
usb-modules-*
usb-storage-modules-*
scsi-core-modules-*
# Not needed with the 2.6 kernel on amd64.
userdevfs
# The speakup kernel modules are not useful unless the access images are
# provided.
*-speakup-di
# Only needed on arches that use partconf or autopartkit.
partconf-mkfstab
# Not needed on arches that use partman
mdcfg
lvmcfg

View File

@ -0,0 +1,28 @@
# These udebs are in the d-i cdrom initrd and the cd-drivers+root floppies.
# As such, there is no reason to keep another copy of them on the CD
# in udeb form.
isa-pnp-modules-*
socket-modules-*
console-keymaps-at
console-keymaps-usb
floppy-modules-*
cdrom-core-modules-*
cdrom-modules-*
ide-modules-*
ide-core-modules-*
input-modules-*
fb-modules-*
kbd-chooser
usb-modules-*
usb-storage-modules-*
scsi-core-modules-*
# Not needed with the 2.4 kernel on i386.
userdevfs
# The speakup kernel modules are not useful unless the access images are
# provided.
*-speakup-di
# Only needed on arches that use partconf or autopartkit.
partconf-mkfstab
# Not needed on arches that use partman
mdcfg
lvmcfg

View File

@ -0,0 +1,28 @@
# These udebs build the d-i cdrom initrd. As such, there is no reason
# to keep another copy of them on the CD in udeb form.
#
# This duplicates data found in the file build/pkg-lists/cdrom/powerpc,
# in d-i Subversion.
cdrom-core-modules-*
console-keymaps-at
console-keymaps-usb
eject-udeb
firewire-core-modules-*
fs-common-modules-*
ide-modules-*
input-modules-*
kbd-chooser
scsi-common-modules-*
scsi-core-modules-*
scsi-modules-*
socket-modules-*
usb-modules-*
usb-storage-modules-*
# Not needed with the 2.4 kernel on powerpc.
userdevfs
# Only needed on arches that use partconf or autopartkit.
partconf-mkfstab
# Not needed on arches that use partman
mdcfg
lvmcfg

View File

@ -0,0 +1,3 @@
# S/390 does not support loading udebs off the CD image,
# so we can exclude all udebs from it
*

View File

@ -0,0 +1,5 @@
# Only needed on arches that use partconf or autopartkit.
partconf-mkfstab
# Not needed on arches that use partman
mdcfg
lvmcfg

View File

@ -0,0 +1,3 @@
choose-mirror
netcfg
ethdetect

View File

@ -0,0 +1,2 @@
netcfg
ethdetect

View File

@ -0,0 +1,2 @@
netcfg
ethdetect

View File

@ -0,0 +1,5 @@
choose-mirror
netcfg
ethdetect
pcmciautils-udeb
wireless-tools-udeb

View File

@ -0,0 +1,4 @@
netcfg
ethdetect
pcmciautils-udeb
wireless-tools-udeb

View File

@ -0,0 +1,4 @@
netcfg
ethdetect
pcmciautils-udeb
wireless-tools-udeb

View File

@ -0,0 +1,3 @@
choose-mirror
netcfg
ethdetect

View File

@ -0,0 +1,2 @@
netcfg
ethdetect

View File

@ -0,0 +1,2 @@
netcfg
ethdetect

View File

@ -0,0 +1,3 @@
choose-mirror
netcfg
ethdetect

View File

@ -0,0 +1,2 @@
netcfg
ethdetect

View File

@ -0,0 +1,2 @@
netcfg
ethdetect

View File

@ -0,0 +1,3 @@
choose-mirror
netcfg
ethdetect

View File

@ -0,0 +1,2 @@
netcfg
ethdetect

View File

@ -0,0 +1,2 @@
netcfg
ethdetect

View File

@ -0,0 +1,3 @@
choose-mirror
netcfg
ethdetect

View File

@ -0,0 +1,2 @@
netcfg
ethdetect

View File

@ -0,0 +1,2 @@
netcfg
ethdetect

View File

@ -0,0 +1,4 @@
choose-mirror
netcfg
ethdetect
wireless-tools-udeb

View File

@ -0,0 +1,3 @@
netcfg
ethdetect
wireless-tools-udeb

View File

@ -0,0 +1,4 @@
netcfg
ethdetect
pcmciautils-udeb
wireless-tools-udeb

View File

@ -0,0 +1,3 @@
choose-mirror
netcfg
ethdetect

View File

@ -0,0 +1,2 @@
netcfg
ethdetect

View File

@ -0,0 +1,2 @@
netcfg
ethdetect

View File

@ -0,0 +1,3 @@
choose-mirror
netcfg
ethdetect

View File

@ -0,0 +1,2 @@
netcfg
ethdetect

View File

@ -0,0 +1,2 @@
netcfg
ethdetect

View File

@ -0,0 +1 @@
apt-mirror-setup

View File

@ -1 +1 @@
etch
lenny

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
live-helper (1.0~a27-1) unstable; urgency=medium
* New upstream release.
-- Daniel Baumann <daniel@debian.org> Mon, 10 Sep 2007 00:00:00 +0200
live-helper (1.0~a26-1) unstable; urgency=medium
* New upstream release.

5
debian/control vendored
View File

@ -5,8 +5,9 @@ Maintainer: Debian Live <debian-live-maint@lists.alioth.debian.org>
Uploaders: Daniel Baumann <daniel@debian.org>
Build-Depends: debhelper (>= 5)
Standards-Version: 3.7.2
XS-Vcs-Svn: svn://svn.debian.org/debian-live/dists/trunk/live-helper/
XS-VCS-Browse: http://svn.debian.org/wsvn/debian-live/dists/trunk/live-helper/
XS-Upstream-Depends: git-core
XS-VCS-Git: git://git.debian.org/git/users/daniel/live-helper.git
XS-VCS-Browse: http://git.debian.org/?p=users/daniel/live-helper.git
Package: live-helper
Architecture: all

5
debian/rules vendored
View File

@ -4,9 +4,8 @@
#export DH_VERBOSE=1
upstream:
# Needs: subversion
cd .. && svn co svn://svn.debian.org/debian-live/dists/trunk/live-helper || true
find . -type d -name .svn | xargs rm -rf
cd .. && git clone git://git.debian.org/git/users/daniel/live-helper.git || true
rm -rf ../live-helper/.git
build:

View File

@ -1,3 +1,32 @@
2007-09-09 Daniel Baumann <daniel@debian.org>
* functions/defaults.sh:
- Fixing typing error.
* data/debian-cd:
- Merging debian-cd 3.0.3 data files.
* functions/defaults.sh, helpers/lh_config:
- Adding debian-installer daily images option.
* helpers/lh_binary_debian-installer:
- Reworking debian-installer flavours and urls.
- Failing when no bootstrap package cache.
* helpers/lh_binary_disk:
- Reworking disk information.
* helpers/lh_bootstrap_cache:
- Creating bootstrap stagefile when restoring cache.
* helpers/lh_bootstrap_cache, lh_chroot_cache:
- Refactoring stage caching.
* helpers/lh_clean:
- Removing cache/stages_bootstrap restore.
* lists/devel-live:
- Moving from svn to git.
* Uploading 1.0~a27-1.
2007-09-04 Daniel Baumann <daniel@debian.org>
* helpers/lh_chroot_cache:
- Added forgotten creation of the stagefile as mentioned by
Peter Holik <peter@holik.at>.
2007-09-04 Daniel Baumann <daniel@debian.org>
* helpers/lh_binary_syslinux, lh_config:
@ -8,6 +37,7 @@
* helpers/lh_bootstrap_cache:
- Added forgotten creation of the stagefile as mentioned by
Peter Holik <peter@holik.at>.
* Uploading 1.0~a26-1.
2007-08-28 Daniel Baumann <daniel@debian.org>

View File

@ -1,9 +1,9 @@
#!/bin/sh
# Needs: man2html svn
# Needs: man2html git-core
# Static variables
PACKAGES="live-helper live-initramfs live-initscripts live-webhelper"
PACKAGES="live-helper live-initramfs"
TEMPDIR="/srv/tmp/manpages"
SERVER="/srv/debian-live/www/other/manpages"
@ -48,7 +48,7 @@ do
# Getting sources
cd "${TEMPDIR}"
svn co svn://svn.debian.org/debian-live/dists/trunk/${PACKAGE} ${PACKAGE}
git clone git://git.debian.org/git/users/daniel/${PACKAGE}.git
# Building manpages
for MANPAGE in "${TEMPDIR}"/${PACKAGE}/manpages/*

View File

@ -1,9 +1,9 @@
#!/bin/sh
# Needs: build-essential fakeroot lsb-release svn [...]
# Needs: build-essential fakeroot lsb-release git-core [...]
# Static variables
PACKAGES="live-helper live-initramfs live-initscripts live-magic live-webhelper"
PACKAGES="live-helper live-initramfs"
DEBEMAIL="debian-live-devel@lists.alioth.debian.org"
EMAIL="debian-live-devel@lists.alioth.debian.org"
@ -52,7 +52,7 @@ do
# Getting sources
cd "${TEMPDIR}"
svn co svn://svn.debian.org/debian-live/dists/trunk/${PACKAGE} ${PACKAGE}
git clone git://git.debian.org/git/users/daniel/${PACKAGE}.git
# Getting version
cd "${TEMPDIR}"/${PACKAGE}
@ -60,7 +60,8 @@ do
# Getting revision
cd "${TEMPDIR}"/${PACKAGE}
REVISION="`svn info | awk '/Last Changed Rev:/ { print $4 }'`"
REVISION="`git log | grep -m1 Date | awk -FDate: '{ print $2 }' | sed -e 's/+.*$//'`"
REVISION="`date -d "${REVISION}" +%Y%m%d.%H%M%S`"
# Check for existing package
if [ ! -f "${SERVER}"/${PACKAGE}_${VERSION}~${REVISION}.dsc ] || [ "${1}" = "--force" ]
@ -72,7 +73,7 @@ do
# Building package
cd "${TEMPDIR}"/${PACKAGE}-${VERSION}~${REVISION}
find . -type d -name .svn | xargs rm -rf
rm -rf .git
dch --force-bad-version --newversion ${VERSION}~${REVISION} --distribution UNRELEASED Autobuild snapshot of SVN r${REVISION}.
dpkg-buildpackage -rfakeroot -sa -uc -us

View File

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

View File

@ -633,6 +633,9 @@ Set_defaults ()
# Setting debian-installer option
LH_DEBIAN_INSTALLER="${LH_DEBIAN_INSTALLER:-disabled}"
# Setting debian-install daily images
LH_DEBIAN_INSTALLER_DAILY="${LH_DEBIAN_INSTALLER_DAILY:-disabled}"
# Setting encryption
# LH_ENCRYPTION

View File

@ -35,20 +35,20 @@ Set_defaults
# Setting remote d-i directories
case "${LH_DEBIAN_INSTALLER}" in
enabled|cdrom|live)
cdrom|netinst|businesscard)
DI="cdrom"
DI_GTK="${DI}/gtk"
DI_KERNEL="vmlinuz"
;;
disabled)
exit 0
netboot)
DI="netboot/debian-installer/${LH_ARCHITECTURE}"
DI_GTK="netboot/gtk/debian-installer/${LH_ARCHITECTURE}"
DI_KERNEL="linux"
;;
netboot)
DI="netboot/debian-installer/i386"
DI_GTK="netboot/gtk/debian-installer/i386"
DI_KERNEL="linux"
disabled)
exit 0
;;
*)
@ -121,61 +121,66 @@ then
fi
fi
# Debian Installer daily builds
case "${LH_ARCHITECTURE}" in
alpha)
URL="http://people.debian.org/~vorlon/d-i/alpha/daily/"
;;
if [ "${LH_DEBIAN_INSTALLER_DAILY}" = "enabled" ]
then
# Debian Installer daily builds
case "${LH_ARCHITECTURE}" in
alpha)
URL="http://people.debian.org/~vorlon/d-i/alpha/daily/"
;;
amd64)
URL="http://people.debian.org/~aba/d-i/images/daily/"
;;
amd64)
URL="http://people.debian.org/~aba/d-i/images/daily/"
;;
arm)
URL="http://people.debian.org/~kmuto/d-i/images/daily/"
;;
arm)
URL="http://people.debian.org/~kmuto/d-i/images/daily/"
;;
hppa)
URL="http://people.debian.org/~kyle/d-i/hppa/daily/"
;;
hppa)
URL="http://people.debian.org/~kyle/d-i/hppa/daily/"
;;
i386)
URL="http://people.debian.org/~joeyh/d-i/images/daily/"
;;
i386)
URL="http://people.debian.org/~joeyh/d-i/images/daily/"
;;
ia64)
URL="http://people.debian.org/~dannf/d-i/images/daily/"
;;
ia64)
URL="http://people.debian.org/~dannf/d-i/images/daily/"
;;
m68k)
URL="http://people.debian.org/~smarenka/d-i/images-m68k/daily/"
;;
m68k)
URL="http://people.debian.org/~smarenka/d-i/images-m68k/daily/"
;;
mips)
URL="http://people.debian.org/~ths/d-i/mips/images/daily/"
;;
mips)
URL="http://people.debian.org/~ths/d-i/mips/images/daily/"
;;
mipsel)
URL="http://people.debian.org/~ths/d-i/mipsel/images/daily/"
;;
mipsel)
URL="http://people.debian.org/~ths/d-i/mipsel/images/daily/"
;;
powerpc)
URL="http://people.debian.org/~wouter/d-i/powerpc/daily/"
;;
powerpc)
URL="http://people.debian.org/~wouter/d-i/powerpc/daily/"
;;
s390)
URL="http://lophos.multibuild.org/d-i/images/daily/"
;;
s390)
URL="http://lophos.multibuild.org/d-i/images/daily/"
;;
sparc)
URL="http://people.debian.org/~stappers/d-i/images/daily/"
;;
sparc)
URL="http://people.debian.org/~stappers/d-i/images/daily/"
;;
*)
Echo_error "No daily-builds found for your architecture."
exit 1
;;
esac
*)
Echo_error "No daily-builds found for your architecture."
exit 1
;;
esac
else
URL="${LH_MIRROR_BOOTSTRAP}/dists/${LH_DISTRIBUTION}/main/installer-${LH_ARCHITECTURE}/current/images/"
fi
# Downloading debian-installer
mkdir -p "${DESTDIR_DI}"
@ -259,6 +264,9 @@ then
# Move files
cp "${FILE}" binary/pool/main/"${LETTER}"/"${SOURCE}"
done
else
Echo_error "E: Could not find cache/packages_bootstrap"
exit 1
fi
# Including local debs

View File

@ -61,36 +61,15 @@ eval VERSION="$`echo VERSION_${LH_DISTRIBUTION}`"
case "${LH_MODE}" in
debian)
if [ -d binary/pool/main/b/base-installer ]
then
if [ -d binary/pool/main/l/live-installer ]
then
TYPE="LIVE/INSTALL"
fi
case "${LH_DEBIAN_INSTALLER}" in
cdrom)
echo "main" > binary/.disk/base_components
TYPE="LIVE/NETINST"
else
TYPE="LIVE"
fi
touch binary/.disk/base_installable
echo "Debian GNU/Linux ${VERSION} \"${DISTRIBUTION}\" - Official ${ARCHITECTURE} ${TYPE} Binary `date +%Y%m%d-%H:%M`" > binary/.disk/info
;;
echo "full_cd" > binary/.disk/cd_type
ubuntu)
echo "Ubuntu Linux ${VERSION} \"${DISTRIBUTION}\" - Unofficial ${ARCHITECTURE} LIVE/NETINST Binary `date +%Y%m%d-%H:%M`" > binary/.disk/info
# Ubuntu 7.04 "Feisty Fawn" - Release i386 (20070418)
;;
esac
if [ "${LH_DEBIAN_INSTALLER}" != "disabled" ]
then
echo "main" > binary/.disk/base_components
touch binary/.disk/base_installable
echo "not_complete" > binary/.disk/cd_type
#touch binary/.disk/mkisofs
echo "Debian GNU/Linux ${VERSION} \"${DISTRIBUTION}\" - Official ${ARCHITECTURE} CD Binary `date +%Y%m%d-%H:%M`" > binary/.disk/info
cat > binary/.disk/udeb_include << EOF
netcfg
@ -100,10 +79,61 @@ pcmciautils-udeb
wireless-tools-udeb
EOF
if [ -d binary/pool/main/l/live-installer ]
then
echo "live-installer" >> binary/.disk/udeb_include
fi
;;
netinst)
echo "main" > binary/.disk/base_components
touch binary/.disk/base_installable
echo "not_complete" > binary/.disk/cd_type
echo "Debian GNU/Linux ${VERSION} \"${DISTRIBUTION}\" - Official ${ARCHITECTURE} NETINST Binary `date +%Y%m%d-%H:%M`" > binary/.disk/info
cat > binary/.disk/udeb_include << EOF
netcfg
ethdetect
pcmcia-cs-udeb
pcmciautils-udeb
wireless-tools-udeb
EOF
;;
businesscard)
echo "main" > binary/.disk/base_components
echo "not_complete" > binary/.disk/cd_type
echo "Debian GNU/Linux ${VERSION} \"${DISTRIBUTION}\" - Official ${ARCHITECTURE} BC Binary `date +%Y%m%d-%H:%M`" > binary/.disk/info
cat > binary/.disk/udeb_include << EOF
choose-mirror
netcfg
ethdetect
pcmcia-cs-udeb
pcmciautils-udeb
wireless-tools-udeb
EOF
;;
disabled)
echo "Debian GNU/Linux ${VERSION} \"${DISTRIBUTION}\" - Official ${ARCHITECTURE} LIVE Binary `date +%Y%m%d-%H:%M`" > binary/.disk/info
;;
esac
;;
ubuntu)
# FIXME
echo "Ubuntu Linux ${VERSION} \"${DISTRIBUTION}\" - Unofficial ${ARCHITECTURE} LIVE/NETINST Binary `date +%Y%m%d-%H:%M`" > binary/.disk/info
# Ubuntu 7.04 "Feisty Fawn" - Release i386 (20070418)
;;
esac
if [ -d binary/pool/main/l/live-installer ]
then
echo "live-installer" >> binary/.disk/udeb_include
fi
# Creating stage file

View File

@ -37,49 +37,50 @@ Echo_message "Begin caching bootstrap stage..."
for STAGE in ${LH_CACHE_STAGES}
do
case "${1}" in
restore)
# Checking stage file
Check_stagefile .stage/bootstrap_cache.restore
if [ "${STAGE}" = "bootstrap" ]
then
case "${1}" in
restore)
# Checking stage file
Check_stagefile .stage/bootstrap_cache.restore
# Checking lock file
Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
if [ "${STAGE}" = "bootstrap" ] && [ -d cache/stages_bootstrap ]
then
# Removing old chroot
rm -rf chroot
# Restoring old cache
${LH_ROOT_COMMAND} cp -a cache/stages_bootstrap chroot
if [ -n "${LH_ROOT_COMMAND}" ]
if [ -d cache/stages_bootstrap ]
then
${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` chroot
# Checking lock file
Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
# Removing old chroot
rm -rf chroot
# Restoring old cache
${LH_ROOT_COMMAND} cp -a cache/stages_bootstrap chroot
if [ -n "${LH_ROOT_COMMAND}" ]
then
${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` chroot
fi
# Creating stage file
Create_stagefile .stage/bootstrap_cache.restore
Create_stagefile .stage/bootstrap
exit 0
fi
;;
# Creating stage file
Create_stagefile .stage/bootstrap_cache.restore
save)
# Checking stage file
Check_stagefile .stage/bootstrap_cache.save
exit 0
fi
;;
# Checking lock file
Check_lockfile .lock
save)
# Checking stage file
Check_stagefile .stage/bootstrap_cache.save
# Creating lock file
Create_lockfile .lock
# Checking lock file
Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
if [ "${STAGE}" = "bootstrap" ]
then
rm -rf cache/stages_bootstrap
mkdir -p cache
@ -93,7 +94,7 @@ do
# Creating stage file
Create_stagefile .stage/bootstrap_cache.save
fi
;;
esac
;;
esac
fi
done

View File

@ -37,49 +37,49 @@ Echo_message "Begin caching chroot stage..."
for STAGE in ${LH_CACHE_STAGES}
do
case "${1}" in
restore)
# Checking stage file
Check_stagefile .stage/chroot_cache.restore
if [ "${STAGE}" = "chroot" ]
then
case "${1}" in
restore)
# Checking stage file
Check_stagefile .stage/chroot_cache.restore
# Checking lock file
Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
if [ "${STAGE}" = "chroot" ] && [ -d cache/stages_chroot ]
then
# Removing old chroot
rm -rf chroot
# Restoring old cache
${LH_ROOT_COMMAND} cp -a cache/stages_chroot chroot
if [ -n "${LH_ROOT_COMMAND}" ]
if [ -d cache/stages_chroot ]
then
${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` chroot
# Checking lock file
Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
# Removing old chroot
rm -rf chroot
# Restoring old cache
${LH_ROOT_COMMAND} cp -a cache/stages_chroot chroot
if [ -n "${LH_ROOT_COMMAND}" ]
then
${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` chroot
fi
# Creating stage file
Create_stagefile .stage/chroot_cache.restore
exit 0
fi
;;
# Creating stage file
Create_stagefile .stage/chroot_cache.restore
save)
# Checking stage file
Check_stagefile .stage/chroot_cache.save
exit 0
fi
;;
# Checking lock file
Check_lockfile .lock
save)
# Checking stage file
Check_stagefile .stage/chroot_cache.save
# Creating lock file
Create_lockfile .lock
# Checking lock file
Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
if [ "${STAGE}" = "chroot" ]
then
rm -rf cache/stages_chroot
mkdir -p cache
@ -90,7 +90,10 @@ do
then
${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` cache/stages_chroot
fi
fi
;;
esac
# Creating stage file
Create_stagefile .stage/chroot_cache.save
;;
esac
fi
done

View File

@ -43,12 +43,6 @@ do
"${0}" binary
"${0}" stage
"${0}" source
if [ -d chroot ]
then
mkdir -p .stage
touch .stage/bootstrap
fi
;;
cache)
@ -67,13 +61,6 @@ do
${LH_ROOT_COMMAND} rm -rf chroot chroot.tmp
if [ "${PURGE}" != "true" ] && [ -d cache/stages_bootstrap ]
then
${LH_ROOT_COMMAND} cp -a cache/stages_bootstrap chroot
mkdir -p .stage
touch .stage/bootstrap
fi
rm -f .stage/chroot*
;;
@ -92,7 +79,7 @@ do
;;
purge)
PURGE="true" "${0}" all
"${0}" all
"${0}" cache
;;

View File

@ -48,6 +48,7 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
\t [--debconf-nowarnings enabled|disabled]\n\
\t [--debconf-priority low|medium|high|critical]\n\
\t [--debian-installer enabled|disabled]\n\
\t [--debian-installer-daily enabled|disabled]\n\
\t [--debug]\n\
\t [-d|--distribution CODENAME]\n\
\t [-e|--encryption aes128|aes192|aes256]\n\
@ -99,7 +100,7 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
Local_arguments ()
{
ARGUMENTS="`getopt --longoptions apt:,apt-ftp-proxy:,apt-http-proxy:,apt-pdiffs:,apt-pipeline:,apt-recommends:,apt-secure:,bootstrap:,cache:,cache-indices:,cache-packages:,cache-stages:,debconf-frontend:,debconf-nowarnings:,debconf-priority:,genisoimage:,initramfs:,losetup:,mode:,root-command:,tasksel:,includes:,templates:,architecture:,bootstrap-config:,bootstrap-flavour:,bootstrap-keyring:,distribution:,mirror-bootstrap:,mirror-bootstrap-security:,mirror-binary:,mirror-binary-security:,sections:,chroot-filesystem:,union-filesystem:,hooks:,interactive:,keyring-packages:,language:,linux-flavours:,linux-packages:,packages:,packages-lists:,tasks:,security:,symlinks:,sysvinit:,binary-images:,binary-indices:,bootappend:,bootloader:,chroot-build:,debian-installer:,encryption:,grub-splash:,hostname:,iso-application:,iso-preparer:,iso-publisher:,iso-volume:,iso-memtest:,net-filesystem:,net-mountoptions:,net-path:,net-server:,syslinux-splash:,syslinux-timeout:,username:,source:,source-images:,breakpoints,conffile:,debug,force,help,quiet,usage,verbose,version --name=${PROGRAM} --options a:f:d:m:l:k:p:b:e:s:c:huv --shell sh -- "${@}"`"
ARGUMENTS="`getopt --longoptions apt:,apt-ftp-proxy:,apt-http-proxy:,apt-pdiffs:,apt-pipeline:,apt-recommends:,apt-secure:,bootstrap:,cache:,cache-indices:,cache-packages:,cache-stages:,debconf-frontend:,debconf-nowarnings:,debconf-priority:,genisoimage:,initramfs:,losetup:,mode:,root-command:,tasksel:,includes:,templates:,architecture:,bootstrap-config:,bootstrap-flavour:,bootstrap-keyring:,distribution:,mirror-bootstrap:,mirror-bootstrap-security:,mirror-binary:,mirror-binary-security:,sections:,chroot-filesystem:,union-filesystem:,hooks:,interactive:,keyring-packages:,language:,linux-flavours:,linux-packages:,packages:,packages-lists:,tasks:,security:,symlinks:,sysvinit:,binary-images:,binary-indices:,bootappend:,bootloader:,chroot-build:,debian-installer:,debian-installer-daily:,encryption:,grub-splash:,hostname:,iso-application:,iso-preparer:,iso-publisher:,iso-volume:,iso-memtest:,net-filesystem:,net-mountoptions:,net-path:,net-server:,syslinux-splash:,syslinux-timeout:,username:,source:,source-images:,breakpoints,conffile:,debug,force,help,quiet,usage,verbose,version --name=${PROGRAM} --options a:f:d:m:l:k:p:b:e:s:c:huv --shell sh -- "${@}"`"
if [ "${?}" != "0" ]
then
@ -411,6 +412,11 @@ Local_arguments ()
shift 2
;;
--debian-installer-daily)
LH_DEBIAN_INSTALLER_DAILY="${2}"
shift 2
;;
-e|--encryption)
LH_ENCRYPTION="${2}"
shift 2
@ -847,6 +853,10 @@ LH_CHROOT_BUILD="${LH_CHROOT_BUILD}"
# (Default: ${LH_DEBIAN_INSTALLER})
LH_DEBIAN_INSTALLER="${LH_DEBIAN_INSTALLER}"
# \$LH_DEBIAN_INSTALLER_DAILY: set daily images
# (Default: ${LH_DEBIAN_INSTALLER_DAILY})
LH_DEBIAN_INSTALLER_DAILY="${LH_DEBIAN_INSTALLER_DAILY}"
# \$LH_ENCRYPTION: set encrytion
# (Default: empty)
LH_ENCRYPTION="${LH_ENCRYPTION}"

View File

@ -5,7 +5,7 @@
# live-helper
cdebootstrap debootstrap
live-helper subversion
live-helper git-core
dosfstools genisoimage mkisofs memtest86+ memtest86 mtools parted genext2fs syslinux grub
# kernel

View File

@ -1,4 +1,4 @@
.TH LH_BINARY 1 "03.09.2007" "1.0~a26" "live\-helper"
.TH LH_BINARY 1 "10.09.2007" "1.0~a27" "live\-helper"
.SH NAME
lh_binary \- Meta\-Helper f\[:u]r lh_binary_*

View File

@ -1,4 +1,4 @@
.TH LH_BINARY 1 "2007\-09\-03" "1.0~a26" "live\-helper"
.TH LH_BINARY 1 "2007\-09\-10" "1.0~a27" "live\-helper"
.SH NAME
lh_binary \- meta\-helper for lh_binary_*

View File

@ -1,4 +1,4 @@
.TH LH_BOOTSTRAP 1 "03.09.2007" "1.0~a26" "live\-helper"
.TH LH_BOOTSTRAP 1 "10.09.2007" "1.0~a27" "live\-helper"
.SH NAME
lh_bootstrap \- Meta\-Helper f\[:u]r lh_bootstrap_*

View File

@ -1,4 +1,4 @@
.TH LH_BOOTSTRAP 1 "2007\-09\-03" "1.0~a26" "live\-helper"
.TH LH_BOOTSTRAP 1 "2007\-09\-10" "1.0~a27" "live\-helper"
.SH NAME
lh_bootstrap \- meta\-helper for lh_bootstrap_*

View File

@ -1,4 +1,4 @@
.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "03.09.2007" "1.0~a26" "live\-helper"
.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "10.09.2007" "1.0~a27" "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\-09\-03" "1.0~a26" "live\-helper"
.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "2007\-09\-10" "1.0~a27" "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 "03.09.2007" "1.0~a26" "live\-helper"
.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "10.09.2007" "1.0~a27" "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\-09\-03" "1.0~a26" "live\-helper"
.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "2007\-09\-10" "1.0~a27" "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 "03.09.2007" "1.0~a26" "live\-helper"
.TH LH_BUILD 1 "10.09.2007" "1.0~a27" "live\-helper"
.SH NAME
lh_build \- erstellen eines Live-Systemes

View File

@ -1,4 +1,4 @@
.TH LH_BUILD 1 "2007\-09\-03" "1.0~a26" "live\-helper"
.TH LH_BUILD 1 "2007\-09\-10" "1.0~a27" "live\-helper"
.SH NAME
lh_build \- building a live system

View File

@ -1,4 +1,4 @@
.TH LH_CHROOT 1 "03.09.2007" "1.0~a26" "live\-helper"
.TH LH_CHROOT 1 "10.09.2007" "1.0~a27" "live\-helper"
.SH NAME
lh_chroot \- Meta\-Helper f\[:u]r lh_chroot_*

View File

@ -1,4 +1,4 @@
.TH LH_CHROOT 1 "2007\-09\-03" "1.0~a26" "live\-helper"
.TH LH_CHROOT 1 "2007\-09\-10" "1.0~a27" "live\-helper"
.SH NAME
lh_chroot \- meta\-helper for lh_chroot_*

View File

@ -1,4 +1,4 @@
.TH LH_CLEAN 1 "03.09.2007" "1.0~a26" "live\-helper"
.TH LH_CLEAN 1 "10.09.2007" "1.0~a27" "live\-helper"
.SH NAME
lh_clean \- r\[:a]umt das Build-Verzeichnis auf

View File

@ -1,4 +1,4 @@
.TH LH_CLEAN 1 "2007\-09\-03" "1.0~a26" "live\-helper"
.TH LH_CLEAN 1 "2007\-09\-10" "1.0~a27" "live\-helper"
.SH NAME
lh_clean \- clean up system build directories

View File

@ -1,4 +1,4 @@
.TH LH_CONFIG 1 "03.09.2007" "1.0~a26" "live\-helper"
.TH LH_CONFIG 1 "10.09.2007" "1.0~a27" "live\-helper"
.SH NAME
lh_config \- erstellt live-helper(7) Konfiguration

View File

@ -1,4 +1,4 @@
.TH LH_CONFIG 1 "2007\-09\-03" "1.0~a26" "live\-helper"
.TH LH_CONFIG 1 "2007\-09\-10" "1.0~a27" "live\-helper"
.SH NAME
lh_config \- create configuration for live-helper(7)

View File

@ -1,4 +1,4 @@
.TH LH_SOURCE 1 "03.09.2007" "1.0~a26" "live\-helper"
.TH LH_SOURCE 1 "10.09.2007" "1.0~a27" "live\-helper"
.SH NAME
lh_source \- Meta\-Helper f\[:u]r lh_source_*

View File

@ -1,4 +1,4 @@
.TH LH_SOURCE 1 "2007\-09\-03" "1.0~a26" "live\-helper"
.TH LH_SOURCE 1 "2007\-09\-10" "1.0~a27" "live\-helper"
.SH NAME
lh_source \- meta\-helper for lh_source_*

View File

@ -1,4 +1,4 @@
.TH LH_TESTROOT 1 "03.09.2007" "1.0~a26" "live\-helper"
.TH LH_TESTROOT 1 "10.09.2007" "1.0~a27" "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\-09\-03" "1.0~a26" "live\-helper"
.TH LH_TESTROOT 1 "2007\-09\-10" "1.0~a27" "live\-helper"
.SH NAME
lh_testroot \- ensure that a system is built as root

View File

@ -1,4 +1,4 @@
.TH LIVE\-HELPER 7 "03.09.2007" "1.0~a26" "live\-helper"
.TH LIVE\-HELPER 7 "10.09.2007" "1.0~a27" "live\-helper"
.SH NAME
live\-helper \- Debian Live Helper-Programme

View File

@ -1,4 +1,4 @@
.TH LIVE\-HELPER 7 "2007\-09\-03" "1.0~a26" "live\-helper"
.TH LIVE\-HELPER 7 "2007\-09\-10" "1.0~a27" "live\-helper"
.SH NAME
live\-helper \- Debian Live helper programs