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

Adding live-helper 1.0~a18-1.

This commit is contained in:
Daniel Baumann 2007-09-23 10:05:14 +02:00
parent ae5c245c5d
commit 615360e7ad
70 changed files with 790 additions and 487 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

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

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
live-helper (1.0~a18-1) unstable; urgency=medium
* New upstream release:
- Dropping transitional package, not needed anymore.
-- Daniel Baumann <daniel@debian.org> Mon, 9 Jul 2007 00:00:00 +0200
live-helper (1.0~a17-1) unstable; urgency=medium live-helper (1.0~a17-1) unstable; urgency=medium
* New upstream release. * New upstream release.

12
debian/control vendored
View File

@ -11,7 +11,7 @@ XS-VCS-Browse: http://svn.debian.org/wsvn/debian-live/dists/trunk/live-helper/
Package: live-helper Package: live-helper
Architecture: all Architecture: all
Depends: cdebootstrap (>= 0.3.15) | debootstrap (>= 0.3.3.2) Depends: cdebootstrap (>= 0.3.15) | debootstrap (>= 0.3.3.2)
Conflicts: live-package (<< 1.0~a13) Conflicts: live-package
Replaces: live-package Replaces: live-package
Provides: make-live Provides: make-live
Description: Debian Live helper programs Description: Debian Live helper programs
@ -25,13 +25,3 @@ Description: Debian Live helper programs
of such a program that uses live-helper is make-live (included here). of such a program that uses live-helper is make-live (included here).
. .
Homepage: <http://debian-live.alioth.debian.org/> Homepage: <http://debian-live.alioth.debian.org/>
Package: live-package
Architecture: all
Depends: live-helper
Description: Debian Live helper programs (transitional package)
Package to ease upgrading from older live-package package to the new
live-helper package.
.
This package can be purged at anytime once the live-helper package has been
installed.

0
debian/postrm vendored Normal file → Executable file
View File

35
docs/BUGS
View File

@ -19,7 +19,8 @@ make-live first bootstraps a basic Debian system with cdebootstrap(1) or
debootstrap(8). Depending on both cdebootstrap/debootstrap and the Debian debootstrap(8). Depending on both cdebootstrap/debootstrap and the Debian
distribution it is bootstrapping, it runs sucessful or not. If a bug appears distribution it is bootstrapping, it runs sucessful or not. If a bug appears
here, check if the error is related to a specific Debian package (most likely), here, check if the error is related to a specific Debian package (most likely),
or if it is related to cdebootstrap/debootstrap itself. or if it is related to cdebootstrap/debootstrap itself. Running lh_bootstrap
with --debug gives you more information.
In both cases, this is not a bug in Debian Live, but rather in Debian itself. We In both cases, this is not a bug in Debian Live, but rather in Debian itself. We
can not fix this directly. Instead, report such a bug against the cdebootstrap can not fix this directly. Instead, report such a bug against the cdebootstrap
@ -36,16 +37,42 @@ If this is the case, this is not a bug in Debian Live, but rather in Debian
again. Report it against the failing package. again. Report it against the failing package.
...at boot time?
If your image does not boot, please report it to the mailing list together with
the information requested in 2. Do not forget to mention, how/when the image
failed, in qemu, vmware or real hardware. If you are using a virtualization
technology of any kind, do always run it on real hardware before reporting a
bug. Nevertheless, providing a screenshot of the failure is also very helpfull.
...at run time? ...at run time?
If a package was successfully installed, but fails while actually running the If a package was successfully installed, but fails while actually running the
Live system, this is probably a bug in Debian Live. Live system, this is probably a bug in Debian Live and you are welcome to report
it to us.
2. Where to send the bug report? 2. Where to send the bug report?
-------------------------------- --------------------------------
Report error logs of build time errors to live-helper and run time errors to Report error logs of build time errors to live-helper and run time errors to
casper in the Debian Bug Tracking System. If you are unsure or need more help live-initramfs in the Debian Bug Tracking System. If you are unsure or need more
before submitting a bug report, you can always send a message to help before submitting a bug report, you can always send a message to
<debian-devel-live@lists.alioth.debian.org>. We will help you to figure it out. <debian-devel-live@lists.alioth.debian.org>. We will help you to figure it out.
To make the most out of your bug report, we require at least the following
information:
* Architecture of the host system
* Version of live-helper on the host system
* Version of live-initramfs on the live system
* Version of cdebootstrap and/or debootstrap on the host system
* Architecture of the live system
* Distribution of the live system
* Version of the kernel on the live system
Additionally, to rule out other errors, it is always a good idea to tar up your
config directory and upload it somewhere (do *NOT* send it as an attachment to
the mailinglist), so that we can try to reproduce the errors you encountered.

96
docs/ChangeLog
View File

@ -1,3 +1,99 @@
2007-07-12 Daniel Baumann <daniel@debian.org>
* helpers/lh_binary_grub, lh_binary_syslinux:
- Also respect local menu.lst and syslinux.cfg.
* helpers/lh_binary_syslinux:
- Cleaned up netboot specific parts as suggested by
Vladimir Stavrinov <vs@inist.ru>.
* helpers/lh_binary_linux-image:
- Skip vmlinuz/initrd symlinks.
* helpers/lh_chroot_hacks:
- Setting correct permissions user home directory in case of includes.
* helpers/make-live:
- Fixed typo in variable name.
* lists/rescue:
- Added aide and tripwire.
2007-07-09 Chris Lamb <chris@chris-lamb.co.uk>
* functions/chroot.sh, functions/defaults.sh:
- Altered LH_DEBCONF_NOWARNINGS so that it accepts "enabled/disabled"
as well as "yes/no" for consistency.
2007-07-09 Daniel Baumann <daniel@debian.org>
* functions/architecture.sh, helpers/lh_binary_debian-installer,
lh_binary_grub, lh_binary_linux-image, lh_binary_memtest,
lh_binary_syslinux, lh_binary_yaboot:
- Simplified multi-arch checks/overrides.
* helpers/lh_binary_grub, lh_binary_syslinux, lh_binary_yaboot:
- Added priority=critical for auto/autogui boot labels.
2007-07-07 Daniel Baumann <daniel@debian.org>
* helpers/lh_binary_chroot:
- Going back to full copy instead of hardlinks.
* helpers/lh_binary_debian-installer:
- Added architectures for daily images.
* helpers/lh_binary_grub:
- Refactored.
* helpers/lh_binary_grub, lh_binary_syslinux, lh_binary_yaboot:
- Added 'quiet' for everything newer than etch.
* helpers/lh_binary_hacks:
- Merged into lh_binary_includes.
* helpers/lh_chroot_hacks:
- Added removal of some build-system influenced files.
- Cleaned up a bit.
* helpers/lh_chroot_localization:
- Fixed typo.
- Added k3b and gwenview.
* helpers/lh_chroot_sysvrc:
- Renamed to lh_chroot_sysv-rc.
* hooks/mini, minimal:
- Using apt-get autoremove.
* lists/devel-live:
- Added.
2007-07-06 Otavio Salvador <otavio@debian.org>
* helpers/lh_binary_rootfs:
- Fix parameters to allow the removal of kernels inside of
squashfs.
2007-07-05 Otavio Salvador <otavio@debian.org>
* helpers/lh_binary_rootfs:
- Fix inverted logic error to detect when exclude the kernel
from the squashfs image.
2007-07-04 Otavio Salvador <otavio@debian.org>
* helpers/lh_binary_hacks:
- Do not fail if binary/parameters.txt.${LH_INITRAMFS} doesn't
exists.
* hooks/mini, hooks/minimal:
- Do not fail if the package isn't installed.
2007-07-04 Daniel Baumann <daniel@debian.org>
* functions/defaults.sh:
- Added architecture handling to mirror defaults.
* helpers/lh_binary_hacks,
includes/includes/sid/live/parameters.txt.casper,
parameters.txt.live-initramfs:
- Added.
2007-07-02 Otavio Salvador <otavio@debian.org>
* helpers/lh_binary_syslinux:
- Fix paths for kernel and initrd image loading.
2007-07-02 Daniel Baumann <daniel@debian.org>
* helpers/lh_binary_grub:
- Also respect splash.xpm and not just splash.xpm.gz as local grub
splash images.
2007-07-01 Daniel Baumann <daniel@debian.org> 2007-07-01 Daniel Baumann <daniel@debian.org>
* helpers/lh_binary_debian-installer: * helpers/lh_binary_debian-installer:

2
examples/cron/etch.sh
View File

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

2
examples/cron/snapshots.sh
View File

@ -13,7 +13,7 @@ NAME="Debian Live Autobuilder"
export DEBEMAIL EMAIL DEBFULLNAME NAME export DEBEMAIL EMAIL DEBFULLNAME NAME
TEMPDIR="/srv/tmp/svn-snapshots" TEMPDIR="/srv/tmp/svn-snapshots"
SERVER="/srv/debian-unofficial/ftp/debian-live/debian-snapshots" SERVER="/srv/debian-unofficial/ftp/debian-live-snapshots"
DATE_START="`date -R`" DATE_START="`date -R`"

5
examples/hooks/qemu-launcher.sh
View File

@ -6,4 +6,9 @@
# To enable it, copy this hook into your config/binary_local-hooks directory. # To enable it, copy this hook into your config/binary_local-hooks directory.
cd binary cd binary
wget http://www.klabs.be/~fpiat/projects/autorun4linuxCD/autorun4linuxCD.tar.gz wget http://www.klabs.be/~fpiat/projects/autorun4linuxCD/autorun4linuxCD.tar.gz
tar xfz autorun4linuxCD.tar.gz
rm -f autorun4linuxCD.tar.gz
cd "${OLDPWD}"

35
functions/architecture.sh
View File

@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
# architecture.sh - handle architecture specific support # architecture.sh - handle architecture specific support
# Copyright (C) 2007 Otavio Salvador <otavio@debian.org> # Copyright (C) 2006-2007 Daniel Baumann <daniel@debian.org>
# #
# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING. # live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
# This is free software, and you are welcome to redistribute it # This is free software, and you are welcome to redistribute it
@ -16,7 +16,7 @@ Check_architecture ()
for ARCHITECTURE in ${ARCHITECTURES} for ARCHITECTURE in ${ARCHITECTURES}
do do
if [ "${ARCHITECTURE}" = "${LIVE_ARCHITECTURE}" ] if [ "`echo ${LIVE_ARCHITECTURE} | grep ${ARCHITECTURE}`" ]
then then
VALID="true" VALID="true"
break break
@ -29,3 +29,34 @@ Check_architecture ()
exit 0 exit 0
fi fi
} }
Check_multiarchitecture ()
{
if [ "`echo ${LIVE_ARCHITECTURE} | wc -w`" -gt "1" ]
then
# First, only support multiarch on iso
if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
then
# Assemble multi-arch
case "${LIVE_CURRENT_ARCHITECTURE}" in
amd64)
DESTDIR="${DESTDIR}.amd"
DESTDIR_LIVE="${DESTDIR_LIVE}.amd"
DESTDIR_INSTALL="${DESTDIR_INSTALL}.amd"
;;
i386)
DESTDIR="${DESTDIR}.386"
DESTDIR_LIVE="${DESTDIR_LIVE}.386"
DESTDIR_INSTALL="${DESTDIR_INSTALL}.386"
;;
powerpc)
DESTDIR="${DESTDIR}.ppc"
DESTDIR_LIVE="${DESTDIR_LIVE}.ppc"
DESTDIR_INSTALL="${DESTDIR_INSTALL}.ppc"
;;
esac
fi
fi
}

2
functions/common.sh
View File

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

92
functions/defaults.sh
View File

@ -131,6 +131,16 @@ Set_defaults ()
LH_DEBCONF_NOWARNINGS="${LH_DEBCONF_NOWARNINGS:-yes}" LH_DEBCONF_NOWARNINGS="${LH_DEBCONF_NOWARNINGS:-yes}"
LH_DEBCONF_PRIORITY="${LH_DEBCONF_PRIORITY:-critical}" LH_DEBCONF_PRIORITY="${LH_DEBCONF_PRIORITY:-critical}"
case "${LH_DEBCONF_NOWARNINGS}" in
enabled)
LH_DEBCONF_NOWARNINGS="yes"
;;
disabled)
LH_DEBCONF_NOWARNINGS="no"
;;
esac
# Setting genisoimage # Setting genisoimage
if [ -z "${LH_GENISOIMAGE}" ] if [ -z "${LH_GENISOIMAGE}" ]
then then
@ -248,11 +258,32 @@ Set_defaults ()
then then
case "${LH_MODE}" in case "${LH_MODE}" in
debian) debian)
LIVE_MIRROR_BOOTSTRAP="http://ftp.debian.org/debian/" case "${LIVE_ARCHITECTURE}" in
amd64|i386)
LIVE_MIRROR_BOOTSTRAP="http://ftp.debian.org/debian/"
;;
*)
LIVE_MIRROR_BOOTSTRAP="http://ftp.de.debian.org/debian/"
;;
esac
;; ;;
ubuntu) ubuntu)
LIVE_MIRROR_BOOTSTRAP="http://archive.ubuntu.com/ubuntu/" case "${LIVE_ARCHITECTURE}" in
amd64|i386|powerpc|sparc)
LIVE_MIRROR_BOOTSTRAP="http://archive.ubuntu.com/ubuntu/"
;;
hppa|ia64)
LIVE_MIRROR_BOOTSTRAP="http://ports.ubuntu.com/"
;;
*)
Echo_error "There is no port of Ubuntu available for your architecture."
exit 1
;;
esac
;; ;;
esac esac
fi fi
@ -266,7 +297,19 @@ Set_defaults ()
;; ;;
ubuntu) ubuntu)
LIVE_MIRROR_BOOTSTRAP_SECURITY="http://security.ubuntu.org/ubuntu/" case "${LIVE_ARCHITECTURE}" in
amd64|i386|powerpc|sparc)
LIVE_MIRROR_BOOTSTRAP_SECURITY="http://archive.ubuntu.com/ubuntu/"
;;
hppa|ia64)
LIVE_MIRROR_BOOTSTRAP_SECURITY="http://ports.ubuntu.com/"
;;
*)
LIVE_MIRROR_BOOTSTRAP_SECURITY="none"
;;
esac
;; ;;
esac esac
fi fi
@ -276,11 +319,32 @@ Set_defaults ()
then then
case "${LH_MODE}" in case "${LH_MODE}" in
debian) debian)
LIVE_MIRROR_BINARY="http://ftp.debian.org/debian/" case "${LIVE_ARCHITECTURE}" in
amd64|i386)
LIVE_MIRROR_BINARY="http://ftp.debian.org/debian/"
;;
*)
LIVE_MIRROR_BINARY="http://ftp.de.debian.org/debian/"
;;
esac
;; ;;
ubuntu) ubuntu)
LIVE_MIRROR_BINARY="http://archive.ubuntu.com/ubuntu/" case "${LIVE_ARCHITECTURE}" in
amd64|i386|powerpc|sparc)
LIVE_MIRROR_BINARY="http://archive.ubuntu.com/ubuntu/"
;;
hppa|ia64)
LIVE_MIRROR_BINARY="http://ports.ubuntu.com/"
;;
*)
Echo_error "There is no port of Ubuntu available for your architecture."
exit 1
;;
esac
;; ;;
esac esac
fi fi
@ -294,7 +358,15 @@ Set_defaults ()
;; ;;
ubuntu) ubuntu)
LIVE_MIRROR_BINARY_SECURITY="http://security.ubuntu.com/ubuntu/" case "${LIVE_ARCHITECTURE}" in
amd64|i386|powerpc|sparc)
LIVE_MIRROR_BINARY_SECURITY="http://security.ubuntu.com/ubuntu/"
;;
*)
LIVE_MIRROR_BINARY_SECURITY="none"
;;
esac
;; ;;
esac esac
fi fi
@ -474,6 +546,11 @@ Set_defaults ()
# LIVE_TASKS # LIVE_TASKS
# Setting security updates option # Setting security updates option
if [ "${LIVE_MIRROR_BOOTSTRAP_SECURITY}" = "none" ] || [ "${LIVE_MIRROR_BINARY_SECURITY}" = "none" ]
then
LIVE_SECURITY="disabled"
fi
LIVE_SECURITY="${LIVE_SECURITY:-enabled}" LIVE_SECURITY="${LIVE_SECURITY:-enabled}"
# Setting symlink convertion option # Setting symlink convertion option
@ -567,6 +644,9 @@ Set_defaults ()
# Setting memtest option # Setting memtest option
LIVE_MEMTEST="${LIVE_MEMTEST:-memtest86+}" LIVE_MEMTEST="${LIVE_MEMTEST:-memtest86+}"
# Setting netboot filesystem
LIVE_NET_FILESYSTEM="${LIVE_NET_FILESYSTEM:-nfs}"
# Setting netboot server path # Setting netboot server path
if [ -z "${LIVE_NET_PATH}" ] if [ -z "${LIVE_NET_PATH}" ]
then then

0
functions/packagelists.sh → functions/packagelist.sh
View File

2
functions/releases.sh
View File

@ -11,7 +11,7 @@ set -e
# Debian releases # Debian releases
VERSION_etch="4.0 r0" VERSION_etch="4.0 r0"
VERSION_lenny="prereleased" VERSION_lenny="prerelease"
VERSION_sid="unreleased" VERSION_sid="unreleased"
# Ubuntu releases # Ubuntu releases

2
functions/templates.sh
View File

@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
# templates.sh - handle templates files # templates.sh - handle templates files
# Copyright (C) 2007 Otavio Salvador <otavio@debian.org> # Copyright (C) 2006-2007 Daniel Baumann <daniel@debian.org>
# #
# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING. # live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
# This is free software, and you are welcome to redistribute it # This is free software, and you are welcome to redistribute it

1
helpers/lh_binary
View File

@ -51,7 +51,6 @@ lh_binary_disk ${*}
lh_binary_includes ${*} lh_binary_includes ${*}
lh_binary_local-includes ${*} lh_binary_local-includes ${*}
lh_binary_local-hooks ${*} lh_binary_local-hooks ${*}
lh_binary_hacks ${*}
lh_binary_md5sum ${*} lh_binary_md5sum ${*}
# Building images # Building images

7
helpers/lh_binary_chroot
View File

@ -63,7 +63,12 @@ ${LH_ROOT_COMMAND} rm -rf chroot/chroot
${LH_ROOT_COMMAND} rm -rf chroot.tmp ${LH_ROOT_COMMAND} rm -rf chroot.tmp
# Copying new chroot # Copying new chroot
${LH_ROOT_COMMAND} cp -al chroot chroot.tmp #if [ "${LIVE_BINARY_INDICES}" = "enabled" ]
#then
${LH_ROOT_COMMAND} cp -a chroot chroot.tmp
#else
# ${LH_ROOT_COMMAND} cp -al chroot chroot.tmp
#fi
${LH_ROOT_COMMAND} mv chroot.tmp chroot/chroot ${LH_ROOT_COMMAND} mv chroot.tmp chroot/chroot
if [ -n "${LH_ROOT_COMMAND}" ] if [ -n "${LH_ROOT_COMMAND}" ]

112
helpers/lh_binary_debian-installer
View File

@ -34,7 +34,7 @@ Set_defaults
# Setting remote d-i directories # Setting remote d-i directories
case "${LIVE_DEBIAN_INSTALLER}" in case "${LIVE_DEBIAN_INSTALLER}" in
netinst) netboot)
DI="netboot/debian-installer/i386" DI="netboot/debian-installer/i386"
DI_GTK="netboot/gtk/debian-installer/i386" DI_GTK="netboot/gtk/debian-installer/i386"
DI_KERNEL="linux" DI_KERNEL="linux"
@ -95,27 +95,7 @@ case "${LIVE_BINARY_IMAGES}" in
;; ;;
esac esac
# Temporary check for broken syslinux Check_multiarchitecture
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" VMLINUZ_DI="vmlinuz"
INITRD_DI="initrd.gz" INITRD_DI="initrd.gz"
@ -140,22 +120,69 @@ then
fi fi
fi fi
# Debian Installer daily builds
case "${LIVE_ARCHITECTURE}" in
alpha)
URL="http://people.debian.org/~vorlon/d-i/alpha/daily/"
;;
amd64)
URL="http://people.debian.org/~aba/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/"
;;
i386)
URL="http://people.debian.org/~joeyh/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/"
;;
mips)
URL="http://people.debian.org/~ths/d-i/mips/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/"
;;
s390)
URL="http://lophos.multibuild.org/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
# Downloading debian-installer # Downloading debian-installer
mkdir -p "${DESTDIR_DI}" mkdir -p "${DESTDIR_DI}"
if [ "${LIVE_DISTRIBUTION}" = "sid" ] # FIXME arch if [ "${LIVE_DISTRIBUTION}" = "sid" ]
then then
case "${LIVE_ARCHITECTURE}" in wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_DI}" ${URL}/${DI}/${DI_KERNEL}
amd64) wget --no-clobber -O "${DESTDIR}"/"${INITRD_DI}" ${URL}/${DI}/initrd.gz
wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_DI}" http://people.debian.org/~aba/d-i/images/daily/${DI}/${DI_KERNEL}
wget --no-clobber -O "${DESTDIR}"/"${INITRD_DI}" http://people.debian.org/~aba/d-i/images/daily/${DI}/initrd.gz
;;
i386)
wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_DI}" http://people.debian.org/~joeyh/d-i/images/daily/${DI}/${DI_KERNEL}
wget --no-clobber -O "${DESTDIR}"/"${INITRD_DI}" http://people.debian.org/~joeyh/d-i/images/daily/${DI}/initrd.gz
;;
esac
else else
wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_DI}" "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DI}"/"${DI_KERNEL}" wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_DI}" "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DI}"/"${DI_KERNEL}"
wget --no-clobber -O "${DESTDIR}"/"${INITRD_DI}" "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DI}"/initrd.gz wget --no-clobber -O "${DESTDIR}"/"${INITRD_DI}" "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DI}"/initrd.gz
@ -166,26 +193,17 @@ if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] |
then then
mkdir -p "${DESTDIR_GI}" mkdir -p "${DESTDIR_GI}"
if [ "${LIVE_DISTRIBUTION}" = "sid" ] # FIXME arch if [ "${LIVE_DISTRIBUTION}" = "sid" ]
then then
case "${LIVE_ARCHITECTURE}" in wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_GI}" ${URL}/${DI_GTK}/${DI_KERNEL}
amd64) wget --no-clobber -O "${DESTDIR}"/"${INITRD_GI}" ${URL}/${DI_GTK}/initrd.gz
wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_GI}" http://people.debian.org/~aba/d-i/images/daily/${DI_GTK}/${DI_KERNEL}
wget --no-clobber -O "${DESTDIR}"/"${INITRD_GI}" http://people.debian.org/~aba/d-i/images/daily/${DI_GTK}/initrd.gz
;;
i386)
wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_GI}" http://people.debian.org/~joeyh/d-i/images/daily/${DI_GTK}/${DI_KERNEL}
wget --no-clobber -O "${DESTDIR}"/"${INITRD_GI}" http://people.debian.org/~joeyh/d-i/images/daily/${DI_GTK}/initrd.gz
;;
esac
else else
wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_GI}" "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DI_GTK}"/"${DI_KERNEL}" wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_GI}" "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DI_GTK}"/"${DI_KERNEL}"
wget --no-clobber -O "${DESTDIR}"/"${INITRD_GI}" "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DI_GTK}"/initrd.gz 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
fi fi
if [ "${LIVE_DEBIAN_INSTALLER}" != "netinst" ]; then if [ "${LIVE_DEBIAN_INSTALLER}" != "netboot" ]; then
# Downloading additional packages # Downloading additional packages
mkdir -p chroot/binary.deb/archives/partial mkdir -p chroot/binary.deb/archives/partial
mv chroot/var/lib/dpkg/status chroot/var/lib/dpkg/status.tmp mv chroot/var/lib/dpkg/status chroot/var/lib/dpkg/status.tmp

142
helpers/lh_binary_grub
View File

@ -63,6 +63,36 @@ Check_package chroot/usr/sbin/grub grub
# Installing depends # Installing depends
Install_package Install_package
# Local functions
Grub_live_entry ()
{
LABEL="${1}"
KERNEL="${2}"
INITRD="${3}"
APPEND="${4}"
LINUX_LIVE="${LINUX_LIVE}\ntitle\t\tDebian GNU/Linux - ${LABEL}"
LINUX_LIVE="${LINUX_LIVE}\nkernel\t\t/${KERNEL} boot=${INITFS} LIVE_BOOTAPPEND ${APPEND}"
LINUX_LIVE="${LINUX_LIVE}\ninitrd\t\t/${INITRD}"
}
Grub_install_entry ()
{
LABEL="${1}"
KERNEL="${2}"
INITRD="${3}"
APPEND="${4}"
if [ "${LIVE_DISTRIBUTION}" != "etch" ] && [ "${LABEL}" != "rescue" ] && [ "${LABEL}" != "rescuegui" ]
then
APPEND="${APPEND} quiet"
fi
LINUX_INSTALL="${LINUX_INSTALL}\ntitle\t\tDebian GNU/Linux - ${LABEL}"
LINUX_INSTALL="${LINUX_INSTALL}\nkernel\t\t/${KERNEL} ${APPEND} --"
LINUX_INSTALL="${LINUX_INSTALL}\ninitrd\t\t/${INITRD}"
}
case "${LH_INITRAMFS}" in case "${LH_INITRAMFS}" in
casper) casper)
INITFS="casper" INITFS="casper"
@ -95,25 +125,7 @@ case "${LIVE_BINARY_IMAGES}" in
;; ;;
esac esac
# Temporary check for broken syslinux Check_multiarchitecture
if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
then
# Assemble multi-arch
if [ -n "${MULTIARCH}" ]
then
case "${LIVE_ARCHITECTURE}" in
amd64)
DESTDIR_LIVE="${DESTDIR_LIVE}.amd"
DESTDIR_INSTALL="${DESTDIR_INSTALL}.amd"
;;
i386)
DESTDIR_LIVE="${DESTDIR_LIVE}.386"
DESTDIR_INSTALL="${DESTDIR_INSTALL}.386"
;;
esac
fi
fi
# Creating directory # Creating directory
mkdir -p "${DESTDIR_LIVE}" mkdir -p "${DESTDIR_LIVE}"
@ -150,7 +162,7 @@ then
live-initramfs) live-initramfs)
if [ "${LIVE_HOSTNAME}" != "debian" ] if [ "${LIVE_HOSTNAME}" != "debian" ]
then then
LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} username=${LIVE_HOSTNAME}" LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} hostname=${LIVE_HOSTNAME}"
fi fi
;; ;;
esac esac
@ -167,51 +179,56 @@ LIVE_BOOTAPPEND="`echo ${LIVE_BOOTAPPEND} | sed -e 's/ //'`"
FAILSAFE="noapic noapm nodma nomce nolapic nosmp vga=normal" FAILSAFE="noapic noapm nodma nomce nolapic nosmp vga=normal"
# Assembling kernel configuration # Assembling kernel configuration
# Default entries
DEFAULT_FLAVOUR="`echo ${LIVE_LINUX_FLAVOURS} | awk '{ print $1 }'`" DEFAULT_FLAVOUR="`echo ${LIVE_LINUX_FLAVOURS} | awk '{ print $1 }'`"
DEFAULT_KERNEL="`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`"
DEFAULT_INITRD="initrd.img-`echo ${DEFAULT_KERNEL} | sed -e 's/vmlinuz-//'`"
LINUX="title\t\tDebian GNU/Linux - live\nkernel\t\t/`basename ${DESTDIR_LIVE}`/`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}` boot=${INITFS} LIVE_BOOTAPPEND\ninitrd\t\t/`basename ${DESTDIR_LIVE}`/initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'`" Grub_live_entry "live" "${DEFAULT_KERNEL}" "${DEFAULT_INITRD}"
LINUX="${LINUX}\n\ntitle\t\tDebian GNU/Linux - live (fail-safe mode)\nkernel\t\t/`basename ${DESTDIR_LIVE}`/`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}\ninitrd\t\t/`basename ${DESTDIR_LIVE}`/initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'`" Grub_live_entry "live (fail-safe mode)" "${DEFAULT_KERNEL}" "${DEFAULT_INITRD}" "${FAILSAFE}"
if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ] for KERNEL in chroot/boot/vmlinuz-*
then do
for KERNEL in chroot/boot/vmlinuz* VERSION="`basename ${KERNEL} | sed -e 's/vmlinuz-//'`"
do
if [ -z "${LINUX}" ]
then
LINUX="title\t\tDebian GNU/Linux - live, kernel `basename ${KERNEL} | sed -e 's/vmlinuz-//'`\nkernel\t\t/`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}` boot=${INITFS} LIVE_BOOTAPPEND\ninitrd\t\t/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`"
LINUX="${LINUX}\n\ntitle\t\tDebian GNU/Linux - live, kernel `basename ${KERNEL} | sed -e 's/vmlinuz-//'` (fail-safe mode)\nkernel\t\t/`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}\ninitrd\t\t/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`"
else
LINUX="${LINUX}\n\ntitle\t\tDebian GNU/Linux - live, kernel `basename ${KERNEL} | sed -e 's/vmlinuz-//'`\nkernel /`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}` boot=${INITFS} LIVE_BOOTAPPEND\ninitrd\t\t/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`"
LINUX="${LINUX}\n\ntitle\t\tDebian GNU/Linux - live, kernel `basename ${KERNEL} | sed -e 's/vmlinuz-//'` (fail-safe mode)\nkernel /`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}\ninitrd\t\t/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`"
fi
done
fi
LINUX="`echo ${LINUX} | sed -e 's#//#/#g'`" Grub_live_entry "live, kernel ${VERSION}" "`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}`" "`basename ${DESTDIR_LIVE}`/initrd.img-${VERSION}"
Grub_live_entry "live, kernel ${VERSION} (fail-safe mode)" "`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}`" "`basename ${DESTDIR_LIVE}`/initrd.img-${VERSION}" "${FAILSAFE}"
done
LINUX_LIVE="`echo ${LINUX_LIVE} | sed -e 's/binary//g' -e 's#//#/#g'`"
# Assembling debian-installer configuration # Assembling debian-installer configuration
if [ "${LIVE_DEBIAN_INSTALLER}" != "disabled" ] if [ "${LIVE_DEBIAN_INSTALLER}" != "disabled" ]
then then
LINUX="title\t\tLive:\nroot\n\n${LINUX}" LINUX_LIVE="title\t\tLive:\nroot\n\n${LINUX_LIVE}"
LINUX_INSTALL="title\t\tInstaller:\nroot"
LIVE_LINUX_INSTALL="title\t\tInstaller:\nroot" VMLINUZ_DI="vmlinuz"
LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - install\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz vga=normal --\ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/initrd.gz" INITRD_DI="initrd.gz"
LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - installgui\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz video=vesa:ywrap,mtrr vga=788 --\ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz" APPEND_DI="vga=normal"
LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - expert\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz priority=low vga=normal --\ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/initrd.gz" VMLINUZ_GI="gtk/vmlinuz"
LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - expertgui\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz priority=low video=vesa:ywrap,mtrr vga=788\ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz" INITRD_GI="gtk/initrd.gz"
APPEND_GI="video=vesa:ywrap,mtrr vga=788"
LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - rescue\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz vga=normal rescue/enable=true --\ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/initrd.gz" Grub_install_entry "install" "${VMLINUZ_DI}" "${INITRD_DI}" "${APPEND_DI}"
LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - rescuegui\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz video=vesa:ywrap,mtrr vga=788 rescue/enable=true --\ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz" Grub_install_entry "installgui" "${VMLINUZ_GI}" "${INITRD_GI}" "${APPEND_GI}"
Grub_install_entry "expert" "${VMLINUZ_DI}" "${INITRD_DI}" "priority=low ${APPEND_DI}"
LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - auto\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz auto=true priority=critical vga=normal --\ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/initrd.gz" Grub_install_entry "expertgui" "${VMLINUZ_GI}" "${INITRD_GI}" "priority=low ${APPEND_GI}"
LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - autogui\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz auto=true priority=critical video=vesa:ywrap,mtrr vga=788 --\ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz" Grub_install_entry "rescue" "${VMLINUZ_DI}" "${INITRD_DI}" "rescue/enable=true ${APPEND_DI}"
Grub_install_entry "rescuegui" "${VMLINUZ_GI}" "${INITRD_GI}" "rescue/enable=true ${APPEND_GI}"
Grub_install_entry "auto" "${VMLINUZ_DI}" "${INITRD_DI}" "auto=true priority=critical ${APPEND_DI}"
Grub_install_entry "autogui" "${VMLINUZ_GI}" "${INITRD_GI}" "auto=true priority=critical ${APPEND_GI}"
fi fi
LINUX_INSTALL="`echo ${LINUX_INSTALL} | sed -e 's/binary//g' -e 's#//#/#g'`"
# Assembling memtest configuration # Assembling memtest configuration
if [ -f "${DESTDIR_LIVE}"/memtest ] if [ -f "${DESTDIR_LIVE}"/memtest ]
then then
MEMTEST="title\t\t${LIVE_MEMTEST}\nkernel\t\t/`basename ${DESTDIR_LIVE}`/memtest" MEMTEST="title\t\tOther:\nroot"
MEMTEST="${MEMTEST}\n\ntitle\t\t${LIVE_MEMTEST}\nkernel\t\t/`basename ${DESTDIR_LIVE}`/memtest"
MEMTEST="`echo ${MEMTEST} | sed -e 's#//#/#g'`" MEMTEST="`echo ${MEMTEST} | sed -e 's#//#/#g'`"
fi fi
@ -219,7 +236,7 @@ fi
mkdir -p binary/boot/grub mkdir -p binary/boot/grub
cp -r "${LIVE_TEMPLATES}"/grub/* binary/boot/grub cp -r "${LIVE_TEMPLATES}"/grub/* binary/boot/grub
# Copyring grub # Copying grub
case ${LIVE_BINARY_IMAGES} in case ${LIVE_BINARY_IMAGES} in
iso) iso)
cp chroot/usr/lib/grub/*/stage2_eltorito binary/boot/grub cp chroot/usr/lib/grub/*/stage2_eltorito binary/boot/grub
@ -230,10 +247,19 @@ case ${LIVE_BINARY_IMAGES} in
;; ;;
esac esac
# Copying local configuration file
if [ -f config/binary_grub/menu.lst ]
then
cp config/binary_grub/menu.lst binary/boot/grub/menu.lst
fi
# Copying splash screen # Copying splash screen
if [ -f config/binary_grub/splash.xpm.gz ] if [ -f config/binary_grub/splash.xpm.gz ]
then then
LIVE_GRUB_SPLASH="config/binary_grub/splash.xpm.gz" LIVE_GRUB_SPLASH="config/binary_grub/splash.xpm.gz"
elif [ -f config/binary_grub/splash.xpm ]
then
LIVE_GRUB_SPLASH="config/binary_grub/splash.xpm"
fi fi
if [ -n "${LIVE_GRUB_SPLASH}" ] if [ -n "${LIVE_GRUB_SPLASH}" ]
@ -247,22 +273,16 @@ then
sed -i -e "s/splashimage.*//" binary/boot/grub/menu.lst sed -i -e "s/splashimage.*//" binary/boot/grub/menu.lst
else else
# Overwriting splash file # Overwriting splash file
cp -f "${LIVE_GRUB_SPLASH}" binary/boot/grub/splash.xpm.gz cp -f "${LIVE_GRUB_SPLASH}" binary/boot/grub
sed -i -e "s#splashimage.*#splashimage /boot/grub/`basename ${LIVE_GRUB_SPLASH}`#" binary/boot/grub/menu.lst
fi fi
fi fi
# Configure grub templates sed -i -e "s#LINUX_LIVE#${LINUX_LIVE}#" -e "s#LINUX_INSTALL#${LINUX_INSTALL}#" -e "s#MEMTEST#${MEMTEST}#" binary/boot/grub/menu.lst
cat >> binary/boot/grub/menu.lst << EOF
title Other:
root
LIVE_MEMTEST
EOF
sed -i -e "s#LIVE_LINUX_LIVE#${LINUX}#" -e "s#LIVE_LINUX_INSTALL#${LIVE_LINUX_INSTALL}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" binary/boot/grub/menu.lst
sed -i -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" binary/boot/grub/menu.lst sed -i -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" binary/boot/grub/menu.lst
sed -i -e 's/\ $//g' binary/boot/grub/menu.lst
# Removing depends # Removing depends
Remove_package Remove_package

56
helpers/lh_binary_hacks
View File

@ -1,56 +0,0 @@
#!/bin/sh
# lh_binary_hacks(1) - execute hacks in 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="execute hacks in 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
Echo_message "Begin executing hacks..."
# Requiring stage file
Require_stagefile .stage/bootstrap
# Checking stage file
Check_stagefile .stage/binary_hacks
# Checking lock file
Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
# Removing live-initramfs docs
if [ "${LH_INITRAMFS}" = "casper" ]
then
rm -f binary/parameters.txt
fi
# Creating stage file
Create_stagefile .stage/binary_hacks

9
helpers/lh_binary_includes
View File

@ -116,7 +116,6 @@ then
cp -r ${CP_OPTIONS} "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/live."${ARCH}"/* binary cp -r ${CP_OPTIONS} "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/live."${ARCH}"/* binary
fi fi
if [ "${LIVE_DEBIAN_INSTALLER}" != "disabled" ] if [ "${LIVE_DEBIAN_INSTALLER}" != "disabled" ]
then then
# Copying install templates # Copying install templates
@ -161,5 +160,13 @@ then
sed -i -e "s#DEBIAN_NAME#${DEBIAN_NAME}#g" -e "s/DEBIAN_DATE/${DEBIAN_DATE}/g" -e "s#DEBIAN_TOOLS#${DEBIAN_TOOLS_TXT}#g" binary/README.txt sed -i -e "s#DEBIAN_NAME#${DEBIAN_NAME}#g" -e "s/DEBIAN_DATE/${DEBIAN_DATE}/g" -e "s#DEBIAN_TOOLS#${DEBIAN_TOOLS_TXT}#g" binary/README.txt
fi fi
# Cleaning up includes
if [ -e binary/parameters.txt.${LH_INITRAMFS} ]
then
mv binary/parameters.txt.${LH_INITRAMFS} binary/parameters.txt
fi
rm -f binary/parameters.txt.*
# Creating stage file # Creating stage file
Create_stagefile .stage/binary_includes Create_stagefile .stage/binary_includes

2
helpers/lh_binary_iso
View File

@ -114,7 +114,7 @@ case "${LIVE_BOOTLOADER}" in
;; ;;
yaboot) yaboot)
GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} --iso-level 2 --netatalk -hfs -probe -map yaboot/hfs.map --chrp-boot -part -no-desktop -hfs-bless binary/yaboot -hfs-volid Debian/Live_powerpc" GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -r --iso-level 2 --netatalk -hfs -probe -map binary/yaboot/hfs.map --chrp-boot -part -no-desktop -hfs-bless binary/yaboot -hfs-volid Debian/Live_powerpc"
if [ "${LIVE_PACKAGES_LISTS}" = "mini" ] || [ "${LIVE_PACKAGES_LISTS}" = "minimal" ] if [ "${LIVE_PACKAGES_LISTS}" = "mini" ] || [ "${LIVE_PACKAGES_LISTS}" = "minimal" ]
then then

29
helpers/lh_binary_linux-image
View File

@ -46,9 +46,6 @@ Check_lockfile .lock
# Creating lock file # Creating lock file
Create_lockfile .lock Create_lockfile .lock
# Removing initrd backup files
rm -f chroot/boot/initrd*bak*
# Setting destination directory # Setting destination directory
case "${LIVE_BINARY_IMAGES}" in case "${LIVE_BINARY_IMAGES}" in
iso) iso)
@ -92,34 +89,14 @@ case "${LIVE_ARCHITECTURE}" in
;; ;;
esac esac
# Temporary check for broken syslinux Check_multiarchitecture
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
# Creating directory # Creating directory
mkdir -p "${DESTDIR}" mkdir -p "${DESTDIR}"
# Installing linux-image # Installing linux-image
cp chroot/boot/"${LINUX}"* "${DESTDIR}" cp chroot/boot/"${LINUX}"-* "${DESTDIR}"
cp chroot/boot/initrd.img* "${DESTDIR}" cp chroot/boot/initrd.img-* "${DESTDIR}"
# Creating stage file # Creating stage file
Create_stagefile .stage/binary_linux-image Create_stagefile .stage/binary_linux-image

18
helpers/lh_binary_memtest
View File

@ -108,23 +108,7 @@ case "${LIVE_BINARY_IMAGES}" in
;; ;;
esac esac
# Temporary check for broken syslinux Check_multiarchitecture
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"
;;
esac
fi
fi
# Creating directory # Creating directory
mkdir -p "${DESTDIR}" mkdir -p "${DESTDIR}"

4
helpers/lh_binary_rootfs
View File

@ -151,9 +151,9 @@ case "${LIVE_CHROOT_FILESYSTEM}" in
MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -info" MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -info"
fi fi
if [ "${LIVE_PACKAGES_LISTS}" != "minimal" ] && [ "${LIVE_PACKAGES_LISTS}" != "mini" ] if [ "${LIVE_PACKAGES_LISTS}" = "minimal" ] || [ "${LIVE_PACKAGES_LISTS}" = "mini" ]
then then
MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -e chroot/boot/${LINUX}* chroot/boot/initrd.img* chroot/${LINUX}* chroot/initrd.img*" MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -e `ls chroot/boot/${LINUX}* chroot/boot/initrd.img* chroot/${LINUX}* chroot/initrd.img* | sed 's,chroot/,,g'`"
fi fi
if [ -f config/binary_rootfs/squashfs.sort ] if [ -f config/binary_rootfs/squashfs.sort ]

140
helpers/lh_binary_syslinux
View File

@ -63,7 +63,7 @@ Check_package chroot/usr/bin/syslinux syslinux
# Installing depends # Installing depends
Install_package Install_package
# Local methods # Local functions
Syslinux_live_entry () Syslinux_live_entry ()
{ {
LABEL="${1}" LABEL="${1}"
@ -71,17 +71,17 @@ Syslinux_live_entry ()
INITRD="${3}" INITRD="${3}"
APPEND="${4}" APPEND="${4}"
# pxelinux and syslinux << 3.36 lacks support to file/path # syslinux << 3.36 lacks support to file/path
if [ "${LIVE_BINARY_IMAGES}" != "net" ] && [ "${DIRECTORY}" != "binary" ] if [ "${LIVE_BINARY_IMAGES}" != "net" ] && [ "`basename ${DESTDIR_LIVE}`" != "binary" ]
then then
DIRECTORY="/`basename ${DESTDIR_LIVE}`" DIRECTORY="`basename ${DESTDIR_LIVE}`"
KERNEL="${DIRECTORY}/${KERNEL}" KERNEL="${DIRECTORY}/${KERNEL}"
INITRD="${DIRECTORY}/${INITRD}" INITRD="${DIRECTORY}/${INITRD}"
fi fi
LINUX_LIVE="${LINUX_LIVE}\nLABEL ${LABEL}\n" LINUX_LIVE="${LINUX_LIVE}\nLABEL ${LABEL}\n"
LINUX_LIVE="${LINUX_LIVE}\tkernel ${KERNEL}\n" LINUX_LIVE="${LINUX_LIVE}\tkernel /${KERNEL}\n"
LINUX_LIVE="${LINUX_LIVE}\tappend initrd=${INITRD} boot=${INITFS} LIVE_BOOTAPPEND ${APPEND}\n" LINUX_LIVE="${LINUX_LIVE}\tappend initrd=/${INITRD} boot=${INITFS} LIVE_BOOTAPPEND ${APPEND}\n"
} }
Syslinux_install_entry () Syslinux_install_entry ()
@ -91,17 +91,23 @@ Syslinux_install_entry ()
INITRD="${3}" INITRD="${3}"
APPEND="${4}" APPEND="${4}"
# pxelinux and syslinux << 3.36 lacks support to file/path # syslinux << 3.36 lacks support to file/path
if [ "${LIVE_BINARY_IMAGES}" != "net" ] && [ "${DIRECTORY}" != "binary" ] if [ "${LIVE_BINARY_IMAGES}" != "net" ] && [ "`basename ${DESTDIR_INSTALL}`" != "binary" ]
then then
DIRECTORY="/`basename ${DESTDIR_INSTALL}`" DIRECTORY="`basename ${DESTDIR_INSTALL}`"
KERNEL="${DIRECTORY}/${KERNEL}" KERNEL="${DIRECTORY}/${KERNEL}"
INITRD="${DIRECTORY}/${INITRD}" INITRD="${DIRECTORY}/${INITRD}"
fi fi
# Boot in quiet mode
if [ "${LIVE_DISTRIBUTION}" != "etch" ] && [ "${LABEL}" != "rescue" ] && [ "${LABEL}" != "rescuegui" ]
then
APPEND="${APPEND} quiet"
fi
LINUX_INSTALL="${LINUX_INSTALL}\nLABEL ${LABEL}\n" LINUX_INSTALL="${LINUX_INSTALL}\nLABEL ${LABEL}\n"
LINUX_INSTALL="${LINUX_INSTALL}\tkernel ${KERNEL}\n" LINUX_INSTALL="${LINUX_INSTALL}\tkernel /${KERNEL}\n"
LINUX_INSTALL="${LINUX_INSTALL}\tappend initrd=${INITRD} ${APPEND} --\n" LINUX_INSTALL="${LINUX_INSTALL}\tappend initrd=/${INITRD} ${APPEND} --\n"
} }
case "${LH_INITRAMFS}" in case "${LH_INITRAMFS}" in
@ -148,7 +154,7 @@ case "${LIVE_BINARY_IMAGES}" in
DESTDIR_INSTALL="binary/install" DESTDIR_INSTALL="binary/install"
# Workaround for syslinux (<< 3.36) which doesn't support long file/path names # syslinux << 3.36 lacks support for long file/path
if [ "${LIVE_DISTRIBUTION}" = "etch" ] if [ "${LIVE_DISTRIBUTION}" = "etch" ]
then then
DESTDIR_LIVE="binary" DESTDIR_LIVE="binary"
@ -157,25 +163,7 @@ case "${LIVE_BINARY_IMAGES}" in
;; ;;
esac esac
# Temporary check for broken syslinux Check_multiarchitecture
if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
then
# Assembling multi-arch
if [ -n "${MULTIARCH}" ]
then
case "${LIVE_ARCHITECTURE}" in
amd64)
DESTDIR_LIVE="${DESTDIR_LIVE}.amd"
DESTDIR_INSTALL="${DESTDIR_INSTALL}.amd"
;;
i386)
DESTDIR_LIVE="${DESTDIR_LIVE}.386"
DESTDIR_INSTALL="${DESTDIR_INSTALL}.386"
;;
esac
fi
fi
# Creating directory # Creating directory
mkdir -p "${DESTDIR_LIVE}" mkdir -p "${DESTDIR_LIVE}"
@ -223,6 +211,29 @@ then
LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} union=${LIVE_UNION_FILESYSTEM}" LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} union=${LIVE_UNION_FILESYSTEM}"
fi fi
if [ "${LIVE_BINARY_IMAGES}" = "net" ]
then
case "${LIVE_NET_FILESYSTEM}" in
nfs)
LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} netboot=nfs nfsroot=LIVE_NET_SERVER:LIVE_NET_PATH"
;;
cifs)
LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} netboot=cifs nfsroot=//LIVE_NET_SERVERLIVE_NET_PATH"
;;
*)
Echo_error "Unsupported net filesystem"
exit 1
;;
esac
if [ -n "${LIVE_NET_MOUNTOPTIONS}" ]
then
LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} nfsopts=${LIVE_NET_MOUNTOPTIONS}"
fi
fi
LIVE_BOOTAPPEND="`echo ${LIVE_BOOTAPPEND} | sed -e 's/ //'`" LIVE_BOOTAPPEND="`echo ${LIVE_BOOTAPPEND} | sed -e 's/ //'`"
# Parameters are listed at: linux/Documentation/kernel-parameters.txt # Parameters are listed at: linux/Documentation/kernel-parameters.txt
@ -240,7 +251,7 @@ Syslinux_live_entry "live-failsafe" "${DEFAULT_KERNEL}" "${DEFAULT_INITRD}" "${F
if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ] if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
then then
for KERNEL in chroot/boot/vmlinuz* for KERNEL in chroot/boot/vmlinuz-*
do do
KERNEL_IMAGE="`basename ${KERNEL}`" KERNEL_IMAGE="`basename ${KERNEL}`"
KERNEL_VERSION="`echo ${KERNEL_IMAGE} | sed -e 's/vmlinuz-//'`" KERNEL_VERSION="`echo ${KERNEL_IMAGE} | sed -e 's/vmlinuz-//'`"
@ -284,8 +295,8 @@ then
Syslinux_install_entry "expertgui" "${VMLINUZ_GI}" "${INITRD_GI}" "priority=low ${APPEND_GI}" Syslinux_install_entry "expertgui" "${VMLINUZ_GI}" "${INITRD_GI}" "priority=low ${APPEND_GI}"
Syslinux_install_entry "rescue" "${VMLINUZ_DI}" "${INITRD_DI}" "rescue/enable=true ${APPEND_DI}" Syslinux_install_entry "rescue" "${VMLINUZ_DI}" "${INITRD_DI}" "rescue/enable=true ${APPEND_DI}"
Syslinux_install_entry "rescuegui" "${VMLINUZ_GI}" "${INITRD_GI}" "rescue/enable=true ${APPEND_GI}" Syslinux_install_entry "rescuegui" "${VMLINUZ_GI}" "${INITRD_GI}" "rescue/enable=true ${APPEND_GI}"
Syslinux_install_entry "auto" "${VMLINUZ_DI}" "${INITRD_DI}" "auto=true ${APPEND_DI}" Syslinux_install_entry "auto" "${VMLINUZ_DI}" "${INITRD_DI}" "auto=true priority=critical ${APPEND_DI}"
Syslinux_install_entry "autogui" "${VMLINUZ_GI}" "${INITRD_GI}" "auto=true ${APPEND_GI}" Syslinux_install_entry "autogui" "${VMLINUZ_GI}" "${INITRD_GI}" "auto=true priority=critical ${APPEND_GI}"
fi fi
LINUX_INSTALL="`echo ${LINUX_INSTALL} | sed -e 's/binary//g' -e 's#//#/#g'`" LINUX_INSTALL="`echo ${LINUX_INSTALL} | sed -e 's/binary//g' -e 's#//#/#g'`"
@ -295,13 +306,13 @@ if [ -f "${DESTDIR_LIVE}"/memtest ]
then then
KERNEL_PATH="/`basename ${DESTDIR_LIVE}`/" KERNEL_PATH="/`basename ${DESTDIR_LIVE}`/"
# pxelinux and syslinux << 3.36 lacks support to file/path # syslinux << 3.36 lacks support to file/path
if [ "${LIVE_BINARY_IMAGES}" = "net" ] || [ "`basename ${DESTDIR_LIVE}`" = "binary" ] if [ "`basename ${DESTDIR_LIVE}`" = "binary" ]
then then
KERNEL_PATH="" KERNEL_PATH=""
fi fi
MEMTEST="LABEL ${KERNEL_PATH}memtest\n\tkernel memtest" MEMTEST="LABEL memtest\n\tkernel ${KERNEL_PATH}memtest"
MEMTEST="`echo ${MEMTEST} | sed -e 's#//#/#g'`" MEMTEST="`echo ${MEMTEST} | sed -e 's#//#/#g'`"
fi fi
@ -311,6 +322,13 @@ case "${LIVE_BINARY_IMAGES}" in
mkdir -p binary/isolinux mkdir -p binary/isolinux
cp chroot/usr/lib/syslinux/isolinux.bin binary/isolinux cp chroot/usr/lib/syslinux/isolinux.bin binary/isolinux
cp -r "${LIVE_TEMPLATES}"/syslinux/* binary/isolinux cp -r "${LIVE_TEMPLATES}"/syslinux/* binary/isolinux
mv binary/isolinux/syslinux.cfg binary/isolinux/isolinux.cfg
# Copying local configuration file
if [ -f config/binary_syslinux/syslinux.cfg ]
then
cp config/binary_syslinux/syslinux.cfg binary/isolinux/isolinux.cfg
fi
# Copying splash screen # Copying splash screen
if [ -f config/binary_syslinux/splash.rle ] if [ -f config/binary_syslinux/splash.rle ]
@ -335,9 +353,6 @@ case "${LIVE_BINARY_IMAGES}" in
sed -i -e "s/LIVE_DATE/`date +%Y%m%d`/" binary/isolinux/f1.txt 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 sed -i -e "s/LIVE_VERSION/${VERSION}/" binary/isolinux/f10.txt
# Remove unused files
rm -f binary/isolinux/pxelinux.cfg
# Working arround syslinux 8.3 limitation # Working arround syslinux 8.3 limitation
if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ] if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
then then
@ -366,12 +381,17 @@ case "${LIVE_BINARY_IMAGES}" in
net) net)
# Copying syslinux # Copying syslinux
cp chroot/usr/lib/syslinux/pxelinux.0 tftpboot cp chroot/usr/lib/syslinux/pxelinux.0 tftpboot
# Install syslinux templates
mkdir -p tftpboot/pxelinux.cfg mkdir -p tftpboot/pxelinux.cfg
cp -r "${LIVE_TEMPLATES}"/syslinux/* tftpboot/pxelinux.cfg cp -r "${LIVE_TEMPLATES}"/syslinux/* tftpboot/pxelinux.cfg
mv tftpboot/pxelinux.cfg/pxelinux.cfg tftpboot/pxelinux.cfg/default mv tftpboot/pxelinux.cfg/syslinux.cfg tftpboot/pxelinux.cfg/default
sed -i -e 's#splash.rle#pxelinux.cfg/splash.rle#' tftpboot/pxelinux.cfg/boot.txt
# Copying local configuration file
if [ -f config/binary_syslinux/syslinux.cfg ]
then
cp config/binary_syslinux/syslinux.cfg tftpboot/pxelinux.cfg/default
fi
#sed -i -e 's#splash.rle#pxelinux.cfg/splash.rle#' tftpboot/pxelinux.cfg/boot.txt
# Copying splash screen # Copying splash screen
if [ -f config/binary_syslinux/splash.rle ] if [ -f config/binary_syslinux/splash.rle ]
@ -392,34 +412,20 @@ case "${LIVE_BINARY_IMAGES}" in
# Configure syslinux templates # Configure syslinux templates
sed -i -e "s@LINUX_LIVE@${LINUX_LIVE}@" -e "s@LINUX_INSTALL@${LINUX_INSTALL}@" -e "s@MEMTEST@${MEMTEST}@" tftpboot/pxelinux.cfg/default sed -i -e "s@LINUX_LIVE@${LINUX_LIVE}@" -e "s@LINUX_INSTALL@${LINUX_INSTALL}@" -e "s@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_BOOTAPPEND#${LIVE_BOOTAPPEND}#" -e "s/LIVE_NET_SERVER/${LIVE_NET_SERVER}/" -e "s#LIVE_NET_PATH#${LIVE_NET_PATH}#" tftpboot/pxelinux.cfg/default
sed -i -e "s/LIVE_DATE/`date +%Y%m%d`/" tftpboot/pxelinux.cfg/f1.txt 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 sed -i -e "s/LIVE_VERSION/${VERSION}/" tftpboot/pxelinux.cfg/f10.txt
# Remove unused files
rm -f tftpboot/pxelinux.cfg/isolinux.cfg
# Working arround syslinux 8.3 limitation # Working arround syslinux 8.3 limitation
if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ] if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -eq "1" ]
then then
NUMBER="0"
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" binary/isolinux/isolinux.cfg
done
else
mv "${DESTDIR_LIVE}"/vmlinuz-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/vmlinuz mv "${DESTDIR_LIVE}"/vmlinuz-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/vmlinuz
mv "${DESTDIR_LIVE}"/initrd.img-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/initrd.img 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" binary/isolinux/isolinux.cfg sed -i -e "s/vmlinuz-.*-${LIVE_LINUX_FLAVOURS}/vmlinuz/g" -e "s/initrd.img-.*-${LIVE_LINUX_FLAVOURS}/initrd.img/g" tftpboot/pxelinux.cfg/default
fi fi
# Remove whitespaces # Remove whitespaces
sed -i -e 's/\ $//g' binary/isolinux/isolinux.cfg sed -i -e 's/\ $//g' tftpboot/pxelinux.cfg/default
;; ;;
tar|usb-hdd) tar|usb-hdd)
@ -435,7 +441,12 @@ case "${LIVE_BINARY_IMAGES}" in
mkdir -p "${DESTDIR}" mkdir -p "${DESTDIR}"
cp chroot/usr/lib/syslinux/isolinux.bin "${DESTDIR}"/syslinux.bin cp chroot/usr/lib/syslinux/isolinux.bin "${DESTDIR}"/syslinux.bin
cp -r "${LIVE_TEMPLATES}"/syslinux/* "${DESTDIR}" cp -r "${LIVE_TEMPLATES}"/syslinux/* "${DESTDIR}"
mv "${DESTDIR}"/isolinux.cfg "${DESTDIR}"/syslinux.cfg
# Copying local configuration file
if [ -f config/binary_syslinux/syslinux.cfg ]
then
cp config/binary_syslinux/syslinux.cfg "${DESTDIR}"/syslinux.cfg
fi
# Copying splash screen # Copying splash screen
if [ -f config/binary_syslinux/splash.rle ] if [ -f config/binary_syslinux/splash.rle ]
@ -460,9 +471,6 @@ case "${LIVE_BINARY_IMAGES}" in
sed -i -e "s/LIVE_DATE/`date +%Y%m%d`/" "${DESTDIR}"/f1.txt sed -i -e "s/LIVE_DATE/`date +%Y%m%d`/" "${DESTDIR}"/f1.txt
sed -i -e "s/LIVE_VERSION/${VERSION}/" "${DESTDIR}"/f10.txt sed -i -e "s/LIVE_VERSION/${VERSION}/" "${DESTDIR}"/f10.txt
# Remove unused files
rm -f "${DESTDIR}"/pxelinux.cfg
# Workaround for syslinux (<< 3.36) which doesn't support long file/path names # Workaround for syslinux (<< 3.36) which doesn't support long file/path names
if [ "${LIVE_DISTRIBUTION}" = "etch" ] && [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ] if [ "${LIVE_DISTRIBUTION}" = "etch" ] && [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
then then

150
helpers/lh_binary_yaboot
View File

@ -63,6 +63,44 @@ Check_package chroot/usr/lib/yaboot/yaboot yaboot
# Installing depends # Installing depends
Install_package Install_package
# Local functions
Yaboot_live_entry ()
{
LABEL="${1}"
KERNEL="${2}"
INITRD="${3}"
APPEND="${4}"
DIRECTORY="/`basename ${DESTDIR_LIVE}`"
LINUX_LIVE="${LINUX_LIVE}\nimage=${DIRECTORY}/${KERNEL}\n"
LINUX_LIVE="${LINUX_LIVE}\tlabel=${LABEL}\n"
LINUX_LIVE="${LINUX_LIVE}\tinitrd=${DIRECTORY}/${INITRD}\n"
LINUX_LIVE="${LINUX_LIVE}\tappend=\"boot=${INITFS} LIVE_BOOTAPPEND ${APPEND}\"\n"
LINUX_LIVE="${LINUX_LIVE}\tinitrd-size=10240\n"
}
Yaboot_install_entry ()
{
LABEL="${1}"
KERNEL="${2}"
INITRD="${3}"
APPEND="${4}"
DIRECTORY="/`basename ${DESTDIR_LIVE}`"
if [ "${LIVE_DISTRIBUTION}" != "etch" ] && [ "${LABEL}" != "rescue" ] && [ "${LABEL}" != "rescuegui" ]
then
APPEND="${APPEND} quiet"
fi
LINUX_INSTALL="${LINUX_INSTALL}\nimage=${DIRECTORY}/${KERNEL}\n"
LINUX_INSTALL="${LINUX_INSTALL}\tlabel=${LABEL}\n"
LINUX_INSTALL="${LINUX_INSTALL}\tinitrd=${DIRECTORY}/${INITRD}\n"
LINUX_INSTALL="${LINUX_INSTALL}\tappend=\"LIVE_BOOTAPPEND ${APPEND} --\"\n"
LINUX_INSTALL="${LINUX_INSTALL}\tinitrd-size=10240\n"
}
case "${LH_INITRAMFS}" in case "${LH_INITRAMFS}" in
casper) casper)
INITFS="casper" INITFS="casper"
@ -76,29 +114,26 @@ esac
# Setting destination directory # Setting destination directory
case "${LIVE_BINARY_IMAGES}" in case "${LIVE_BINARY_IMAGES}" in
iso) iso)
DESTDIR_LIVE="binary/live" case "${LH_INITRAMFS}" in
casper)
DESTDIR_LIVE="binary/casper"
;;
live-initramfs)
DESTDIR_LIVE="binary/live"
;;
esac
DESTDIR_INSTALL="binary/install" DESTDIR_INSTALL="binary/install"
;; ;;
net|tar|usb-hdd) net|tar|usb-hdd)
Echo_error "not supported, FIXME" Echo_error "not yet supported, aborting (FIXME)."
exit 1
;; ;;
esac esac
# Temporary check for broken syslinux FIXME Check_multiarchitecture
if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
then
# Assembling multi-arch
if [ -n "${MULTIARCH}" ]
then
case "${LIVE_ARCHITECTURE}" in
powerpc)
DESTDIR_LIVE="${DESTDIR_LIVE}.ppc"
DESTDIR_INSTALL="${DESTDIR_INSTALL}.ppc"
;;
esac
fi
fi
# Creating directory # Creating directory
mkdir -p "${DESTDIR_LIVE}" mkdir -p "${DESTDIR_LIVE}"
@ -149,79 +184,74 @@ fi
LIVE_BOOTAPPEND="`echo ${LIVE_BOOTAPPEND} | sed -e 's/ //'`" LIVE_BOOTAPPEND="`echo ${LIVE_BOOTAPPEND} | sed -e 's/ //'`"
# Parameters are listed at: linux/Documentation/kernel-parameters.txt # Parameters are listed at: linux/Documentation/kernel-parameters.txt
FAILSAFE="noapic noapm nodma nomce nolapic nosmp vga=normal" # FIXME FAILSAFE="noapic noapm nodma nomce nolapic nosmp vga=ofonly"
# Assembling kernel configuration # Assembling kernel configuration
if [ "${LIVE_BINARY_IMAGES}" != "net" ]
then
DEFAULT_FLAVOUR="`echo ${LIVE_LINUX_FLAVOURS} | awk '{ print $1 }'`"
LINUX="image=/`basename ${DESTDIR_LIVE}`/`basename chroot/boot/vmlinux-*${DEFAULT_FLAVOUR}`\n\tinitrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename chroot/boot/vmlinux-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinux-//'`\n\tlabel=live\n\tappend=\"boot=${INITFS} LIVE_BOOTAPPEND\"\n\tinitrd-size=1048576\n\tread-only"
else
DEFAULT_FLAVOUR="`echo ${LIVE_LINUX_FLAVOURS} | awk '{ print $1 }'`"
LINUX="image=`basename chroot/boot/vmlinux-*${DEFAULT_FLAVOUR}`\n\tinitrd=initrd.img-`basename chroot/boot/vmlinux-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinux-//'`\n\tlabel=live\n\tappend=\"boot=${INITFS} LIVE_BOOTAPPEND\"\n\tinitrd-size=1048576\n\tread-only"
fi
# FIXME # Default entries
DEFAULT_FLAVOUR="`echo ${LIVE_LINUX_FLAVOURS} | awk '{ print $1 }'`"
DEFAULT_KERNEL="`basename chroot/boot/vmlinux-*${DEFAULT_FLAVOUR}`"
DEFAULT_INITRD="initrd.img-`echo ${DEFAULT_KERNEL} | sed -e 's/vmlinux-//'`"
Yaboot_live_entry "live" "${DEFAULT_KERNEL}" "${DEFAULT_INITRD}"
Yaboot_live_entry "live-failsafe" "${DEFAULT_KERNEL}" "${DEFAULT_INITRD}" "${FAILSAFE}"
if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ] if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
then then
for KERNEL in chroot/boot/vmlinux* for KERNEL in chroot/boot/vmlinux-*
do do
if [ -z "${LINUX}" ] KERNEL_IMAGE="`basename ${KERNEL}`"
then KERNEL_VERSION="`echo ${KERNEL_IMAGE} | sed -e 's/vmlinux-//'`"
if [ "${LIVE_BINARY_IMAGES}" = "iso" ] INITRD="initrd.img-${KERNEL_VERSION}"
then
LINUX="label LIVE-`basename ${KERNEL} | sed -e 's/vmlinux-//'`\n kernel /`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}`\n append initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinux-//'` boot=${INITFS} LIVE_BOOTAPPEND" Yaboot_live_entry "live-${KERNEL_VERSION}" "${KERNEL_IMAGE}" "${INITRD}"
else Yaboot_live_entry "live-${KERNEL_VERSION}-failsafe" "${KERNEL_IMAGE}" "${INITRD}" "${FAILSAFE}"
LINUX="label LIVE-`basename ${KERNEL} | sed -e 's/vmlinux-//'`\n kernel `basename ${KERNEL}`\n append initrd=initrd.img-`basename ${KERNEL} | sed -e 's/vmlinux-//'` boot=${INITFS} LIVE_BOOTAPPEND"
fi
else
if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
then
LINUX="${LINUX}\nlabel LIVE-`basename ${KERNEL} | sed -e 's/vmlinux-//'`\n kernel /`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}`\n append initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinux-//'` boot=${INITFS} LIVE_BOOTAPPEND"
else
LINUX="${LINUX}\nlabel LIVE-`basename ${KERNEL} | sed -e 's/vmlinux-//'`\n kernel `basename ${KERNEL}`\n append initrd=initrd.img-`basename ${KERNEL} | sed -e 's/vmlinux-//'` boot=${INITFS} LIVE_BOOTAPPEND"
fi
fi
done done
fi fi
# Removing '//' LINUX_LIVE="`echo ${LINUX_LIVE} | sed -e 's/binary//g' -e 's#//#/#g'`"
LINUX="`echo ${LINUX} | sed -e 's#//#/#g'`"
# Assembling debian-installer configuration # Assembling debian-installer configuration
if [ "${LIVE_DEBIAN_INSTALLER}" != "disabled" ] if [ "${LIVE_DEBIAN_INSTALLER}" != "disabled" ]
then then
VMLINUZ_DI="vmlinuz" VMLINUZ_DI="vmlinuz"
INITRD_DI="initrd.gz" INITRD_DI="initrd.gz"
APPEND_DI="vga=normal"
VMLINUZ_GI="gtk/vmlinuz" VMLINUZ_GI="gtk/vmlinuz"
INITRD_GI="gtk/initrd.gz" INITRD_GI="gtk/initrd.gz"
APPEND_GI="video=vesa:ywrap,mtrr vga=788"
LIVE_LINUX_INSTALL="LABEL install\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_DI}\n\tappend vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_DI} -- " Yaboot_install_entry "linux" "${VMLINUZ_DI}" "${INITRD_DI}" "${APPEND_DI}"
LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL linux\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_DI}\n\tappend vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_DI} -- " Yaboot_install_entry "install" "${VMLINUZ_DI}" "${INITRD_DI}" "${APPEND_DI}"
LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL installgui\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_GI}\n\tappend video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_GI} -- " Yaboot_install_entry "installgui" "${VMLINUZ_GI}" "${INITRD_GI}" "${APPEND_GI}"
Yaboot_install_entry "expert" "${VMLINUZ_DI}" "${INITRD_DI}" "priority=low ${APPEND_DI}"
LIVE_KENREL_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL expert\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_DI}\n\tappend priority=low vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_DI} -- " Yaboot_install_entry "expertgui" "${VMLINUZ_GI}" "${INITRD_GI}" "priority=low ${APPEND_GI}"
LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL expertgui\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_GI}\n\tappend priority=low video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_GI} -- " Yaboot_install_entry "rescue" "${VMLINUZ_DI}" "${INITRD_DI}" "rescue/enable=true ${APPEND_DI}"
Yaboot_install_entry "rescuegui" "${VMLINUZ_GI}" "${INITRD_GI}" "rescue/enable=true ${APPEND_GI}"
LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL rescue\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_DI}\n\tappend vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_DI} rescue/enable=true -- " Yaboot_install_entry "auto" "${VMLINUZ_DI}" "${INITRD_DI}" "auto=true priority=critical ${APPEND_DI}"
LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL rescuegui\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_GI}\n\tappend video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_GI} rescue/enable=true -- " Yaboot_install_entry "autogui" "${VMLINUZ_GI}" "${INITRD_GI}" "auto=true priority=critical ${APPEND_GI}"
LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL auto\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_DI}\n\tappend auto=true priority=critical vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_DI} -- "
LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL autogui\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_GI}\n\tappend auto=true priority=critical video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_GI} -- "
fi fi
LIVE_LINUX_INSTALL="`echo ${LIVE_LINUX_INSTALL} | sed -e 's/binary//g' -e 's#//#/#g'`" LINUX_INSTALL="`echo ${LINUX_INSTALL} | sed -e 's/binary//g' -e 's#//#/#g'`"
case "${LIVE_BINARY_IMAGES}" in case "${LIVE_BINARY_IMAGES}" in
iso) iso|usb-hdd)
# Copying yaboot # Copying yaboot
mkdir -p binary/yaboot mkdir -p binary/yaboot
cp chroot/usr/lib/yaboot/yaboot binary/yaboot cp chroot/usr/lib/yaboot/yaboot binary/yaboot
cp -r "${LIVE_TEMPLATES}"/yaboot/* binary/yaboot cp -r "${LIVE_TEMPLATES}"/yaboot/* binary/yaboot
if [ "${LIVE_BINARY_IMAGES}" = "usb-hdd" ]
then
mv binary/yaboot/yaboot.conf binary/yaboot/yaboot.conf.tmp
echo "root=/dev/ram" > binary/yaboot/yaboot.conf
cat binary/yaboot/yaboot.conf.tmp >> binary/yaboot/yaboot.conf
rm -f binary/yaboot/yaboot.conf.tmp
fi
# Configure yaboot templates # Configure yaboot templates
sed -i -e "s#LIVE_LINUX_LIVE#${LINUX}#" -e "s#LIVE_LINUX_INSTALL#${LIVE_LINUX_INSTALL}#" binary/yaboot/yaboot.conf sed -i -e "s#LINUX_LIVE#${LINUX_LIVE}#" -e "s#LINUX_INSTALL#${LINUX_INSTALL}#" binary/yaboot/yaboot.conf
sed -i -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" binary/yaboot/yaboot.conf sed -i -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" binary/yaboot/yaboot.conf
sed -i -e "s/LIVE_DATE/`date +%Y%m%d`/" -e "s/LIVE_VERSION/${VERSION}/" binary/yaboot/boot.msg sed -i -e "s/LIVE_DATE/`date +%Y%m%d`/" -e "s/LIVE_VERSION/${VERSION}/" binary/yaboot/boot.msg
;; ;;

4
helpers/lh_chroot
View File

@ -37,7 +37,7 @@ lh_chroot_cache restore ${*}
lh_chroot_proc install ${*} lh_chroot_proc install ${*}
lh_chroot_sysfs install ${*} lh_chroot_sysfs install ${*}
lh_chroot_debianchroot install ${*} lh_chroot_debianchroot install ${*}
lh_chroot_sysvrc install ${*} lh_chroot_sysv-rc install ${*}
lh_chroot_hosts install ${*} lh_chroot_hosts install ${*}
lh_chroot_resolv install ${*} lh_chroot_resolv install ${*}
lh_chroot_hostname install ${*} lh_chroot_hostname install ${*}
@ -68,7 +68,7 @@ lh_chroot_apt remove ${*}
lh_chroot_hostname remove ${*} lh_chroot_hostname remove ${*}
lh_chroot_resolv remove ${*} lh_chroot_resolv remove ${*}
lh_chroot_hosts remove ${*} lh_chroot_hosts remove ${*}
lh_chroot_sysvrc remove ${*} lh_chroot_sysv-rc remove ${*}
lh_chroot_debianchroot remove ${*} lh_chroot_debianchroot remove ${*}
lh_chroot_sysfs remove ${*} lh_chroot_sysfs remove ${*}
lh_chroot_proc remove ${*} lh_chroot_proc remove ${*}

22
helpers/lh_chroot_hacks
View File

@ -83,10 +83,32 @@ esac
# Update initramfs # Update initramfs
Chroot "update-initramfs -k all -t -u" Chroot "update-initramfs -k all -t -u"
# Remove build systems clock drift
echo "0.0 0 0.0" > chroot/etc/adjtime
# Remove generated xorg.conf based on build systems configuration
rm -f chroot/etc/X11/xorg.conf
# Touch resolv.conf
touch chroot/etc/resolv.conf
# Remove cruft
rm -f chroot/boot/initrd*bak*
rm -f /etc/apt/trusted.gpg~
rm -f chroot/etc/group- chroot/etc/passwd-
rm -f chroot/etc/gshadow- chroot/etc/shadow-
rm -f chroot/var/cache/debconf/*-old
rm -f chroot/var/lib/dpkg/*-old
if [ -n "${LH_ROOT_COMMAND}" ] if [ -n "${LH_ROOT_COMMAND}" ]
then then
${LH_ROOT_COMMAND} chown -R --quiet `whoami`:`whoami` chroot ${LH_ROOT_COMMAND} chown -R --quiet `whoami`:`whoami` chroot
fi fi
if [ -d chroot/home/${LIVE_USERNAME} ]
then
chown -R --quiet 999:999 chroot/home/${LIVE_USERNAME}
fi
# Creating stage file # Creating stage file
Create_stagefile .stage/chroot_hacks Create_stagefile .stage/chroot_hacks

6
helpers/lh_chroot_linux-image
View File

@ -64,6 +64,12 @@ do_initrd = Yes
warn_initrd = No warn_initrd = No
EOF EOF
# Diverting update-initramfs
#if [ "${LH_INITRAMFS}" = "live-initramfs" ]
#then
# mv chroot/usr/sbin/update-initramfs chroot/usr/sbin/update-initramfs.live-helper
#fi
if [ "${LIVE_LINUX_PACKAGES}" != "none" ] if [ "${LIVE_LINUX_PACKAGES}" != "none" ]
then then
for FLAVOUR in ${LIVE_LINUX_FLAVOURS} for FLAVOUR in ${LIVE_LINUX_FLAVOURS}

2
helpers/lh_chroot_local-packageslists
View File

@ -55,7 +55,7 @@ then
do do
# Generate package list # Generate package list
Expand_packagelist "`basename ${PACKAGESLIST}`" "config/chroot_local-packageslists" "${LH_BASE:-/usr/share/live-helper/lists}/lists" > chroot/root/"`basename ${PACKAGESLIST}`" Expand_packagelist "`basename ${PACKAGESLIST}`" "config/chroot_local-packageslists" "${LH_BASE:-/usr/share/live-helper/lists}/lists" > chroot/root/"`basename ${PACKAGESLIST}`"
# Installing package list # Installing package list
case "${LH_APT}" in case "${LH_APT}" in
apt|apt-get) apt|apt-get)

5
helpers/lh_chroot_localization
View File

@ -611,7 +611,7 @@ then
# Setting packages # Setting packages
for LOCALIZATION in ${LOCALIZATIONS} for LOCALIZATION in ${LOCALIZATIONS}
do do
case "${LOCALZATION}" in case "${LOCALIZATION}" in
iceape) iceape)
Check_package chroot/usr/bin/iceape iceweasel-l10n-"${ICEAPE}" Check_package chroot/usr/bin/iceape iceweasel-l10n-"${ICEAPE}"
;; ;;
@ -638,6 +638,9 @@ then
esac esac
done done
Check_package chroot/usr/bin/gwenview gwenview-i18n
Check_package chroot/usr/bin/k3b k3b-i18n
# Restoring cache # Restoring cache
Restore_cache cache/packages_localization Restore_cache cache/packages_localization

6
helpers/lh_chroot_sources
View File

@ -295,12 +295,6 @@ case "${1}" in
rm -rf chroot/var/cache/apt rm -rf chroot/var/cache/apt
mkdir -p chroot/var/cache/apt/archives/partial mkdir -p chroot/var/cache/apt/archives/partial
# Removing old files
rm -f chroot/var/lib/dpkg/available-old
rm -f chroot/var/lib/dpkg/diversions-old
rm -f chroot/var/lib/dpkg/statoverride-old
rm -f chroot/var/lib/dpkg/status-old
# Removing stage file # Removing stage file
rm -f .stage/chroot_sources rm -f .stage/chroot_sources
;; ;;

8
helpers/lh_chroot_sysvrc → helpers/lh_chroot_sysv-rc
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# lh_chroot_sysvrc(1) - manage /usr/sbin/policy-rc.d # lh_chroot_sysv-rc(1) - manage /usr/sbin/policy-rc.d
# Copyright (C) 2006-2007 Daniel Baumann <daniel@debian.org> # Copyright (C) 2006-2007 Daniel Baumann <daniel@debian.org>
# #
# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING. # live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
@ -40,7 +40,7 @@ case "${1}" in
Echo_message "Configuring file /usr/sbin/policy-rc.d" Echo_message "Configuring file /usr/sbin/policy-rc.d"
# Checking stage file # Checking stage file
Check_stagefile .stage/chroot_sysvrc Check_stagefile .stage/chroot_sysv-rc
# Checking lock file # Checking lock file
Check_lockfile .lock Check_lockfile .lock
@ -67,7 +67,7 @@ EOF
chmod 0755 chroot/usr/sbin/policy-rc.d chmod 0755 chroot/usr/sbin/policy-rc.d
# Creating stage file # Creating stage file
Create_stagefile .stage/chroot_sysvrc Create_stagefile .stage/chroot_sysv-rc
;; ;;
remove) remove)
@ -89,7 +89,7 @@ EOF
fi fi
# Removing stage file # Removing stage file
rm -f .stage/chroot_sysvrc rm -f .stage/chroot_sysv-rc
;; ;;
*) *)

8
helpers/lh_config
View File

@ -357,6 +357,14 @@ LIVE_ISO_VOLUME="${LIVE_ISO_VOLUME}"
# (Default: ${LIVE_MEMTEST}) # (Default: ${LIVE_MEMTEST})
LIVE_MEMTEST="${LIVE_MEMTEST}" LIVE_MEMTEST="${LIVE_MEMTEST}"
# \$LIVE_NET_FILESYSTEM: set netboot filesystem
# (Default: ${LIVE_NET_FILESYSTEM})
LIVE_NET_FILESYSTEM="${LIVE_NET_FILESYSTEM}"
# \$LIVE_NET_MOUNTOPTIONS: set nfsopts
# (Default: empty)
LIVE_NET_MOUNTOPTIONS="${LIVE_NET_MOUNTOPTIONS}"
# \$LIVE_NET_PATH: set netboot server directory # \$LIVE_NET_PATH: set netboot server directory
# (Default: ${LIVE_NET_PATH}) # (Default: ${LIVE_NET_PATH})
LIVE_NET_PATH="${LIVE_NET_PATH}" LIVE_NET_PATH="${LIVE_NET_PATH}"

2
helpers/make-live
View File

@ -190,7 +190,7 @@ Local_arguments ()
;; ;;
--keyring-packages) --keyring-packages)
LIVE_KEYRING_PACKAGS="${2}"; shift 2 LIVE_KEYRING_PACKAGES="${2}"; shift 2
;; ;;
--hooks) --hooks)

12
hooks/mini
View File

@ -10,9 +10,15 @@
set -e set -e
# Removing unused packages # Removing unused packages
apt-get remove --purge --yes apt-utils aptitude for PACKAGE in apt-utils aptitude man-db manpages info ssl wget
apt-get remove --purge --yes man-db manpages info do
apt-get remove --purge --yes ssl wget if ! apt-get remove --purge --yes "${PACKAGE}"
then
echo "WARNING: ${PACKAGE} isn't installed"
fi
done
apt-get autoremove || true
# Removing unused files # Removing unused files
find . -name *~ | xargs rm -f find . -name *~ | xargs rm -f

12
hooks/minimal
View File

@ -10,9 +10,15 @@
set -e set -e
# Removing unused packages # Removing unused packages
apt-get remove --purge --yes apt-utils aptitude for PACKAGE in apt-utils aptitude man-db manpages info ssl wget
apt-get remove --purge --yes man-db manpages info do
apt-get remove --purge --yes ssl wget if ! apt-get remove --purge --yes "${PACKAGE}"
then
echo "WARNING: ${PACKAGE} isn't installed"
fi
done
apt-get autoremove || true
# Removing unused files # Removing unused files
find . -name *~ | xargs rm -f find . -name *~ | xargs rm -f

40
includes/sid/live/parameters.txt
View File

@ -1,40 +0,0 @@
Boot Parameters for Debian Live
-------------------------------
Updated for live-initramfs 1.90.1-1 on 2007-06-11.
These options (can be combined) work from the ISOLINUX bootprompt:
live access=v1|v2|v3|m1|m2 specify accessibility level
live console=TTY,SPEED setting default console for live-getty
live hostname=HOSTNAME override hostname value
live integrity-check check media data integrity and md5sums
live ip=IFACE,ADDRESS,NETMASK,GATEWAY specify network interface(s)
live ip[=frommedia] skips dhcp/static, uses preconfiguration
live keyb|kbd-chooser/method=KEYBOARD
live klayout|console-setup/layoutcode=LAYOUT
live kvariant|console-setup/variantcode=VARIANT
live kmodel|console-setup/modelcode=CODE
live koptions=OPTIONS
live live-getty
live live-media|bootfrom=DEVICE
live live-media-encryption|encryption=TYPE
live live-media-offset=BYTES
live live-media-timeout=SECONDS
live locale|debian-installer/local=LOCALE
live module=NAME
live netboot[=nfs|cifs]
live noautologin
live noxautologin
live nopersistent
live nosudo
live noswap
live persistent
live quickreboot
live showmounts
live todisk=DEVICE
live toram copy media to RAM and run from there
live preseed/file|file=FILE
live package/question=VALUE
live xdebconf
live xvideomode=RESOLUTION

29
includes/sid/live/parameters.txt.casper Normal file
View File

@ -0,0 +1,29 @@
Boot Parameters for Debian Live
-------------------------------
Updated for casper 1.77+debian-7 on 2007-02-08.
These options (can be combined) work from the syslinux bootprompt:
casper casper-getty
casper xdebconf
casper hostname=HOSTNAME
casper userfullname=USERFULLNAME
casper username=USERNAME
casper {keyb|kbd-chooser/method}=KEYBOARD
casper {klayout|console-setup/layoutcode}=LAYOUT
casper {kvariant|console-setup/variantcode}=VARIANT ,
casper {kmodel|console-setup/modelcode}=CODE , koptions=OPTIONS
casper ip=IFACE,ADDRESS,NETMASK,GATEWAY[:IFACE,ADDRESS,NETMASK,GATEWAY]*
casper ip[=frommedia]
casper {live-media|bootfrom}=DEVICE
casper live-media-offset=BYTES
casper locale=LOCALE | debian-installer/locale=LOCALE
casper netboot[=nfs|cifs]
casper persistent
casper nopersistent
casper showmounts
casper todisk=DEVICE
casper toram
casper {preseed/file|file}=FILE
casper package/question=VALUE

46
includes/sid/live/parameters.txt.live-initramfs Normal file
View File

@ -0,0 +1,46 @@
Boot Parameters for Debian Live
-------------------------------
Updated for live-initramfs 1.91.3-1 on 2007-07-09.
These options (can be combined) work from the syslinux bootprompt:
live access=ACCESS
live console=TTY,SPEED
live hostname=HOSTNAME
live username=USER
live userfullname=USERFULLNAME
live integrity-check
live ip=[CLIENT_IP]:[SERVER_IP]:[GATEWAY_IP]:[NETMASK]:[HOSTNAME]:[DEVICE]:[AUTOCONF] [,[CLIENT_IP]:[SERVER_IP]:[GATEWAY_IP]:[NETMASK]:[HOSTNAME]:[DEVICE]:[AUTOCONF]]*
live ip[=frommedia]
live {keyb|kbd-chooser/method}=KEYBOARD
live {klayout|console-setup/layoutcode}=LAYOUT
live {kvariant|console-setup/variantcode}=VARIANT
live {kmodel|console-setup/modelcode}=CODE
live koptions=OPTIONS
live live-getty
live {live-media|bootfrom}=DEVICE
live {live-media-encryption|encryption}=TYPE
live live-media-offset=BYTES
live live-media-timeout=SECONDS
live {locale|debian-installer/locale}=LOCALE
live module=NAME
live netboot[=nfs|cifs]
live nfsopts=
live noautologin
live noxautologin
live nofastboot
live nopersistent
live nosudo
live noswap
live persistent
live {preseed/file|file}=FILE
live package/question=VALUE
live quickreboot
live showmounts
live timezone=TIMEZONE
live todisk=DEVICE
live toram
live union=unionfs|aufs
live xdebconf
live xvideomode=RESOLUTION

17
lists/devel-live Normal file
View File

@ -0,0 +1,17 @@
# /usr/share/live-helper/lists/devel-live - package list for live-helper(7)
## LH: Development (Debian Live)
#<include> standard
cdebootstrap debootstrap
live-helper subversion
aufs-source kqemu-source squashfs-source unionfs-source
aufs-tools qemu unionfs-tools
#linux-headers-2.6-all
vim less screen gnupg
build-essential debhelper dh-make lintian fakeroot devscripts wdiff
autotools-dev dpatch module-assistant

3
lists/rescue
View File

@ -156,3 +156,6 @@ clamav-data
smbclient smbclient
nfs-common nfs-common
wireless-tools wireless-tools
aide
tripwire

2
manpages/lh_binary.de.1
View File

@ -1,4 +1,4 @@
.TH LH_BINARY 1 "02.07.2007" "1.0~a17" "live\-helper" .TH LH_BINARY 1 "09.07.2007" "1.0~a18" "live\-helper"
.SH NAME .SH NAME
lh_binary \- Meta\-Helper f\[:u]r lh_binary_* lh_binary \- Meta\-Helper f\[:u]r lh_binary_*

2
manpages/lh_binary.en.1
View File

@ -1,4 +1,4 @@
.TH LH_BINARY 1 "2007\-07\-02" "1.0~a17" "live\-helper" .TH LH_BINARY 1 "2007\-07\-09" "1.0~a18" "live\-helper"
.SH NAME .SH NAME
lh_binary \- meta\-helper for lh_binary_* lh_binary \- meta\-helper for lh_binary_*

2
manpages/lh_bootstrap.de.1
View File

@ -1,4 +1,4 @@
.TH LH_BOOTSTRAP 1 "02.07.2007" "1.0~a17" "live\-helper" .TH LH_BOOTSTRAP 1 "09.07.2007" "1.0~a18" "live\-helper"
.SH NAME .SH NAME
lh_bootstrap \- Meta\-Helper f\[:u]r lh_bootstrap_* lh_bootstrap \- Meta\-Helper f\[:u]r lh_bootstrap_*

2
manpages/lh_bootstrap.en.1
View File

@ -1,4 +1,4 @@
.TH LH_BOOTSTRAP 1 "2007\-07\-02" "1.0~a17" "live\-helper" .TH LH_BOOTSTRAP 1 "2007\-07\-09" "1.0~a18" "live\-helper"
.SH NAME .SH NAME
lh_bootstrap \- meta\-helper for lh_bootstrap_* lh_bootstrap \- meta\-helper for lh_bootstrap_*

2
manpages/lh_bootstrap_cdebootstrap.de.1
View File

@ -1,4 +1,4 @@
.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "02.07.2007" "1.0~a17" "live\-helper" .TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "09.07.2007" "1.0~a18" "live\-helper"
.SH NAME .SH NAME
lh_bootstrap_cdebootstrap \- erstellt ein Debian-System mit \fIcdebootstrap\fR(1) lh_bootstrap_cdebootstrap \- erstellt ein Debian-System mit \fIcdebootstrap\fR(1)

2
manpages/lh_bootstrap_cdebootstrap.en.1
View File

@ -1,4 +1,4 @@
.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "2007\-07\-02" "1.0~a17" "live\-helper" .TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "2007\-07\-09" "1.0~a18" "live\-helper"
.SH NAME .SH NAME
lh_bootstrap_cdebootstrap \- bootstrap a Debian system with \fIcdebootstrap\fR(1) lh_bootstrap_cdebootstrap \- bootstrap a Debian system with \fIcdebootstrap\fR(1)

2
manpages/lh_bootstrap_debootstrap.de.1
View File

@ -1,4 +1,4 @@
.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "02.07.2007" "1.0~a17" "live\-helper" .TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "09.07.2007" "1.0~a18" "live\-helper"
.SH NAME .SH NAME
lh_bootstrap_debootstrap \- erstellt ein Debian-System mit \fIdebootstrap\fR(8) lh_bootstrap_debootstrap \- erstellt ein Debian-System mit \fIdebootstrap\fR(8)

2
manpages/lh_bootstrap_debootstrap.en.1
View File

@ -1,4 +1,4 @@
.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "2007\-07\-02" "1.0~a17" "live\-helper" .TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "2007\-07\-09" "1.0~a18" "live\-helper"
.SH NAME .SH NAME
lh_bootstrap_debootstrap \- bootstrap a Debian system with \fIdebootstrap\fR(8) lh_bootstrap_debootstrap \- bootstrap a Debian system with \fIdebootstrap\fR(8)

2
manpages/lh_build.de.1
View File

@ -1,4 +1,4 @@
.TH LH_BUILD 1 "02.07.2007" "1.0~a17" "live\-helper" .TH LH_BUILD 1 "09.07.2007" "1.0~a18" "live\-helper"
.SH NAME .SH NAME
lh_build \- erstellen eines Live-Systemes lh_build \- erstellen eines Live-Systemes

2
manpages/lh_build.en.1
View File

@ -1,4 +1,4 @@
.TH LH_BUILD 1 "2007\-07\-02" "1.0~a17" "live\-helper" .TH LH_BUILD 1 "2007\-07\-09" "1.0~a18" "live\-helper"
.SH NAME .SH NAME
lh_build \- building a live system lh_build \- building a live system

2
manpages/lh_chroot.de.1
View File

@ -1,4 +1,4 @@
.TH LH_CHROOT 1 "02.07.2007" "1.0~a17" "live\-helper" .TH LH_CHROOT 1 "09.07.2007" "1.0~a18" "live\-helper"
.SH NAME .SH NAME
lh_chroot \- Meta\-Helper f\[:u]r lh_chroot_* lh_chroot \- Meta\-Helper f\[:u]r lh_chroot_*

2
manpages/lh_chroot.en.1
View File

@ -1,4 +1,4 @@
.TH LH_CHROOT 1 "2007\-07\-02" "1.0~a17" "live\-helper" .TH LH_CHROOT 1 "2007\-07\-09" "1.0~a18" "live\-helper"
.SH NAME .SH NAME
lh_chroot \- meta\-helper for lh_chroot_* lh_chroot \- meta\-helper for lh_chroot_*

2
manpages/lh_clean.de.1
View File

@ -1,4 +1,4 @@
.TH LH_CLEAN 1 "02.07.2007" "1.0~a17" "live\-helper" .TH LH_CLEAN 1 "09.07.2007" "1.0~a18" "live\-helper"
.SH NAME .SH NAME
lh_clean \- r\[:a]umt das Build-Verzeichnis auf lh_clean \- r\[:a]umt das Build-Verzeichnis auf

2
manpages/lh_clean.en.1
View File

@ -1,4 +1,4 @@
.TH LH_CLEAN 1 "2007\-07\-02" "1.0~a17" "live\-helper" .TH LH_CLEAN 1 "2007\-07\-09" "1.0~a18" "live\-helper"
.SH NAME .SH NAME
lh_clean \- clean up system build directories lh_clean \- clean up system build directories

2
manpages/lh_source.de.1
View File

@ -1,4 +1,4 @@
.TH LH_SOURCE 1 "02.07.2007" "1.0~a17" "live\-helper" .TH LH_SOURCE 1 "09.07.2007" "1.0~a18" "live\-helper"
.SH NAME .SH NAME
lh_source \- Meta\-Helper f\[:u]r lh_source_* lh_source \- Meta\-Helper f\[:u]r lh_source_*

2
manpages/lh_source.en.1
View File

@ -1,4 +1,4 @@
.TH LH_SOURCE 1 "2007\-07\-02" "1.0~a17" "live\-helper" .TH LH_SOURCE 1 "2007\-07\-09" "1.0~a18" "live\-helper"
.SH NAME .SH NAME
lh_source \- meta\-helper for lh_source_* lh_source \- meta\-helper for lh_source_*

2
manpages/lh_testroot.de.1
View File

@ -1,4 +1,4 @@
.TH LH_TESTROOT 1 "02.07.2007" "1.0~a17" "live\-helper" .TH LH_TESTROOT 1 "09.07.2007" "1.0~a18" "live\-helper"
.SH NAME .SH NAME
lh_testroot \- stellt sicher dass das System als root gebaut wird lh_testroot \- stellt sicher dass das System als root gebaut wird

2
manpages/lh_testroot.en.1
View File

@ -1,4 +1,4 @@
.TH LH_TESTROOT 1 "2007\-07\-02" "1.0~a17" "live\-helper" .TH LH_TESTROOT 1 "2007\-07\-09" "1.0~a18" "live\-helper"
.SH NAME .SH NAME
lh_testroot \- ensure that a system is built as root lh_testroot \- ensure that a system is built as root

2
manpages/live-helper.de.7
View File

@ -1,4 +1,4 @@
.TH LIVE\-HELPER 7 "02.07.2007" "1.0~a17" "live\-helper" .TH LIVE\-HELPER 7 "09.07.2007" "1.0~a18" "live\-helper"
.SH NAME .SH NAME
live\-helper \- Debian Live Helper-Programme live\-helper \- Debian Live Helper-Programme

2
manpages/live-helper.en.7
View File

@ -1,4 +1,4 @@
.TH LIVE\-HELPER 7 "2007\-07\-02" "1.0~a17" "live\-helper" .TH LIVE\-HELPER 7 "2007\-07\-09" "1.0~a18" "live\-helper"
.SH NAME .SH NAME
live\-helper \- Debian Live helper programs live\-helper \- Debian Live helper programs

2
manpages/make-live.de.1
View File

@ -1,4 +1,4 @@
.TH MAKE\-LIVE 1 "02.07.2007" "1.0~a17" "live\-helper" .TH MAKE\-LIVE 1 "09.07.2007" "1.0~a18" "live\-helper"
.SH NAME .SH NAME
make\-live \- erstellt ein Debian Live-System make\-live \- erstellt ein Debian Live-System

2
manpages/make-live.en.1
View File

@ -1,4 +1,4 @@
.TH MAKE\-LIVE 1 "2007\-07\-02" "1.0~a17" "live\-helper" .TH MAKE\-LIVE 1 "2007\-07\-09" "1.0~a18" "live\-helper"
.SH NAME .SH NAME
make\-live \- build a Debian Live system make\-live \- build a Debian Live system

6
templates/grub/menu.lst
View File

@ -2,6 +2,8 @@ default 0
color cyan/blue white/blue color cyan/blue white/blue
splashimage /boot/grub/splash.xpm.gz splashimage /boot/grub/splash.xpm.gz
LIVE_LINUX_LIVE LINUX_LIVE
LIVE_LINUX_INSTALL LINUX_INSTALL
MEMTEST

27
templates/syslinux/pxelinux.cfg
View File

@ -1,27 +0,0 @@
default live
label live
kernel vmlinuz
append initrd=initrd.img boot=casper netboot nfsroot=LIVE_NET_SERVER:LIVE_NET_PATH LIVE_BOOTAPPEND
label nfs
kernel vmlinuz
append initrd=initrd.img boot=casper netboot=nfs nfsroot=LIVE_NET_SERVER:LIVE_NET_PATH LIVE_BOOTAPPEND
label nfslegacy
kernel vmlinuz
append initrd=initrd.img boot=casper root=/dev/nfs nfsroot=LIVE_NET_SERVER:LIVE_NET_PATH LIVE_BOOTAPPEND
label cifs
kernel vmlinuz
append initrd=initrd.img boot=casper netboot=cifs nfsroot=LIVE_NET_SERVER:LIVE_NET_PATH LIVE_BOOTAPPEND
label cifslegacy
kernel vmlinuz
append initrd=initrd.img boot=casper root=/dev/cifs nfsroot=LIVE_NET_SERVER:LIVE_NET_PATH LIVE_BOOTAPPEND
label memtest
kernel memtest
display pxelinux.cfg/isolinux.txt
timeout 0
prompt 1
F1 pxelinux.cfg/f1.txt
F3 pxelinux.cfg/f3.txt
F4 pxelinux.cfg/f4.txt
F8 pxelinux.cfg/f8.txt
F9 pxelinux.cfg/f9.txt
F0 pxelinux.cfg/f10.txt

0
templates/syslinux/isolinux.cfg → templates/syslinux/syslinux.cfg
View File

2
templates/yaboot/boot.msg
View File

@ -7,7 +7,7 @@ The default option is 'live'.
If the system fails to boot at all (the typical If the system fails to boot at all (the typical
symptom is a white screen which doesn't go away), symptom is a white screen which doesn't go away),
use 'live video=ofonly'. append 'video=ofonly' or use 'live-failsafe'.
The plain options are for the powerpc family of The plain options are for the powerpc family of
processors (from 601 to G4). The *64 options are for processors (from 601 to G4). The *64 options are for

6
templates/yaboot/yaboot.conf
View File

@ -1,6 +1,6 @@
default=live default=live
message=/live/boot.msg message=/yaboot/boot.msg
LIVE_LINUX_LIVE LINUX_LIVE
LIVE_LINUX_INSTALL LINUX_INSTALL