diff options
76 files changed, 1539 insertions, 5487 deletions
@@ -15,9 +15,19 @@ install: mkdir -p $(DESTDIR)/usr/share/doc/live-helper cp -r COPYING doc/* $(DESTDIR)/usr/share/doc/live-helper + # Installing manpages + mkdir -p $(DESTDIR)/usr/share/man/man1 + cp manpages/*.1 $(DESTDIR)/usr/share/man/man1 + + mkdir -p $(DESTDIR)/usr/share/man/man7 + cp manpages/*.7 $(DESTDIR)/usr/share/man/man7 + uninstall: # Uninstalling executables - rm -f $(DESTDIR)/usr/bin/lh_* $(DESTDIR)/usr/bin/make-live + for HELPER in helpers/*; \ + do \ + rm -f $(DESTDIR)/usr/bin/`basename $$HELPER`; \ + done # Uninstalling shared data rm -rf $(DESTDIR)/usr/share/live-helper @@ -25,6 +35,17 @@ uninstall: # Uninstalling documentation rm -rf $(DESTDIR)/usr/share/doc/live-helper + # Uninstalling manpages + for MANPAGE in manpages/*.1; \ + do \ + rm -f $(DESTDIR)/usr/share/man/man1/`basename $$MANPAGE`; \ + done + + for MANPAGE in manpages/*.7; \ + do \ + rm -f $(DESTDIR)/usr/share/man/man7/`basename $$MANPAGE`; \ + done + clean: reinstall: uninstall install diff --git a/debian/changelog b/debian/changelog index cb11408..8af6ff7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +live-helper (1.0~a2-1) unstable; urgency=low + + * New upstream release. + + -- Daniel Baumann <daniel@debian.org> Mon, 19 Mar 2007 00:00:00 +0100 + live-helper (1.0~a1-3) unstable; urgency=low * helpers/lh_chroot_hacks: Added removal of udev persistent-net rule. diff --git a/doc/CREDITS b/doc/CREDITS index cf8a3d4..f0bd7ef 100644 --- a/doc/CREDITS +++ b/doc/CREDITS @@ -7,6 +7,7 @@ Patches (alphabetical order): * Frederic Lehobey <Frederic.Lehobey@free.fr> * Guerkan Senguen <gurkan@linuks.mine.nu> * Hadar Weiss <whadar@gmail.com> + * Inigo Tejedor Arrondo <inigo@navarrux.org> * Jason D. Clinton <me@jasonclinton.com> * Kai Hendry <hendry@iki.fi> * Marcelo D. Re <mdre@rectorado.unl.edu.ar> diff --git a/doc/ChangeLog b/doc/ChangeLog index 1785b79..a3eae21 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,16 +1,112 @@ -2007-03-14 Daniel Baumann <daniel@debian.org> +2006-03-19 Daniel Baumann <daniel@debian.org> - * helpers/lh_chroot_hacks: Added removal of udev persistent-net rule. - * Uploaded 1.0~a1-3. + * Uploaded 1.0~a2-1. -2007-03-14 Daniel Baumann <daniel@debian.org> +2007-03-18 Daniel Baumann <daniel@debian.org> - * functions/defaults.sh: Fixed setting of LIVE_SYSVINIT. - * helpers/lh_chroot_sysvinit: Changed check for LIVE_SYSVINIT from disabled to - enabled. - * Uploaded 1.0~a1-2. + * functions/defaults.sh: + - Quoted date call in LIVE_ISO_VOLUME. + * manpages/lh_clean.1: + - Added. -2007-03-12 Daniel Baumann <daniel@debian.org> +2007-03-17 Daniel Baumann <daniel@debian.org> - * Rewritten live-package. - * Uploaded 1.0~a1-1. + * functions/defaults.sh, helpers/*: + - Renamed LIVE_MIRROR to LIVE_MIRROR_LOCAL and LIVE_MIRROR_SECURITY + to LIVE_MIRROR_LOCAL_SECURITY. + * doc/examples/beryl-hook.sh: + - Added, thanks to Inigo Tejedor Arrondo <inigo@navarrux.org>. + * helpers/lh_config, make-live: + - Added check for newconfig to prevent overwriting of non-specified + options to default values. + * helpers/lh_chroot_localhooks: + - Added basename where needed. + * helpers/lh_chroot_sources: + - Added check for local sources.list in config for custom + repositories. + - Replaced security check for etch with check for not-unstable. + * manpages/lh_binary.1, lh_bootstrap.1, lh_bootstrap_cdebootstrap.1, + lh_bootstrap_debootstrap.1, lh_testroot.1: + - Added. + * templates/syslinux/pxlinux.cfg: + - Fixed path. + +2007-03-16 Daniel Baumann <daniel@debian.org> + + * helpers/lh_binary_usb: Corrected stagefile creation. + +2007-03-15 Daniel Baumann <daniel@debian.org> + + * Makefile: + - Replaced helper uninstall routine with a less intrusive one. + * doc/NEWS: + - Updated. + * functions/conffile.sh: + - Beautified. + * functions/defaults.sh: + - Added LH_LOSETUP. + * functions/lockfile.sh: + - Beautified. + * helpers/*: + - Allowing apt-get, not just apt in LH_APT. + * helpers/lh_config: + - Added check for existing configuration. + * helpers/lh_binary_md5sum: + - Removed legacy code. + * helpers/lh_binary_manifest: + - Added creation of packages.txt. + * helpers/lh_binary_usb, lh_source_usb: + - Replaced loop device node workaround with a better one. + * helpers/lh_chroot_hooks, lh_chroot_localhooks: + - Fixed executable check. + * helpers/lh_source_config: + - Added. + * helpers/lh_source_download: + - Separeted debian sources and debian-live configuration into + different directories. + - Added live-helper to the sources. + * helpers/lh_source_generic, lh_source_iso, lh_source_usb, + lh_source_net: + - Removed annyoing warning when sources are disabled. + * helpers/lh_source_net: + - Beautified. + * helpers/make-live: + - Fixed typo in ARGUMENTS. + - Moved help, usage, version into functions. + - Removed build pre-option. + * manpages/live-helper.7: + - Added. + * templates/syslinux/f10.txt: + - Added note about Debian Live project. + +2007-03-14 Daniel Baumann <daniel@debian.org> + + * functions/defaults.sh, helpers/*: + - Converted LIVE_ROOT to directory, not full path. + * functions/*, helpers/*: + - Replaced LIVE_CHROOT with directory name. + * functions/conffile.sh: + - Added warning if CONFFILE is not readable. + * helpers/lh_chroot_localization: + - Completed check for koffice. + * helpers/lh_source_download: + - Fixed typo in old source removal. + +2007-03-14 Daniel Baumann <daniel@debian.org> + + * helpers/lh_chroot_hacks: + - Added removal of udev persistent-net rule. + * Uploaded 1.0~a1-3. + +2007-03-14 Daniel Baumann <daniel@debian.org> + + * functions/defaults.sh: + - Fixed setting of LIVE_SYSVINIT. + * helpers/lh_chroot_sysvinit: + - Changed check for LIVE_SYSVINIT from disabled to enabled. + * Uploaded 1.0~a1-2. + +2007-03-12 Daniel Baumann <daniel@debian.org> + + * Rewritten live-package. + * Uploaded 1.0~a1-1. @@ -12,7 +12,7 @@ News: * 2006-06-02: Added support for netboot image generation. http://lists.alioth.debian.org/pipermail/debian-live-devel/2006-May/000185.html - * 2006-07-17: Uploaded live-package to Debian unstable. + * 2006-07-17: Uploaded first live-package to Debian unstable. http://packages.debian.org/changelogs/pool/main/l/live-package/current/changelog#versionversion0.99-1 * 2007-02-05: Setup image autobuild server. @@ -24,4 +24,4 @@ News: * 2007-02-17: Added support for encrypted live filesystem. http://lists.alioth.debian.org/pipermail/debian-live-devel/2007-February/000836.html - * 2007-03-12: Uploaded live-helper to Debian unstable. + * 2007-03-12: Uploaded first live-helper to Debian unstable. @@ -55,6 +55,7 @@ |_ lh_binary_localincludes |_ lh_binary_md5sum | + |_ lh_binary_hdd |_ lh_binary_iso |_ lh_binary_net |_ lh_binary_usb @@ -70,8 +71,10 @@ |_ lh_chroot_resolv install |_ lh_chroot_sources install | + |_ lh_source_config |_ lh_source_download | + |_ lh_source_hdd |_ lh_source_generic |_ lh_source_iso |_ lh_source_net @@ -11,3 +11,8 @@ Todo: * write manpage and documentation * write lh_binary_di and lh_binary_gi * write lh_binary_grub + +Later: + * Add win32 autorun like + http://morphix.svn.sourceforge.net/viewvc/morphix/trunk/cdrom-misc/autorun/ + * Add loadlin batch diff --git a/doc/examples/beryl-hook.sh b/doc/examples/beryl-hook.sh new file mode 100755 index 0000000..1591487 --- /dev/null +++ b/doc/examples/beryl-hook.sh @@ -0,0 +1,60 @@ +#!/bin/sh + +# This is a hook for live-helper(7) to install beryl and enable aixgl. +# It was originally written by Inigo Tejedor Arrondo <inigo@navarrux.org>. +# To enable it, copy this hook into your config/chroot_localhooks directory. +# +# At boot prompt, type 'linux aixgl', press enter and have fun. + +# Update sources.list +cat >> /etc/apt/sources.list << EOF +# beryl-project +deb http://debian.beryl-project.org/ etch main +EOF + +if grep deb-src /etc/apt/sources.list +then + echo "deb-src http://debian.beryl-project.org/ etch main" >> /etc/apt/sources.list +fi + +# Import archive signing key +wget -O - http://debian.beryl-project.org/root@lupine.me.uk.gpg | apt-key add - + +# Update indices +apt-get update + +# Install packages +PACKAGES="beryl beryl-core beryl-manager beryl-plugins beryl-plugins-unsupported beryl-settings beryl-settings-bindings beryl-settings-simple" + +if [ -f /usr/bin/gnome-session ] +then + PACKAGES="${PACKAGES} emerald emerald-themes heliodor" +fi + +if [ -f /usr/bin/kstart ] +then + PACKAGES="${PACKAGES} aquamarine" +fi + +apt-get install --yes ${PACKAGES} + +# Add init script +cat > /etc/init.d/aixgl << EOF +#!/bin/sh + +if cat /proc/cmdline | grep aixgl > /dev/null +then + echo "Configuring xorg for aixgl..." + + echo "" >> /etc/X11/xorg.conf + echo "# Added by beryl-hook.sh" >> /etc/X11/xorg.conf + echo "Section \"Extensions\"" >> /etc/X11/xorg.conf + echo " Option \"Composite\" \"Enable\"" >> /etc/X11/xorg.conf + echo "EndSection" >> /etc/X11/xorg.conf + + sed -i -e "s/Section \"Device\""/"Section \"Device\"\n\t Option \"XAANoOffscreenPixmaps\" \"true\"\n\t Option \"AddARGBGLXVisuals\" \"on\"\n\t Option \"AllowGLXWithComposite\" \"true\"/" -e "s/Section \"Module\""/"Section \"Module\"\n\t Load \"i2c\"\n\t Load \"int10\"\n\t Load \"xtrap\"\n\t Load \"vbe\"/" /etc/X11/xorg.conf +fi +EOF + +chmod 0755 /etc/init.d/aixgl +update-rc.d aixgl defaults diff --git a/functions/chroot.sh b/functions/chroot.sh index 60de2dd..0dc0215 100755 --- a/functions/chroot.sh +++ b/functions/chroot.sh @@ -9,5 +9,5 @@ Chroot () COMMANDS="${1}" # Executing commands in chroot - chroot "${LIVE_CHROOT}" /usr/bin/env -i HOME="/root" PATH="/usr/sbin:/usr/bin:/sbin:/bin" TERM="${TERM}" ftp_proxy="${LH_APT_FTPPROXY}" http_proxy="${LH_APT_HTTPPPROXY}" DEBIAN_FRONTEND="${LH_DEBCONF_FRONTEND}" DEBIAN_PRIORITY="${LH_DEBCONF_PRIORITY}" ${COMMANDS} + chroot chroot /usr/bin/env -i HOME="/root" PATH="/usr/sbin:/usr/bin:/sbin:/bin" TERM="${TERM}" ftp_proxy="${LH_APT_FTPPROXY}" http_proxy="${LH_APT_HTTPPPROXY}" DEBIAN_FRONTEND="${LH_DEBCONF_FRONTEND}" DEBIAN_PRIORITY="${LH_DEBCONF_PRIORITY}" ${COMMANDS} } diff --git a/functions/conffile.sh b/functions/conffile.sh index 5df00d3..0cd8d29 100755 --- a/functions/conffile.sh +++ b/functions/conffile.sh @@ -9,8 +9,13 @@ Read_conffile () CONFFILE="${1}" # Reading configuration file - if [ -r "${CONFFILE}" ] + if [ -f "${CONFFILE}" ] then - . "${CONFFILE}" + if [ -r "${CONFFILE}" ] + then + . "${CONFFILE}" + else + echo "W: failed to read ${CONFFILE}" + fi fi } diff --git a/functions/defaults.sh b/functions/defaults.sh index 9463ad6..9ada89e 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -55,7 +55,7 @@ Set_defaults () fi # Setting bootstrap program - if [ -z "${LH_BOOTSTRAP}" ] + if [ -z "${LH_BOOTSTRAP}" ] || [ ! -x "${LH_BOOTSTRAP}" ] then if [ -x "/usr/bin/cdebootstrap" ] then @@ -87,32 +87,44 @@ Set_defaults () fi # Setting genisoimage - if [ -x /usr/bin/genisoimage ] + if [ -z "${LH_GENISOIMAGE}" ] || [ ! -x "${LH_GENISOIMAGE}" ] then - LH_GENISOIMAGE="genisoimage" - elif [ -x /usr/bin/mkisofs ] - then - LH_GENISOIMAGE="mkisofs" - else - echo "E: cannot find genisoimage nor mkisofs (FIXME)." - exit 1 + if [ -x /usr/bin/genisoimage ] + then + LH_GENISOIMAGE="genisoimage" + elif [ -x /usr/bin/mkisofs ] + then + LH_GENISOIMAGE="mkisofs" + else + echo "E: cannot find genisoimage nor mkisofs (FIXME)." + exit 1 + fi fi - # Setting root directory - if [ -z "${LIVE_ROOT}" ] + # Setting losetup + if [ -z "${LH_LOSETUP}" ] || [ ! -x "${LH_LOSETUP}" ] then - LIVE_ROOT="`pwd`/debian-live" + # Check for loop-aes-utils divertion + if [ -x /sbin/losetup.orig ] + then + LH_LOSETUP="losetup.orig" + elif [ -x /sbin/losetup ] + then + LH_LOSETUP="losetup" + else + echo "E: Can't process file /sbin/losetup (FIXME)" + fi fi - # Setting chroot directory - if [ -z "${LIVE_CHROOT}" ] + # Setting root directory + if [ -z "${LIVE_ROOT}" ] then - LIVE_CHROOT="${LIVE_ROOT}/chroot" + LIVE_ROOT="debian-live" fi ## config/bootstrap - # Setting architecture string + # Setting architecture value if [ -z "${LIVE_ARCHITECTURE}" ] then if [ -x "/usr/bin/dpkg" ] @@ -123,46 +135,46 @@ Set_defaults () fi fi - # Setting distribution string + # Setting distribution value if [ -z "${LIVE_DISTRIBUTION}" ] then LIVE_DISTRIBUTION="sid" fi - # Setting distribution configuration string + # Setting distribution configuration value # LIVE_DISTRIBUTION_CONFIG - # Setting flavour string + # Setting flavour value if [ -z "${LIVE_FLAVOUR}" ] then LIVE_FLAVOUR="standard" fi - # Setting mirror string - if [ -z "${LIVE_MIRROR}" ] + # Setting local mirror value + if [ -z "${LIVE_MIRROR_LOCAL}" ] then - LIVE_MIRROR="http://ftp.debian.org/debian/" + LIVE_MIRROR_LOCAL="http://ftp.debian.org/debian/" fi - # Setting security mirror string - if [ -z "${LIVE_MIRROR_SECURITY}" ] + # Setting local security mirror value + if [ -z "${LIVE_MIRROR_LOCAL_SECURITY}" ] then - LIVE_MIRROR_SECURITY="http://security.debian.org/" + LIVE_MIRROR_LOCAL_SECURITY="http://security.debian.org/" fi - # Setting mirror string + # Setting generic mirror value if [ -z "${LIVE_MIRROR_GENERIC}" ] then LIVE_MIRROR_GENERIC="http://ftp.debian.org/debian/" fi - # Setting security mirror string + # Setting generic security mirror value if [ -z "${LIVE_MIRROR_GENERIC_SECURITY}" ] then LIVE_MIRROR_GENERIC_SECURITY="http://security.debian.org/" fi - # Setting sections string + # Setting sections value if [ -z "${LIVE_SECTIONS}" ] then LIVE_SECTIONS="main" @@ -349,7 +361,7 @@ Set_defaults () # Setting iso volume if [ -z "${LIVE_ISO_VOLUME}" ] then - LIVE_ISO_VOLUME='Debian Live ${DATE}' + LIVE_ISO_VOLUME="Debian Live \`date +%Y%m%d\`" fi # Setting netboot server address diff --git a/functions/help.sh b/functions/help.sh new file mode 100755 index 0000000..7a6311a --- /dev/null +++ b/functions/help.sh @@ -0,0 +1,18 @@ +#!/bin/sh + +# help.sh - handle help information + +Help () +{ + echo "${PROGRAM} - ${DESCRIPTION}" + echo + echo "${USAGE}" + echo "Usage: ${PROGRAM} [-h|--help]" + echo "Usage: ${PROGRAM} [-u|--usage]" + echo "Usage: ${PROGRAM} [-v|--version]" + echo + echo "${HELP}" + echo + echo "Report bugs to Debian Live project <http://debian-live.alioth.debian.org/>." + exit 0 +} diff --git a/functions/lockfile.sh b/functions/lockfile.sh index 9eb2f9b..02cf18b 100755 --- a/functions/lockfile.sh +++ b/functions/lockfile.sh @@ -27,9 +27,9 @@ Create_lockfile () mkdir -p "${LOCKDIRECTORY}" fi - # Creating lock file - trap "test -f ${LOCKFILE} && \ - rm -f ${LOCKFILE}; exit 0" 0 2 15 + # Creating lock trap + trap "test -f ${LOCKFILE} && rm -f ${LOCKFILE}; exit 0" 0 2 15 + # Creating lock file touch "${LOCKFILE}" } diff --git a/functions/usage.sh b/functions/usage.sh new file mode 100755 index 0000000..7f8d694 --- /dev/null +++ b/functions/usage.sh @@ -0,0 +1,16 @@ +#!/bin/sh + +# usage.sh - handle usage information + +Usage () +{ + echo "${PROGRAM} - ${DESCRIPTION}" + echo + echo "${USAGE}" + echo "Usage: ${PROGRAM} [-h|--help]" + echo "Usage: ${PROGRAM} [-u|--usage]" + echo "Usage: ${PROGRAM} [-v|--version]" + echo + echo "Try \"${PROGRAM} --help\" for more information." + exit 1 +} diff --git a/functions/version.sh b/functions/version.sh index 2d5ff20..ebca430 100755 --- a/functions/version.sh +++ b/functions/version.sh @@ -2,5 +2,33 @@ # version.sh - handle version information -DATE="`date +%Y%m%d`" -VERSION="1.0~a1" +VERSION="1.0~a2" + +Version () +{ + echo "${PROGRAM}, version ${VERSION}" + echo "This program is a part of live-helper." + echo + echo "Copyright (C) 2006-2007 Daniel Baumann <daniel@debian.org>" + echo "Copyright (C) 2006-2007 Marco Amadori <marco.amadori@gmail.com>" + echo + echo "This program is free software; you can redistribute it and/or modify" + echo "it under the terms of the GNU General Public License as published by" + echo "the Free Software Foundation; either version 2 of the License, or" + echo "(at your option) any later version." + echo + echo "This program is distributed in the hope that it will be useful," + echo "but WITHOUT ANY WARRANTY; without even the implied warranty of" + echo "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the" + echo "GNU General Public License for more details." + echo + echo "You should have received a copy of the GNU General Public License" + echo "along with this program; if not, write to the Free Software" + echo "Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA" + echo + echo "On Debian systems, the complete text of the GNU General Public License" + echo "can be found in /usr/share/common-licenses/GPL file." + echo + echo "Homepage: <http://debian-live.alioth.debian.org/>" + exit 0 +} diff --git a/helpers/lh_binary b/helpers/lh_binary index 36dc722..cc392f5 100755 --- a/helpers/lh_binary +++ b/helpers/lh_binary @@ -2,17 +2,6 @@ # lh_image(1) - building the images -# Source common functions -for FUNCTION in /usr/share/live-helper/functions/*.sh -do - . ${FUNCTION} -done - -# Reading configuration files -Read_conffile config/common -Read_conffile config/image -Set_defaults - # Building root filesystem lh_binary_rootfs lh_binary_manifest @@ -34,6 +23,7 @@ lh_binary_localincludes lh_binary_md5sum # Building images +lh_binary_hdd lh_binary_iso lh_binary_net lh_binary_usb diff --git a/helpers/lh_binary_encryption b/helpers/lh_binary_encryption index 9df73b2..871adaa 100755 --- a/helpers/lh_binary_encryption +++ b/helpers/lh_binary_encryption @@ -16,17 +16,17 @@ Read_conffile config/image Set_defaults # Requiring stage file -Require_stagefile "${LIVE_ROOT}"/.stage/bootstrap -Require_stagefile "${LIVE_ROOT}"/.stage/binary_rootfs +Require_stagefile .stage/bootstrap +Require_stagefile .stage/binary_rootfs # Checking lock file -Check_lockfile "${LIVE_ROOT}"/.lock +Check_lockfile .lock # Creating lock file -Create_lockfile "${LIVE_ROOT}"/.lock +Create_lockfile .lock # Checking stage file -Check_stagefile "${LIVE_ROOT}"/.stage/binary_encryption +Check_stagefile .stage/binary_encryption if [ -n "${LIVE_ENCRYPTION}" ] then @@ -51,11 +51,11 @@ then ;; esac - echo "Encrypting ${LIVE_ROOT}/binary/casper/filesystem.${ROOTFS} with ${LIVE_ENCRYPTION}..." + echo "Encrypting binary/casper/filesystem.${ROOTFS} with ${LIVE_ENCRYPTION}..." while true do - cat ${LIVE_ROOT}/binary/casper/filesystem.${ROOTFS} | aespipe -e "${LIVE_ENCRYPTION}" -T > "${LIVE_ROOT}"/binary/casper/filesystem.${ROOTFS} && break + cat binary/casper/filesystem.${ROOTFS} | aespipe -e "${LIVE_ENCRYPTION}" -T > binary/casper/filesystem.${ROOTFS} && break echo -n "Something went wrong... Retry? [YES/no] " @@ -69,5 +69,5 @@ then done # Creating stage file - Create_stagefile "${LIVE_ROOT}"/.stage/binary_encryption + Create_stagefile .stage/binary_encryption fi diff --git a/helpers/lh_binary_hdd b/helpers/lh_binary_hdd new file mode 100755 index 0000000..d973db5 --- /dev/null +++ b/helpers/lh_binary_hdd @@ -0,0 +1,46 @@ +#!/bin/sh + +# lh_binary_hdd(1) - build harddisk binary image + +set -e + +# Source common functions +for FUNCTION in /usr/share/live-helper/functions/*.sh +do + . ${FUNCTION} +done + +# Reading configuration files +Read_conffile config/common +Read_conffile config/bootstrap +Read_conffile config/image +Set_defaults + +# Requiring stage file +Require_stagefile .stage/bootstrap + +# Checking lock file +Check_lockfile .lock + +# Creating lock file +Create_lockfile .lock + +# Checking stage file +Check_stagefile .stage/binary_hdd + +for IMAGE in ${LIVE_BINARY_IMAGE} +do + if [ "${IMAGE}" = "hdd" ] + then + # Remove old binary + if [ -f binary-hdd.tar.gz ] + then + rm -f binary-hdd.tar.gz + fi + + tar cfz binary-hdd.tar.gz binary + + # Creating stage file + Create_stagefile .stage/binary_hdd + fi +done diff --git a/helpers/lh_binary_includes b/helpers/lh_binary_includes index b170514..647ed0b 100755 --- a/helpers/lh_binary_includes +++ b/helpers/lh_binary_includes @@ -17,26 +17,26 @@ Read_conffile config/image Set_defaults # Requiring stage file -Require_stagefile "${LIVE_ROOT}"/.stage/bootstrap +Require_stagefile .stage/bootstrap # Checking lock file -Check_lockfile "${LIVE_ROOT}"/.lock +Check_lockfile .lock # Creating lock file -Create_lockfile "${LIVE_ROOT}"/.lock +Create_lockfile .lock # Checking stage file -Check_stagefile "${LIVE_ROOT}"/.stage/binary_includes +Check_stagefile .stage/binary_includes if ls /usr/share/live-helper/includes/common/* &> /dev/null then - cp -r /usr/share/live-helper/includes/common/* "${LIVE_ROOT}"/binary + cp -r /usr/share/live-helper/includes/common/* binary fi if ls /usr/share/live-helper/includes/"${LIVE_BINARY_IMAGE}"/* &> /dev/null then - cp -r /usr/share/live-helper/includes/"${LIVE_BINARY_IMAGE}"/* "${LIVE_ROOT}"/binary + cp -r /usr/share/live-helper/includes/"${LIVE_BINARY_IMAGE}"/* binary fi # Creating stage file -Create_stagefile "${LIVE_ROOT}"/.stage/binary_includes +Create_stagefile .stage/binary_includes diff --git a/helpers/lh_binary_iso b/helpers/lh_binary_iso index d39313f..102b5a4 100755 --- a/helpers/lh_binary_iso +++ b/helpers/lh_binary_iso @@ -17,38 +17,38 @@ Read_conffile config/image Set_defaults # Requiring stage file -Require_stagefile "${LIVE_ROOT}"/.stage/bootstrap +Require_stagefile .stage/bootstrap # Checking lock file -Check_lockfile "${LIVE_ROOT}"/.lock +Check_lockfile .lock # Creating lock file -Create_lockfile "${LIVE_ROOT}"/.lock +Create_lockfile .lock # Checking stage file -Check_stagefile "${LIVE_ROOT}"/.stage/binary_iso +Check_stagefile .stage/binary_iso for IMAGE in ${LIVE_BINARY_IMAGE} do if [ "${IMAGE}" = "iso" ] then # Remove old binary - if [ -f "${LIVE_ROOT}"/binary.iso ] + if [ -f binary.iso ] then - rm -f "${LIVE_ROOT}"/binary.iso + rm -f binary.iso fi # Create image if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] then - ${LH_GENISOIMAGE} -A "Debian Live" -p "Debian Live; http://debian-live.alioth.debian.org/; debian-live-devel@lists.alioth.debian.org" -publisher "Debian Live; http://debian-live.alioth.debian.org/; debian-live-devel@lists.alioth.debian.org" -o "${LIVE_ROOT}"/"${LIVE_IMAGE}"binary.iso -r -J -l -V "${LIVE_ISO_VOLUME}" -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table "${LIVE_ROOT}"/binary ${LIVE_INCLUDE_IMAGE} + ${LH_GENISOIMAGE} -A "Debian Live" -p "Debian Live; http://debian-live.alioth.debian.org/; debian-live-devel@lists.alioth.debian.org" -publisher "Debian Live; http://debian-live.alioth.debian.org/; debian-live-devel@lists.alioth.debian.org" -o "${LIVE_IMAGE}"binary.iso -r -J -l -V "${LIVE_ISO_VOLUME}" -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table binary ${LIVE_INCLUDE_IMAGE} else echo "W: Bootloader on your architecture not yet supported (Continuing in 5 seconds)." sleep 5 - ${LH_GENISOIMAGE} -A "Debian Live" -p "Debian Live; http://debian-live.alioth.debian.org/; debian-live-devel@lists.alioth.debian.org" -publisher "Debian Live; http://debian-live.alioth.debian.org/; debian-live-devel@lists.alioth.debian.org" -o "${LIVE_ROOT}"/"${LIVE_IMAGE}"binary.iso -r -J -l -V "${LIVE_ISO_VOLUME}" "${LIVE_ROOT}"/binary ${LIVE_INCLUDE_IMAGE} + ${LH_GENISOIMAGE} -A "Debian Live" -p "Debian Live; http://debian-live.alioth.debian.org/; debian-live-devel@lists.alioth.debian.org" -publisher "Debian Live; http://debian-live.alioth.debian.org/; debian-live-devel@lists.alioth.debian.org" -o "${LIVE_IMAGE}"binary.iso -r -J -l -V "${LIVE_ISO_VOLUME}" binary ${LIVE_INCLUDE_IMAGE} fi # Creating stage file - Create_stagefile "${LIVE_ROOT}"/.stage/binary_iso + Create_stagefile .stage/binary_iso fi done diff --git a/helpers/lh_binary_linuximage b/helpers/lh_binary_linuximage index d332c53..7a9576d 100755 --- a/helpers/lh_binary_linuximage +++ b/helpers/lh_binary_linuximage @@ -16,32 +16,32 @@ Read_conffile config/image Set_defaults # Requiring stage file -Require_stagefile "${LIVE_ROOT}"/.stage/bootstrap +Require_stagefile .stage/bootstrap # Checking lock file -Check_lockfile "${LIVE_ROOT}"/.lock +Check_lockfile .lock # Creating lock file -Create_lockfile "${LIVE_ROOT}"/.lock +Create_lockfile .lock # Checking stage file -Check_stagefile "${LIVE_ROOT}"/.stage/binary_linuximage +Check_stagefile .stage/binary_linuximage # Removing initrd backup files -rm -f "${LIVE_CHROOT}"/boot/initrd*bak* +rm -f chroot/boot/initrd*bak* # Setting destination directory case "${LIVE_BINARY_IMAGE}" in iso) - DESTDIR="${LIVE_ROOT}/binary/isolinux" + DESTDIR="binary/isolinux" ;; net) - DESTDIR="${LIVE_ROOT}/tftpboot" + DESTDIR="tftpboot" ;; - usb) - DESTDIR="${LIVE_ROOT}/binary" + usb|hdd) + DESTDIR="binary" ;; esac @@ -52,8 +52,8 @@ then fi # Installing linux-image -cp "${LIVE_CHROOT}"/boot/vmlinuz* "${DESTDIR}"/vmlinuz -cp "${LIVE_CHROOT}"/boot/initrd.img* "${DESTDIR}"/initrd.gz +cp chroot/boot/vmlinuz* "${DESTDIR}"/vmlinuz +cp chroot/boot/initrd.img* "${DESTDIR}"/initrd.gz # Creating stage file -Create_stagefile "${LIVE_ROOT}"/.stage/binary_linuximage +Create_stagefile .stage/binary_linuximage diff --git a/helpers/lh_binary_localincludes b/helpers/lh_binary_localincludes index 2aa6547..4cc2dd8 100755 --- a/helpers/lh_binary_localincludes +++ b/helpers/lh_binary_localincludes @@ -16,24 +16,24 @@ Read_conffile config/chroot Set_defaults # Requiring stage file -Require_stagefile "${LIVE_ROOT}"/.stage/bootstrap +Require_stagefile .stage/bootstrap # Checking lock file -Check_lockfile "${LIVE_ROOT}"/.lock +Check_lockfile .lock # Creating lock file -Create_lockfile "${LIVE_ROOT}"/.lock +Create_lockfile .lock # Checking stage file -Check_stagefile "${LIVE_ROOT}"/.stage/binary_localincludes +Check_stagefile .stage/binary_localincludes -if ls "${LIVE_ROOT}"/config/binary_localincludes/* &> /dev/null +if ls config/binary_localincludes/* &> /dev/null then - cd "${LIVE_ROOT}"/config/binary_localincludes - # Copying includes - find . | cpio -dmpu "${LIVE_ROOT}"/binary + cd config/binary_localincludes + find . | cpio -dmpu ../../binary + cd "${OLDPWD}" # Creating stage file - Create_stagefile "${LIVE_ROOT}"/.stage/binary_localincludes + Create_stagefile .stage/binary_localincludes fi diff --git a/helpers/lh_binary_manifest b/helpers/lh_binary_manifest index d109280..a0c2480 100755 --- a/helpers/lh_binary_manifest +++ b/helpers/lh_binary_manifest @@ -16,19 +16,22 @@ Read_conffile config/image Set_defaults # Requiring stage file -Require_stagefile "${LIVE_ROOT}"/.stage/bootstrap +Require_stagefile .stage/bootstrap # Checking lock file -Check_lockfile "${LIVE_ROOT}"/.lock +Check_lockfile .lock # Creating lock file -Create_lockfile "${LIVE_ROOT}"/.lock +Create_lockfile .lock # Checking stage file -Check_stagefile "${LIVE_ROOT}"/.stage/binary_manifest +Check_stagefile .stage/binary_manifest # Add filesystem.manifest -Chroot "dpkg --get-selections" | awk '{ print $1 }' | sort -u > "${LIVE_ROOT}"/binary/casper/filesystem.manifest +Chroot "dpkg --get-selections" | awk '{ print $1 }' | sort -u > binary/casper/filesystem.manifest + +# Add packages.list +Chroot "dpkg -l" > packages.txt # Creating stage file -Create_stagefile "${LIVE_ROOT}"/.stage/binary_manifest +Create_stagefile .stage/binary_manifest diff --git a/helpers/lh_binary_md5sum b/helpers/lh_binary_md5sum index 9ab3f35..cd925d9 100755 --- a/helpers/lh_binary_md5sum +++ b/helpers/lh_binary_md5sum @@ -16,36 +16,27 @@ Read_conffile config/image Set_defaults # Requiring stage file -Require_stagefile "${LIVE_ROOT}"/.stage/bootstrap +Require_stagefile .stage/bootstrap # Checking lock file -Check_lockfile "${LIVE_ROOT}"/.lock +Check_lockfile .lock # Creating lock file -Create_lockfile "${LIVE_ROOT}"/.lock +Create_lockfile .lock # Checking stage file -Check_stagefile "${LIVE_ROOT}"/.stage/binary_md5sum +Check_stagefile .stage/binary_md5sum # Remove old md5sums -if [ -f "${LIVE_ROOT}"/binary/md5sum.txt ] +if [ -f binary/md5sum.txt ] then - rm -f "${LIVE_ROOT}"/binary/md5sum.txt + rm -f binary/md5sum.txt fi # Calculating md5sums -cd "${LIVE_ROOT}"/binary -find . -type f -print0 | xargs -0 md5sum > "${LIVE_ROOT}"/md5sum.txt +cd binary +find . -type f -print0 | xargs -0 md5sum > md5sum.txt cd "${OLDPWD}" -if [ -d "${LIVE_INCLUDE_IMAGE}" ] -then - cd "${LIVE_INCLUDE_IMAGE}" - find . -type f -print0 | xargs -0 md5sum >> "${LIVE_ROOT}"/md5sum.txt - cd "${OLDPWD}" -fi - -mv "${LIVE_ROOT}"/md5sum.txt "${LIVE_ROOT}"/binary - # Creating stage file -Create_stagefile "${LIVE_ROOT}"/.stage/binary_md5sum +Create_stagefile .stage/binary_md5sum diff --git a/helpers/lh_binary_memtest86 b/helpers/lh_binary_memtest86 index 95952af..1fc3430 100755 --- a/helpers/lh_binary_memtest86 +++ b/helpers/lh_binary_memtest86 @@ -17,16 +17,16 @@ Read_conffile config/image Set_defaults # Requiring stage file -Require_stagefile "${LIVE_ROOT}"/.stage/bootstrap +Require_stagefile .stage/bootstrap # Checking lock file -Check_lockfile "${LIVE_ROOT}"/.lock +Check_lockfile .lock # Creating lock file -Create_lockfile "${LIVE_ROOT}"/.lock +Create_lockfile .lock # Checking stage file -Check_stagefile "${LIVE_ROOT}"/.stage/binary_memtest86 +Check_stagefile .stage/binary_memtest86 if [ "${LIVE_ARCHITECTURE}" != "amd64" ] && [ "${LIVE_ARCHITECTURE}" != "i386" ] then @@ -36,7 +36,7 @@ fi if [ "${LIVE_MEMTEST86}" = "enabled" ] then - if [ ! -f "${LIVE_CHROOT}"/boot/memtest86+.bin ] + if [ ! -f chroot/boot/memtest86+.bin ] then PACKAGES="${PACKAGES} memtest86+" fi @@ -45,7 +45,7 @@ then then # Installing symlinks case "${LH_APT}" in - apt) + apt|apt-get) Chroot "apt-get install --yes ${PACKAGES}" ;; @@ -57,15 +57,15 @@ then case "${LIVE_BINARY_IMAGE}" in iso) - DESTDIR="${LIVE_ROOT}/binary/isolinux" + DESTDIR="binary/isolinux" ;; net) - DESTDIR="${LIVE_ROOT}/tftpboot" + DESTDIR="tftpboot" ;; - usb) - DESTDIR="${LIVE_ROOT}/binary" + usb|hdd) + DESTDIR="binary" ;; esac @@ -76,13 +76,13 @@ then fi # Installing memtest86+ - cp "${LIVE_ROOT}"/chroot/boot/memtest86+.bin "${DESTDIR}"/memtest + cp chroot/boot/memtest86+.bin "${DESTDIR}"/memtest if [ -n "${PACKAGES}" ] then # Removing syslinux case "${LH_APT}" in - apt) + apt|apt-get) Chroot "apt-get remove --purge --yes ${PACKAGES}" ;; @@ -93,5 +93,5 @@ then fi # Creating stage file - Create_stagefile "${LIVE_ROOT}"/.stage/binary_memtest86 + Create_stagefile .stage/binary_memtest86 fi diff --git a/helpers/lh_binary_net b/helpers/lh_binary_net index 6281448..7d657c9 100755 --- a/helpers/lh_binary_net +++ b/helpers/lh_binary_net @@ -17,37 +17,38 @@ Read_conffile config/image Set_defaults # Requiring stage file -Require_stagefile "${LIVE_ROOT}"/.stage/bootstrap +Require_stagefile .stage/bootstrap # Checking lock file -Check_lockfile "${LIVE_ROOT}"/.lock +Check_lockfile .lock # Creating lock file -Create_lockfile "${LIVE_ROOT}"/.lock +Create_lockfile .lock # Checking stage file -Check_stagefile "${LIVE_ROOT}"/.stage/binary_net +Check_stagefile .stage/binary_net for IMAGE in ${LIVE_BINARY_IMAGE} do if [ "${IMAGE}" = "net" ] then # Remove old binary - if [ -f "${LIVE_ROOT}"/binary.tar.gz ] + if [ -f binary-net.tar.gz ] then - rm -f "${LIVE_ROOT}"/binary.tar.gz + rm -f binary-net.tar.gz fi # Creating image file - cd "${LIVE_ROOT}" && \ - mv binary "`basename ${LIVE_SERVER_PATH}`" && \ - cd .. && \ - tar cfz binary.tar.gz "`basename ${LIVE_ROOT}`/`basename ${LIVE_SERVER_PATH}`" "`basename ${LIVE_ROOT}`/tftpboot" && \ - mv binary.tar.gz "${LIVE_ROOT}" && \ - cd "${OLDPWD}" && \ + mv binary "`basename ${LIVE_SERVER_PATH}`" + + cd .. + tar cfz binary-net.tar.gz "${LIVE_ROOT}/`basename ${LIVE_SERVER_PATH}`" "${LIVE_ROOT}/tftpboot" + mv binary-net.tar.gz "${LIVE_ROOT}" + cd "${OLDPWD}" + mv "`basename ${LIVE_SERVER_PATH}`" binary # Creating stage file - Create_stagefile "${LIVE_ROOT}"/.stage/binary_net + Create_stagefile .stage/binary_net fi done diff --git a/helpers/lh_binary_rootfs b/helpers/lh_binary_rootfs index bbb2153..1ce994f 100755 --- a/helpers/lh_binary_rootfs +++ b/helpers/lh_binary_rootfs @@ -16,61 +16,61 @@ Read_conffile config/image Set_defaults # Requiring stage file -Require_stagefile "${LIVE_ROOT}"/.stage/bootstrap +Require_stagefile .stage/bootstrap # Checking lock file -Check_lockfile "${LIVE_ROOT}"/.lock +Check_lockfile .lock # Creating lock file -Create_lockfile "${LIVE_ROOT}"/.lock +Create_lockfile .lock # Checking stage file -Check_stagefile "${LIVE_ROOT}"/.stage/binary_rootfs +Check_stagefile .stage/binary_rootfs # Creating directory -if [ ! -d "${LIVE_ROOT}"/binary/casper ] +if [ ! -d binary/casper ] then - mkdir -p "${LIVE_ROOT}"/binary/casper + mkdir -p binary/casper fi case "${LIVE_FILESYSTEM}" in ext2) - if [ -f "${LIVE_ROOT}"/binary/casper/filesystem.ext2 ] + if [ -f binary/casper/filesystem.ext2 ] then - rm -f "${LIVE_ROOT}"/binary/casper/filesystem.ext2 + rm -f binary/casper/filesystem.ext2 fi - DU_DIM="`du -ks ${LIVE_CHROOT} | cut -f1`" + DU_DIM="`du -ks chroot | cut -f1`" REAL_DIM="`expr ${DU_DIM} + ${DU_DIM} / 20`" # Just 5% more to be sure, need something more sophistcated here... - genext2fs --size-in-blocks=${REAL_DIM} --reserved-blocks=0 --root="${LIVE_CHROOT}" "${LIVE_ROOT}"/binary/casper/filesystem.ext2 + genext2fs --size-in-blocks=${REAL_DIM} --reserved-blocks=0 --root=chroot binary/casper/filesystem.ext2 ;; plain) - if [ -d "${LIVE_ROOT}"/binary/casper/filesystem.dir ] + if [ -d binary/casper/filesystem.dir ] then - rm -rf "${LIVE_ROOT}"/binary/casper/filesystem.dir + rm -rf binary/casper/filesystem.dir fi - cd "${LIVE_CHROOT}" - find . | cpio -pumd "${LIVE_ROOT}"/binary/casper/filesystem.dir + cd chroot + find . | cpio -pumd ../binary/casper/filesystem.dir cd "${OLDPWD}" ;; squashfs) - if [ -f "${LIVE_ROOT}"/binary/casper/filesystem.squashfs ] + if [ -f binary/casper/filesystem.squashfs ] then - rm "${LIVE_ROOT}"/binary/casper/filesystem.squashfs + rm binary/casper/filesystem.squashfs fi if [ "${LIVE_FLAVOUR}" = "minimal" ] || [ "${LIVE_FLAVOUR}" = "mini" ] then - mksquashfs "${LIVE_CHROOT}" "${LIVE_ROOT}"/binary/casper/filesystem.squashfs -e "${LIVE_CHROOT}"/boot/vmlinuz* "${LIVE_CHROOT}"/boot/initrd.img* "${LIVE_CHROOT}"/vmlinuz "${LIVE_CHROOT}"/initrd.img "${LIVE_CHROOT}"/boot/config-* "${LIVE_CHROOT}"/boot/System.map-* + mksquashfs chroot binary/casper/filesystem.squashfs -e chroot/boot/vmlinuz* chroot/boot/initrd.img* chroot/vmlinuz chroot/initrd.img chroot/boot/config-* chroot/boot/System.map-* else - mksquashfs "${LIVE_CHROOT}" "${LIVE_ROOT}"/binary/casper/filesystem.squashfs + mksquashfs chroot binary/casper/filesystem.squashfs fi ;; esac # Creating stage file -Create_stagefile "${LIVE_ROOT}"/.stage/binary_rootfs +Create_stagefile .stage/binary_rootfs diff --git a/helpers/lh_binary_syslinux b/helpers/lh_binary_syslinux index 5384232..d80d66e 100755 --- a/helpers/lh_binary_syslinux +++ b/helpers/lh_binary_syslinux @@ -17,16 +17,16 @@ Read_conffile config/image Set_defaults # Requiring stage file -Require_stagefile "${LIVE_ROOT}"/.stage/bootstrap +Require_stagefile .stage/bootstrap # Checking lock file -Check_lockfile "${LIVE_ROOT}"/.lock +Check_lockfile .lock # Creating lock file -Create_lockfile "${LIVE_ROOT}"/.lock +Create_lockfile .lock # Checking stage file -Check_stagefile "${LIVE_ROOT}"/.stage/binary_syslinux +Check_stagefile .stage/binary_syslinux if [ "${LIVE_ARCHITECTURE}" != "amd64" ] && [ "${LIVE_ARCHITECTURE}" != "i386" ] then @@ -36,7 +36,7 @@ fi if [ "${LIVE_SYSLINUX}" = "enabled" ] then - if [ ! -f "${LIVE_CHROOT}"/usr/bin/syslinux ] + if [ ! -f chroot/usr/bin/syslinux ] then PACKAGES="${PACKAGES} syslinux" fi @@ -45,7 +45,7 @@ then then # Installing symlinks case "${LH_APT}" in - apt) + apt|apt-get) Chroot "apt-get install --yes ${PACKAGES}" ;; @@ -63,73 +63,73 @@ then case "${LIVE_BINARY_IMAGE}" in iso) # Copying syslinux - mkdir -p "${LIVE_ROOT}"/binary/isolinux - cp "${LIVE_CHROOT}"/usr/lib/syslinux/isolinux.bin "${LIVE_ROOT}"/binary/isolinux - cp -r "${LIVE_TEMPLATES}"/syslinux/* "${LIVE_ROOT}"/binary/isolinux + mkdir -p binary/isolinux + cp chroot/usr/lib/syslinux/isolinux.bin binary/isolinux + cp -r "${LIVE_TEMPLATES}"/syslinux/* binary/isolinux # Copying splash screen if [ -n "${LIVE_SYSLINUX_SPLASH}" ] then - cp "${LIVE_SYSLINUX_SPLASH}" "${LIVE_ROOT}/binary/isolinux/splash.rle" + cp "${LIVE_SYSLINUX_SPLASH}" binary/isolinux/splash.rle fi # Configure syslinux templates - sed -i -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" "${LIVE_ROOT}"/binary/isolinux/isolinux.cfg - sed -i -e "s/LIVE_DATE/${DATE}/" "${LIVE_ROOT}"/binary/isolinux/f1.txt - sed -i -e "s/LIVE_VERSION/${VERSION}/" "${LIVE_ROOT}"/binary/isolinux/f10.txt + sed -i -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" binary/isolinux/isolinux.cfg + sed -i -e "s/LIVE_DATE/`date +%Y%m%d`/" binary/isolinux/f1.txt + sed -i -e "s/LIVE_VERSION/${VERSION}/" binary/isolinux/f10.txt # Remove unused files - rm -f "${LIVE_ROOT}"/binary/isolinux/pxelinux.cfg + rm -f binary/isolinux/pxelinux.cfg ;; net) # Copying syslinux - mkdir -p "${LIVE_ROOT}"/tftpboot - cp "${LIVE_CHROOT}"/usr/lib/syslinux/pxelinux.0 "${LIVE_ROOT}"/tftpboot + mkdir -p tftpboot + cp chroot/usr/lib/syslinux/pxelinux.0 tftpboot # Install syslinux templates - mkdir -p "${LIVE_ROOT}"/tftpboot/pxelinux.cfg - cp -r "${LIVE_TEMPLATES}"/syslinux/* "${LIVE_ROOT}"/tftpboot/pxelinux.cfg - mv "${LIVE_ROOT}"/tftpboot/pxelinux.cfg/pxelinux.cfg "${LIVE_ROOT}"/tftpboot/pxelinux.cfg/default - sed -i -e 's#splash.rle#pxelinux.cfg/splash.rle#' "${LIVE_ROOT}"/tftpboot/pxelinux.cfg/isolinux.txt + mkdir -p tftpboot/pxelinux.cfg + cp -r "${LIVE_TEMPLATES}"/syslinux/* tftpboot/pxelinux.cfg + mv tftpboot/pxelinux.cfg/pxelinux.cfg tftpboot/pxelinux.cfg/default + sed -i -e 's#splash.rle#pxelinux.cfg/splash.rle#' tftpboot/pxelinux.cfg/isolinux.txt # Copying splash screen if [ -n "${LIVE_SYSLINUX_SPLASH}" ] then - cp "${LIVE_SYSLINUX_SPLASH}" "${LIVE_ROOT}/tftpboot/pxelinux.cfg/splash.rle" + cp "${LIVE_SYSLINUX_SPLASH}" ftpboot/pxelinux.cfg/splash.rle fi # Configure syslinux templates - sed -i -e "s/LIVE_SERVER_ADDRESS/${LIVE_SERVER_ADDRESS}/" -e "s#LIVE_SERVER_PATH#${LIVE_SERVER_PATH}#" -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" "${LIVE_ROOT}"/tftpboot/pxelinux.cfg/default - sed -i -e "s/LIVE_DATE/${DATE}/" "${LIVE_ROOT}"/tftpboot/pxelinux.cfg/f1.txt - sed -i -e "s/LIVE_VERSION/${VERSION}/" "${LIVE_ROOT}"/tftpboot/pxelinux.cfg/f10.txt + sed -i -e "s/LIVE_SERVER_ADDRESS/${LIVE_SERVER_ADDRESS}/" -e "s#LIVE_SERVER_PATH#${LIVE_SERVER_PATH}#" -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" tftpboot/pxelinux.cfg/default + sed -i -e "s/LIVE_DATE/`date +%Y%m%d`/" tftpboot/pxelinux.cfg/f1.txt + sed -i -e "s/LIVE_VERSION/${VERSION}/" tftpboot/pxelinux.cfg/f10.txt # Remove unused files - rm -f "${LIVE_ROOT}"/tftpboot/pxelinux.cfg/isolinux.cfg + rm -f tftpboot/pxelinux.cfg/isolinux.cfg ;; - usb) + usb|hdd) # Copying syslinux - mkdir -p "${LIVE_ROOT}"/binary - cp "${LIVE_CHROOT}"/usr/lib/syslinux/isolinux.bin "${LIVE_ROOT}"/binary/syslinux.bin - cp -r "${LIVE_TEMPLATES}"/syslinux/* "${LIVE_ROOT}"/binary - mv "${LIVE_ROOT}"/binary/isolinux.cfg "${LIVE_ROOT}"/binary/syslinux.cfg - mv "${LIVE_ROOT}"/binary/isolinux.txt "${LIVE_ROOT}"/binary/syslinux.txt - sed -i -e "s/isolinux.txt/syslinux.txt/" "${LIVE_ROOT}"/binary/syslinux.cfg + mkdir -p binary + cp chroot/usr/lib/syslinux/isolinux.bin binary/syslinux.bin + cp -r "${LIVE_TEMPLATES}"/syslinux/* binary + mv binary/isolinux.cfg binary/syslinux.cfg + mv binary/isolinux.txt binary/syslinux.txt + sed -i -e "s/isolinux.txt/syslinux.txt/" binary/syslinux.cfg # Copying splash screen if [ -n "${LIVE_SYSLINUX_SPLASH}" ] then - cp "${LIVE_SYSLINUX_SPLASH}" "${LIVE_ROOT}/binary/splash.rle" + cp "${LIVE_SYSLINUX_SPLASH}" binary/splash.rle fi # Configure syslinux templates - sed -i -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" "${LIVE_ROOT}"/binary/syslinux.cfg - sed -i -e "s/LIVE_DATE/${DATE}/" "${LIVE_ROOT}"/binary/f1.txt - sed -i -e "s/LIVE_VERSION/${VERSION}/" "${LIVE_ROOT}"/binary/f10.txt + sed -i -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" binary/syslinux.cfg + sed -i -e "s/LIVE_DATE/`date +%Y%m%d`/" binary/f1.txt + sed -i -e "s/LIVE_VERSION/${VERSION}/" binary/f10.txt # Remove unused files - rm -f "${LIVE_ROOT}"/binary/pxelinux.cfg + rm -f binary/pxelinux.cfg ;; esac @@ -137,7 +137,7 @@ then then # Removing syslinux case "${LH_APT}" in - apt) + apt|apt-get) Chroot "apt-get remove --purge --yes ${PACKAGES}" ;; @@ -148,5 +148,5 @@ then fi # Creating stage file - Create_stagefile "${LIVE_ROOT}"/.stage/binary_syslinux + Create_stagefile .stage/binary_syslinux fi diff --git a/helpers/lh_binary_usb b/helpers/lh_binary_usb index ec0d13f..79a3ee0 100755 --- a/helpers/lh_binary_usb +++ b/helpers/lh_binary_usb @@ -17,37 +17,38 @@ Read_conffile config/image Set_defaults # Requiring stage file -Require_stagefile "${LIVE_ROOT}"/.stage/bootstrap +Require_stagefile .stage/bootstrap +Require_stagefile .stage/chroot_proc # Checking lock file -Check_lockfile "${LIVE_ROOT}"/.lock +Check_lockfile .lock # Creating lock file -Create_lockfile "${LIVE_ROOT}"/.lock +Create_lockfile .lock # Checking stage file -Check_stagefile "${LIVE_ROOT}"/.stage/binary_usb +Check_stagefile .stage/binary_usb for IMAGE in ${LIVE_BINARY_IMAGE} do if [ "${IMAGE}" = "usb" ] then - if [ ! -f "${LIVE_CHROOT}"/sbin/mkdosfs ] + if [ ! -f chroot/sbin/mkdosfs ] then PACKAGES="${PACKAGES} dosfstools" fi - if [ ! -f "${LIVE_CHROOT}"/usr/bin/mtools ] + if [ ! -f chroot/usr/bin/mtools ] then PACKAGES="${PACKAGES} mtools" fi - if [ ! -f "${LIVE_CHROOT}"/sbin/parted ] + if [ ! -f chroot/sbin/parted ] then PACKAGES="${PACKAGES} parted" fi - if [ ! -f "${LIVE_CHROOT}"/usr/bin/syslinux ] + if [ ! -f chroot/usr/bin/syslinux ] then PACKAGES="${PACKAGES} syslinux" fi @@ -56,7 +57,7 @@ do then # Installing packages case "${LH_APT}" in - apt) + apt|apt-get) Chroot "apt-get install --yes ${PACKAGES}" ;; @@ -67,52 +68,55 @@ do fi # Remove old binary - if [ -f "${LIVE_ROOT}"/binary.img ] + if [ -f binary.img ] then - rm -f "${LIVE_ROOT}"/binary.img + rm -f binary.img fi # Everything which comes here needs to be cleaned up, - DU_DIM="`du -ms ${LIVE_ROOT}/binary | cut -f1`" + DU_DIM="`du -ms binary | cut -f1`" REAL_DIM="`expr ${DU_DIM} + ${DU_DIM} / 20`" # Just 5% more to be sure, need something more sophistcated here... - dd if=/dev/zero of="${LIVE_ROOT}"/binary.img bs=1024k count=${REAL_DIM} - FREELO="`losetup -f`" - if [ ! -b "${LIVE_CHROOT}"/${FREELO} ] + dd if=/dev/zero of=binary.img bs=1024k count=${REAL_DIM} + FREELO="`${LH_LOSETUP} -f`" + if [ ! -b chroot/${FREELO} ] then MAKEDEV="true" - Chroot "cd /dev && ./MAKEDEV ${FREELO}" + + mv chroot/dev chroot/dev.tmp + find /dev | cpio -dmpu chroot fi echo "!!! The following error/warning messages can be ignored !!!" - lh_losetup $FREELO "${LIVE_ROOT}"/binary.img 0 + lh_losetup $FREELO binary.img 0 Chroot "parted -s ${FREELO} mklabel msdos" || true Chroot "parted -s ${FREELO} mkpartfs primary fat16 0.0 100%" || true Chroot "parted -s ${FREELO} set 1 boot on" || true Chroot "parted -s ${FREELO} set 1 lba off" || true - cat "${LIVE_CHROOT}"/usr/lib/syslinux/mbr.bin > ${FREELO} - losetup -d ${FREELO} + cat chroot/usr/lib/syslinux/mbr.bin > ${FREELO} + ${LH_LOSETUP} -d ${FREELO} - lh_losetup $FREELO "${LIVE_ROOT}"/binary.img 1 + lh_losetup $FREELO binary.img 1 Chroot "mkfs.msdos -n DEBIAN_LIVE ${FREELO}" - mkdir -p "${LIVE_ROOT}"/binary.tmp - mount ${FREELO} "${LIVE_ROOT}"/binary.tmp - cp -r "${LIVE_ROOT}"/binary/* "${LIVE_ROOT}"/binary.tmp - umount "${LIVE_ROOT}"/binary.tmp - rmdir "${LIVE_ROOT}"/binary.tmp + mkdir -p binary.tmp + mount ${FREELO} binary.tmp + cp -r binary/* binary.tmp + umount binary.tmp + rmdir binary.tmp Chroot "syslinux ${FREELO}" - losetup -d ${FREELO} + ${LH_LOSETUP} -d ${FREELO} echo "!!! The above error/warning messages can be ignored !!!" if [ -n "${MAKEDEV}" ] then - rm -f "${LIVE_CHROOT}"/${FREELO} + rm -f chroot/dev + mv chroot/dev.tmp chroot/dev fi if [ -n "${PACKAGES}" ] then # Removing packages case "${LH_APT}" in - apt) + apt|apt-get) Chroot "apt-get remove --purge --yes ${PACKAGES}" ;; @@ -121,8 +125,8 @@ do ;; esac fi - fi - # Creating stage file - Create_stagefile "${LIVE_ROOT}"/.stage/binary_usb + # Creating stage file + Create_stagefile .stage/binary_usb + fi done diff --git a/helpers/lh_bootstrap b/helpers/lh_bootstrap index 9d1170d..c4db590 100755 --- a/helpers/lh_bootstrap +++ b/helpers/lh_bootstrap @@ -12,7 +12,6 @@ done # Reading configuration files Read_conffile config/common -Read_conffile config/bootstrap Set_defaults # Bootstrapping system diff --git a/helpers/lh_bootstrap_cdebootstrap b/helpers/lh_bootstrap_cdebootstrap index c5602a6..e4b83a2 100755 --- a/helpers/lh_bootstrap_cdebootstrap +++ b/helpers/lh_bootstrap_cdebootstrap @@ -19,24 +19,18 @@ Read_conffile config/bootstrap Set_defaults # Checking stage file -Check_stagefile "${LIVE_ROOT}"/.stage/bootstrap +Check_stagefile .stage/bootstrap # Checking lock file -Check_lockfile "${LIVE_ROOT}"/.lock +Check_lockfile .lock # Creating lock file -Create_lockfile "${LIVE_ROOT}"/.lock - -# Creating root directory -if [ ! -d "${LIVE_ROOT}" ] -then - mkdir -p "${LIVE_ROOT}" -fi +Create_lockfile .lock # Creating chroot directory -if [ ! -d "${LIVE_CHROOT}" ] +if [ ! -d chroot ] then - mkdir -p "${LIVE_CHROOT}" + mkdir -p chroot fi # Setting cdebootstrap options @@ -60,44 +54,44 @@ fi if [ -x "/usr/bin/cdebootstrap" ] then # Restore old cache - if [ -d "${LIVE_ROOT}"/cache/bootstrap ] + if [ -d cache/bootstrap ] then - mkdir -p "${LIVE_CHROOT}"/var/cache/bootstrap - cp "${LIVE_ROOT}"/cache/bootstrap/*.deb "${LIVE_CHROOT}"/var/cache/bootstrap + mkdir -p chroot/var/cache/bootstrap + cp cache/bootstrap/*.deb chroot/var/cache/bootstrap fi if [ "${LH_CACHE}" = "enabled" ] then # Executing cdebootstrap (download-only) - cdebootstrap ${CDEBOOTSTRAP_OPTIONS} --download-only "${LIVE_DISTRIBUTION}" "${LIVE_CHROOT}" "${LIVE_MIRROR}" + cdebootstrap ${CDEBOOTSTRAP_OPTIONS} --download-only "${LIVE_DISTRIBUTION}" chroot "${LIVE_MIRROR_LOCAL}" # Removing old cache - if [ -d "${LIVE_ROOT}"/cache/bootstrap ] + if [ -d cache/bootstrap ] then - rm -f "${LIVE_ROOT}"/cache/bootstrap/*.deb + rm -f cache/bootstrap/*.deb fi # Saving new cache - if [ ! -d "${LIVE_ROOT}"/cache/bootstrap ] + if [ ! -d cache/bootstrap ] then - mkdir -p "${LIVE_ROOT}"/cache/bootstrap + mkdir -p cache/bootstrap fi - cp "${LIVE_CHROOT}"/var/cache/bootstrap/*.deb "${LIVE_ROOT}"/cache/bootstrap + cp chroot/var/cache/bootstrap/*.deb cache/bootstrap fi # Executing cdebootstrap (regular run) - cdebootstrap ${CDEBOOTSTRAP_OPTIONS} "${LIVE_DISTRIBUTION}" "${LIVE_CHROOT}" "${LIVE_MIRROR}" + cdebootstrap ${CDEBOOTSTRAP_OPTIONS} "${LIVE_DISTRIBUTION}" chroot "${LIVE_MIRROR_LOCAL}" else echo "E: Can't process file /usr/bin/cdebootstrap (FIXME)" exit 1 fi # Removing bootstrap cache -if [ -d "${LIVE_CHROOT}/var/cache/bootstrap" ] +if [ -d chroot/var/cache/bootstrap ] then - rm -rf "${LIVE_CHROOT}"/var/cache/bootstrap + rm -rf chroot/var/cache/bootstrap fi # Creating stage file -Create_stagefile "${LIVE_ROOT}"/.stage/bootstrap +Create_stagefile .stage/bootstrap diff --git a/helpers/lh_bootstrap_debootstrap b/helpers/lh_bootstrap_debootstrap index 42009cb..8ff83af 100755 --- a/helpers/lh_bootstrap_debootstrap +++ b/helpers/lh_bootstrap_debootstrap @@ -19,24 +19,18 @@ Read_conffile config/bootstrap Set_defaults # Checking stage file -Check_stagefile "${LIVE_ROOT}"/.stage/bootstrap +Check_stagefile .stage/bootstrap # Checking lock file -Check_lockfile "${LIVE_ROOT}"/.lock +Check_lockfile .lock # Creating lock file -Create_lockfile "${LIVE_ROOT}"/.lock - -# Creating root directory -if [ ! -d "${LIVE_ROOT}" ] -then - mkdir -p "${LIVE_ROOT}" -fi +Create_lockfile .lock # Creating chroot directory -if [ ! -d "${LIVE_CHROOT}" ] +if [ ! -d chroot ] then - mkdir -p "${LIVE_CHROOT}" + mkdir -p chroot fi # Setting debootstrap options @@ -53,41 +47,41 @@ fi if [ -x "/usr/sbin/debootstrap" ] then # Restore old cache - if [ -d "${LIVE_ROOT}"/cache/bootstrap ] + if [ -d cache/bootstrap ] then - mkdir -p "${LIVE_CHROOT}"/var/cache/apt/archives - cp "${LIVE_ROOT}"/cache/bootstrap/*.deb "${LIVE_CHROOT}"/var/cache/apt/archives + mkdir -p chroot/var/cache/apt/archives + cp cache/bootstrap/*.deb chroot/var/cache/apt/archives fi if [ "${LH_CACHE}" = "enabled" ] then # Executing debootstrap (download-only) - debootstrap ${DEBOOTSTRAP_OPTIONS} --download-only "${LIVE_DISTRIBUTION}" "${LIVE_CHROOT}" "${LIVE_MIRROR}" "${LIVE_DEBOOTSTRAP_SCRIPT}" + debootstrap ${DEBOOTSTRAP_OPTIONS} --download-only "${LIVE_DISTRIBUTION}" chroot "${LIVE_MIRROR_LOCAL}" "${LIVE_DEBOOTSTRAP_SCRIPT}" # Removing old cache - if [ -d "${LIVE_ROOT}"/cache/bootstrap ] + if [ -d cache/bootstrap ] then - rm -f "${LIVE_ROOT}"/cache/bootstrap/*.deb + rm -f cache/bootstrap/*.deb fi # Saving new cache - if [ ! -d "${LIVE_ROOT}"/cache/bootstrap ] + if [ ! -d cache/bootstrap ] then - mkdir -p "${LIVE_ROOT}"/cache/bootstrap + mkdir -p cache/bootstrap fi - cp "${LIVE_CHROOT}"/var/cache/apt/archives/*.deb "${LIVE_ROOT}"/cache/bootstrap + cp chroot/var/cache/apt/archives/*.deb cache/bootstrap fi # Executing debootstrap (regular run) - debootstrap ${DEBOOTSTRAP_OPTIONS} "${LIVE_DISTRIBUTION}" "${LIVE_CHROOT}" "${LIVE_MIRROR}" "${LIVE_DEBOOTSTRAP_SCRIPT}" + debootstrap ${DEBOOTSTRAP_OPTIONS} "${LIVE_DISTRIBUTION}" chroot "${LIVE_MIRROR_LOCAL}" "${LIVE_DEBOOTSTRAP_SCRIPT}" else echo "E: Can't process file /usr/bin/debootstrap (FIXME)" exit 1 fi # Removing bootstrap cache -rm -rf "${LIVE_CHROOT}"/var/cache/apt/archives/*.deb +rm -rf chroot/var/cache/apt/archives/*.deb # Creating stage file -Create_stagefile "${LIVE_ROOT}"/.stage/bootstrap +Create_stagefile .stage/bootstrap diff --git a/helpers/lh_chroot_apt b/helpers/lh_chroot_apt index 3983923..fd37012 100755 --- a/helpers/lh_chroot_apt +++ b/helpers/lh_chroot_apt @@ -16,34 +16,34 @@ Read_conffile config/chroot Set_defaults # Requiring stage file -Require_stagefile "${LIVE_ROOT}"/.stage/bootstrap +Require_stagefile .stage/bootstrap # Checking lock file -Check_lockfile "${LIVE_ROOT}"/.lock +Check_lockfile .lock # Creating lock file -Create_lockfile "${LIVE_ROOT}"/.lock +Create_lockfile .lock case "${1}" in install) # Checking stage file - Check_stagefile "${LIVE_ROOT}"/.stage/chroot_apt + Check_stagefile .stage/chroot_apt - if [ "${LH_APT}" = "aptitude" ] && [ ! -d "${LIVE_CHROOT}"/etc/apt/apt.conf.d ] + if [ "${LH_APT}" = "aptitude" ] && [ ! -d chroot/etc/apt/apt.conf.d ] then - mkdir -p "${LIVE_CHROOT}"/etc/apt/apt.conf.d + mkdir -p chroot/etc/apt/apt.conf.d fi # Configuring apt ftp proxy if [ -n "${LH_APT_FTPPROXY}" ] then case "${LH_APT}" in - apt) - echo "Acquire::ftp::Proxy \"${LH_APT_FTPPROXY}\";" >> "${LIVE_CHROOT}"/etc/apt/apt.conf + apt|apt-get) + echo "Acquire::ftp::Proxy \"${LH_APT_FTPPROXY}\";" >> chroot/etc/apt/apt.conf ;; aptitude) - echo "Acquire::ftp::Proxy \"${LH_APT_FTPPROXY}\";" > "${LIVE_CHROOT}"/etc/apt/apt.conf.d/ftp-proxy + echo "Acquire::ftp::Proxy \"${LH_APT_FTPPROXY}\";" > chroot/etc/apt/apt.conf.d/ftp-proxy ;; esac fi @@ -52,12 +52,12 @@ case "${1}" in if [ -n "${LH_APT_HTTPPROXY}" ] then case "${LH_APT}" in - apt) - echo "Acquire::http::Proxy \"${LH_APT_HTTPPROXY}\";" >> "${LIVE_CHROOT}"/etc/apt/apt.conf + apt|apt-get) + echo "Acquire::http::Proxy \"${LH_APT_HTTPPROXY}\";" >> chroot/etc/apt/apt.conf ;; aptitude) - echo "Acquire::http::Proxy \"${LH_APT_HTTPPROXY}\";" > "${LIVE_CHROOT}"/etc/apt/apt.conf.d/http-proxy + echo "Acquire::http::Proxy \"${LH_APT_HTTPPROXY}\";" > chroot/etc/apt/apt.conf.d/http-proxy ;; esac fi @@ -66,22 +66,22 @@ case "${1}" in if [ "${LH_APT_PDIFFS}" = "enabled" ] then case "${LH_APT}" in - apt) - echo "Acquire::PDiffs \"true\";" >> "${LIVE_CHROOT}"/etc/apt/apt.conf + apt|apt-get) + echo "Acquire::PDiffs \"true\";" >> chroot/etc/apt/apt.conf ;; aptitude) - echo "Acquire::PDiffs \"true\";" > "${LIVE_CHROOT}"/etc/apt/apt.conf.d/pdiffs + echo "Acquire::PDiffs \"true\";" > chroot/etc/apt/apt.conf.d/pdiffs ;; esac else case "${LH_APT}" in - apt) - echo "Acquire::PDiffs \"false\";" >> "${LIVE_CHROOT}"/etc/apt/apt.conf + apt|apt-get) + echo "Acquire::PDiffs \"false\";" >> chroot/etc/apt/apt.conf ;; aptitude) - echo "Acquire::PDiffs \"false\";" > "${LIVE_CHROOT}"/etc/apt/apt.conf.d/pdiffs + echo "Acquire::PDiffs \"false\";" > chroot/etc/apt/apt.conf.d/pdiffs ;; esac fi @@ -90,48 +90,48 @@ case "${1}" in if [ "${LH_APT_RECOMMENDS}" = "enabled" ] then case "${LH_APT}" in - apt) - echo "Aptitude::Recommends-Important \"true\";" >> "${LIVE_CHROOT}"/etc/apt/apt.conf + apt|apt-get) + echo "Aptitude::Recommends-Important \"true\";" >> chroot/etc/apt/apt.conf ;; aptitude) - echo "Aptitude::Recommends-Important \"true\";" > "${LIVE_CHROOT}"/etc/apt/apt.conf.d/recommends + echo "Aptitude::Recommends-Important \"true\";" > chroot/etc/apt/apt.conf.d/recommends ;; esac else case "${LH_APT}" in - apt) - echo "Aptitude::Recommends-Important \"false\";" >> "${LIVE_CHROOT}"/etc/apt/apt.conf + apt|apt-get) + echo "Aptitude::Recommends-Important \"false\";" >> chroot/etc/apt/apt.conf ;; aptitude) - echo "Aptitude::Recommends-Important \"false\";" > "${LIVE_CHROOT}"/etc/apt/apt.conf.d/recommends + echo "Aptitude::Recommends-Important \"false\";" > chroot/etc/apt/apt.conf.d/recommends ;; esac fi # Creating stage file - Create_stagefile "${LIVE_ROOT}"/.stage/chroot_apt + Create_stagefile .stage/chroot_apt ;; remove) # Deconfiguring apt settings - rm -f "${LIVE_CHROOT}"/etc/apt/apt.conf + rm -f chroot/etc/apt/apt.conf # Deconfiguring aptitude ftp proxy - rm -f "${LIVE_CHROOT}"/etc/apt/apt.conf.d/ftp-proxy + rm -f chroot/etc/apt/apt.conf.d/ftp-proxy # Deconfiguring aptitude http proxy - rm -f "${LIVE_CHROOT}"/etc/apt/apt.conf.d/http-proxy + rm -f chroot/etc/apt/apt.conf.d/http-proxy # Deconfiguring aptitude pdiffs - rm -f "${LIVE_CHROOT}"/etc/apt/apt.conf.d/pdiffs + rm -f chroot/etc/apt/apt.conf.d/pdiffs # Deconfiguring aptitude recommends - rm -f "${LIVE_CHROOT}"/etc/apt/apt.conf.d/recommends + rm -f chroot/etc/apt/apt.conf.d/recommends # Removing stage file - rm -f "${LIVE_ROOT}"/.stage/chroot_apt + rm -f .stage/chroot_apt ;; *) diff --git a/helpers/lh_chroot_debianchroot b/helpers/lh_chroot_debianchroot index 6272fe0..d6fcaa3 100755 --- a/helpers/lh_chroot_debianchroot +++ b/helpers/lh_chroot_debianchroot @@ -16,44 +16,44 @@ Read_conffile config/chroot Set_defaults # Requiring stage file -Require_stagefile "${LIVE_ROOT}"/.stage/bootstrap +Require_stagefile .stage/bootstrap # Checking lock file -Check_lockfile "${LIVE_ROOT}"/.lock +Check_lockfile .lock # Creating lock file -Create_lockfile "${LIVE_ROOT}"/.lock +Create_lockfile .lock case "${1}" in install) # Checking stage file - Check_stagefile "${LIVE_ROOT}"/.stage/chroot_debianchroot + Check_stagefile .stage/chroot_debianchroot - if [ -f "${LIVE_CHROOT}"/etc/debian_chroot ] + if [ -f chroot/etc/debian_chroot ] then # Save chroot file - mv "${LIVE_CHROOT}"/etc/debian_chroot "${LIVE_CHROOT}"/etc/debian_chroot.orig + mv chroot/etc/debian_chroot chroot/etc/debian_chroot.orig fi # Create chroot file - echo "live" > "${LIVE_CHROOT}"/etc/debian_chroot + echo "live" > chroot/etc/debian_chroot # Creating stage file - Create_stagefile "${LIVE_ROOT}"/.stage/chroot_debianchroot + Create_stagefile .stage/chroot_debianchroot ;; remove) - if [ -f "${LIVE_CHROOT}"/etc/debian_chroot.orig ] + if [ -f chroot/etc/debian_chroot.orig ] then # Restore chroot file - mv "${LIVE_CHROOT}"/etc/debian_chroot.orig "${LIVE_CHROOT}"/etc/debian_chroot + mv chroot/etc/debian_chroot.orig chroot/etc/debian_chroot else # Remove chroot file - rm -f "${LIVE_CHROOT}"/etc/debian_chroot + rm -f chroot/etc/debian_chroot fi # Removing stage file - rm -f "${LIVE_ROOT}"/.stage/chroot_debianchroot + rm -f .stage/chroot_debianchroot ;; *) diff --git a/helpers/lh_chroot_hacks b/helpers/lh_chroot_hacks index d46e0c5..2b08283 100755 --- a/helpers/lh_chroot_hacks +++ b/helpers/lh_chroot_hacks @@ -16,16 +16,16 @@ Read_conffile config/chroot Set_defaults # Requiring stage file -Require_stagefile "${LIVE_ROOT}"/.stage/bootstrap +Require_stagefile .stage/bootstrap # Checking stage file -Check_stagefile "${LIVE_ROOT}"/.stage/chroot_hacks +Check_stagefile .stage/chroot_hacks # Checking lock file -Check_lockfile "${LIVE_ROOT}"/.lock +Check_lockfile .lock # Creating lock file -Create_lockfile "${LIVE_ROOT}"/.lock +Create_lockfile .lock # Removing udev mac caching rule rm -f chroot/etc/udev/rules.d/z25_persistent-net.rules @@ -33,7 +33,7 @@ rm -f chroot/etc/udev/rules.d/z25_persistent-net.rules case "${LIVE_BINARY_IMAGE}" in net) case "${LH_APT}" in - apt) + apt|apt-get) Chroot "apt-get install --yes smbfs" ;; @@ -42,13 +42,13 @@ case "${LIVE_BINARY_IMAGE}" in ;; esac - if [ ! -d "${LIVE_CHROOT}"/etc/initramfs-tools ] + if [ ! -d chroot/etc/initramfs-tools ] then - mkdir "${LIVE_CHROOT}"/etc/initramfs-tools + mkdir chroot/etc/initramfs-tools fi # Configuring initramfs for NFS -cat >> "${LIVE_CHROOT}"/etc/initramfs-tools/initramfs.conf << EOF +cat >> chroot/etc/initramfs-tools/initramfs.conf << EOF MODULES=netboot BOOT=nfs NFSROOT=auto @@ -60,4 +60,4 @@ esac Chroot "update-initramfs -tu" # Creating stage file -Create_stagefile "${LIVE_ROOT}"/.stage/chroot_hacks +Create_stagefile .stage/chroot_hacks diff --git a/helpers/lh_chroot_hooks b/helpers/lh_chroot_hooks index 727eed9..d655825 100755 --- a/helpers/lh_chroot_hooks +++ b/helpers/lh_chroot_hooks @@ -16,35 +16,35 @@ Read_conffile config/chroot Set_defaults # Requiring stage file -Require_stagefile "${LIVE_ROOT}"/.stage/bootstrap +Require_stagefile .stage/bootstrap # Checking stage file -Check_stagefile "${LIVE_ROOT}"/.stage/chroot_hooks +Check_stagefile .stage/chroot_hooks # Checking lock file -Check_lockfile "${LIVE_ROOT}"/.lock +Check_lockfile .lock # Creating lock file -Create_lockfile "${LIVE_ROOT}"/.lock +Create_lockfile .lock # Processing hooks if [ -n "${LIVE_PACKAGES_LIST}" ] && [ -f /usr/share/live-helper/hooks/"${LIVE_PACKAGES_LIST}" ] then # Copying hook - cp /usr/share/live-helper/hooks/"${LIVE_PACKAGES_LIST}" "${LIVE_CHROOT}"/root + cp /usr/share/live-helper/hooks/"${LIVE_PACKAGES_LIST}" chroot/root # Making hook executable - if [ -x "${LIVE_CHROOT}"/root/${LIVE_PACKAGES_LIST} ] + if [ ! -x chroot/root/${LIVE_PACKAGES_LIST} ] then - chmod +x "${LIVE_CHROOT}"/root/${LIVE_PACKAGES_LIST} + chmod +x chroot/root/${LIVE_PACKAGES_LIST} fi # Executing hook Chroot "/root/${LIVE_PACKAGES_LIST}" # Removing hook - rm -f "${LIVE_CHROOT}"/root/"${LIVE_PACKAGE_LIST}" + rm -f chroot/root/"${LIVE_PACKAGE_LIST}" # Creating stage file - Create_stagefile "${LIVE_ROOT}"/.stage/chroot_hooks + Create_stagefile .stage/chroot_hooks fi diff --git a/helpers/lh_chroot_hosts b/helpers/lh_chroot_hosts index d1c1607..48cc1c9 100755 --- a/helpers/lh_chroot_hosts +++ b/helpers/lh_chroot_hosts @@ -16,47 +16,47 @@ Read_conffile config/chroot Set_defaults # Requiring stage file -Require_stagefile "${LIVE_ROOT}"/.stage/bootstrap +Require_stagefile .stage/bootstrap # Checking lock file -Check_lockfile "${LIVE_ROOT}"/.lock +Check_lockfile .lock # Creating lock file -Create_lockfile "${LIVE_ROOT}"/.lock +Create_lockfile .lock case "${1}" in install) # Checking stage file - Check_stagefile "${LIVE_ROOT}"/.stage/chroot_hosts + Check_stagefile .stage/chroot_hosts - if [ -f "${LIVE_CHROOT}"/etc/hosts ] + if [ -f chroot/etc/hosts ] then # Save hosts file - cp "${LIVE_CHROOT}"/etc/hosts "${LIVE_CHROOT}"/etc/hosts.orig + cp chroot/etc/hosts chroot/etc/hosts.orig fi if [ -f /etc/hosts ] then # Copy hosts file - cp /etc/hosts "${LIVE_CHROOT}"/etc/hosts + cp /etc/hosts chroot/etc/hosts fi # Creating stage file - Create_stagefile "${LIVE_ROOT}"/.stage/chroot_hosts + Create_stagefile .stage/chroot_hosts ;; remove) - if [ -f "${LIVE_CHROOT}"/etc/hosts.orig ] + if [ -f chroot/etc/hosts.orig ] then # Restore hosts file - mv "${LIVE_CHROOT}"/etc/hosts.orig "${LIVE_CHROOT}"/etc/hosts + mv chroot/etc/hosts.orig chroot/etc/hosts else # Remove hosts file - rm -f "${LIVE_CHROOT}"/etc/hosts + rm -f chroot/etc/hosts fi # Removing stage file - rm -f "${LIVE_ROOT}"/.stage/chroot_hosts + rm -f .stage/chroot_hosts ;; *) diff --git a/helpers/lh_chroot_linuximage b/helpers/lh_chroot_linuximage index 354c507..0658155 100755 --- a/helpers/lh_chroot_linuximage +++ b/helpers/lh_chroot_linuximage @@ -16,34 +16,34 @@ Read_conffile config/chroot Set_defaults # Requiring stage file -Require_stagefile "${LIVE_ROOT}"/.stage/bootstrap +Require_stagefile .stage/bootstrap # Checking lock file -Check_lockfile "${LIVE_ROOT}"/.lock +Check_lockfile .lock # Creating lock file -Create_lockfile "${LIVE_ROOT}"/.lock +Create_lockfile .lock case "${1}" in install) # Checking stage file - Check_stagefile "${LIVE_ROOT}"/.stage/chroot_linuximage + Check_stagefile .stage/chroot_linuximage - if [ -f "${LIVE_CHROOT}"/etc/kernel-img.conf ] + if [ -f chroot/etc/kernel-img.conf ] then # Saving kernel-img.conf - cp "${LIVE_CHROOT}"/etc/kernel-img.conf "${LIVE_CHROOT}"/etc/kernel-img.conf.old + cp chroot/etc/kernel-img.conf chroot/etc/kernel-img.conf.old fi # Configuring kernel-img.conf - echo "do_initrd = Yes" >> "${LIVE_CHROOT}"/etc/kernel-img.conf + echo "do_initrd = Yes" >> chroot/etc/kernel-img.conf # Creating stage file - Create_stagefile "${LIVE_ROOT}"/.stage/chroot_linuximage + Create_stagefile .stage/chroot_linuximage # Installing linux-image, modules and casper case "${LH_APT}" in - apt) + apt|apt-get) Chroot "apt-get install --yes ${LIVE_KERNEL_PACKAGES}" ;; @@ -54,17 +54,17 @@ case "${1}" in ;; remove) - if [ -f "${LIVE_CHROOT}"/etc/kernel-img.conf.old ] + if [ -f chroot/etc/kernel-img.conf.old ] then # Restoring kernel-img.conf file - mv "${LIVE_CHROOT}"/etc/kernel-img.conf.old "${LIVE_CHROOT}"/etc/kernel-img.conf + mv chroot/etc/kernel-img.conf.old chroot/etc/kernel-img.conf else # Removing kernel-img.conf file - rm -f "${LIVE_CHROOT}"/etc/kernel-img.conf + rm -f chroot/etc/kernel-img.conf fi # Removing stage file - rm -f "${LIVE_ROOT}"/.stage/chroot_linuximage + rm -f .stage/chroot_linuximage ;; *) diff --git a/helpers/lh_chroot_localhooks b/helpers/lh_chroot_localhooks index 4d0bf3b..794e759 100755 --- a/helpers/lh_chroot_localhooks +++ b/helpers/lh_chroot_localhooks @@ -16,38 +16,38 @@ Read_conffile config/chroot Set_defaults # Requiring stage file -Require_stagefile "${LIVE_ROOT}"/.stage/bootstrap +Require_stagefile .stage/bootstrap # Checking stage file -Check_stagefile "${LIVE_ROOT}"/.stage/chroot_localhooks +Check_stagefile .stage/chroot_localhooks # Checking lock file -Check_lockfile "${LIVE_ROOT}"/.lock +Check_lockfile .lock # Creating lock file -Create_lockfile "${LIVE_ROOT}"/.lock +Create_lockfile .lock # Processing localhooks -if ls "${LIVE_ROOT}"/config/chroot_localhooks/* &> /dev/null +if ls config/chroot_localhooks/* &> /dev/null then - for HOOK in "${LIVE_ROOT}"/config/chroot_localhooks/* + for HOOK in config/chroot_localhooks/* do # Copying hook - cp "${HOOK}" "${LIVE_CHROOT}"/root + cp "${HOOK}" chroot/root # Making hook executable - if [ -x "${LIVE_CHROOT}"/root/"${HOOK}" ] + if [ ! -x chroot/root/"`basename ${HOOK}`" ] then - chmod +x "${LIVE_CHROOT}"/root/${HOOK} + chmod +x chroot/root/"`basename ${HOOK}`" fi # Executing hook Chroot "/root/`basename ${HOOK}`" # Removing hook - rm -f "${LIVE_CHROOT}"/"`basename ${HOOK}`" + rm -f chroot/"`basename ${HOOK}`" done # Creating stage file - Create_stagefile "${LIVE_ROOT}"/.stage/chroot_localhooks + Create_stagefile .stage/chroot_localhooks fi diff --git a/helpers/lh_chroot_localincludes b/helpers/lh_chroot_localincludes index 4c0957a..fc9c829 100755 --- a/helpers/lh_chroot_localincludes +++ b/helpers/lh_chroot_localincludes @@ -16,24 +16,24 @@ Read_conffile config/chroot Set_defaults # Requiring stage file -Require_stagefile "${LIVE_ROOT}"/.stage/bootstrap +Require_stagefile .stage/bootstrap # Checking stage file -Check_stagefile "${LIVE_ROOT}"/.stage/chroot_localincludes +Check_stagefile .stage/chroot_localincludes # Checking lock file -Check_lockfile "${LIVE_ROOT}"/.lock +Check_lockfile .lock # Creating lock file -Create_lockfile "${LIVE_ROOT}"/.lock +Create_lockfile .lock -if ls "${LIVE_ROOT}"/config/chroot_localincludes/* &> /dev/null +if ls config/chroot_localincludes/* &> /dev/null then - cd "${LIVE_ROOT}"/config/chroot_localincludes - # Copying includes - find . | cpio -dmpu "${LIVE_CHROOT}" + cd config/chroot_localincludes + find . | cpio -dmpu ../../chroot + cd "${OLDPWD}" # Creating stage file - Create_stagefile "${LIVE_ROOT}"/.stage/chroot_localincludes + Create_stagefile .stage/chroot_localincludes fi diff --git a/helpers/lh_chroot_localization b/helpers/lh_chroot_localization index bbf05bf..24d60c0 100755 --- a/helpers/lh_chroot_localization +++ b/helpers/lh_chroot_localization @@ -16,16 +16,16 @@ Read_conffile config/chroot Set_defaults # Requiring stage file -Require_stagefile "${LIVE_ROOT}"/.stage/bootstrap +Require_stagefile .stage/bootstrap # Checking stage file -Check_stagefile "${LIVE_ROOT}"/.stage/chroot_localization +Check_stagefile .stage/chroot_localization # Checking lock file -Check_lockfile "${LIVE_ROOT}"/.lock +Check_lockfile .lock # Creating lock file -Create_lockfile "${LIVE_ROOT}"/.lock +Create_lockfile .lock # Setting localizations if [ -n "${LIVE_LANGUAGE}" ] @@ -617,42 +617,42 @@ then do case "${LOCALZATION}" in iceape) - if [ -f "${LIVE_CHROOT}"/usr/bin/iceape ] + if [ -f chroot/usr/bin/iceape ] then PACKAGES="${PACKAGES} iceweasel-l10n-${ICEAPE}" fi ;; icedove) - if [ -f "${LIVE_CHROOT}"/usr/bin/icedove ] + if [ -f chroot/usr/bin/icedove ] then PACKAGES="${PACKAGES} icedove-locale-${ICEDOVE}" fi ;; iceweasel) - if [ -f "${LIVE_CHROOT}"/usr/bin/iceweasel ] + if [ -f chroot/usr/bin/iceweasel ] then PACKAGES="${PACKAGES} iceweasel-l10n-${ICEWEASEL}" fi ;; kde) - if [ -f "${LIVE_CHROOT}"/usr/bin/kstart ] + if [ -f chroot/usr/bin/kstart ] then PACKAGES="${PACKAGES} kde-i18n-${KDE}" fi ;; koffice) - if [ -f "${LIVE_CHROOT}" ] + if [ -f chroot/usr/bin/usr/bin/koconverter ] then PACKAGES="${PACKAGES} koffice-i18n-${KOFFICE}" fi ;; openoffice) - if [ -f "${LIVE_CHROOT}"/usr/bin/ooffice ] + if [ -f chroot/usr/bin/ooffice ] then PACKAGES="${PACKAGES} openoffice.org-l10n-${OPENOFFICE}" fi @@ -661,14 +661,14 @@ then done # Restore old cache - if [ -d "${LIVE_ROOT}"/cache/chroot_localization ] + if [ -d cache/chroot_localization ] then - cp "${LIVE_ROOT}"/cache/chroot_localization/*.deb "${LIVE_CHROOT}"/var/cache/apt/archives + cp cache/chroot_localization/*.deb chroot/var/cache/apt/archives fi # Installing packages case "${LH_APT}" in - apt) + apt|apt-get) Chroot "apt-get install --yes ${PACKAGES}" ;; @@ -680,16 +680,16 @@ then # Saving new cache Chroot "apt-get autoclean" - if ls "${LIVE_CHROOT}"/var/cache/apt/archives/*.deb &> /dev/null + if ls chroot/var/cache/apt/archives/*.deb &> /dev/null then - if [ ! -d "${LIVE_ROOT}"/cache/chroot_localization ] + if [ ! -d cache/chroot_localization ] then - mkdir -p "${LIVE_ROOT}"/cache/chroot_localization + mkdir -p cache/chroot_localization fi - mv -f "${LIVE_CHROOT}"/var/cache/apt/archives/*.deb "${LIVE_ROOT}"/cache/chroot_localization + mv -f chroot/var/cache/apt/archives/*.deb cache/chroot_localization fi # Creating stage file - Create_stagefile "${LIVE_ROOT}"/.stage/chroot_localization + Create_stagefile .stage/chroot_localization fi diff --git a/helpers/lh_chroot_localpackages b/helpers/lh_chroot_localpackages index 1ed4339..7f13acb 100755 --- a/helpers/lh_chroot_localpackages +++ b/helpers/lh_chroot_localpackages @@ -16,35 +16,35 @@ Read_conffile config/chroot Set_defaults # Requiring stage file -Require_stagefile "${LIVE_ROOT}"/.stage/bootstrap +Require_stagefile .stage/bootstrap # Checking stage file -Check_stagefile "${LIVE_ROOT}"/.stage/chroot_localpackages +Check_stagefile .stage/chroot_localpackages # Checking lock file -Check_lockfile "${LIVE_ROOT}"/.lock +Check_lockfile .lock # Creating lock file -Create_lockfile "${LIVE_ROOT}"/.lock +Create_lockfile .lock -if ls "${LIVE_ROOT}"/config/chroot_localpackages/*.deb &> /dev/null +if ls config/chroot_localpackages/*.deb &> /dev/null then # Restore old cache - if [ -d "${LIVE_ROOT}"/cache/chroot_localpackages ] + if [ -d cache/chroot_localpackages ] then - cp "${LIVE_ROOT}"/cache/chroot_localpackages/*.deb "${LIVE_CHROOT}"/var/cache/apt/archives + cp cache/chroot_localpackages/*.deb chroot/var/cache/apt/archives fi # Copying packages - cp "${LIVE_ROOT}"/config/chroot_localpackages/*.deb "${LIVE_CHROOT}"/root + cp config/chroot_localpackages/*.deb chroot/root # Installing packages - Chroot "find /root -name *.deb" > "${LIVE_CHROOT}"/root/localpackages + Chroot "find /root -name *.deb" > chroot/root/localpackages Chroot "xargs --arg-file=/root/localpackages dpkg -i" || true # Cleaning dependencies case "${LH_APT}" in - apt) + apt|apt-get) Chroot "apt-get install -f --yes" ;; @@ -54,22 +54,22 @@ then esac # Removing package files - rm -f "${LIVE_CHROOT}"/root/*.deb - rm -f "${LIVE_CHROOT}"/root/localpackages + rm -f chroot/root/*.deb + rm -f chroot/root/localpackages # Saving new cache Chroot "apt-get autoclean" - if ls "${LIVE_CHROOT}"/var/cache/apt/archives/*.deb &> /dev/null + if ls chroot/var/cache/apt/archives/*.deb &> /dev/null then - if [ ! -d "${LIVE_ROOT}"/cache/chroot_localpackages ] + if [ ! -d cache/chroot_localpackages ] then - mkdir -p "${LIVE_ROOT}"/cache/chroot_localpackages + mkdir -p cache/chroot_localpackages fi - mv -f "${LIVE_CHROOT}"/var/cache/apt/archives/*.deb "${LIVE_ROOT}"/cache/chroot_localpackages + mv -f chroot/var/cache/apt/archives/*.deb cache/chroot_localpackages fi # Creating stage file - Create_stagefile "${LIVE_ROOT}"/.stage/chroot_localpackages + Create_stagefile .stage/chroot_localpackages fi diff --git a/helpers/lh_chroot_localpackageslist b/helpers/lh_chroot_localpackageslist index a7313cb..5039bc3 100755 --- a/helpers/lh_chroot_localpackageslist +++ b/helpers/lh_chroot_localpackageslist @@ -16,33 +16,33 @@ Read_conffile config/chroot Set_defaults # Requiring stage file -Require_stagefile "${LIVE_ROOT}"/.stage/bootstrap +Require_stagefile .stage/bootstrap # Checking stage file -Check_stagefile "${LIVE_ROOT}"/.stage/chroot_localpackageslist +Check_stagefile .stage/chroot_localpackageslist # Checking lock file -Check_lockfile "${LIVE_ROOT}"/.lock +Check_lockfile .lock # Creating lock file -Create_lockfile "${LIVE_ROOT}"/.lock +Create_lockfile .lock -if ls "${LIVE_ROOT}"/config/chroot_localpackageslist/* &> /dev/null +if ls config/chroot_localpackageslist/* &> /dev/null then # Restore old cache - if [ -d "${LIVE_ROOT}"/cache/chroot_localpackageslist ] + if [ -d cache/chroot_localpackageslist ] then - cp "${LIVE_ROOT}"/cache/chroot_localpackageslist/*.deb "${LIVE_CHROOT}"/var/cache/apt/archives + cp cache/chroot_localpackageslist/*.deb chroot/var/cache/apt/archives fi - for PACKAGESLIST in "${LIVE_ROOT}"/config/chroot_localpackageslist/* + for PACKAGESLIST in config/chroot_localpackageslist/* do # Copying package list - grep -v "^#" "${PACKAGESLIST}" > "${LIVE_CHROOT}"/root/"`basename ${PACKAGESLIST}`" + grep -v "^#" "${PACKAGESLIST}" > chroot/root/"`basename ${PACKAGESLIST}`" # Installing package list case "${LH_APT}" in - apt) + apt|apt-get) Chroot "xargs --arg-file=/root/`basename ${PACKAGESLIST}` apt-get install --yes" ;; @@ -52,22 +52,22 @@ then esac # Removing package list - rm -f "${LIVE_CHROOT}"/root/"`basename ${PACKAGESLIST}`" + rm -f chroot/root/"`basename ${PACKAGESLIST}`" done # Saving new cache Chroot "apt-get autoclean" - if ls "${LIVE_CHROOT}"/var/cache/apt/archives/*.deb &> /dev/null + if ls chroot/var/cache/apt/archives/*.deb &> /dev/null then - if [ ! -d "${LIVE_ROOT}"/cache/chroot_localpackageslist ] + if [ ! -d cache/chroot_localpackageslist ] then - mkdir -p "${LIVE_ROOT}"/cache/chroot_localpackageslist + mkdir -p cache/chroot_localpackageslist fi - mv -f "${LIVE_CHROOT}"/var/cache/apt/archives/*.deb "${LIVE_ROOT}"/cache/chroot_localpackageslist + mv -f chroot/var/cache/apt/archives/*.deb cache/chroot_localpackageslist fi # Creating stage file - Create_stagefile "${LIVE_ROOT}"/.stage/chroot_localpackageslist + Create_stagefile .stage/chroot_localpackageslist fi diff --git a/helpers/lh_chroot_packages b/helpers/lh_chroot_packages index 14e9659..e61d160 100755 --- a/helpers/lh_chroot_packages +++ b/helpers/lh_chroot_packages @@ -17,28 +17,28 @@ Read_conffile config/chroot Set_defaults # Requiring stage file -Require_stagefile "${LIVE_ROOT}"/.stage/bootstrap +Require_stagefile .stage/bootstrap # Checking stage file -Check_stagefile "${LIVE_ROOT}"/.stage/chroot_packages +Check_stagefile .stage/chroot_packages # Checking lock file -Check_lockfile "${LIVE_ROOT}"/.lock +Check_lockfile .lock # Creating lock file -Create_lockfile "${LIVE_ROOT}"/.lock +Create_lockfile .lock if [ -n "${LIVE_PACKAGES}" ] then # Restore old cache - if [ -d "${LIVE_ROOT}"/cache/chroot ] + if [ -d cache/chroot ] then - cp "${LIVE_ROOT}"/cache/chroot_packages/*.deb "${LIVE_CHROOT}"/var/cache/apt/archives + cp cache/chroot_packages/*.deb chroot/var/cache/apt/archives fi # Installing packages case "${LH_APT}" in - apt) + apt|apt-get) Chroot "apt-get install --yes ${LIVE_PACKAGES}" ;; @@ -50,16 +50,16 @@ then # Saving new cache Chroot "apt-get autoclean" - if ls "${LIVE_CHROOT}"/var/cache/apt/archives/*.deb &> /dev/null + if ls chroot/var/cache/apt/archives/*.deb &> /dev/null then - if [ ! -d "${LIVE_ROOT}"/cache/chroot_packages ] + if [ ! -d cache/chroot_packages ] then - mkdir -p "${LIVE_ROOT}"/cache/chroot_packages + mkdir -p cache/chroot_packages fi - mv -f "${LIVE_CHROOT}"/var/cache/apt/archives/*.deb "${LIVE_ROOT}"/cache/chroot_packages + mv -f chroot/var/cache/apt/archives/*.deb cache/chroot_packages fi # Creating stage file - Create_stagefile "${LIVE_ROOT}"/.stage/chroot_packages + Create_stagefile .stage/chroot_packages fi diff --git a/helpers/lh_chroot_packageslist b/helpers/lh_chroot_packageslist index c222d7d..dfe3a5c 100755 --- a/helpers/lh_chroot_packageslist +++ b/helpers/lh_chroot_packageslist @@ -16,23 +16,23 @@ Read_conffile config/chroot Set_defaults # Requiring stage file -Require_stagefile "${LIVE_ROOT}"/.stage/bootstrap +Require_stagefile .stage/bootstrap # Checking stage file -Check_stagefile "${LIVE_ROOT}"/.stage/chroot_packageslist +Check_stagefile .stage/chroot_packageslist # Checking lock file -Check_lockfile "${LIVE_ROOT}"/.lock +Check_lockfile .lock # Creating lock file -Create_lockfile "${LIVE_ROOT}"/.lock +Create_lockfile .lock if [ -n "${LIVE_PACKAGES_LIST}" ] then # Restore old cache - if [ -d "${LIVE_ROOT}"/cache/chroot_packageslist ] + if [ -d cache/chroot_packageslist ] then - cp "${LIVE_ROOT}"/cache/chroot_packageslist/*.deb "${LIVE_CHROOT}"/var/cache/apt/archives + cp cache/chroot_packageslist/*.deb chroot/var/cache/apt/archives fi for LIST in ${LIVE_PACKAGES_LIST} @@ -40,11 +40,11 @@ then if [ -f /usr/share/live-helper/lists/"${LIST}" ] then # Copying package list - grep -v "^#" /usr/share/live-helper/lists/"${LIST}" > "${LIVE_CHROOT}"/root/"${LIST}" + grep -v "^#" /usr/share/live-helper/lists/"${LIST}" > chroot/root/"${LIST}" # Installing package list case "${LH_APT}" in - apt) + apt|apt-get) Chroot "xargs --arg-file=/root/${LIST} apt-get install --yes" ;; @@ -54,23 +54,23 @@ then esac # Removing package list - rm -f "${LIVE_CHROOT}"/root/"${LIST}" + rm -f chroot/root/"${LIST}" fi done # Saving new cache Chroot "apt-get autoclean" - if ls "${LIVE_CHROOT}"/var/cache/apt/archives/*.deb &> /dev/null + if ls chroot/var/cache/apt/archives/*.deb &> /dev/null then - if [ ! -d "${LIVE_ROOT}"/cache/chroot_packageslist ] + if [ ! -d cache/chroot_packageslist ] then - mkdir -p "${LIVE_ROOT}"/cache/chroot_packageslist + mkdir -p cache/chroot_packageslist fi - mv -f "${LIVE_CHROOT}"/var/cache/apt/archives/*.deb "${LIVE_ROOT}"/cache/chroot_packageslist + mv -f chroot/var/cache/apt/archives/*.deb cache/chroot_packageslist fi # Creating stage file - Create_stagefile "${LIVE_ROOT}"/.stage/chroot_packageslist + Create_stagefile .stage/chroot_packageslist fi diff --git a/helpers/lh_chroot_proc b/helpers/lh_chroot_proc index 1b78ecf..0310d9c 100755 --- a/helpers/lh_chroot_proc +++ b/helpers/lh_chroot_proc @@ -16,42 +16,42 @@ Read_conffile config/chroot Set_defaults # Requiring stage file -Require_stagefile "${LIVE_ROOT}"/.stage/bootstrap +Require_stagefile .stage/bootstrap # Checking lock file -Check_lockfile "${LIVE_ROOT}"/.lock +Check_lockfile .lock # Creating lock file -Create_lockfile "${LIVE_ROOT}"/.lock +Create_lockfile .lock case "${1}" in install) # Checking stage file - Check_stagefile "${LIVE_ROOT}"/.stage/chroot_proc + Check_stagefile .stage/chroot_proc - if [ ! -d "${LIVE_CHROOT}"/proc ] + if [ ! -d chroot/proc ] then # Creating mountpoint - mkdir -p "${LIVE_CHROOT}"/proc + mkdir -p chroot/proc fi # Mounting /proc - mount proc-live -t proc "${LIVE_CHROOT}"/proc + mount proc-live -t proc chroot/proc # Creating stage file - Create_stagefile "${LIVE_ROOT}"/.stage/chroot_proc + Create_stagefile .stage/chroot_proc ;; remove) # Workaround binfmt-support /proc locking - umount "${LIVE_CHROOT}"/proc/sys/fs/binfmt_misc > /dev/null 2>&1 || true + umount chroot/proc/sys/fs/binfmt_misc > /dev/null 2>&1 || true # Unmounting /proc - #fuser -km "${LIVE_CHROOT}"/proc - umount "${LIVE_CHROOT}"/proc > /dev/null 2>&1 + #fuser -km chroot/proc + umount chroot/proc > /dev/null 2>&1 # Removing stage file - rm -f "${LIVE_ROOT}"/.stage/chroot_proc + rm -f .stage/chroot_proc ;; *) diff --git a/helpers/lh_chroot_resolv b/helpers/lh_chroot_resolv index b6a7948..830c185 100755 --- a/helpers/lh_chroot_resolv +++ b/helpers/lh_chroot_resolv @@ -16,47 +16,47 @@ Read_conffile config/chroot Set_defaults # Requiring stage file -Require_stagefile "${LIVE_ROOT}"/.stage/bootstrap +Require_stagefile .stage/bootstrap # Checking lock file -Check_lockfile "${LIVE_ROOT}"/.lock +Check_lockfile .lock # Creating lock file -Create_lockfile "${LIVE_ROOT}"/.lock +Create_lockfile .lock case "${1}" in install) # Checking stage file - Check_stagefile "${LIVE_ROOT}"/.stage/chroot_resolv + Check_stagefile .stage/chroot_resolv - if [ -f "${LIVE_CHROOT}"/etc/resolv.conf ] + if [ -f chroot/etc/resolv.conf ] then # Save resolv file - cp "${LIVE_CHROOT}"/etc/resolv.conf "${LIVE_CHROOT}"/etc/resolv.conf.orig + cp chroot/etc/resolv.conf chroot/etc/resolv.conf.orig fi if [ -f /etc/resolv.conf ] then # Copy resolv file - cp /etc/resolv.conf "${LIVE_CHROOT}"/etc/resolv.conf + cp /etc/resolv.conf chroot/etc/resolv.conf fi # Creating stage file - Create_stagefile "${LIVE_ROOT}"/.stage/chroot_resolv + Create_stagefile .stage/chroot_resolv ;; remove) - if [ -f "${LIVE_CHROOT}"/etc/resolv.conf.orig ] + if [ -f chroot/etc/resolv.conf.orig ] then # Restore resolv file - mv "${LIVE_CHROOT}"/etc/resolv.conf.orig "${LIVE_CHROOT}"/etc/resolv.conf + mv chroot/etc/resolv.conf.orig chroot/etc/resolv.conf else # Remove resolv file - rm -f "${LIVE_CHROOT}"/etc/resolv.conf + rm -f chroot/etc/resolv.conf fi # Removing stage file - rm -f "${LIVE_ROOT}"/.stage/chroot_resolv + rm -f .stage/chroot_resolv ;; *) diff --git a/helpers/lh_chroot_sources b/helpers/lh_chroot_sources index 8d4ddbe..4fae531 100755 --- a/helpers/lh_chroot_sources +++ b/helpers/lh_chroot_sources @@ -18,47 +18,55 @@ Read_conffile config/image Set_defaults # Requiring stage file -Require_stagefile "${LIVE_ROOT}"/.stage/bootstrap +Require_stagefile .stage/bootstrap # Checking lock file -Check_lockfile "${LIVE_ROOT}"/.lock +Check_lockfile .lock # Creating lock file -Create_lockfile "${LIVE_ROOT}"/.lock +Create_lockfile .lock case "${1}" in install) # Checking stage file - Check_stagefile "${LIVE_ROOT}"/.stage/chroot_sources + Check_stagefile .stage/chroot_sources # Configure custom sources.list - echo "deb ${LIVE_MIRROR} ${LIVE_DISTRIBUTION} ${LIVE_SECTIONS}" > "${LIVE_CHROOT}"/etc/apt/sources.list + echo "deb ${LIVE_MIRROR_LOCAL} ${LIVE_DISTRIBUTION} ${LIVE_SECTIONS}" > chroot/etc/apt/sources.list if [ "${LIVE_SOURCE}" = "enabled" ] then - echo "deb-src ${LIVE_MIRROR} ${LIVE_DISTRIBUTION} ${LIVE_SECTIONS}" >> "${LIVE_CHROOT}"/etc/apt/sources.list + echo "deb-src ${LIVE_MIRROR_LOCAL} ${LIVE_DISTRIBUTION} ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list fi if [ "${LIVE_SECURITY}" = "enabled" ] then - if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "testing" ] + if [ "${LIVE_DISTRIBUTION}" != "sid" ] && [ "${LIVE_DISTRIBUTION}" = "unstable" ] then - echo "deb ${LIVE_MIRROR_SECURITY} ${LIVE_DISTRIBUTION}/updates ${LIVE_SECTIONS}" >> "${LIVE_CHROOT}"/etc/apt/sources.list + echo "deb ${LIVE_MIRROR_LOCAL_SECURITY} ${LIVE_DISTRIBUTION}/updates ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list if [ "${LIVE_SOURCE}" = "yes" ] then - echo "deb-src ${LIVE_MIRROR_SECURITY} ${LIVE_DISTRIBUTION}/updates ${LIVE_SECTIONS}" >> "${LIVE_CHROOT}"/etc/apt/sources.list + echo "deb-src ${LIVE_MIRROR_LOCAL_SECURITY} ${LIVE_DISTRIBUTION}/updates ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list fi fi fi + # Check local sources.list + if [ -f config/sources.list.local ] + then + echo "" >> chroot/etc/apt/sources.list + echo "# Custom repositories" >> chroot/etc/apt/sources.list + cat config/sources.list.local >> chroot/etc/apt/sources.list + fi + # Installing aptitude if [ "${LH_APT}" = "apt" ] then Chroot "apt-get update" elif [ "${LH_APT}" = "aptitude" ] then - if [ ! -x "${LH_CHROOT}"/usr/bin/aptitude ] + if [ ! -x /usr/bin/aptitude ] then Chroot "apt-get update" Chroot "apt-get install --yes --force-yes aptitude" @@ -68,7 +76,7 @@ case "${1}" in fi # Creating stage file - Create_stagefile "${LIVE_ROOT}"/.stage/chroot_sources + Create_stagefile .stage/chroot_sources ;; remove) @@ -76,31 +84,39 @@ case "${1}" in if [ "${LH_APT_GENERIC}" = "enabled" ] then # Cleaning apt list cache - rm -rf "${LIVE_CHROOT}"/var/lib/apt/lists - mkdir -p "${LIVE_CHROOT}"/var/lib/apt/lists/partial + rm -rf chroot/var/lib/apt/lists + mkdir -p chroot/var/lib/apt/lists/partial - echo "deb ${LIVE_MIRROR_GENERIC} ${LIVE_DISTRIBUTION} ${LIVE_SECTIONS}" > "${LIVE_CHROOT}"/etc/apt/sources.list + echo "deb ${LIVE_MIRROR_GENERIC} ${LIVE_DISTRIBUTION} ${LIVE_SECTIONS}" > chroot/etc/apt/sources.list if [ "${LIVE_SOURCE}" = "enabled" ] then - echo "deb-src ${LIVE_MIRROR_GENERIC} ${LIVE_DISTRIBUTION} ${LIVE_SECTIONS}" >> "${LIVE_CHROOT}"/etc/apt/sources.list + echo "deb-src ${LIVE_MIRROR_GENERIC} ${LIVE_DISTRIBUTION} ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list fi if [ "${LIVE_SECURITY}" = "enabled" ] then if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "testing" ] then - echo "deb ${LIVE_MIRROR_GENERIC_SECURITY} ${LIVE_DISTRIBUTION}/updates ${LIVE_SECTIONS}" >> "${LIVE_CHROOT}"/etc/apt/sources.list + echo "deb ${LIVE_MIRROR_GENERIC_SECURITY} ${LIVE_DISTRIBUTION}/updates ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list if [ "${LIVE_SOURCE}" = "yes" ] then - echo "deb-src ${LIVE_MIRROR_GENERIC_SECURITY} ${LIVE_DISTRIBUTION}/updates ${LIVE_SECTIONS}" >> "${LIVE_CHROOT}"/etc/apt/sources.list + echo "deb-src ${LIVE_MIRROR_GENERIC_SECURITY} ${LIVE_DISTRIBUTION}/updates ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list fi fi fi + # Check local sources.list + if [ -f config/sources.list.generic ] + then + echo "" >> chroot/etc/apt/sources.list + echo "# Custom repositories" >> chroot/etc/apt/sources.list + cat config/sources.list.generic >> chroot/etc/apt/sources.list + fi + case "${LH_APT}" in - apt) + apt|apt-get) Chroot "apt-get update" ;; @@ -111,17 +127,17 @@ case "${1}" in fi # Cleaning apt packages cache - rm -rf "${LIVE_CHROOT}"/var/cache/apt - mkdir -p "${LIVE_CHROOT}"/var/cache/apt/archives/partial + rm -rf chroot/var/cache/apt + mkdir -p chroot/var/cache/apt/archives/partial # Removing old files - rm -f "${LIVE_CHROOT}"/var/lib/dpkg/available-old - rm -f "${LIVE_CHROOT}"/var/lib/dpkg/diversions-old - rm -f "${LIVE_CHROOT}"/var/lib/dpkg/statoverride-old - rm -f "${LIVE_CHROOT}"/var/lib/dpkg/status-old + 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 - rm -f "${LIVE_ROOT}"/.stage/chroot_sources + rm -f .stage/chroot_sources ;; *) diff --git a/helpers/lh_chroot_symlinks b/helpers/lh_chroot_symlinks index 8da149f..9f958c6 100755 --- a/helpers/lh_chroot_symlinks +++ b/helpers/lh_chroot_symlinks @@ -16,20 +16,20 @@ Read_conffile config/chroot Set_defaults # Requiring stage file -Require_stagefile "${LIVE_ROOT}"/.stage/bootstrap +Require_stagefile .stage/bootstrap # Checking lock file -Check_lockfile "${LIVE_ROOT}"/.lock +Check_lockfile .lock # Creating lock file -Create_lockfile "${LIVE_ROOT}"/.lock +Create_lockfile .lock # Checking stage file -Check_stagefile "${LIVE_ROOT}"/.stage/chroot_symlinks +Check_stagefile .stage/chroot_symlinks if [ "${LIVE_SYMLINKS}" = "enabled" ] then - if [ -f "${LIVE_CHROOT}"/usr/bin/symlinks ] + if [ -f chroot/usr/bin/symlinks ] then SYMLINKS="true" fi @@ -38,7 +38,7 @@ then then # Installing symlinks case "${LH_APT}" in - apt) + apt|apt-get) Chroot "apt-get install --yes symlinks" ;; @@ -55,7 +55,7 @@ then then # Removing symlinks case "${LH_APT}" in - apt) + apt|apt-get) Chroot "apt-get remove --purge --yes symlinks" ;; @@ -66,5 +66,5 @@ then fi # Creating stage file - Create_stagefile "${LIVE_ROOT}"/.stage/chroot_symlinks + Create_stagefile .stage/chroot_symlinks fi diff --git a/helpers/lh_chroot_sysfs b/helpers/lh_chroot_sysfs index 421d993..8480061 100755 --- a/helpers/lh_chroot_sysfs +++ b/helpers/lh_chroot_sysfs @@ -16,39 +16,39 @@ Read_conffile config/chroot Set_defaults # Requiring stage file -Require_stagefile "${LIVE_ROOT}"/.stage/bootstrap +Require_stagefile .stage/bootstrap # Checking lock file -Check_lockfile "${LIVE_ROOT}"/.lock +Check_lockfile .lock # Creating lock file -Create_lockfile "${LIVE_ROOT}"/.lock +Create_lockfile .lock case "${1}" in install) # Checking stage file - Check_stagefile "${LIVE_ROOT}"/.stage/chroot_sysfs + Check_stagefile .stage/chroot_sysfs - if [ ! -d "${LIVE_CHROOT}"/sys ] + if [ ! -d chroot/sys ] then # Create mountpoint - mkdir -p "${LIVE_CHROOT}"/sys + mkdir -p chroot/sys fi # Mounting /sys - mount sys-live -t sysfs "${LIVE_CHROOT}"/sys + mount sys-live -t sysfs chroot/sys # Creating stage file - Create_stagefile "${LIVE_ROOT}"/.stage/chroot_sysfs + Create_stagefile .stage/chroot_sysfs ;; remove) # Unmounting /sys - #fuser -km "${LIVE_CHROOT}"/sys - umount "${LIVE_CHROOT}"/sys > /dev/null 2>&1 + #fuser -km chroot/sys + umount chroot/sys > /dev/null 2>&1 # Removing stage file - rm -f "${LIVE_ROOT}"/.stage/chroot_sysfs + rm -f .stage/chroot_sysfs ;; *) diff --git a/helpers/lh_chroot_sysvinit b/helpers/lh_chroot_sysvinit index 933da57..cae4b8a 100755 --- a/helpers/lh_chroot_sysvinit +++ b/helpers/lh_chroot_sysvinit @@ -16,21 +16,21 @@ Read_conffile config/chroot Set_defaults # Requiring stage file -Require_stagefile "${LIVE_ROOT}"/.stage/bootstrap +Require_stagefile .stage/bootstrap # Checking lock file -Check_lockfile "${LIVE_ROOT}"/.lock +Check_lockfile .lock # Creating lock file -Create_lockfile "${LIVE_ROOT}"/.lock +Create_lockfile .lock # Checking stage file -Check_stagefile "${LIVE_ROOT}"/.stage/chroot_sysvinit +Check_stagefile .stage/chroot_sysvinit if [ "${LIVE_SYSVINIT}" = "enabled" ] then # Disable all - for FILE in "${LIVE_CHROOT}"/etc/init.d/* + for FILE in chroot/etc/init.d/* do Chroot "update-rc.d -f `basename ${FILE}` remove" done @@ -38,7 +38,7 @@ then # Re-enable all required (taken from -f standard chroot) for PACKAGE in casper console-common cron dpkg ifupdown initscripts kbd klogd libc6 libdevmapper1.02 libselinux1 libsepol1 login makedev module-init-tools netbase openbsd-inetd procps sudo sysklogd udev util-linux do - if [ -f "${LIVE_CHROOT}"/var/lib/dpkg/info/${PACKAGE}.postinst ] + if [ -f chroot/var/lib/dpkg/info/${PACKAGE}.postinst ] then # Re-configure if existing Chroot "/var/lib/dpkg/info/${PACKAGE}.postinst configure" @@ -46,5 +46,5 @@ then done # Creating stage file - Create_stagefile "${LIVE_ROOT}"/.stage/chroot_sysvinit + Create_stagefile .stage/chroot_sysvinit fi diff --git a/helpers/lh_chroot_sysvrc b/helpers/lh_chroot_sysvrc index 4f4eeef..403982b 100755 --- a/helpers/lh_chroot_sysvrc +++ b/helpers/lh_chroot_sysvrc @@ -16,27 +16,27 @@ Read_conffile config/chroot Set_defaults # Requiring stage file -Require_stagefile "${LIVE_ROOT}"/.stage/bootstrap +Require_stagefile .stage/bootstrap # Checking lock file -Check_lockfile "${LIVE_ROOT}"/.lock +Check_lockfile .lock # Creating lock file -Create_lockfile "${LIVE_ROOT}"/.lock +Create_lockfile .lock case "${1}" in install) # Checking stage file - Check_stagefile "${LIVE_ROOT}"/.stage/chroot_sysvrc + Check_stagefile .stage/chroot_sysvrc - if [ -f "${LIVE_CHROOT}"/usr/sbin/policy-rc.d ] + if [ -f chroot/usr/sbin/policy-rc.d ] then # Save policy-rc.d file - mv "${LIVE_CHROOT}"/usr/sbin/policy-rc.d "${LIVE_CHROOT}"/usr/sbin/policy-rc.d.orig + mv chroot/usr/sbin/policy-rc.d chroot/usr/sbin/policy-rc.d.orig fi # Create policy-rc.d file -cat > "${LIVE_CHROOT}"/usr/sbin/policy-rc.d << EOF +cat > chroot/usr/sbin/policy-rc.d << EOF #!/bin/sh echo @@ -45,24 +45,24 @@ echo "Warning: invoke-rc.d policy in action. Skiping daemon starting" exit 101 EOF - chmod 0755 "${LIVE_CHROOT}"/usr/sbin/policy-rc.d + chmod 0755 chroot/usr/sbin/policy-rc.d # Creating stage file - Create_stagefile "${LIVE_ROOT}"/.stage/chroot_sysvrc + Create_stagefile .stage/chroot_sysvrc ;; remove) - if [ -f "${LIVE_CHROOT}"/usr/sbin/policy-rc.d.orig ] + if [ -f chroot/usr/sbin/policy-rc.d.orig ] then # Restore policy-rc.d file - mv "${LIVE_CHROOT}"/usr/sbin/policy-rc.d.orig "${LIVE_CHROOT}"/usr/sbin/policy-rc.d + mv chroot/usr/sbin/policy-rc.d.orig chroot/usr/sbin/policy-rc.d else # Remove policy-rc.d file - rm -f "${LIVE_CHROOT}"/usr/sbin/policy-rc.d + rm -f chroot/usr/sbin/policy-rc.d fi # Removing stage file - rm -f "${LIVE_ROOT}"/.stage/chroot_sysvrc + rm -f .stage/chroot_sysvrc ;; *) diff --git a/helpers/lh_chroot_tasks b/helpers/lh_chroot_tasks index 4959d76..b2ffb8f 100755 --- a/helpers/lh_chroot_tasks +++ b/helpers/lh_chroot_tasks @@ -16,23 +16,23 @@ Read_conffile config/chroot Set_defaults # Requiring stage file -Require_stagefile "${LIVE_ROOT}"/.stage/bootstrap +Require_stagefile .stage/bootstrap # Checking stage file -Check_stagefile "${LIVE_ROOT}"/.stage/chroot_tasks +Check_stagefile .stage/chroot_tasks # Checking lock file -Check_lockfile "${LIVE_ROOT}"/.lock +Check_lockfile .lock # Creating lock file -Create_lockfile "${LIVE_ROOT}"/.lock +Create_lockfile .lock if [ -n "${LIVE_TASKS}" ] && [ "${LH_APT}" = "aptitude" ] then # Restore old cache - if [ -d "${LIVE_ROOT}"/cache/chroot_tasks ] + if [ -d cache/chroot_tasks ] then - cp "${LIVE_ROOT}"/cache/chroot_tasks/*.deb "${LIVE_CHROOT}"/var/cache/apt/archives + cp cache/chroot_tasks/*.deb chroot/var/cache/apt/archives fi Chroot "aptitude install --assume-yes ${LIVE_TASKS}" @@ -40,16 +40,16 @@ then # Saving new cache Chroot "apt-get autoclean" - if ls "${LIVE_CHROOT}"/var/cache/apt/archives/*.deb &> /dev/null + if ls chroot/var/cache/apt/archives/*.deb &> /dev/null then - if [ ! -d "${LIVE_ROOT}"/cache/chroot_tasks ] + if [ ! -d cache/chroot_tasks ] then - mkdir -p "${LIVE_ROOT}"/cache/chroot_tasks + mkdir -p cache/chroot_tasks fi - mv -f "${LIVE_CHROOT}"/var/cache/apt/archives/*.deb "${LIVE_ROOT}"/cache/chroot_tasks + mv -f chroot/var/cache/apt/archives/*.deb cache/chroot_tasks fi # Creating stage file - Create_stagefile "${LIVE_ROOT}"/.stage/chroot_tasks + Create_stagefile .stage/chroot_tasks fi diff --git a/helpers/lh_clean b/helpers/lh_clean index f4c8960..8508a9c 100755 --- a/helpers/lh_clean +++ b/helpers/lh_clean @@ -26,43 +26,44 @@ case "${1}" in ;; cache) - rm -rf "${LIVE_ROOT}"/cache + rm -rf cache ;; chroot) - umount -f "${LIVE_CHROOT}"/sys > /dev/null 2>&1 || true - umount -f "${LIVE_CHROOT}"/proc > /dev/null 2>&1 || true - umount -f "${LIVE_CHROOT}"/lib/init/rw > /dev/null 2>&1 || true - umount -f "${LIVE_CHROOT}"/dev/shm > /dev/null 2>&1 || true - umount -f "${LIVE_CHROOT}"/dev/pts > /dev/null 2>&1 || true - umount -f "${LIVE_CHROOT}"/dev > /dev/null 2>&1 || true - - rm -rf "${LIVE_CHROOT}" + umount -f chroot/sys > /dev/null 2>&1 || true + umount -f chroot/proc > /dev/null 2>&1 || true + umount -f chroot/lib/init/rw > /dev/null 2>&1 || true + umount -f chroot/dev/shm > /dev/null 2>&1 || true + umount -f chroot/dev/pts > /dev/null 2>&1 || true + umount -f chroot/dev > /dev/null 2>&1 || true + + rm -rf chroot ;; binary) - rm -rf "${LIVE_ROOT}"/binary + rm -rf binary - rm -f "${LIVE_ROOT}"/binary.iso - rm -f "${LIVE_ROOT}"/binary.img - rm -f "${LIVE_ROOT}"/binary.tar.gz + rm -f binary.iso + rm -f binary.img + rm -f binary*.tar.gz + rm -f packages.txt - rm -f "${LIVE_ROOT}"/.stage/binary* + rm -f .stage/binary* ;; stage) - rm -rf "${LIVE_ROOT}"/.stage - rm -f "${LIVE_ROOT}"/.lock + rm -rf .stage + rm -f .lock ;; source) - rm -rf "${LIVE_ROOT}"/source + rm -rf source - rm -f "${LIVE_ROOT}"/source.iso - rm -f "${LIVE_ROOT}"/source.img - rm -f "${LIVE_ROOT}"/source.tar.gz + rm -f source.iso + rm -f source.img + rm -f source*.tar.gz - rm -f "${LIVE_ROOT}"/.stage/source* + rm -f .stage/source* ;; *) diff --git a/helpers/lh_config b/helpers/lh_config index a9bdb98..b0aff1e 100755 --- a/helpers/lh_config +++ b/helpers/lh_config @@ -10,6 +10,16 @@ do . ${FUNCTION} done +if [ "${1}" != "newconfig" ] +then + # Source existing configuration + Read_conffile "${LIVE_ROOT}"/config/common + Read_conffile "${LIVE_ROOT}"/config/bootstrap + Read_conffile "${LIVE_ROOT}"/config/chroot + Read_conffile "${LIVE_ROOT}"/config/image +fi + +# Setting defaults Set_defaults # Creating configuration directory @@ -47,7 +57,7 @@ LH_APT_RECOMMENDS="${LH_APT_RECOMMENDS}" # (Default: ${LH_BOOTSTRAP}) LH_BOOTSTRAP="${LH_BOOTSTRAP}" -# \$LH_CACHE: enable cache +# \$LH_CACHE: control if downloaded packages should be cached # (Default: ${LH_CACHE}) LH_CACHE="${LH_CACHE}" @@ -63,13 +73,13 @@ LH_DEBCONF_PRIORITY="${LH_DEBCONF_PRIORITY}" # (Default: autodetected) LH_GENISOIMAGE="${LH_GENISOIMAGE}" +# \$LH_LOSETUP: set the losetup program +# (Default: autodetected) +LH_LOSETUP="${LH_LOSETUP}" + # \$LIVE_ROOT: set the root directory -# (Default: \`pwd\`/debian-live) +# (Default: ${LIVE_ROOT}) LIVE_ROOT="${LIVE_ROOT}" - -# \$LIVE_CHROOT: set the chroot directory -# (Default: \${LIVE_ROOT}/chroot) -LIVE_CHROOT="${LIVE_CHROOT}" EOF # Creating lh_chroot_* configuration @@ -139,13 +149,13 @@ LIVE_DISTRIBUTION_CONFIG="${LIVE_DISTRIBUTION_CONFIG}" # (Default: ${LIVE_FLAVOUR}) LIVE_FLAVOUR="${LIVE_FLAVOUR}" -# \$LIVE_MIRROR: set the mirror to use -# (Default: ${LIVE_MIRROR}) -LIVE_MIRROR="${LIVE_MIRROR}" +# \$LIVE_MIRROR_LOCAL: set the local mirror to use +# (Default: ${LIVE_MIRROR_LOCAL}) +LIVE_MIRROR_LOCAL="${LIVE_MIRROR_LOCAL}" -# \$LIVE_MIRROR_SECURITY: set the security mirror to use -# (Default: ${LIVE_MIRROR_SECURITY}) -LIVE_MIRROR_SECURITY="${LIVE_MIRROR_SECURITY}" +# \$LIVE_MIRROR_LOCAL_SECURITY: set the local security mirror to use +# (Default: ${LIVE_MIRROR_LOCAL_SECURITY}) +LIVE_MIRROR_LOCAL_SECURITY="${LIVE_MIRROR_LOCAL_SECURITY}" # \$LIVE_MIRROR_GENERIC: set the generic mirror to use # (Default: ${LIVE_MIRROR_GENERIC}) @@ -155,7 +165,7 @@ LIVE_MIRROR_GENERIC="${LIVE_MIRROR_GENERIC}" # (Default: ${LIVE_MIRROR_GENERIC_SECURITY}) LIVE_MIRROR_GENERIC_SECURITY="${LIVE_MIRROR_GENERIC_SECURITY}" -# \$LIVE_SECTIONS: select the section to use +# \$LIVE_SECTIONS: select the section(s) to use # (Default: ${LIVE_SECTIONS}) LIVE_SECTIONS="${LIVE_SECTIONS}" EOF diff --git a/helpers/lh_losetup b/helpers/lh_losetup index 442afdb..94337ac 100755 --- a/helpers/lh_losetup +++ b/helpers/lh_losetup @@ -2,9 +2,21 @@ # lh_losetup <device> <file> <partition> +set -e + +# Source common functions +for FUNCTION in /usr/share/live-helper/functions/*.sh +do + . ${FUNCTION} +done + +# Reading configuration files +Read_conffile config/common +Set_defaults + if [ -z "${1}" ] then - DEVICE="`losetup -f`" + DEVICE="`${LH_LOSETUP} -f`" else DEVICE="${1}" fi @@ -12,9 +24,9 @@ fi FILE="${2}" PARTITION="${3}" -losetup "${DEVICE}" "${FILE}" +${LH_LOSETUP} "${DEVICE}" "${FILE}" FDISK_OUT="`fdisk -l -u ${DEVICE} 2>&1`" -losetup -d "${DEVICE}" +${LH_LOSETUP} -d "${DEVICE}" LOOPDEVICE="`echo ${DEVICE}p${PARTITION:=1}`" CYL=`echo "$FDISK_OUT" | sed -ne "s_^$LOOPDEVICE[ *]*\([0-9]*\).*_\1_p"` @@ -25,7 +37,7 @@ echo loop $DEVICE at offset $OFFSET if [ "${PARTITION}" = "0" ] then - losetup "${DEVICE}" "${FILE}" + ${LH_LOSETUP} "${DEVICE}" "${FILE}" else - losetup -o "${OFFSET}" "${DEVICE}" "${FILE}" + ${LH_LOSETUP} -o "${OFFSET}" "${DEVICE}" "${FILE}" fi diff --git a/helpers/lh_source b/helpers/lh_source index 5d08385..0d23184 100755 --- a/helpers/lh_source +++ b/helpers/lh_source @@ -19,6 +19,7 @@ lh_chroot_resolv install lh_chroot_sources install # Preparing images +lh_source_config lh_source_download # Building images @@ -28,6 +29,6 @@ lh_source_net lh_source_usb # Deconfiguring chroot -rm -f "${LIVE_ROOT}"/.stage/chroot_sources +rm -f .stage/chroot_sources lh_chroot_resolv remove lh_chroot_hosts remove diff --git a/helpers/lh_source_config b/helpers/lh_source_config new file mode 100755 index 0000000..fe96d09 --- /dev/null +++ b/helpers/lh_source_config @@ -0,0 +1,52 @@ +#!/bin/sh + +# lh_source_config(1) - copies debian-live config into source + +set -e + +# Source common functions +for FUNCTION in /usr/share/live-helper/functions/*.sh +do + . ${FUNCTION} +done + +# Reading configuration files +Read_conffile config/common +Read_conffile config/image +Set_defaults + +if [ "${LIVE_SOURCE}" = "enabled" ] +then + # Requiring stage file + Require_stagefile .stage/bootstrap + + # Checking lock file + Check_lockfile .lock + + # Creating lock file + Create_lockfile .lock + + # Checking stage file + Check_stagefile .stage/source_config + + # Remove old sources + if [ -d source/debian-live ] + then + rm -rf source/debian-live + fi + + # Copy system configuration + mkdir -p source/debian-live + cp -a config source/debian-live + + # Create tarball + cd source + tar cfz debian-live-config_`date +%Y%m%d.%s`.tar.gz debian-live + cd "${OLDPWD}" + + rm -rf source/debian-live/config + mv source/debian-live-config_*.tar.gz source/debian-live + + # Creating stage file + Create_stagefile .stage/source_config +fi diff --git a/helpers/lh_source_download b/helpers/lh_source_download index 0684d87..2081220 100755 --- a/helpers/lh_source_download +++ b/helpers/lh_source_download @@ -18,30 +18,31 @@ Set_defaults if [ "${LIVE_SOURCE}" = "enabled" ] then # Requiring stage file - Require_stagefile "${LIVE_ROOT}"/.stage/bootstrap + Require_stagefile .stage/bootstrap # Checking lock file - Check_lockfile "${LIVE_ROOT}"/.lock + Check_lockfile .lock # Creating lock file - Create_lockfile "${LIVE_ROOT}"/.lock + Create_lockfile .lock # Checking stage file - Check_stagefile "${LIVE_ROOT}"/.stage/source_download + Check_stagefile .stage/source_download # Remove old sources - if [ "${LIVE_ROOT}"/source ] + if [ -d source/debian ] then - rm -rf "${LIVE_ROOT}"/source + rm -rf source/debian fi # Download sources - Chroot "dpkg --get-selections" | awk '{ print $1 }' > "${LIVE_CHROOT}"/root/dpkg-selection.txt + Chroot "dpkg --get-selections" | awk '{ print $1 }' > chroot/root/dpkg-selection.txt + #echo "live-helper" >> chroot/root/dpkg-selection.txt Chroot "xargs --arg-file=/root/dpkg-selection.txt apt-get source --download-only" - rm -f "${LIVE_CHROOT}"/root/dpkg-selection.txt + rm -f chroot/root/dpkg-selection.txt # Sort sources - for DSC in "${LIVE_CHROOT}"/*.dsc + for DSC in chroot/*.dsc do SOURCE="`awk '/Source:/ { print $2; }' ${DSC}`" @@ -53,15 +54,12 @@ then fi # Install directory - install -d -m 0755 "${LIVE_ROOT}"/source/"${LETTER}"/"${SOURCE}" + install -d -m 0755 source/debian/"${LETTER}"/"${SOURCE}" # Move files - mv "${LIVE_CHROOT}"/"${SOURCE}"_* "${LIVE_ROOT}"/source/"${LETTER}"/"${SOURCE}" + mv chroot/"${SOURCE}"_* source/debian/"${LETTER}"/"${SOURCE}" done - # Copy system configuration - cp -a "${LIVE_ROOT}"/config "${LIVE_ROOT}"/source - # Creating stage file - Create_stagefile "${LIVE_ROOT}"/.stage/source_download + Create_stagefile .stage/source_download fi diff --git a/helpers/lh_source_generic b/helpers/lh_source_generic index a4fa1cc..88b0bf7 100755 --- a/helpers/lh_source_generic +++ b/helpers/lh_source_generic @@ -17,7 +17,6 @@ Set_defaults if [ "${LIVE_SOURCE}" = "disabled" ] then - echo "W: source images disabled (FIXME)" exit 0 fi @@ -26,28 +25,27 @@ do if [ "${IMAGE}" = "generic" ] then # Requiring stage file - Require_stagefile "${LIVE_ROOT}"/.stage/source_download + Require_stagefile .stage/source_download # Checking lock file - Check_lockfile "${LIVE_ROOT}"/.lock + Check_lockfile .lock # Creating lock file - Create_lockfile "${LIVE_ROOT}"/.lock + Create_lockfile .lock # Checking stage file - Check_stagefile "${LIVE_ROOT}"/.stage/source_generic + Check_stagefile .stage/source_generic # Remove old source - if [ -f "${LIVE_ROOT}"/source.tar ] + if [ -f source.tar ] then - rm -f "${LIVE_ROOT}"/source.tar + rm -f source.tar fi # Create tarball - cd "${LIVE_ROOT}" && tar cf source.tar source # Creating stage file - Create_stagefile "${LIVE_ROOT}"/.stage/source_generic + Create_stagefile .stage/source_generic fi done diff --git a/helpers/lh_source_hdd b/helpers/lh_source_hdd new file mode 100755 index 0000000..93eaa7f --- /dev/null +++ b/helpers/lh_source_hdd @@ -0,0 +1,51 @@ +#!/bin/sh + +# lh_source_hdd(1) - build source harddisk image + +set -e + +# Source common functions +for FUNCTION in /usr/share/live-helper/functions/*.sh +do + . ${FUNCTION} +done + +# Reading configuration files +Read_conffile config/common +Read_conffile config/image +Set_defaults + +if [ "${LIVE_SOURCE}" = "disabled" ] +then + exit 0 +fi + +for IMAGE in ${LIVE_SOURCE_IMAGE} +do + if [ "${IMAGE}" = "hdd" ] + then + # Requiring stage file + Require_stagefile .stage/source_download + + # Checking lock file + Check_lockfile .lock + + # Creating lock file + Create_lockfile .lock + + # Checking stage file + Check_stagefile .stage/source_hdd + + # Remove old source + if [ -f source-hdd.tar.gz ] + then + rm -f source-hdd.tar.gz + fi + + # Create tarball + tar cfz source-hdd.tar.gz source + + # Creating stage file + Create_stagefile .stage/source_hdd + fi +done diff --git a/helpers/lh_source_iso b/helpers/lh_source_iso index 96d24ae..3254ed6 100755 --- a/helpers/lh_source_iso +++ b/helpers/lh_source_iso @@ -17,7 +17,6 @@ Set_defaults if [ "${LIVE_SOURCE}" = "disabled" ] then - echo "W: source images disabled (FIXME)" exit 0 fi @@ -26,28 +25,27 @@ do if [ "${IMAGE}" = "iso" ] then # Requiring stage file - Require_stagefile "${LIVE_ROOT}"/.stage/source_download + Require_stagefile .stage/source_download # Checking lock file - Check_lockfile "${LIVE_ROOT}"/.lock + Check_lockfile .lock # Creating lock file - Create_lockfile "${LIVE_ROOT}"/.lock + Create_lockfile .lock # Checking stage file - Check_stagefile "${LIVE_ROOT}"/.stage/source_iso + Check_stagefile .stage/source_iso # Remove old source - if [ -f "${LIVE_ROOT}"/source.iso ] + if [ -f source.iso ] then - rm -f "${LIVE_ROOT}"/source.iso + rm -f source.iso fi # Create image - cd "${LIVE_ROOT}" && ${LH_GENISOIMAGE} -A "Debian Live" -p "Debian Live; http://debian-live.alioth.debian.org/; debian-live-devel@lists.alioth.debian.org" -publisher "Debian Live; http://debian-live.alioth.debian.org/; debian-live-devel@lists.alioth.debian.org" -o source.iso -r -J -l -V "${LIVE_DISK_VOLUME}" source # Creating stage file - Create_stagefile "${LIVE_ROOT}"/.stage/source_iso + Create_stagefile .stage/source_iso fi done diff --git a/helpers/lh_source_net b/helpers/lh_source_net index 30a8b83..0f60ddc 100755 --- a/helpers/lh_source_net +++ b/helpers/lh_source_net @@ -17,7 +17,6 @@ Set_defaults if [ "${LIVE_SOURCE}" = "disabled" ] then - echo "W: source images disabled (FIXME)" exit 0 fi @@ -26,28 +25,27 @@ do if [ "${IMAGE}" = "net" ] then # Requiring stage file - Require_stagefile "${LIVE_ROOT}"/.stage/source_download + Require_stagefile .stage/source_download # Checking lock file - Check_lockfile "${LIVE_ROOT}"/.lock + Check_lockfile .lock # Creating lock file - Create_lockfile "${LIVE_ROOT}"/.lock + Create_lockfile .lock # Checking stage file - Check_stagefile "${LIVE_ROOT}"/.stage/source_net + Check_stagefile .stage/source_net # Remove old source - if [ -f "${LIVE_ROOT}"/source.tar.gz ] + if [ -f source-net.tar.gz ] then - rm -f "${LIVE_ROOT}"/source.tar.gz + rm -f source-net.tar.gz fi # Create tarball - cd "${LIVE_ROOT}" && - tar cfz source.tar.gz source + tar cfz source-net.tar.gz source # Creating stage file - Create_stagefile "${LIVE_ROOT}"/.stage/source_net + Create_stagefile .stage/source_net fi done diff --git a/helpers/lh_source_usb b/helpers/lh_source_usb index 03e90d7..7df37c7 100755 --- a/helpers/lh_source_usb +++ b/helpers/lh_source_usb @@ -18,7 +18,6 @@ Set_defaults if [ "${LIVE_SOURCE}" = "disabled" ] then - echo "W: source images disabled (FIXME)" exit 0 fi @@ -27,23 +26,23 @@ do if [ "${IMAGE}" = "usb" ] then # Requiring stage file - Require_stagefile "${LIVE_ROOT}"/.stage/source_download + Require_stagefile .stage/source_download # Checking lock file - Check_lockfile "${LIVE_ROOT}"/.lock + Check_lockfile .lock # Creating lock file - Create_lockfile "${LIVE_ROOT}"/.lock + Create_lockfile .lock # Checking stage file - Check_stagefile "${LIVE_ROOT}"/.stage/source_usb + Check_stagefile .stage/source_usb - if [ ! -f "${LIVE_CHROOT}"/sbin/mkdosfs ] + if [ ! -f chroot/sbin/mkdosfs ] then PACKAGES="${PACKAGES} dosfstools" fi - if [ ! -f "${LIVE_CHROOT}"/sbin/parted ] + if [ ! -f chroot/sbin/parted ] then PACKAGES="${PACKAGES} parted" fi @@ -52,7 +51,7 @@ do then # Installing packages case "${LH_APT}" in - apt) + apt|apt-get) Chroot "apt-get install --yes ${PACKAGES}" ;; @@ -63,49 +62,52 @@ do fi # Remove old source - if [ -f "${LIVE_ROOT}"/source.img ] + if [ -f source.img ] then - rm -f "${LIVE_ROOT}"/source.img + rm -f source.img fi # Everything which comes here needs to be cleaned up, - DU_DIM="`du -ms ${LIVE_ROOT}/source | cut -f1`" + DU_DIM="`du -ms source | cut -f1`" REAL_DIM="`expr ${DU_DIM} + ${DU_DIM} / 20`" # Just 5% more to be sure, need something more sophistcated here... - dd if=/dev/zero of="${LIVE_ROOT}"/source.img bs=1024k count=${REAL_DIM} - FREELO="`losetup -f`" - if [ ! -b "${LIVE_CHROOT}"/${FREELO} ] + dd if=/dev/zero of=source.img bs=1024k count=${REAL_DIM} + FREELO="`${LH_LOSETUP} -f`" + if [ ! -b chroot/${FREELO} ] then MAKEDEV="true" - Chroot "cd /dev && ./MAKEDEV ${FREELO}" + + mv chroot/dev chroot/dev.tmp + find /dev | cpio -dmpu chroot fi echo "!!! The following error/warning messages can be ignored !!!" - lh_losetup $FREELO "${LIVE_ROOT}"/source.img 0 + lh_losetup $FREELO source.img 0 Chroot "parted -s ${FREELO} mklabel msdos" || true Chroot "parted -s ${FREELO} mkpartfs primary fat16 0.0 100%" || true Chroot "parted -s ${FREELO} set 1 lba off" || true - losetup -d ${FREELO} + ${LH_LOSETUP} -d ${FREELO} - lh_losetup $FREELO "${LIVE_ROOT}"/source.img 1 + lh_losetup $FREELO source.img 1 Chroot "mkfs.msdos -n DEBIAN_LIVE ${FREELO}" - mkdir -p "${LIVE_ROOT}"/source.tmp - mount ${FREELO} "${LIVE_ROOT}"/source.tmp - cp -r "${LIVE_ROOT}"/source/* "${LIVE_ROOT}"/source.tmp - umount "${LIVE_ROOT}"/source.tmp - rmdir "${LIVE_ROOT}"/source.tmp - losetup -d ${FREELO} + mkdir -p source.tmp + mount ${FREELO} source.tmp + cp -r source/* source.tmp + umount source.tmp + rmdir source.tmp + ${LH_LOSETUP} -d ${FREELO} echo "!!! The above error/warning messages can be ignored !!!" if [ -n "${MAKEDEV}" ] then - rm -f "${LIVE_CHROOT}"/${FREELO} + rm -f chroot/dev + mv chroot/dev.tmp chroot/dev fi if [ -n "${PACKAGES}" ] then # Removing packages case "${LH_APT}" in - apt) + apt|apt-get) Chroot "apt-get remove --purge --yes ${PACKAGES}" ;; @@ -116,6 +118,6 @@ do fi # Creating stage file - Create_stagefile "${LIVE_ROOT}"/.stage/source_usb + Create_stagefile .stage/source_usb fi done diff --git a/helpers/make-live b/helpers/make-live index 8ae82ae..6dc27af 100755 --- a/helpers/make-live +++ b/helpers/make-live @@ -4,6 +4,7 @@ set -e # Set static variables PROGRAM="`basename ${0}`" +DESCRIPTION="utility to build Debian Live systems" # Source common functions for FUNCTION in /usr/share/live-helper/functions/*.sh @@ -11,67 +12,21 @@ do . ${FUNCTION} done -USAGE="Usage: ${PROGRAM} build|config [--apt apt|aptitude] [--apt-ftpproxy URL] [--apt-httpproxy URL] [--apt-generic enabled|disabled] [--apt-pdiffs enabled|disabled] [--apt-recommends enabled|disabled] [--bootstrap cdebootstrap|deboostrap] [--cache enabled|disabled] [--debconf-frontend dialog|readline|noninteractive] [--debconf-priority low|medium|high|critical] [--genisoimage genisoimage|mkisofs] [--root DIRECTORY] [--chroot DIRECTORY] [-a|--architecture ARCHITECTURE] [-d|--distribution testing|unstable|etch|sid] [--distribution-config DIRECTORY] [-f|--flavour minimal|standard] [-m|--mirror URL] [--mirror-security URL] [--mirror-generic URL] [--mirror-generic-security URL] [--sections SECTION|\"SECTIONS\"] [-k|--kernel KERNEL] [--kernel-packages PACKAGES] [-l|--language LANGUAGE] [--packages PACKAGE|\"PACKAGES\"] [-p|--packages-list LIST] [--tasks TASK|\"TASKS\"] [--security enabled|disabled] [--symlinks enabled|disabled] [--sysvinit enabled|disabled] [--bootappend KERNEL_PARAMETER|\"KERNEL_PARAMETERS\"] [-e|--encryption ALGORITHM] [--filesystem ext2|plain|squashfs] [--memtest86 enabled|disabled] [--iso-volume STRING] [--server-address HOSTNAME|IP] [--server-path DIRECTORY] [--source enabled|disabled] [--syslinux enabled|disabled] [--syslinux-splash FILE] [-b|--binary-image iso|usb|net] [-s|--source-image generic|iso|usb|net] [--templates DIRECTORY]" +Set_defaults -Help () -{ - echo "${PROGRAM} - utility to build Debian Live systems" - echo - echo "${USAGE}" - echo "Usage: ${PROGRAM} [-h|--help]" - echo "Usage: ${PROGRAM} [-u|--usage]" - echo "Usage: ${PROGRAM} [-v|--version]" - echo - echo "Lists: gnome, gnome-core, gnome-desktop, gnome-full, gnome-junior, gnustep, kde, kde-core, kde-desktop, kde-extra, kde-full, kde-junior, mini, minimal, minimal-net, rescue, standard, standard-x11, xfce, xfce-desktop, xfce-junior" - echo - echo "Report bugs to Debian Live project <http://debian-live.alioth.debian.org/>." - exit 0 -} +# Source existing configuration +Read_conffile debian-live/config/common +Read_conffile debian-live/config/bootstrap +Read_conffile debian-live/config/chroot +Read_conffile debian-live/config/image -Usage () -{ - echo "${PROGRAM} - utility to build Debian Live systems" - echo - echo "${USAGE}" - echo "Usage: ${PROGRAM} [-h|--help]" - echo "Usage: ${PROGRAM} [-u|--usage]" - echo "Usage: ${PROGRAM} [-v|--version]" - echo - echo "Try \"${PROGRAM} --help\" for more information." - exit ${1} -} +USAGE="Usage: ${PROGRAM} [config] [--apt apt|aptitude] [--apt-ftpproxy URL] [--apt-httpproxy URL] [--apt-generic enabled|disabled] [--apt-pdiffs enabled|disabled] [--apt-recommends enabled|disabled] [--bootstrap cdebootstrap|deboostrap] [--cache enabled|disabled] [--debconf-frontend dialog|readline|noninteractive] [--debconf-priority low|medium|high|critical] [--genisoimage genisoimage|mkisofs] [--losetup losetup|losetup.org] [--root DIRECTORY] [-a|--architecture ARCHITECTURE] [-d|--distribution testing|unstable|etch|sid] [--distribution-config DIRECTORY] [-f|--flavour minimal|standard] [-m|--mirror-local URL] [--mirror-local-security URL] [--mirror-generic URL] [--mirror-generic-security URL] [--sections SECTION|\"SECTIONS\"] [-k|--kernel KERNEL] [--kernel-packages PACKAGES] [-l|--language LANGUAGE] [--packages PACKAGE|\"PACKAGES\"] [-p|--packages-list LIST] [--tasks TASK|\"TASKS\"] [--security enabled|disabled] [--symlinks enabled|disabled] [--sysvinit enabled|disabled] [--bootappend KERNEL_PARAMETER|\"KERNEL_PARAMETERS\"] [-e|--encryption ALGORITHM] [--filesystem ext2|plain|squashfs] [--memtest86 enabled|disabled] [--iso-volume STRING] [--server-address HOSTNAME|IP] [--server-path DIRECTORY] [--source enabled|disabled] [--syslinux enabled|disabled] [--syslinux-splash FILE] [-b|--binary-image hdd|iso|usb|net] [-s|--source-image generic|hdd|iso|usb|net] [--templates DIRECTORY]" -Version () -{ - echo "${PROGRAM}, version ${VERSION}" - echo - echo "Copyright (C) 2006-2007 Daniel Baumann <daniel@debian.org>" - echo "Copyright (C) 2006-2007 Marco Amadori <marco.amadori@gmail.com>" - echo - echo "This program is free software; you can redistribute it and/or modify" - echo "it under the terms of the GNU General Public License as published by" - echo "the Free Software Foundation; either version 2 of the License, or" - echo "(at your option) any later version." - echo - echo "This program is distributed in the hope that it will be useful," - echo "but WITHOUT ANY WARRANTY; without even the implied warranty of" - echo "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the" - echo "GNU General Public License for more details." - echo - echo "You should have received a copy of the GNU General Public License" - echo "along with this program; if not, write to the Free Software" - echo "Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA" - echo - echo "On Debian systems, the complete text of the GNU General Public License" - echo "can be found in /usr/share/common-licenses/GPL file." - echo - echo "Homepage: <http://debian-live.alioth.debian.org/>" - exit 0 -} +HELP="Lists: gnome, gnome-core, gnome-desktop, gnome-full, gnome-junior, gnustep, kde, kde-core, kde-desktop, kde-extra, kde-full, kde-junior, mini, minimal, minimal-net, rescue, standard, standard-x11, xfce, xfce-desktop, xfce-junior" Main () { - ARGUMENTS="`getopt --longoptions build,config,apt:,apt-ftpproxy:,apt-httpprox:,apt-generic:,apt-pdiffs:,apt-recommends:,bootstrap:,cache:,debconf-frontend:,debconf-priority:,genisoimage:,root:,chroot:,architecture:,distribution:,distribution-config:,flavour:,mirror:,mirror-security:,mirror-generic:,mirror-generic-security:,sections:,kernel:,kernel-packages:,language:,packages:,packages-list:,tasks:,security:,symlinks:,sysvinit:,bootappend:,encryption:,filesystem:,memtest86:,iso-volume:,server-address:,server-path:,source:,syslinux:,syslinux-splash:,binary-image:,binary-source:,templates:,help,usage,version --name=${PROGRAM} --options a:d:f:m:k:l:p:e:b:s:huv --shell sh -- "${@}"`" + ARGUMENTS="`getopt --longoptions apt:,apt-ftpproxy:,apt-httpproxy:,apt-generic:,apt-pdiffs:,apt-recommends:,bootstrap:,cache:,debconf-frontend:,debconf-priority:,genisoimage:,losetup:,root:,architecture:,distribution:,distribution-config:,flavour:,mirror:,mirror-security:,mirror-generic:,mirror-generic-security:,sections:,kernel:,kernel-packages:,language:,packages:,packages-list:,tasks:,security:,symlinks:,sysvinit:,bootappend:,encryption:,filesystem:,memtest86:,iso-volume:,server-address:,server-path:,source:,syslinux:,syslinux-splash:,binary-image:,binary-source:,templates:,help,usage,version --name=${PROGRAM} --options a:d:f:m:k:l:p:e:b:s:huv --shell sh -- "${@}"`" if [ "${?}" != "0" ] then @@ -79,20 +34,10 @@ Main () exit 1 fi - case "${1}" in - config) - CONFIG="true" - ;; - - build) - BUILD="true" - ;; - - *) - echo "E: no operation (config|build) specified." - exit 1 - ;; - esac + if [ "${1}" = "config" ] + then + CONFIG="true" + fi eval set -- "${ARGUMENTS}" @@ -144,12 +89,12 @@ Main () LH_GENISOIMAGE="${2}"; shift 2 ;; - --root) - LIVE_ROOT="${2}"; shift 2 + --losetup) + LH_LOSETUP="${2}"; shift 2 ;; - --chroot) - LIVE_CHROOT="${2}"; shift 2 + --root) + LIVE_ROOT="${2}"; shift 2 ;; # bootstrap @@ -170,12 +115,12 @@ Main () LIVE_FLAVOUR="${2}"; shift 2 ;; - -m|--mirror) - LIVE_MIRROR="${2}"; shift 2 + -m|--mirror-local) + LIVE_MIRROR_LOCAL="${2}"; shift 2 ;; - --mirror-security) - LIVE_MIRROR_SECURITY="${2}"; shift 2 + --mirror-local-security) + LIVE_MIRROR_LOCAL_SECURITY="${2}"; shift 2 ;; --mirror-generic) @@ -306,16 +251,12 @@ Main () # Initializing lh_testroot - Set_defaults # Configuring (this is really shit!) - if [ "${CONFIG}" = "true" ] - then - LH_APT="${LH_APT}" LH_APT_FTPPROXY="${LH_APT_FTPPROXY}" LH_APT_HTTPPROXY="${LH_APT_HTTPPROXY}" LH_APT_GENERIC="${LH_APT_GENERIC}" LH_APT_PDIFFS="${LH_APT_PDIFFS}" LH_APT_RECOMMENDS="${LH_APT_RECOMMENDS}" LH_BOOTSTRAP="${LH_BOOTSTRAP}" LH_CACHE="${LH_CACHE}" LH_DEBCONF_FRONTEND="${LH_DEBCONF_FRONTEND}" LH_DEBCONF_PRIORITY="${LH_DEBCONF_PRIORITY}" LH_GENISOIMAGE="${LH_GENISOIMAGE}" LIVE_ROOT="${LIVE_ROOT}" LIVE_CHROOT="${LIVE_CHROOT}" LIVE_ARCHITECTURE="${LIVE_ARCHITECTURE}" LIVE_DISTRIBUTION="${LIVE_DISTRIBUTION}" LIVE_DISTRIBUTION_CONFIG="${LIVE_DISTRIBUTION_CONFIG}" LIVE_FLAVOUR="${LIVE_FLAVOUR}" LIVE_MIRROR="${LIVE_MIRROR}" LIVE_MIRROR_SECURITY="${LIVE_MIRROR_SECURITY}" LIVE_MIRROR_GENERIC="${LIVE_MIRROR_GENERIC}" LIVE_MIRROR_GENERIC_SECURITY="${LIVE_MIRROR_GENERIC_SECURITY}" LIVE_SECTIONS="${LIVE_SECTIONS}" LIVE_KERNEL="${LIVE_KERNEL}" LIVE_KERNEL_PACKAGES="${LIVE_KERNEL_PACKAGES}" LIVE_LANGUAGE="${LIVE_LANGUAGE}" LIVE_PACKAGES="${LIVE_PACKAGES}" LIVE_PACKAGES_LIST="${LIVE_PACKAGES_LIST}" LIVE_TASKS="${LIVE_TASKS}" LIVE_SECURITY="${LIVE_SECURITY}" LIVE_SYMLINKS="${LIVE_SYMLINKS}" LIVE_SYSVINIT="${LIVE_SYSVINIT}" LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND}" LIVE_ENCRYPTION="${LIVE_ENCRYPTION}" LIVE_FILESYSTEM="${LIVE_FILESYSTEM}" LIVE_MEMTEST86="${LIVE_MEMTEST86}" LIVE_ISO_VOLUME="${LIVE_ISO_VOLUME}" LIVE_SERVER_ADDRESS="${LIVE_SERVER_ADDRESS}" LIVE_SERVER_PATH="${LIVE_SERVER_PATH}" LIVE_SOURCE="${LIVE_SOURCE}" LIVE_SYSLINUX="${LIVE_SYSLINUX}" LIVE_SYSLINUX_SPLASH="${LIVE_SYSLINUX_SPLASH}" LIVE_BINARY_IMAGE="${LIVE_BINARY_IMAGE}" LIVE_SOURCE_IMAGE="${LIVE_SOURCE_IMAGE}" LIVE_TEMPLATES="${LIVE_TEMPLATES}" lh_config - fi + LH_APT="${LH_APT}" LH_APT_FTPPROXY="${LH_APT_FTPPROXY}" LH_APT_HTTPPROXY="${LH_APT_HTTPPROXY}" LH_APT_GENERIC="${LH_APT_GENERIC}" LH_APT_PDIFFS="${LH_APT_PDIFFS}" LH_APT_RECOMMENDS="${LH_APT_RECOMMENDS}" LH_BOOTSTRAP="${LH_BOOTSTRAP}" LH_CACHE="${LH_CACHE}" LH_DEBCONF_FRONTEND="${LH_DEBCONF_FRONTEND}" LH_DEBCONF_PRIORITY="${LH_DEBCONF_PRIORITY}" LH_GENISOIMAGE="${LH_GENISOIMAGE}" LIVE_ROOT="${LIVE_ROOT}" LIVE_ARCHITECTURE="${LIVE_ARCHITECTURE}" LIVE_DISTRIBUTION="${LIVE_DISTRIBUTION}" LIVE_DISTRIBUTION_CONFIG="${LIVE_DISTRIBUTION_CONFIG}" LIVE_FLAVOUR="${LIVE_FLAVOUR}" LIVE_MIRROR_LOCAL="${LIVE_MIRROR_LOCAL}" LIVE_MIRROR_LOCAL_SECURITY="${LIVE_MIRROR_LOCAL_SECURITY}" LIVE_MIRROR_GENERIC="${LIVE_MIRROR_GENERIC}" LIVE_MIRROR_GENERIC_SECURITY="${LIVE_MIRROR_GENERIC_SECURITY}" LIVE_SECTIONS="${LIVE_SECTIONS}" LIVE_KERNEL="${LIVE_KERNEL}" LIVE_KERNEL_PACKAGES="${LIVE_KERNEL_PACKAGES}" LIVE_LANGUAGE="${LIVE_LANGUAGE}" LIVE_PACKAGES="${LIVE_PACKAGES}" LIVE_PACKAGES_LIST="${LIVE_PACKAGES_LIST}" LIVE_TASKS="${LIVE_TASKS}" LIVE_SECURITY="${LIVE_SECURITY}" LIVE_SYMLINKS="${LIVE_SYMLINKS}" LIVE_SYSVINIT="${LIVE_SYSVINIT}" LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND}" LIVE_ENCRYPTION="${LIVE_ENCRYPTION}" LIVE_FILESYSTEM="${LIVE_FILESYSTEM}" LIVE_MEMTEST86="${LIVE_MEMTEST86}" LIVE_ISO_VOLUME="${LIVE_ISO_VOLUME}" LIVE_SERVER_ADDRESS="${LIVE_SERVER_ADDRESS}" LIVE_SERVER_PATH="${LIVE_SERVER_PATH}" LIVE_SOURCE="${LIVE_SOURCE}" LIVE_SYSLINUX="${LIVE_SYSLINUX}" LIVE_SYSLINUX_SPLASH="${LIVE_SYSLINUX_SPLASH}" LIVE_BINARY_IMAGE="${LIVE_BINARY_IMAGE}" LIVE_SOURCE_IMAGE="${LIVE_SOURCE_IMAGE}" LIVE_TEMPLATES="${LIVE_TEMPLATES}" lh_config newconfig # Building - if [ "${BUILD}" = "true" ] + if [ -z "${CONFIG}" ] then cd "${LIVE_ROOT}" && lh_build fi diff --git a/lists/knoppix b/lists/knoppix deleted file mode 100644 index e981fd7..0000000 --- a/lists/knoppix +++ /dev/null @@ -1,1292 +0,0 @@ -# /usr/share/make-live/lists/gnome - package list for make-live(1) -# - -# Minimal -eject file sudo vim-tiny - -# Standard -console-common kbd locales - -# X11 -desktop-base xresprobe - -# Knoppix packages -# URL: http://ftp.kernel.org/pub/dist/knoppix/packages.txt -0wn -aalib-bin -aalib1 -ace-of-penguins -acpi -adduser -adtool -aespipe -afio -airsnort -alevt -alien -alsa-base -alsa-utils -amanda-client -amanda-common -amanda-server -anacron -apache2 -apache2-mpm-prefork -apache2-utils -apache2.2-common -apmd -apt -apt-file -apt-method-installed -apt-show-versions -apt-utils -arj -ark -arpwatch -artwiz-cursor -at -atitvout -atmel-firmware -attr -audacity -aufs-cvs-modules-2.6.19 -aufs-cvs-utils -aumix-gtk -autoconf -autofs -autotools-dev -autotrace -avm-firmware -base-files -base-passwd -bash -bb -bc -beryl -beryl-core -beryl-manager -beryl-plugins -beryl-plugins-data -beryl-settings -biew -bin86 -bind9 -bind9-host -binfmt-support -bing -binutils -binutils-dev -bittorrent -blt -bluetooth -bluez-firmware -bluez-utils -bochsbios -bonnie++ -bridge-utils -brltty -bsdiff -bsdmainutils -bsdutils -buffer -build-essential -busybox -bzip2 -ca-certificates -cabextract -capiutils -cdbackup -cdbs -cdda2wav -cddb -cdparanoia -cdrdao -cdrecord -checkmem -chkrootkit -clamav -clamav-base -clamav-freshclam -cloop-module-2.6.19 -hi -configure-xawtv -console-common -console-data -console-tools -convertfs -coreutils -cowsay -cpio -cpp -cpp-4.1 -cpuburn -cramfsprogs -cron -cryptcat -cryptsetup -cups-pdf -cupsys -cupsys-bsd -cupsys-client -cupsys-common -cupsys-driver-gutenprint -cvs -dante-client -dash -dbus -dc -dcraw -dctrl-tools -dd-rescue -dds2tar -debconf -debconf-i18n -debconf-utils -debfoster -debhelper -debian-archive-keyring -debianutils -debootstrap -deborphan -debsums -defoma -devscripts -dh-make -dhcp3-common -dhcp3-server -dialog -dict -dictionaries-common -dietlibc-dev -diff -diffstat -ding -distcc -dmidecode -dmraid -dmsetup -dnsutils -doc-base -docbook-xml -dosfstools -dpkg -dpkg-dev -dpkg-repack -drdsl -dselect -dsniff -dump -dupload -dvb-mpegtools -dvb-utils -dvbackup -dvbsnoop -dvbstream -dvbtune -dvd+rw-tools -dvdauthor -dvdbackup -dvgrab -e00compr -e2fslibs -e2fsprogs -ed -efax -eject -elinks -emerald -enscript -escputil -esound-common -etherwake -ethtool -ettercap-common -ettercap-gtk -euro-support -euro-support-console -expect -ext2resize -fakeroot -fb-music-low -fbi -fbset -fdflush -fdisk-udeb -fdutils -fetchmail -ffmpeg -file -fileutils -findutils -finger -firefox -fluxbox -fontconfig -fontconfig-config -foomatic-bin -foomatic-db -foomatic-db-engine -foomatic-db-gutenprint -foomatic-db-hpijs -foomatic-filters -foremost -fortune-mod -fortunes-debian-hints -fortunes-min -fping -freeglut3 -freemind -freenx -frozen-bubble -hi -ftp -ftpd -fttools -fuse-utils -g++ -g++-4.1 -gaim -gaim-data -gaim-encryption -gawk -gcc -gcc-3.3-base -gcc-4.1 -gcc-4.1-base -gconf2 -gconf2-common -gdb -genisoimage -genliloconf -gettext -gettext-base -gif2png -giflib-bin -giflib3g -giftrans -gimp -gimp-data -gimp-print -gksu -gnome-keyring -gnuchess -gnupg -gnupg2 -gocr -gpart -gparted -gpgsm -gpgv -gphoto2 -gpm -gpsdrive -gpstrans -gq -gqcam -grep -groff -groff-base -hi -grub-disk -gs-common -gs-esp -gscanbus -gsfonts -gsfonts-x11 -gsm-utils -gtans -gtk-smooth-themes -gtk2-engines -gtk2-engines-smooth -gtkam -gv -gzip -hal -hdparm -hexedit -hfsplus -hfsutils -hicolor-icon-theme -hostap-utils -hostapd -hostname -hpijs -hping2 -html2text -httptunnel -hunt -hwsetup -hwtools -i810switch -ibod -icedax -icedove -icedove-locale-de -iceweasel -iceweasel-l10n-de -icewm -icewm-common -icmpush -idswakeup -iftop -ifupdown -ijsgutenprint -imagemagick -imaze -imlib-base -imlib11 -info -infobash -ingerman -initramfs-tools -initrd-tools -initscripts -intltool-debian -ipcalc -ipchains -iperf -ipppd -iproute -ipsec-tools -iptables -iptraf -iputils-ping -iputils-tracepath -ipv6calc -ipw2100-nonfree -ipw2200-nonfree -ipx -irda-common -irda-tools -irssi -irssi-plugin-icq -irssi-scripts -isapnptools -isdnactivecards -isdnutils-base -isdnvboxclient -isomaster -ispell -java-common -jfsutils -joe -k3b -k3b-defaults -k3b-i18n -kaffeine -kalarm -kamera -kandy -kappfinder -kate -katomic -kbackup -kbackup-multibuf -kbattleship -kbdconfig -kcalc -kcharselect -kcontrol -kde-i18n-de -kde-i18n-es -kde-i18n-fr -kde-i18n-it -kde-i18n-ja -kde-i18n-nl -kde-i18n-pl -kde-i18n-tr -kdeaddons-kfile-plugins -kdeadmin-kfile-plugins -kdebase -kdebase-bin -kdebase-data -kdebase-kio-plugins -kdebluetooth -kdegraphics-kfile-plugin -kdelibs-data -kdelibs4c2a -kdemultimedia-kfile-plug -kdemultimedia-kio-plugin -kdenetwork-kfile-plugins -kdepasswd -kdepim-kfile-plugins -kdepim-kio-plugins -kdeprint -kdesktop -kdessh -kdf -kdm -kexec-tools -kfax -kfind -kfloppy -kget -kghostview -khelpcenter -khexedit -kicker -kiconedit -kismet -klaptopdaemon -klibc-utils -klipper -klogd -kmahjongg -kmail -kmailcvt -kmenuedit -kmix -knode -knotes -konq-plugins -konqueror -konqueror-nsplugins -konsole -konsolekalendar -kooka -kpackage -kpager -kpdf -kpersonalizer -kpf -kphone -kppp -krdc -kreversi -krfb -ksmserver -ksnapshot -ksokoban -ksplash -ksudoku -ksync -ksysguard -ksysguardd -ksysv -kteatime -ktimer -ktip -ktnef -ktuberling -kuickshow -kuser -kview -kviewshell -kwin -kwlan -laptop-detect -ldap-utils -lde -less -lesstif2 -lftp -lha -liba52-0.7.4 -libaa1 -libacl1 -libadns1 -libao2 -libapache2-mod-php4 -libapm1 -libapr1 -libaprutil1 -libapt-pkg-perl -libart-2.0-2 -libarts1c2a -libartsc0 -libasound2 -libaspell15 -libatk1.0-0 -libatm1 -libattr1 -libaudio2 -libaudiofile0 -libautotrace3 -libavahi-client3 -libavahi-common-data -libavahi-common3 -libavahi-compat-howl0 -libavahi-compat-libdnssd -libavahi-qt3-1 -libavc1394-0 -libavcodec0d -libavformat0d -libbeecrypt6 -libberylsettings0 -libbind9-0 -libblkid1 -libbluetooth2 -libbz2-1.0 -libc6 -libc6-dev -libcaca0 -libcairo2 -libcap1 -libcapi20-3 -libcapi20-dev -libcdio6 -libcdk5 -libcdparanoia0 -libclamav1 -libcomerr2 -libconfhelper-perl -libconfig-file-perl -libconsole -libcroco3 -libcucul0 -libcupsimage2 -libcupsys2 -libcurl3 -libcurl3-gnutls -libdate-manip-perl -libdb1-compat -libdb4.2 -libdb4.3 -libdb4.4 -libdbd-mysql-perl -libdbi-perl -libdbus-1-3 -libdbus-glib-1-2 -libdbus-qt-1-1c2 -libdc1394-13 -libdevmapper1.02 -libdirectfb-0.9-25 -libdm0 -libdns21 -libdrm2 -libdv-bin -libdv4 -libdvdread3 -libedit2 -libelfg0 -libemeraldengine0 -libenchant1c2a -libesd-alsa0 -libevent1 -libexif-gtk5 -libexif12 -libexpat1 -libfam0 -libflac++5 -libflac7 -libfontconfig1 -libfontenc1 -libfreetype6 -libfribidi0 -libfs6 -libft-perl -libfuse2 -libgcc1 -libgconf2-4 -libgcrypt11 -libgd2-xpm -libgdbm3 -libgdchart-gd2-noxpm -libgeoip1 -libgimp2.0 -libgksu2-0 -libgl1-mesa-dri -libgl1-mesa-glx -libglade2-0 -libglib1.2 -libglib2.0-0 -libglib2.0-data -libglibmm-2.4-1c2a -libglu1-mesa -libgmp3c2 -libgnome-keyring0 -libgnutls13 -libgpg-error0 -libgpgme11 -libgphoto2-2 -libgphoto2-port0 -libgpmg1 -libgsf-1-114 -libgsf-1-common -libgsm1 -libgsmme1c2a -libgssapi2 -libgstreamer0.10-0 -libgtk1.2 -libgtk1.2-common -libgtk2.0-0 -libgtk2.0-bin -libgtk2.0-common -libgtkmm-2.4-1c2a -libgtkspell0 -libgtop2-7 -libgtop2-common -libgutenprint2 -libgutenprintui2-1 -libhal-storage1 -libhal1 -libhfsp0 -libhtml-parser-perl -libhtml-tagset-perl -libhtml-tree-perl -libice6 -libid3tag0 -libident -libidl0 -libidn11 -libieee1284-3 -libijs-0.35 -libisc11 -libisccc0 -libisccfg1 -libiso9660-4 -libiw28 -libjack0.100.0-0 -libjasper-1.701-1 -libjcode-pm-perl -libjpeg-progs -libjpeg62 -libjpeg62-dev -libk3b2 -libkcal2b -libkcddb1 -libkdegames1 -libkdepim1a -libkleopatra1 -libklibc -libkmime2 -libkonq4 -libkpimidentities1 -libkrb53 -libksba8 -libkscan1 -libksieve0 -libktnef1 -liblcms1 -libldap-2.3-0 -libldap2 -liblircclient0 -liblocale-gettext-perl -liblockdev1 -liblockfile1 -liblogfile-rotate-perl -libltdl3 -liblua50 -liblualib50 -liblwres9 -liblzo1 -libmad0 -libmagic1 -libmagick++9c2a -libmagick9 -libmikmod2 -libmimelib1c2a -libmng1 -libmodplug0c2 -libmpcdec3 -libmusicbrainz4c2a -libmyspell3c2 -libmysqlclient15off -libnasl2 -libncp -libncurses5 -libncurses5-dev -libncursesw5 -libneon25 -libnessus2 -libnet-daemon-perl -libnet0 -libnet1 -libnetpbm10 -libnewt-utf8-0 -libnewt0.52 -libnfsidmap2 -libnids1.20 -libnspr4 -libnspr4-0d -libnss3-0d -libntfs9 -libogg0 -liboggflac3 -libopencdk8 -libopenexr2c2a -libopenobex1 -liborbit2 -libpam-modules -libpam-ncp -libpam-runtime -libpam0g -libpango1.0-0 -libpango1.0-common -libpaper-utils -libpaper1 -libparted1.6-0 -libparted1.7-1 -libpcap0.7 -libpcap0.8 -libpcd2 -libpci2 -libpcre3 -libperl5.8 -libpisock9 -libplot2c2 -libplrpc-perl -libpng12-0 -libpoppler0c2 -libpoppler0c2-qt -libpopt0 -libportaudio0 -libpostproc0d -libpq4 -libpstoedit0c2a -libpth20 -libqt3-mt -libquicktime0 -libraw1394-8 -libreadline4 -libreadline5 -librecode0 -librpcsecgss3 -librpm4 -librsvg2-2 -libsamplerate0 -libsane -libsane-extras -libsasl2 -libsasl2-2 -libsasl2-modules -libscrollkeeper0 -libsdl-console -libsdl-gfx1.2-4 -libsdl-image1.2 -libsdl-mixer1.2 -libsdl-net1.2 -libsdl-pango1 -libsdl-perl -libsdl-ttf2.0-0 -libsdl1.2debian -libsdl1.2debian-alsa -libselinux1 -libsensors3 -libsepol1 -libsexy2 -libsigc++-2.0-0c2a -libslang2 -libslp1 -libsm6 -libsmbclient -libsmpeg0 -libsndfile1 -libsnmp-base -libsnmp9 -libspeex1 -libsqlite3-0 -libss2 -libssl0.9.7 -libssl0.9.8 -libssp0 -libstartup-notification0 -libstdc++2.10-glibc2.2 -libstdc++5 -libstdc++6 -libstdc++6-4.1-dev -libsvga1 -libsysfs2 -libt1-5 -libtag1c2a -libtasn1-3 -libtext-charwidth-perl -libtext-iconv-perl -libtext-wrapi18n-perl -libtheora0 -libtiff-tools -libtiff4 -libttf2 -libungif4g -libuniconf4.2 -liburi-perl -libusb-0.1-4 -libuuid1 -libvcdinfo0 -libvolume-id0 -libvorbis0a -libvorbisenc2 -libvorbisfile3 -libvte-common -libvte4 -libweakref-perl -libwmf0.2-7 -libwnck-common -libwnck18 -libwrap0 -libwvstreams4.2-base -libwvstreams4.2-extras -libwww-perl -libwxgtk2.4-1 -libx11-6 -libx11-data -libxau6 -libxaw7 -libxcomp1 -libxcompext1 -libxcomposite1 -libxcursor1 -libxdamage1 -libxdelta2 -libxdmcp6 -libxext6 -libxfixes3 -libxfont1 -libxft2 -libxi6 -libxine1 -libxinerama1 -libxkbfile1 -libxml2 -libxmu6 -libxmuu1 -libxp6 -libxplc0.3.13 -libxpm4 -libxrandr2 -libxrender1 -libxres1 -libxslt1.1 -libxss1 -libxt6 -libxtrap6 -libxtst6 -libxv1 -libxvmc1 -libxxf86dga1 -libxxf86misc1 -libxxf86vm1 -libzvbi-common -libzvbi0 -libzzip-0-12 -lilo -linux-image-2.6.19 -linux-kernel-headers -linux-sound-base -lisa -loadlin -locales -lockfile-progs -login -logrotate -loop-aes-modules-2.6.19 -loop-aes-utils -lrzsz -lsb-base -lsof -ltrace -lvm-common -lvm2 -lynx -lzop -m4 -macutils -madwifi-modules-2.6.19 -madwifi-tools -mailx -make -makedev -man-db -manpages -manpages-de -manpages-dev -mawk -mbr -mc -mdadm -memtester -menu -menu-xdg -mesa-utils -mikmod -mime-support -minicom -mkbootdev -mkisofs -hi -mktemp -mobilemesh -modconf -module-init-tools -modutils -mount -mouseconfig -mpack -mpg321 -mplayer -mplayer-skin-blue -ms-sys -mt-st -mtools -mtr-tiny -mutt -myspell-en-us -mysql-client -mysql-client-5.0 -mysql-common -nano -nasm -ncpfs -ncurses-base -ncurses-bin -ndiswrapper-modules-2.6. -ndiswrapper-utils -nedit -nessus -nessus-plugins -nessusd -net-tools -netbase -netcat -netcat6 -netpbm -netpipe-tcp -networkstatus -nfs-common -nfs-kernel-server -ngrep -nmap -ntfs-3g -ntpdate -nvtv -nxagent -nxclient -nxdesktop -nxlibs -nxproxy -nxssh -nxtunnel-client -nxtunnel-server -odbcinst1debian1 -openbsd-inetd -openhackware -openoffice-de-en -openoffice.org-debian-me -openssh-client -openssh-server -openssl -openvpn -outguess -p0f -parted-bf -partimage -partimage-server -passwd -patch -pciutils -pciutils-dev -pcmcia-cs -pcmciautils -perl -perl-base -perl-modules -perl-suid -pgpgpg -php4-common -php4-mysql -pia -pkg-config -playmidi -pmount -pnm2ppa -po-debconf -portmap -poster -powermgmt-base -ppmd -ppp -hi -pppdcapiplugin -pppoe -pppoeconf -pppstatus -pptp-linux -print-utils-pfeifle -prism54-nonfree -procinfo -procmail -procps -proll -psfontmgr -psmisc -psutils -pump -python -python-central -python-imaging -python-imaging-tk -python-minimal -python-support -python-tk -python2.4 -python2.4-minimal -qemu -qobex -qps -qtparted -radio -rcs -rdate -rdesktop -readline-common -recode -recover -reiserfsprogs -reportbug -rpm -rsync -rt2x00-cvs-modules-2.6.1 -rxvt-beta -s3switch -samba -samba-common -sane -sane-utils -sash -scanmodem -scantv -scli -screen -scribus -scrollkeeper -sed -sendfile -sendip -setserial -sgml-base -sgml-data -shaper -sharutils -sitar -slang1 -slang1a-utf8 -sleuthkit -smail -smartmontools -smbclient -smbconf-pfeifle -smbconf-pfeifle-nonfree -smbfs -sniffit -sound-recorder -sox -speedtouch -speex -squid -squid-common -squidclient -ssh -ssl-cert -sslwrap -star -statserial -strace -stress -stunnel -sudo -sun-java5-bin -sun-java5-demo -sun-java5-jdk -sun-java5-jre -sun-java5-plugin -sweep -symlinks -synaptic -sysklogd -syslinux -sysv-rc -sysvinit -sysvinit-utils -tar -tcl8.4 -tcpd -tcpdump -telnet-ssl -telnetd-ssl -testdisk -tftp -tftpd-hpa -thttpd -thunderbird -thunderbird-locale-de -tiger -tightvncserver -tk8.4 -tnef -tofrodos -tpconfig -traceroute -trans-de-en -transfig -tshark -tsocks -ttf-bitstream-vera -ttf-f500 -ttf-freefont -ttf-isabella -ttf-openoffice -ttf-opensymbol -ttf-staypuft -ttf-summersby -ttmkfdir -twm -txt2regex -type-handling -type1inst -tzdata -ucf -udev -udpcast -uml-utilities -umlrun-uml -unifont -units -unixodbc -unp -unzip -unzoo -update -update-inetd -urlview -usbutils -usbview -user-de -util-linux -util-linux-locales -uudeview -v4l-conf -vcdimager -vcdtools -vgabios -vim -vim-common -vim-gtk -vim-gui-common -vim-runtime -vim-scripts -vimpart -vlan -vnc-common -vorbis-tools -vpnc -vrms -wakeonlan -wavemon -wavtools -wget -whiptail -whois -wine -winetools -wipe -wireless-tools -wireshark -wireshark-common -wodim -wpasupplicant -wprint -wvdial -x-ttcidfont-conf -x11-common -xaos -xaw3dg -xawtv -xawtv-plugins -xbase-clients -xbattle -xbitmaps -xboard -xchat -xchat-common -xdelta -xdialog -xdm -xfonts-100dpi -xfonts-100dpi-transcoded -xfonts-75dpi -xfonts-75dpi-transcoded -xfonts-base -xfonts-bolkhov-cp1251-75 -xfonts-bolkhov-cp1251-mi -xfonts-dosemu -xfonts-encodings -xfonts-scalable -xfonts-terminus -xfonts-utils -xfsdump -xfsprogs -xgalaga -xkb-data -xkbset -xlibmesa-gl -xlibs -xloadimage -xml-core -xmms -xmms-cdread -xmms-goom -xmms-modplug -xmms-volnorm -xnest -xorg -xosview -xpdf -xpdf-common -xpdf-reader -xpdf-utils -xsane -xsane-common -xserver-xorg -xserver-xorg-core -xserver-xorg-input-evdev -xserver-xorg-input-kbd -xserver-xorg-input-mouse -xserver-xorg-input-synap -xserver-xorg-video-all -xserver-xorg-video-apm -xserver-xorg-video-ark -xserver-xorg-video-ati -xserver-xorg-video-chips -xserver-xorg-video-cirru -xserver-xorg-video-cyrix -xserver-xorg-video-dummy -xserver-xorg-video-fbdev -xserver-xorg-video-glint -xserver-xorg-video-i128 -xserver-xorg-video-i740 -xserver-xorg-video-i810 -xserver-xorg-video-imstt -xserver-xorg-video-mga -xserver-xorg-video-neoma -xserver-xorg-video-newpo -xserver-xorg-video-nsc -xserver-xorg-video-nv -xserver-xorg-video-rendi -xserver-xorg-video-s3 -xserver-xorg-video-s3vir -xserver-xorg-video-savag -xserver-xorg-video-silic -xserver-xorg-video-sis -xserver-xorg-video-sisus -xserver-xorg-video-tdfx -xserver-xorg-video-tga -xserver-xorg-video-tride -xserver-xorg-video-tseng -xserver-xorg-video-v4l -xserver-xorg-video-vesa -xserver-xorg-video-vga -xserver-xorg-video-via -xserver-xorg-video-vmwar -xserver-xorg-video-voodo -xskat -xterm -xtightvncviewer -xtv -xutils -xutils-dev -xviddetect -xzoom -zile -zip -zlib1g -zlib1g-dev diff --git a/lists/knoppix-dvd b/lists/knoppix-dvd deleted file mode 100644 index c6ab94e..0000000 --- a/lists/knoppix-dvd +++ /dev/null @@ -1,3417 +0,0 @@ -# /usr/share/make-live/lists/gnome - package list for make-live(1) -# - -# Minimal -eject file sudo vim-tiny - -# Standard -console-common kbd locales - -# X11 -desktop-base xresprobe - -# Knoppix packages -# URL: http://ftp.kernel.org/pub/dist/knoppix-dvd/packages-dvd.txt -0wn -3270-common -a2ps -aalib-bin -aalib1 -abiword-common -abiword-gnome -abiword-help -ace-of-penguins -acpi -adduser -adtool -aespipe -afio -airsnort -akregator -alevt -alien -alsa-base -alsa-utils -amanda-client -amanda-common -amanda-server -amarok -amarok-engines -amarok-xine -amor -anacron -ant -ant-optional -antlr -apache -apache-common -apache-dev -apache-doc -apache-utils -apache2 -apache2-doc -apache2-mpm-prefork -apache2-utils -apache2.2-common -apcalc -apcalc-common -apel -apmd -apt -apt-doc -apt-file -apt-listchanges -apt-method-installed -apt-show-versions -apt-utils -aptitude -aribas -arj -ark -arpwatch -arts -artsbuilder -artwiz-cursor -asclock -asclock-themes -aspell -aspell-de -aspell-doc -aspell-en -aspell-es -aspell-fr -aspell-it -aspell-pl -at -at-spi -atitvout -atlantik -atlantikdesigner -atlas2-base -atlas3-base -atlas3-base-dev -atlas3-headers -atmel-firmware -attr -auctex -audacious -audacious-plugins -audacious-plugins-extra -audacity -aufs-cvs-modules-2.6.19 -aufs-cvs-utils -aumix-gtk -autoclass -autoconf -autofs -automake1.4 -automake1.7 -automake1.9 -autotools-dev -autotrace -avce00 -avm-firmware -axiom -axiom-databases -axkit -axkit-examples -axkit-language-htmldoc -axkit-language-query -axyftp-doc -axyftp-gtk -bacula -bacula-client -bacula-common -bacula-console -bacula-director-common -bacula-director-mysql -bacula-doc -bacula-fd -bacula-sd -bacula-sd-sqlite3 -bacula-server -base-files -base-passwd -bash -basket -bb -bc -beneath-a-steel-sky -beryl -beryl-core -beryl-manager -beryl-plugins -beryl-plugins-data -beryl-settings -biew -bin86 -bind9 -bind9-host -binfmt-support -bing -binutils -binutils-dev -bison -bitmap-mule -bittorrent -blas -blender -blinken -blt -bluefish -bluez-firmware -bluez-utils -bochs -bochs-doc -bochs-sdl -bochs-term -bochs-wx -bochs-x -bochsbios -bonnie++ -bridge-utils -brltty -bsdiff -bsdmainutils -bsdutils -buffer -bug-buddy -build-essential -busybox -bximage -bzflag -bzflag-server -bzip2 -ca-certificates -cabextract -capisuite -capiutils -capplets-data -cdbackup -cdbs -cdd-common -cdda2wav -cddb -cdparanoia -cdrdao -cdrecord -cdrtools-doc -cdrw-taper -cernlib-base -cervisia -cfortran -cgoban -checkmem -chipcard-tools -chkrootkit -chktex -chromium -chromium-data -cjk-latex -cl-asdf -cl-cil -cl-reversi -cl-utilities -clamav -clamav-base -clamav-docs -clamav-freshclam -clara -cli-common -cli-common-dev -cloop-module-2.6.19 -cloop-utils -cmt -colorgcc -comerr-dev -common-lisp-controller -compiz -compiz-core -compiz-gnome -compiz-gtk -compiz-plugins -configure-xawtv -console-common -console-data -console-tools -convertfs -coreutils -cowsay -cpio -cpp -cpp-3.3 -cpp-3.4 -cpp-4.0 -cpp-4.0-doc -cpp-4.1 -cpp-4.1-doc -cpp-doc -cpuburn -crack-attack -cramfsprogs -cron -crossfire-client -crossfire-client-gtk -crossfire-client-gtk2 -crossfire-client-images -crossfire-client-sounds -crossfire-client-x11 -crossfire-common -crossfire-doc -crossfire-edit -crossfire-maps -crossfire-server -cryptcat -cryptsetup -crystalspace -crystalspace-dev -crystalspace-doc -csh -csound -csound-doc -cups-pdf -cupsys -cupsys-bsd -cupsys-client -cupsys-common -cupsys-driver-gutenprint -cvs -cycle -d4x -d4x-common -dante-client -dash -dasher -dasher-data -db4.2-util -db4.3-util -dbconfig-common -dbishell -dbus -dc -dcraw -dctrl-tools -dd-rescue -ddd -dds2tar -debconf -debconf-i18n -debconf-utils -debfoster -debhelper -debian-archive-keyring -debian-keyring -debiandoc-sgml -debianutils -debootstrap -deborphan -debsums -defoma -defrag -desktop-base -desktop-file-utils -devscripts -dh-make -dhcp3-common -dhcp3-server -dia -dia-common -dia-gnome -dia-libs -dialog -dict -dictionaries-common -dietlibc-dev -diff -diffstat -digikam -digikamimageplugins -dillo -ding -dirmngr -discover1 -discover1-data -distcc -dlint -dlocate -dmidecode -dmraid -dmsetup -dnsutils -doc-base -doc-linux-html -docbook -docbook-dsssl -docbook-xml -docbook-xsl -dosfstools -dpatch -dpkg -dpkg-dev -dpkg-repack -drdsl -dselect -dsh -dsniff -dump -dupload -dvb-mpegtools -dvb-utils -dvbackup -dvbsnoop -dvbstream -dvbtune -dvd+rw-tools -dvdauthor -dvdbackup -dvdrecord -dvgrab -dvipng -e00compr -e2fslibs -e2fslibs-dev -e2fsprogs -ec-fonts-mftraced -ecj-bootstrap -eclipse -eclipse-jdt -eclipse-pde -eclipse-platform -eclipse-rcp -eclipse-source -ed -edict -efax -efax-gtk -effectv -efibootmgr -eject -ekiga -elinks -emacs-intl-fonts -emacs21 -emacs21-bin-common -emacs21-common -emacsen-common -emerald -emerald-themes -enigma -enigma-data -enlightenment -enlightenment-data -enscript -eog -epiphany-browser -erlang -erlang-base -erlang-dev -erlang-examples -erlang-mode -erlang-nox -erlang-src -erlang-x11 -escputil -esound -esound-common -ess -eterm -etherwake -ethtool -ettercap-common -ettercap-gtk -euler -euro-support -euro-support-console -euro-support-x -evilwm -evince -evolution -evolution-common -evolution-data-server -evolution-data-server-co -evolution-exchange -evolver -expect -ext2resize -eyesapplet -f2c -fakeroot -falconseye -falconseye-data -fast-user-switch-applet -fastjar -fb-music-low -fbi -fbset -fdflush -fdisk-udeb -fdutils -fenris -festival -festlex-cmu -festlex-poslex -festvox-kallpc16k -festvox-kdlpc16k -fetchmail -ffmpeg -fftw-dev -fftw2 -fftw3 -fftw3-dev -fifteenapplet -file -file-roller -fileutils -findutils -finger -firefox -firefox-dom-inspector -flex -flobopuyo -fluxbox -fnlib-data -fontconfig -fontconfig-config -fontforge -fontforge-doc -fonty -foomatic-bin -foomatic-db -foomatic-db-engine -foomatic-db-gimp-print -foomatic-db-gutenprint -foomatic-db-hpijs -foomatic-filters -foremost -fortune-mod -fortunes-debian-hints -fortunes-min -fp-compiler -fp-docs -fp-ide -fp-units-base -fp-units-db -fp-units-fcl -fp-units-fv -fp-units-gfx -fp-units-gnome1 -fp-units-gtk -fp-units-gtk2 -fp-units-misc -fp-units-net -fp-units-rtl -fp-utils -fpc-crosswin32 -fpc-src -fping -freeciv-client-gtk -freeciv-data -freeciv-server -freefem -freefem-doc -freefem-examples -freefem3d -freeglut3 -freemind -freenx -freepats -freepops -freeradius -frozen-bubble -hi -ftape-util -ftp -ftpd -fttools -fuse-utils -g++ -g++-3.3 -g++-4.0 -g++-4.1 -g-wrap -g77 -g77-3.3 -g77-3.3-doc -g77-3.4 -gaim -gaim-data -gaim-encryption -gambas-gb-qt -gambas-runtime -gambit -gambit-doc -gamin -gap -gap-character-tables -gap-core -gap-dev -gap-doc -gap-libs -gap-online-help -gap-prim-groups -gap-small-groups -gap-small-groups-extra -gap-table-of-marks -gap-trans-groups -gawk -gbib -gcalctool -gcc -gcc-3.3 -gcc-3.3-base -gcc-3.4 -gcc-3.4-base -gcc-4.0 -gcc-4.0-base -gcc-4.0-doc -gcc-4.1 -gcc-4.1-base -gcc-4.1-doc -gcc-doc -gcc-doc-base -gcj -gcj-3.3 -gcj-4.0-base -gcj-4.1 -gcj-4.1-base -gcom -gcompris -gcompris-data -gcompris-sound-da -gcompris-sound-de -gcompris-sound-en -gcompris-sound-es -gcompris-sound-fr -gcompris-sound-it -gcompris-sound-pt -gcompris-sound-ru -gconf -gconf-editor -gconf2 -gconf2-common -gdal-bin -gdb -gdk-imlib1 -gdk-imlib11 -gdm -gdm-themes -geant321-doc -geas -geas-doc -geda -geda-doc -geda-examples -geda-gattrib -geda-gnetlist -geda-gschem -geda-gsymcheck -geda-symbols -geda-utils -gedit -gedit-common -geg -genisoimage -genliloconf -geomview -gerbv -gettext -gettext-base -gettext-el -gfortran -gfortran-4.1 -gftp -gftp-common -gftp-gtk -gftp-text -ghemical -gif2png -giflib-bin -giflib3g -giftrans -gij -gij-4.0 -gij-4.1 -gimp -gimp-data -gimp-print -ginac-tools -git-core -gjdoc -gkrellm -gkrellmd -gksu -glibc-doc -glpk -gmessage -gmsh -gmt -gmt-coast-low -gmt-doc -gmt-examples -gmt-tutorial -gmt-tutorial-pdf -gnokii -gnome -gnome-about -gnome-accessibility-them -gnome-applets -gnome-applets-data -gnome-backgrounds -gnome-bin -gnome-cards-data -gnome-control-center -gnome-core -gnome-cups-manager -gnome-desktop-data -gnome-desktop-environmen -gnome-doc-tools -gnome-doc-utils -gnome-games -gnome-games-data -gnome-games-extra-data -gnome-gv -gnome-icon-theme -gnome-keyring -gnome-keyring-manager -gnome-libs-data -gnome-mag -gnome-media -gnome-media-common -gnome-menus -gnome-mime-data -gnome-netstatus-applet -gnome-nettool -gnome-office -gnome-panel -gnome-panel-data -gnome-session -gnome-system-monitor -gnome-system-tools -gnome-terminal -gnome-terminal-data -gnome-themes -gnome-themes-extras -gnome-user-guide -gnome-utils -gnome-volume-manager -gnome2-user-guide -gnopernicus -gnubg -gnubg-data -gnucash -gnucash-common -gnucash-docs -gnuchess -gnuchess-book -gnue-appserver -gnue-common -gnue-designer -gnue-forms -gnue-navigator -gnue-reports -gnugo -gnuhtml2latex -gnumeric -gnumeric-common -gnumeric-doc -gnumeric-plugins-extra -gnupg -gnupg-agent -gnupg2 -gnuplot -gnuplot-doc -gnuplot-nox -gnuplot-x11 -gnustep-base-common -gnustep-common -gnustep-make -gnutls-bin -gocr -gok -gok-doc -gpart -gparted -gpc -gpc-2.1-3.4 -gpc-2.1-3.4-doc -gpdf -gperiodic -gpgsm -gpgv -gphoto2 -gpm -gpp -gprolog -gprolog-doc -gpsdrive -gpstrans -gq -gqcam -gqview -grace -gramofile -graphviz -graphviz-doc -grass -grass-doc -grep -grep-dctrl -gri -gri-el -gri-html-doc -grip -groff -groff-base -hi -grub-disk -gs-common -gs-esp -gs-gpl -gscanbus -gsfonts -gsfonts-x11 -gsl-bin -gsl-doc-pdf -gsl-ref-html -gsl-ref-psdoc -gsm-utils -gstreamer0.10-alsa -gstreamer0.10-gnomevfs -gstreamer0.10-gnonlin -gstreamer0.10-plugins-ba -gstreamer0.10-plugins-go -gstreamer0.10-plugins-ug -gstreamer0.8-plugin-apps -gstreamer0.8-tools -gtans -gthumb -gtk-engines-qtpixmap -gtk-smooth-themes -gtk2-engines -gtk2-engines-pixbuf -gtk2-engines-spherecryst -gtk2-engines-xfce -gtkam -gtkglarea5 -gtkhtml3.2 -gtkhtml3.6 -gtkhtml3.8 -gucharmap -guile-1.6 -guile-1.6-dev -guile-1.6-libs -guile-1.6-slib -guile-g-wrap -guile-library -gutenprint-doc -gutenprint-locales -gv -gwenview -gzip -hal -hal-device-manager -hdparm -helix-player -hermes1 -hevea -hexedit -hfsplus -hfsutils -hicolor-icon-theme -hostap-utils -hostapd -hostname -hotplug-utils -hpijs -hping2 -hspell -htdig -html2text -htmldoc -htmldoc-common -httptunnel -hunt -hwinfo -hwsetup -hwtools -i810switch -iamerican -iasl -ibod -ibritish -iceape-browser -icedax -icedove -icedove-inspector -icedove-locale-bg -icedove-locale-cs -icedove-locale-da -icedove-locale-de -icedove-locale-el -icedove-locale-es-es -icedove-locale-fi -icedove-locale-fr -icedove-locale-gu -icedove-locale-he -icedove-locale-hu -icedove-locale-it -icedove-locale-ja -icedove-locale-ko -icedove-locale-mk -icedove-locale-nb -icedove-locale-nl -icedove-locale-ru -icedove-locale-sk -icedove-locale-sl -icedove-locale-sv -icedove-locale-tr -icedove-locale-zh-cn -icedove-typeaheadfind -iceweasel -iceweasel-dom-inspector -iceweasel-l10n-ar -iceweasel-l10n-bg -iceweasel-l10n-ca -iceweasel-l10n-cs -iceweasel-l10n-da -iceweasel-l10n-de -iceweasel-l10n-el -iceweasel-l10n-es-es -iceweasel-l10n-eu -iceweasel-l10n-fi -iceweasel-l10n-fr -iceweasel-l10n-hu -iceweasel-l10n-it -iceweasel-l10n-ja -iceweasel-l10n-lt -iceweasel-l10n-nl -iceweasel-l10n-pl -iceweasel-l10n-pt-br -iceweasel-l10n-ru -iceweasel-l10n-sk -iceweasel-l10n-sl -iceweasel-l10n-zh-cn -icewm -icewm-common -icewm-themes -icmpush -iconx -idswakeup -iftop -ifupdown -ijsgimpprint -ijsgutenprint -ilisp -imageindex -imagemagick -imaze -imlib-base -imlib-progs -imlib11 -indi -industrial-cursor-theme -info -infobash -initramfs-tools -initrd-tools -initscripts -inkscape -intltool-debian -ipcalc -ipchains -iperf -ipppd -iproute -ipsec-tools -iptables -iptraf -iputils-ping -iputils-tracepath -ipv6calc -ipw2100-nonfree -ipw2200-nonfree -ipx -ipython -irb -irb1.8 -ircii -irda-common -irda-tools -irssi -irssi-plugin-icq -irssi-scripts -isapnptools -isdnactivecards -isdnutils-base -isdnvboxclient -iso-codes -isomaster -ispell -jackd -jade -java-common -jfsutils -jikes -joe -john -jokosher -jpilot -jpilot-backup -jpilot-mail -jpilot-plugins -jpilot-syncmal -juk -junit -k3b -k3b-defaults -k3b-i18n -kaddressbook -kaffe -kaffe-common -kaffe-pthreads -kaffeine -kakasi -kakasi-dic -kalarm -kalzium -kalzium-data -kamera -kanagram -kandy -kanjidic -kappfinder -kapptemplate -karbon -karm -kasteroids -kate -kate-plugins -katomic -kbabel -kbabel-dev -kbackgammon -kbackup -kbackup-doc -kbackup-multibuf -kbattleship -kbdconfig -kbear -kblackbox -kbounce -kbruch -kbugbuster -kcachegrind -kcalc -kcharselect -kchart -kcoloredit -kcontrol -kcron -kdat -kde-amusements -kde-core -kde-i18n-az -kde-i18n-bg -kde-i18n-ca -kde-i18n-cs -kde-i18n-da -kde-i18n-de -kde-i18n-el -kde-i18n-es -kde-i18n-et -kde-i18n-fa -kde-i18n-fi -kde-i18n-fr -kde-i18n-he -kde-i18n-hu -kde-i18n-it -kde-i18n-ja -kde-i18n-nl -kde-i18n-pl -kde-i18n-pt -kde-i18n-ptbr -kde-i18n-ru -kde-i18n-sk -kde-i18n-sl -kde-i18n-sr -kde-i18n-sv -kde-i18n-tr -kde-i18n-zhcn -kde-i18n-zhtw -kdeaddons-kfile-plugins -kdeadmin -kdeadmin-kfile-plugins -kdeartwork -kdeartwork-emoticons -kdeartwork-misc -kdeartwork-style -kdeartwork-theme-icon -kdeartwork-theme-window -kdebase -kdebase-bin -kdebase-data -kdebase-kio-plugins -kdebluetooth -kdeedu -kdeedu-data -kdeedu-doc-html -kdegames -kdegames-card-data -kdegames-doc-html -kdegraphics-doc-html -kdegraphics-kfile-plugin -kdelibs -kdelibs-data -kdelibs4-dev -kdelibs4c2a -kdemultimedia-kfile-plug -kdemultimedia-kio-plugin -kdenetwork-kfile-plugins -kdepasswd -kdepim -kdepim-kfile-plugins -kdepim-kio-plugins -kdepim-kresources -kdepim-wizards -kdeprint -kdesdk -kdesdk-doc-html -kdesdk-kfile-plugins -kdesdk-kio-plugins -kdesdk-misc -kdesdk-scripts -kdesktop -kdessh -kdetoys -kdetoys-doc-html -kdevelop -kdevelop-data -kdevelop-doc -kdewallpapers -kdewebdev -kdewebdev-doc-html -kdf -kdict -kdiff3 -kdissert -kdm -kdoc -kdvi -keduca -kenolaba -kernel-package -kexec-tools -kexi -kfax -kfilereplace -kfind -kfloppy -kformula -kfouleggs -kgamma -kget -kghostview -kgoldrunner -khangman -khelpcenter -khexedit -kicker -kiconedit -kig -kile -kile-i18n -kimagemapeditor -kino -kiosktool -kipi-plugins -kismet -kitchensync -kiten -kivio -kivio-data -kjumpingcube -klaptopdaemon -klatin -kleopatra -klettres -klettres-data -klibc-utils -klickety -klines -klinkstatus -klipper -klogd -kmahjongg -kmail -kmailcvt -kmenuedit -kmessedwords -kmines -kmix -kmoon -kmplot -kmrml -kmtrace -kmymoney2 -knetwalk -knetworkconf -knode -knotes -kodo -koffice -koffice-data -koffice-dev -koffice-doc -koffice-doc-html -koffice-i18n-af -koffice-i18n-bg -koffice-i18n-br -koffice-i18n-ca -koffice-i18n-cs -koffice-i18n-da -koffice-i18n-de -koffice-i18n-el -koffice-i18n-es -koffice-i18n-et -koffice-i18n-fa -koffice-i18n-fi -koffice-i18n-fr -koffice-i18n-he -koffice-i18n-hu -koffice-i18n-it -koffice-i18n-ja -koffice-i18n-nl -koffice-i18n-pl -koffice-i18n-pt -koffice-i18n-ptbr -koffice-i18n-ru -koffice-i18n-se -koffice-i18n-sk -koffice-i18n-sl -koffice-i18n-sr -koffice-i18n-sv -koffice-i18n-tr -koffice-i18n-zhcn -koffice-i18n-zhtw -koffice-libs -kolf -kolourpaint -kommander -kommander-dev -kompare -konq-plugins -konqueror -konqueror-nsplugins -konquest -konsole -konsolekalendar -kontact -konversation -kooka -kopete -korganizer -korn -koshell -kpackage -kpager -kpat -kpdf -kpercentage -kpersonalizer -kpf -kphone -kpilot -kplato -kpoker -kppp -kpresenter -kpresenter-data -kqemu-gui -krdc -kreversi -krfb -krita -krita-data -kruler -krusader -ksame -kscreensaver -kscreensaver-xsavers -kshisen -ksim -ksirtet -ksmiletris -ksmserver -ksnake -ksnapshot -ksokoban -kspaceduel -ksplash -kspread -kspy -kstars -kstars-data -ksudoku -ksvg -ksync -ksysguard -ksysguardd -ksysv -kteatime -kthesaurus -ktimer -ktip -ktnef -ktouch -ktron -ktuberling -kturtle -ktux -kugar -kuickshow -kuiviewer -kunittest -kuser -kvdr -kverbos -kview -kviewshell -kvoctrain -kweather -kwifimanager -kwin -kwin4 -kwlan -kword -kword-data -kwordquiz -kworldclock -kxsldbg -lacheck -ladcca2 -ladspa-sdk -lam-runtime -lam4c2 -lapack -lapack3 -laptop-detect -larswm -latex-beamer -latex-cjk-common -latex-xcolor -latex-xft-fonts -latex2html -lazarus -ldap-utils -lde -less -lesstif-dev -lesstif1 -lesstif2 -lftp -lha -liba52-0.7.4 -libaa1 -libaa1-dev -libacl1 -libacl1-dev -libadns1 -libaiksaurus-1.2-0c2a -libaiksaurus-1.2-data -libakode2 -libalgorithm-dependency- -libalut0 -libanthy0 -libao2 -libapache-dbi-perl -libapache-mod-perl -libapache-mod-ssl -libapache-request-perl -libapache-session-perl -libapache2-mod-jk -libapache2-mod-php5 -libapm1 -libappconfig-perl -libapr0 -libapr1 -libaprutil1 -libapt-pkg-perl -libaqbanking-data -libaqbanking-plugins-lib -libaqbanking16 -libaqdtaus3 -libaqgeldkarte4 -libaqhbci10 -libarchive-zip-perl -libart-2.0-2 -libart-2.0-dev -libart2 -libarts1-dev -libarts1c2a -libartsc0 -libartsc0-dev -libasound2 -libasound2-dev -libaspell-dev -libaspell15 -libast2 -libasyncns0 -libatk1.0-0 -libatk1.0-dev -libatm1 -libatspi1.0-0 -libattr1 -libattr1-dev -libaudacious4 -libaudio-dev -libaudio2 -libaudiofile-dev -libaudiofile0 -libauthen-sasl-perl -libautotrace3 -libavahi-client-dev -libavahi-client3 -libavahi-common-data -libavahi-common-dev -libavahi-common3 -libavahi-compat-howl0 -libavahi-compat-libdnssd -libavahi-glib1 -libavahi-qt3-1 -libavahi-qt3-dev -libavc1394-0 -libavc1394-dev -libavcodec0d -libavformat0d -libbcel-java -libbeecrypt6 -libberylsettings0 -libbind9-0 -libblkid1 -libbluetooth2 -libbonobo2-0 -libbonobo2-common -libbonoboui2-0 -libbonoboui2-common -libboost-date-time1.33.1 -libboost-filesystem1.33. -libboost-python1.32.0 -libboost-python1.33.0c2a -libboost-python1.33.1 -libboost-regex1.33.1 -libbraille -libbrlapi1 -libbz2-1.0 -libbz2-dev -libc-client2002edebian -libc6 -libc6-dev -libcaca0 -libcache-cache-perl -libcache-simple-timedexp -libcairo-perl -libcairo2 -libcairo2-dev -libcamel1.2-8 -libcanlock2 -libcap-dev -libcap1 -libcapi20-3 -libcapi20-dev -libcapsinetwork0c2a -libcdio6 -libcdk5 -libcdparanoia0 -libcfitsio2 -libchipcard-common -libchipcard2-0c2 -libchipcard20 -libclamav1 -libclan2c2a-gui -libclan2c2a-jpeg -libclan2c2a-mikmod -libclan2c2a-png -libclan2c2a-sound -libclan2c2a-vorbis -libclanlib2c2a -libclass-accessor-perl -libclass-autouse-perl -libclass-container-perl -libclass-data-inheritabl -libclass-inspector-perl -libclass-returnvalue-per -libcln4 -libclone-perl -libcomerr2 -libcommons-beanutils-jav -libcommons-collections-j -libcommons-collections3- -libcommons-dbcp-java -libcommons-digester-java -libcommons-el-java -libcommons-fileupload-ja -libcommons-launcher-java -libcommons-logging-java -libcommons-modeler-java -libcommons-pool-java -libcommons-validator-jav -libcompfaceg1 -libcompress-zlib-perl -libconfhelper-perl -libconfig-file-perl -libconfig-tiny-perl -libconsole -libconvert-asn1-perl -libconvert-binhex-perl -libcroco3 -libcrypt-ssleay-perl -libcsiro0 -libcucul0 -libcupsimage2 -libcupsys2 -libcupsys2-dev -libcurl3 -libcurl3-gnutls -libcvsservice0 -libdate-manip-perl -libdb1-compat -libdb3 -libdb4.2 -libdb4.3 -libdb4.4 -libdb4.4-dev -libdbd-mysql-perl -libdbd-pg-perl -libdbi-perl -libdbix-dbschema-perl -libdbix-searchbuilder-pe -libdbus-1-2 -libdbus-1-3 -libdbus-1-dev -libdbus-glib-1-2 -libdbus-qt-1-1c2 -libdc1394-13 -libdevel-stacktrace-perl -libdevel-symdump-perl -libdevmapper1.02 -libdigest-sha1-perl -libdirectfb-0.9-25 -libdirectfb-dev -libdirectfb-extra -libdiscover1 -libdjvulibre15 -libdm0 -libdmx-dev -libdmx1 -libdns21 -libdrm2 -libdshconfig1 -libdv-bin -libdv4 -libdv4-dev -libdvdread-dev -libdvdread3 -libebook1.2-5 -libecal1.2-6 -libedata-book1.2-2 -libedata-cal1.2-5 -libedataserver1.2-7 -libedataserverui1.2-6 -libedit2 -libeel2-2 -libeel2-data -libegroupwise1.2-10 -libelfg0 -libemeraldengine0 -libenchant1c2a -liberror-perl -libesd-alsa0 -libesd0-dev -libestools1.2 -libevent1 -libexception-class-perl -libexchange-storage1.2-1 -libexif-dev -libexif-gtk5 -libexif12 -libexiv2-0.10 -libexo-0.3-0 -libexpat1 -libexpat1-dev -libextutils-autoinstall- -libf2c2 -libf2c2-dev -libfcgi-perl -libffi4 -libffi4-dev -libfile-find-rule-perl -libfile-flat-perl -libfile-ncopy-perl -libfile-remove-perl -libfile-slurp-perl -libfinance-quote-perl -libflac++5 -libflac7 -libfltk1.1 -libfluidsynth1 -libfont-afm-perl -libfontconfig1 -libfontconfig1-dev -libfontenc-dev -libfontenc1 -libforms1 -libfreefem0 -libfreetype6 -libfreetype6-dev -libfreezethaw-perl -libfribidi0 -libfs-dev -libfs6 -libft-perl -libfuse-dev -libfuse2 -libg2c0 -libg2c0-dev -libgadu3 -libgail-common -libgail-gnome-module -libgail17 -libgal2.2-1 -libgal2.2-common -libgal2.4-0 -libgal2.4-common -libgamin-dev -libgamin0 -libgc1c2 -libgcc1 -libgcj-bc -libgcj-common -libgcj4 -libgcj4-awt -libgcj4-common -libgcj6 -libgcj6-jar -libgcj7-0 -libgcj7-awt -libgcj7-dev -libgcj7-jar -libgcompris-1-0 -libgconf11 -libgconf2-4 -libgconf2.0-cil -libgcrypt11 -libgcrypt11-dev -libgd2-xpm -libgda2-3 -libgda2-common -libgdal1-1.3.2 -libgdbm3 -libgdchart-gd2-noxpm -libgdgeda6 -libgdiplus -libgdk-pixbuf-dev -libgdk-pixbuf2 -libgecko2.0-cil -libgeda20 -libgeo-ipfree-perl -libgeoip1 -libgeos2c2a -libgfortran1 -libgfortran1-dev -libghemical-data -libghemical0c2a -libghttp1 -libgimp2.0 -libginac1.3c2a -libgksu1.2-0 -libgksu2-0 -libgksuui1.0-1 -libgl1-mesa-dev -libgl1-mesa-dri -libgl1-mesa-glx -libglade2-0 -libglade2.0-cil -libgle3 -libglib-perl -libglib1.2 -libglib1.2-dev -libglib2.0-0 -libglib2.0-cil -libglib2.0-data -libglib2.0-dev -libglibmm-2.4-1c2a -libglibmm-2.4-dev -libglide3 -libglpk0 -libglpng -libglu1-mesa -libglu1-mesa-dev -libglu1-xorg -libglu1-xorg-dev -libgmp3c2 -libgnokii3 -libgnome-desktop-2 -libgnome-keyring0 -libgnome-mag2 -libgnome-media0 -libgnome-menu2 -libgnome-pilot2 -libgnome-speech3 -libgnome-window-settings -libgnome2-0 -libgnome2-canvas-perl -libgnome2-common -libgnome2-perl -libgnome2-vfs-perl -libgnome2.0-cil -libgnome32 -libgnomecanvas2-0 -libgnomecanvas2-common -libgnomecups1.0-1 -libgnomecupsui1.0-1c2a -libgnomeprint2.2-0 -libgnomeprint2.2-data -libgnomeprintui2.2-0 -libgnomeprintui2.2-commo -libgnomesupport0 -libgnomeui-0 -libgnomeui-common -libgnomeui32 -libgnomevfs2-0 -libgnomevfs2-bin -libgnomevfs2-common -libgnomevfs2-extra -libgnorba27 -libgnorbagtk0 -libgnutls-dev -libgnutls12 -libgnutls13 -libgoffice-1-2 -libgoffice-1-common -libgpg-error-dev -libgpg-error0 -libgpgme11 -libgphoto2-2 -libgphoto2-2-dev -libgphoto2-port0 -libgpmg1 -libgpod0 -libgraflib1 -libgraflib1-dev -libgrafx11-1 -libgrafx11-1-dev -libgraphicsmagick1 -libgsf-1-114 -libgsf-1-common -libgsf-gnome-1-114 -libgsl0 -libgsl0-dev -libgsm1 -libgsmme1c2a -libgssapi2 -libgstreamer-plugins-bas -libgstreamer0.10-0 -libgstreamer0.8-0 -libgtk1.2 -libgtk1.2-common -libgtk1.2-dev -libgtk2-perl -libgtk2.0-0 -libgtk2.0-bin -libgtk2.0-cil -libgtk2.0-common -libgtk2.0-dev -libgtkglext1 -libgtkhtml3.2-11 -libgtkhtml3.6-18 -libgtkhtml3.8-15 -libgtkmm-2.4-1c2a -libgtkmm-2.4-dev -libgtksourceview-common -libgtksourceview1.0-0 -libgtksourceview2.0-cil -libgtkspell0 -libgtop2-7 -libgtop2-common -libgts-0.7-1 -libgucharmap4 -libguile-ltdl-1 -libgutenprint2 -libgutenprintui2-1 -libgwenhywfar-data -libgwenhywfar38 -libgwrap-runtime0 -libgwrap-runtime0-dev -libhal-storage1 -libhal1 -libhd13 -libhdf4g -libhdf5-serial-1.6.5-0 -libhdf5-serial-dev -libhfsp0 -libhtml-format-perl -libhtml-mason-perl -libhtml-parser-perl -libhtml-scrubber-perl -libhtml-tableextract-per -libhtml-tagset-perl -libhtml-template-expr-pe -libhtml-template-perl -libhtml-tree-perl -libhttp-ghttp-perl -libice-dev -libice6 -libicu36 -libid3-3.8.3c2a -libid3tag0 -libident -libidl0 -libidn11 -libidn11-dev -libiec61883-0 -libieee1284-3 -libifp4 -libijs-0.35 -libimage-base-bundle-per -libimage-info-perl -libimlib2 -libimlib2-dev -libindex0 -libio-pty-perl -libio-socket-ssl-perl -libio-string-perl -libio-stringy-perl -libiodbc2 -libipc-run-perl -libipc-sharelite-perl -libisc11 -libisccc0 -libisccfg1 -libiso9660-4 -libiw-dev -libiw28 -libjack0.100.0-0 -libjack0.100.0-dev -libjasper-1.701-1 -libjasper-1.701-dev -libjaxp1.3-java -libjcode-perl -libjcode-pm-perl -libjpeg-progs -libjpeg62 -libjpeg62-dev -libjsch-java -libk3b2 -libkadm55 -libkbanking1 -libkcal2b -libkcddb1 -libkdeedu3 -libkdegames1 -libkdepim1a -libkernlib1 -libkernlib1-dev -libkexif1 -libkgantt0 -libkipi0 -libkiten1 -libkjsembed1 -libkleopatra1 -libklibc -libkmime2 -libkonq4 -libkpathsea4 -libkpimexchange1 -libkpimidentities1 -libkrb5-dev -libkrb53 -libksba8 -libkscan1 -libksieve0 -libktnef1 -libktoblzcheck1c2a -liblcms1 -liblcms1-dev -libldap-2.3-0 -libldap2 -libldap2-dev -liblinphone1 -liblircclient0 -liblo0 -liblocale-gettext-perl -liblocale-maketext-fuzzy -liblocale-maketext-lexic -liblockdev1 -liblockfile1 -liblog-dispatch-perl -liblog4j1.2-java -liblog4net1.2-cil -liblogfile-rotate-perl -libloudmouth1-0 -liblrdf0 -libltdl3 -libltdl3-dev -liblua50 -liblua50-dev -liblualib50 -liblualib50-dev -liblucene-java -liblucene-java-doc -liblwres1 -liblwres9 -liblzo-dev -liblzo1 -libm17n-0 -libmad0 -libmad0-dev -libmagic1 -libmagick++9c2a -libmagick9 -libmagick9-dev -libmailtools-perl -libmal1 -libmath++0c2a -libmathlib2 -libmathlib2-dev -libmdc2 -libmeanwhile1 -libmediastreamer0 -libmetacity0 -libmhash2 -libmikmod2 -libmime-perl -libmimelib1c2a -libmldbm-perl -libmms0 -libmng-dev -libmng1 -libmodplug0c2 -libmodule-versions-repor -libmono-accessibility2.0 -libmono-cairo1.0-cil -libmono-cecil0.4-cil -libmono-corlib1.0-cil -libmono-corlib2.0-cil -libmono-data-tds1.0-cil -libmono-data-tds2.0-cil -libmono-microsoft-build2 -libmono-peapi1.0-cil -libmono-peapi2.0-cil -libmono-relaxng1.0-cil -libmono-security1.0-cil -libmono-security2.0-cil -libmono-sharpzip0.84-cil -libmono-sharpzip2.84-cil -libmono-system-data1.0-c -libmono-system-data2.0-c -libmono-system-runtime1. -libmono-system-runtime2. -libmono-system-web1.0-ci -libmono-system-web2.0-ci -libmono-system1.0-cil -libmono-system2.0-cil -libmono-winforms2.0-cil -libmono0 -libmono1.0-cil -libmono2.0-cil -libmopac7-0 -libmozjs0d -libmpcdec3 -libmpeg2-4 -libmpeg2-4-dev -libmpeg3-1 -libmpeg3-dev -libmpfr1 -libmpich1.0c2 -libmusicbrainz4c2a -libmx4j-java -libmyspell3c2 -libmysqlclient10 -libmysqlclient15-dev -libmysqlclient15off -libnasl2 -libnautilus-burn2 -libnautilus-burn3 -libnautilus-extension1 -libncp -libncurses5 -libncurses5-dev -libncursesw5 -libncursesw5-dev -libneon25 -libneon26 -libnessus2 -libnet-daemon-perl -libnet-ip-perl -libnet-ldap-perl -libnet-ssleay-perl -libnet0 -libnet1 -libnetcdf3 -libnetpbm10 -libnewt-dev -libnewt-utf8-0 -libnewt0.52 -libnfsidmap2 -libnids1.20 -libniftiio0 -libnjb5 -libnm-glib0 -libnotify1 -libnspr4 -libnspr4-0d -libnss-mdns -libnss3 -libnss3-0d -libntfs9 -libnumber-compare-perl -liboaf0 -libofx3 -libogg-dev -libogg0 -liboggflac3 -liboil0.3 -libopal-2.2.0 -libopenal0a -libopenbabel1 -libopencdk8 -libopencdk8-dev -libopenexr-dev -libopenexr2c2a -libopenobex1 -liborbit0 -liborbit2 -liboro-java -libortp5 -libosip2-3 -libosp5 -libostyle1c2 -libotf0 -libpacklib1 -libpacklib1-dev -libpam-modules -libpam-ncp -libpam-runtime -libpam0g -libpam0g-dev -libpanel-applet2-0 -libpango1.0-0 -libpango1.0-common -libpango1.0-dev -libpaper-utils -libpaper1 -libparams-util-perl -libparams-validate-perl -libpari-dev -libpari2-gmp -libparse-recdescent-perl -libparted1.6-0 -libparted1.7-1 -libparted1.7-dev -libpath-class-perl -libpawlib2 -libpawlib2-dev -libpcap0.7 -libpcap0.8 -libpcd2 -libpci2 -libpcre3 -libpcre3-dev -libpcrecpp0 -libpcsclite1 -libperl5.8 -libpg-perl -libpgsql2 -libpisock8 -libpisock9 -libpisync0 -libplot2c2 -libplplot9 -libplrpc-perl -libpng12-0 -libpng12-dev -libpod-tests-perl -libpoppler0c2 -libpoppler0c2-glib -libpoppler0c2-qt -libpopt-dev -libpopt0 -libportaudio0 -libpostproc0d -libpq-dev -libpq4 -libpqxx-2.6.8 -libprefork-perl -libpstoedit0c2a -libpt-1.10.0 -libpt-plugins-oss -libpt-plugins-v4l2 -libpth20 -libpulse0 -libpvm3 -libqbanking4 -libqcad0 -libqhull5 -libqscintilla6 -libqt3-compat-headers -libqt3-headers -libqt3-mt -libqt3-mt-dev -libqt3-mt-psql -libqt4-core -libqt4-gui -libqthreads-12 -libquantlib-0.3.13 -libquicktime-dev -libquicktime0 -libraptor1 -libraw1394-8 -libraw1394-dev -libreadline-ruby1.8 -libreadline4 -libreadline5 -libreadline5-dev -librecode0 -libregexp-common-perl -libregexp-java -libresid-builder0c2a -libresmgr1 -libroman-perl -librpcsecgss3 -librplay3 -librpm4 -librsvg2-2 -librsvg2-common -libruby1.8 -librxp1 -libsablot0 -libsamplerate0 -libsane -libsane-extras -libsasl2 -libsasl2-2 -libsasl2-dev -libsasl2-modules -libsc7 -libscrollkeeper0 -libsdl-console -libsdl-erlang -libsdl-gfx1.2-4 -libsdl-image1.2 -libsdl-mixer1.2 -libsdl-net1.2 -libsdl-pango1 -libsdl-perl -libsdl-ttf2.0-0 -libsdl1.2-dev -libsdl1.2debian -libsdl1.2debian-alsa -libselinux1 -libsensors3 -libsepol1 -libservlet2.3-java -libservlet2.4-java -libsexy2 -libsgmls-perl -libsgutils1 -libshout3 -libsidplay1 -libsidplay2 -libsigc++-2.0-0c2a -libsigc++-2.0-dev -libslang2 -libslang2-dev -libslp1 -libsm-dev -libsm6 -libsmbclient -libsmpeg0 -libsndfile1 -libsnmp-base -libsnmp9 -libsoup2.2-8 -libsp1c2 -libspeex1 -libsqlite0 -libsqlite3-0 -libss2 -libssl-dev -libssl0.9.6 -libssl0.9.7 -libssl0.9.8 -libssp0 -libstartup-notification0 -libstdc++2.10-glibc2.2 -libstdc++5 -libstdc++5-3.3-dev -libstdc++6 -libstdc++6-4.0-dev -libstdc++6-4.1-dev -libstroke0 -libstruts1.2-java -libsufary2 -libsvga1 -libsvga1-dev -libsvn1 -libswt3.2-gtk-java -libswt3.2-gtk-jni -libsysfs2 -libt1-5 -libtag1c2a -libtagc0 -libtasn1-3 -libtasn1-3-dev -libtemplate-perl -libterm-readkey-perl -libterm-readline-perl-pe -libtest-classapi-perl -libtest-inline-perl -libtext-autoformat-perl -libtext-charwidth-perl -libtext-format-perl -libtext-glob-perl -libtext-iconv-perl -libtext-quoted-perl -libtext-reform-perl -libtext-template-perl -libtext-wikiformat-perl -libtext-wrapi18n-perl -libtext-wrapper-perl -libtheora-dev -libtheora0 -libthunar-vfs-1-2 -libtidy-0.99-0 -libtiff-tools -libtiff4 -libtiff4-dev -libtiffxx0c2 -libtime-modules-perl -libtimedate-perl -libtomcat5-java -libtomcat5.5-java -libtool -libtotem-plparser1 -libtree-simple-perl -libtse3-0.3.1c2a -libttf2 -libtunepimp-bin -libtunepimp3 -libufsparse -libungif4-dev -libungif4g -libuniconf4.2 -liburi-perl -libusb-0.1-4 -libusb-dev -libuuid1 -libvcdinfo0 -libvisual-0.4-0 -libvolume-id0 -libvorbis-dev -libvorbis0a -libvorbisenc2 -libvorbisfile3 -libvte-common -libvte4 -libvtk5 -libvtk5-dev -libwant-perl -libwavpack0 -libweakref-perl -libwmf-bin -libwmf-dev -libwmf0.2-7 -libwnck-common -libwnck18 -libwpd8c2a -libwrap0 -libwrap0-dev -libwraster3 -libwv-1.2-1 -libwv-1.2-3 -libwv2-1c2 -libwvstreams4.2-base -libwvstreams4.2-extras -libwww-perl -libwxbase2.6-0 -libwxgtk2.4-1 -libwxgtk2.6-0 -libx11-6 -libx11-data -libx11-dev -libxalan110 -libxau-dev -libxau6 -libxaw-headers -libxaw6 -libxaw7 -libxaw7-dev -libxcomp1 -libxcompext1 -libxcomposite-dev -libxcomposite1 -libxcursor-dev -libxcursor1 -libxdamage-dev -libxdamage1 -libxdelta2 -libxdmcp-dev -libxdmcp6 -libxerces2-java -libxerces27 -libxevie-dev -libxevie1 -libxext-dev -libxext6 -libxfce4mcs-client3 -libxfce4mcs-manager3 -libxfce4util4 -libxfcegui4-4 -libxfixes-dev -libxfixes3 -libxfont-dev -libxfont1 -libxft-dev -libxft2 -libxi-dev -libxi6 -libxine-dev -libxine1 -libxinerama-dev -libxinerama1 -libxkbfile-dev -libxkbfile1 -libxkbui-dev -libxkbui1 -libxklavier10 -libxml++1.0c2a -libxml-dom-perl -libxml-filter-buffertext -libxml-libxml-common-per -libxml-libxml-perl -libxml-libxslt-perl -libxml-namespacesupport- -libxml-parser-perl -libxml-perl -libxml-regexp-perl -libxml-rss-perl -libxml-sablot-perl -libxml-sax-machines-perl -libxml-sax-perl -libxml-sax-writer-perl -libxml-simple-perl -libxml-xpath-perl -libxml1 -libxml2 -libxml2-dev -libxml2-utils -libxmu-dev -libxmu-headers -libxmu6 -libxmuu-dev -libxmuu1 -libxp-dev -libxp6 -libxplc0.3.13 -libxpm-dev -libxpm4 -libxrandr-dev -libxrandr2 -libxrender-dev -libxrender1 -libxres-dev -libxres1 -libxslt1-dev -libxslt1.1 -libxss-dev -libxss1 -libxt-dev -libxt6 -libxtrap-dev -libxtrap6 -libxtst-dev -libxtst6 -libxul-common -libxul0d -libxv-dev -libxv1 -libxvmc-dev -libxvmc1 -libxxf86dga-dev -libxxf86dga1 -libxxf86misc-dev -libxxf86misc1 -libxxf86vm-dev -libxxf86vm1 -libzipios++0c2a -libzvbi-common -libzvbi-dev -libzvbi-doc -libzvbi0 -libzvt2.0-0 -lilo -lilypond-data -lilypond-doc -linneighborhood -linphone -linphone-common -linphone-nox -linux-image-2.6.19 -linux-kernel-headers-kno -linux-sound-base -linuxdoc-tools -linuxdoc-tools-info -linuxdoc-tools-latex -linuxdoc-tools-text -lisa -loadlin -locales -lockfile-progs -login -logrotate -lookup -loop-aes-modules-2.6.19 -loop-aes-source -loop-aes-utils -lrzsz -lsb -lsb-base -lsb-core -lsb-cxx -lsb-desktop -lsb-graphics -lsb-qt4 -lsb-release -lsdvd -lskat -lsof -ltrace -lua50 -lvm-common -lvm2 -lynx -lyx -lyx-common -lyx-qt -lyx-xforms -lzop -m17n-db -m4 -macutils -madwifi-modules-2.6.19 -madwifi-source -madwifi-tools -mailx -make -makedev -man-db -manpages -manpages-de -manpages-dev -matwrap -mawk -maxima -maxima-doc -maxima-emacs -maxima-share -maxima-src -maxima-test -mayavi -mbr -mc -mcl -mcl-doc -mdadm -med-common -med-tools -medcon -memtest86 -memtest86+ -memtester -mencal -menu -menu-xdg -mesa-common-dev -mesa-utils -metacity -metacity-common -metamail -mgdiff -mgp -mikmod -mime-support -mimms -mindi -mindi-busybox -mindi-kernel -mindi-partimagehack -minicom -misdn-utils -misdn-voipisdn -mkbootdev -mkisofs -hi -mktemp -mldonkey-gui -mldonkey-server -mlock -mobilemesh -modconf -module-assistant -module-init-tools -modutils -mondo -mondo-doc -mono -mono-apache-server -mono-common -mono-devel -mono-gac -mono-gmcs -mono-jay -mono-jit -mono-mcs -mono-runtime -mono-utils -mono-xsp-base -monodevelop -monodoc-base -monodoc-browser -monodoc-http -monodoc-manual -monopd -monotone -mount -mouseconfig -mozilla-browser -mozilla-firefox -mozilla-helix-player -mozilla-psm -mozilla-thunderbird -mozilla-thunderbird-insp -mozilla-thunderbird-type -mpack -mpage -mpg321 -mplayer -mplayer-skin-blue -mpqc -mpqc-support -ms-sys -mt-st -mtools -mtr -mtx -multimix -mutt -myspell-bg -myspell-de-at -myspell-de-ch -myspell-de-de -myspell-en-gb -myspell-en-us -myspell-es -myspell-fr -myspell-it -myspell-pl -mysql-client -mysql-client-5.0 -mysql-common -mysql-server -mysql-server-5.0 -mysql-zrm -mysql-zrm-socket-server -nagios-nrpe-plugin -nagios-plugins-basic -nagios2 -nagios2-common -nagios2-doc -nano -nasm -nautilus -nautilus-cd-burner -nautilus-data -ncftp -ncpfs -ncurses-base -ncurses-bin -ncurses-term -ndiswrapper-modules-2.6. -ndiswrapper-source -nedit -nessus -nessus-plugins -nessusd -net-tools -netbase -netcat -netcat6 -nethack-common -nethack-console -nethack-qt -nethack-x11 -netpbm -netpipe-tcp -netpipes -netris -netspeed -networkstatus -neverball -neverdata -nfs-common -nfs-kernel-server -ngrep -nis -nkf -nmap -noteedit -noteedit-data -nowebm -nparted -ntfs-3g -ntpdate -nvtv -nvu -nxagent -nxclient -nxdesktop -nxlibs -nxproxy -nxssh -nxtunnel-client -nxtunnel-server -oaf -obconf -ocaml-base-nox -ocfs2-tools -ocfs2console -octave -octave-epstk -octave-sp -octave-statdataml -octave2.1 -octave2.9 -octave2.9-doc -octave2.9-headers -octave2.9-htmldoc -odbc-postgresql -odbcinst1debian1 -ofx -oneko -openbox -openbsd-inetd -openhackware -openjade -openjade1.3 -openoffice-de-en -openoffice.org-debian-me -opensched -openssh-client -openssh-server -openssl -openvpn -outguess -p0f -pari-doc -pari-extra -pari-gp -parted-bf -partimage -partimage-server -passwd -patch -patchutils -paw -paw-common -paw-demos -pax -pcb -pciutils -pciutils-dev -pcmcia-cs -pcmciautils -pdl -pentanet-doc -pentanet-utils -perl -perl-base -perl-doc -perl-modules -perl-suid -perl-tk -perlmagick -pgapack -pgdocs-pdf-a4 -pgf -pgpgpg -php5 -php5-common -php5-gd -php5-imap -php5-ldap -php5-mhash -php5-mysql -phpmyadmin -pi -pia -pilot-link -pinentry-qt -pingus -pingus-data -pioneers-ai -pioneers-client -pioneers-help -pioneers-server-console -pioneers-server-data -pioneers-server-gtk -pkg-config -planetpenguin-racer -planetpenguin-racer-data -planner -playmidi -plib1.8.4c2 -plotutils -pm-dev -pmidi -pmount -pmtools -pnm2ppa -po-debconf -portmap -poster -postgresql-8.0 -postgresql-client-8.0 -postgresql-client-common -postgresql-common -postgresql-contrib-8.0 -postgresql-doc-8.0 -postgresql-plperl-8.0 -postgresql-plpython-8.0 -postgresql-pltcl-8.0 -postgresql-server-dev-8. -potrace -powermgmt-base -poxml -ppmd -ppp -hi -pppdcapiplugin -pppoe -pppoeconf -pppstatus -pptp-linux -prelink -preview-latex-style -print-utils-pfeifle -prism54-nonfree -procinfo -procmail -procps -proj -proll -psfontmgr -psgml -psmisc -pspp -psutils -pump -pvm -pxlib1 -pybliographer -python -python-alsaaudio -python-apt -python-bibtex -python-cairo -python-central -python-dbus -python-doc -python-egenix-mxdatetime -python-egenix-mxtools -python-extclass -python-glade2 -python-gmenu -python-gnome2 -python-gnome2-desktop -python-gst0.10 -python-gtk-1.2 -python-gtk2 -python-imaging -python-imaging-doc -python-imaging-doc-html -python-imaging-doc-pdf -python-imaging-tk -python-ldap -python-libxml2 -python-minimal -python-netcdf -python-numeric -python-numeric-ext -python-numeric-tutorial -python-pygresql -python-pyorbit -python-pysqlite2 -python-scientific -python-scientific-doc -python-sigmask -python-support -python-tk -python-vtk -python-wxgtk2.4 -python-wxgtk2.6 -python-wxversion -python-xml -python2.1 -python2.3 -python2.3-dev -python2.3-doc -python2.4 -python2.4-doc -python2.4-minimal -qca-tls -qcad -qemu -qm -qmtest -qobex -qps -qt3-assistant -qt3-designer -qt3-dev-tools -qt3-doc -qtparted -quanta -quanta-data -quantlib-examples -quantlib-python -quantlib-refman -quantlib-refman-html -quantlib-ruby -r-base -r-base-core -r-base-dev -r-base-html -r-base-latex -r-cran-abind -r-cran-acepack -r-cran-boot -r-cran-car -r-cran-chron -r-cran-cluster -r-cran-coda -r-cran-dbi -r-cran-design -r-cran-effects -r-cran-foreign -r-cran-gdata -r-cran-gmodels -r-cran-gplots -r-cran-gregmisc -r-cran-gtkdevice -r-cran-gtools -r-cran-hmisc -r-cran-its -r-cran-kernsmooth -r-cran-lattice -r-cran-lmtest -r-cran-mapdata -r-cran-maps -r-cran-mcmcpack -r-cran-mgcv -r-cran-multcomp -r-cran-mvtnorm -r-cran-nlme -r-cran-qtl -r-cran-quadprog -r-cran-rcmdr -r-cran-relimp -r-cran-rgl -r-cran-rmysql -r-cran-rodbc -r-cran-rpart -r-cran-rquantlib -r-cran-sandwich -r-cran-sm -r-cran-statdataml -r-cran-strucchange -r-cran-survival -r-cran-tkrplot -r-cran-tseries -r-cran-vr -r-cran-xml -r-cran-zoo -r-doc-html -r-doc-info -r-doc-pdf -r-mathlib -r-recommended -radio -raptor-utils -ratmenu -ratpoison -rcalc -rcs -rdate -rdesktop -readline-common -realpath -recode -recover -refblas3 -refblas3-dev -reiserfsprogs -reportbug -request-tracker3 -request-tracker3.4 -resmgr -rfb -rhythmbox -rocklight -rootstrap -rosegarden -rosegarden-data -rosegarden4 -rplay-client -rpm -rsync -rt2x00-cvs-modules-2.6.1 -rt3-clients -rt3.4-apache -rt3.4-clients -rtai -rtai-doc -rtai-source -rtfm -rubber -ruby -ruby-examples -ruby1.8 -rxp -rxvt-beta -s3switch -samba -samba-common -sane -sane-utils -sash -sbcl -sbl-auto-udeb -scanmodem -scantv -scli -scons -screen -scribus -scribus-doc-de -scribus-doc-en -scribus-doc-fr -scrollkeeper -scsitools -scummvm -sdic -sdic-edict -secpolicy -sed -selfhtml -sendemail -sendfile -sendip -setserial -sfftobmp -sffview -sg3-utils -sgml-base -sgml-data -sgmlspl -sgmltools-lite -shaper -shared-mime-info -sharutils -sitar -slang1 -slang1a-utf8 -slapd -sleuthkit -slib -slirp -slrn -smail -smake -smartmontools -smbclient -smbconf-pfeifle -smbconf-pfeifle-nonfree -smbfs -smpeg-plaympeg -smpeg-xmms -sniffit -sodipodi -sound-juicer -sound-recorder -sox -sp -speedtouch -speex -spell -spellutils -sqlite -sqlite-doc -squid -squid-common -squidclient -ssh -ssl-cert -sslwrap -star -statserial -stellarium -stellarium-data -strace -stress -stunnel -subversion -sudo -sufary -sun-java5-bin -sun-java5-demo -sun-java5-fonts -sun-java5-jdk -sun-java5-jre -sun-java5-plugin -sunbird -sweep -swi-prolog -sylpheed -sylpheed-doc -sylpheed-i18n -symlinks -synaptic -sysklogd -syslinux -system-tools-backends -sysv-rc -sysvinit -sysvinit-utils -tar -tcl8.3 -tcl8.4 -tclreadline -tcpd -tcpdump -telnet-ssl -telnetd-ssl -terminatorx -testdisk -tetex-base -tetex-bin -tetex-doc -tetex-extra -tex-common -tex4ht -tex4ht-common -texi2html -texinfo -texmacs -texmacs-common -tftp -tftpd-hpa -thttpd -thunar -thunderbird -thunderbird-inspector -thunderbird-locale-bg -thunderbird-locale-cs -thunderbird-locale-da -thunderbird-locale-de -thunderbird-locale-el -thunderbird-locale-es-es -thunderbird-locale-fi -thunderbird-locale-fr -thunderbird-locale-gu -thunderbird-locale-he -thunderbird-locale-hu -thunderbird-locale-it -thunderbird-locale-ja -thunderbird-locale-ko -thunderbird-locale-mk -thunderbird-locale-nb -thunderbird-locale-nl -thunderbird-locale-ru -thunderbird-locale-sk -thunderbird-locale-sl -thunderbird-locale-sv -thunderbird-locale-tr -thunderbird-locale-zh-cn -thunderbird-typeaheadfin -tidy -tidy-doc -tiger -tightvncserver -timeout -timezoneconf -timidity -timidity-patches -tint -tix -tk8.3 -tk8.4 -tkdiff -tnef -tofrodos -tomcat5 -tomcat5-admin -tomcat5-webapps -toppler -tora -totem -totem-mozilla -totem-xine -tpconfig -traceroute -trang -trans-de-en -transfig -tripwire -tsclient -tshark -tsocks -ttf-arabeyes -ttf-arphic-bsmi00lp -ttf-bengali-fonts -ttf-bitstream-vera -ttf-dejavu -ttf-devanagari-fonts -ttf-dustin -ttf-f500 -ttf-farsiweb -ttf-freefont -ttf-gentium -ttf-gujarati-fonts -ttf-indic-fonts -ttf-isabella -ttf-junicode -ttf-kannada-fonts -ttf-kochi-gothic -ttf-malayalam-fonts -ttf-openoffice -ttf-opensymbol -ttf-oriya-fonts -ttf-punjabi-fonts -ttf-sjfonts -ttf-staypuft -ttf-summersby -ttf-tamil-fonts -ttf-telugu-fonts -ttmkfdir -tuxeyes -tuxkart -tuxkart-data -tuxmath -tuxpaint -tuxpaint-data -tuxpaint-stamps-default -tuxpuck -tuxtype -tuxtype-data -tvtime -twm -txt2regex -type-handling -type1inst -tzdata -ucf -udev -udpcast -umbrello -uml-utilities -umlrun -umlrun-uml -unifont -units -unixodbc -unp -unzip -unzoo -update -update-inetd -urlview -usbutils -usbview -user-de -user-mode-linux -user-mode-linux-doc -util-linux -util-linux-locales -uudeview -uuid-dev -v4l-conf -valgrind -vcdimager -vcdtools -vdr -vegastrike -vegastrike-data -vegastrike-music -verilog -vgabios -vigor -vim -vim-common -vim-gtk -vim-gui-common -vim-runtime -vim-scripts -vimpart -vino -vis5d-doc -vlan -vnc-common -vorbis-tools -vpnc -vrms -vtk-doc -vtk-examples -vtk-tcl -w3-dtd-mathml -w3c-dtd-xhtml -w3m -wakeonlan -wamerican -wavemon -wavtools -wbritish -wcanadian -wcatalan -wfrench -wget -wheretero -whiptail -whisker -whitespace -whois -wine -wine-dev -winetools -wings3d -wipe -wireless-tools -wireshark -wireshark-common -witalian -wmaker -wmaker-data -wmaker-usersguide-ps -wmakerconf -wmakerconf-data -wngerman -wnorwegian -wodim -wordnet -wordnet-base -wordtrans-data -wpasupplicant -wpolish -wprint -wv -wvdial -wwwconfig-common -wxmaxima -x-ttcidfont-conf -x11-common -x11proto-bigreqs-dev -x11proto-composite-dev -x11proto-core-dev -x11proto-damage-dev -x11proto-dmx-dev -x11proto-evie-dev -x11proto-fixes-dev -x11proto-fontcache-dev -x11proto-fonts-dev -x11proto-gl-dev -x11proto-input-dev -x11proto-kb-dev -x11proto-print-dev -x11proto-randr-dev -x11proto-record-dev -x11proto-render-dev -x11proto-resource-dev -x11proto-scrnsaver-dev -x11proto-trap-dev -x11proto-video-dev -x11proto-xcmisc-dev -x11proto-xext-dev -x11proto-xf86bigfont-dev -x11proto-xf86dga-dev -x11proto-xf86dri-dev -x11proto-xf86misc-dev -x11proto-xf86vidmode-dev -x11proto-xinerama-dev -x3270 -xalan -xaos -xaw3dg -xawtv -xawtv-plugins -xbase-clients -xbattle -xbitmaps -xboard -xboing -xchat -xchat-common -xclass-common -xcursor-themes -xdelta -xdg-utils -xdialog -xdm -xemacs21 -xemacs21-basesupport -xemacs21-bin -xemacs21-mule -xemacs21-mulesupport -xemacs21-support -xemacs21-supportel -xen-docs-3.0 -xen-hypervisor-3.0-i386 -xen-utils-3.0.3-1 -xen-utils-common -xfce -xfce4 -xfce4-icon-theme -xfce4-mcs-manager -xfce4-mcs-plugins -xfce4-mixer -xfce4-mixer-alsa -xfce4-panel -xfce4-session -xfce4-utils -xfdesktop4 -xfig -xfonts-100dpi -xfonts-100dpi-transcoded -xfonts-75dpi -xfonts-75dpi-transcoded -xfonts-base -xfonts-base-transcoded -xfonts-bolkhov-cp1251-75 -xfonts-bolkhov-cp1251-mi -xfonts-dosemu -xfonts-encodings -xfonts-scalable -xfonts-terminus -xfonts-utils -xfonts-x3270-misc -xfprint4 -xfsdump -xfsprogs -xfwm4 -xfwm4-themes -xgalaga -xine-ui -xjdic -xkb-data -xkbset -xlib6g -xlibmesa-gl -xlibmesa-gl-dev -xlibs -xlibs-static-dev -xloadimage -xmaxima -xmedcon -xmhtml1 -xml-core -xmms -xmms-cdread -xmms-goom -xmms-modplug -xmms-volnorm -xnest -xorg -xorg-dev -xosview -xpaint -xpdf -xpdf-common -xpdf-reader -xpdf-utils -xppaut -xsane -xsane-common -xscreensaver -xscreensaver-gl -xscreensaver-gnome -xserver-xorg -xserver-xorg-core -xserver-xorg-dev -xserver-xorg-input-all -xserver-xorg-input-evdev -xserver-xorg-input-kbd -xserver-xorg-input-mouse -xserver-xorg-input-synap -xserver-xorg-input-wacom -xserver-xorg-video-all -xserver-xorg-video-apm -xserver-xorg-video-ark -xserver-xorg-video-ati -xserver-xorg-video-chips -xserver-xorg-video-cirru -xserver-xorg-video-cyrix -xserver-xorg-video-dummy -xserver-xorg-video-fbdev -xserver-xorg-video-glint -xserver-xorg-video-i128 -xserver-xorg-video-i740 -xserver-xorg-video-i810 -xserver-xorg-video-imstt -xserver-xorg-video-mga -xserver-xorg-video-neoma -xserver-xorg-video-newpo -xserver-xorg-video-nsc -xserver-xorg-video-nv -xserver-xorg-video-rendi -xserver-xorg-video-s3 -xserver-xorg-video-s3vir -xserver-xorg-video-savag -xserver-xorg-video-silic -xserver-xorg-video-sis -xserver-xorg-video-sisus -xserver-xorg-video-tdfx -xserver-xorg-video-tga -xserver-xorg-video-tride -xserver-xorg-video-tseng -xserver-xorg-video-v4l -xserver-xorg-video-vesa -xserver-xorg-video-vga -xserver-xorg-video-via -xserver-xorg-video-vmwar -xserver-xorg-video-voodo -xskat -xsltproc -xterm -xtightvncviewer -xtrans-dev -xtv -xutils -xutils-dev -xviddetect -xvier -xvncviewer -xvt -xwpe -xzoom -yacas -yacas-doc -yacas-proteus -yafray -yelp -yorick -yorick-data -yorick-doc -zenity -zile -zip -zlib-bin -zlib1g -zlib1g-dev diff --git a/manpages/lh_binary.1 b/manpages/lh_binary.1 new file mode 100644 index 0000000..cb60795 --- /dev/null +++ b/manpages/lh_binary.1 @@ -0,0 +1,56 @@ +.TH LH_BINARY 1 "2007\-03\-19" "1.0~a2" "live\-helper" + +.SH NAME +lh_binary \- meta-helper for lh_binary_* + +.SH SYNOPSIS +.B lh_binary [\fIlive\-helper\ options\fR\|] + +.SH DESCRIPTION +lh_binary is a meta-helper. It calls all necessary helpers to complete the binary stage. + +.SH OPTIONS +lh_bootstrap has no options (FIXME). + +.SH BINARY HELPERS +Here is the complete list of available binary helper commands. See their man pages for additional documentation. +.IP "\fIlh_binary_encryption\fR(1)" 4 +encrypts the root filesystem. +.IP "\fIlh_binary_includes\fR(1)" 4 +copies files into the binary image. +.IP "\fIlh_binary_hdd\fR(1)" 4 +creates the harddisk binary tarball. +.IP "\fIlh_binary_iso\fR(1)" 4 +creates the CD/DVD binary image. +.IP "\fIlh_binary_linuximage\fR(1)" 4 +copies linux-image into the binary image. +.IP "\fIlh_binary_localincludes\fR(1)" 4 +copies local files into the binary image. +.IP "\fIlh_binary_manifest\fR(1)" 4 +creates the package list of the root filesystem. +.IP "\fIlh_binary_md5sum\fR(1)" 4 +creates md5sum.txt in the binary image. +.IP "\fIlh_binary_memtest86\fR(1)" 4 +copies memtest86 into the binary image. +.IP "\fIlh_binary_net\fR(1)" 4 +creates the netboot binary tarball. +.IP "\fIlh_binary_rootfs\fR(1)" 4 +creates the root filesystem. +.IP "\fIlh_binary_syslinux\fR(1)" 4 +copies syslinux into the binary image. +.IP "\fIlh_binary_usb\fR(1)" 4 +creates the USB binary image. + +.SH SEE ALSO +\fIlive\-helper\fR(7) +.PP +This program is a part of live-helper. + +.SH BUGS +Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR>. + +.SH HOMEPAGE +More information about the Debian Live project can be found at <\fIhttp://debian\-live.alioth.debian.org/\fR> and <\fIhttp://wiki.debian.org/DebianLive/\fR>. + +.SH AUTHOR +live\-helper was written by Daniel Baumann <\fIdaniel@debian.org\fR> and Marco Amadori <\fImarco.amadori@gmail.com\fR>, for the Debian project. diff --git a/manpages/lh_bootstrap.1 b/manpages/lh_bootstrap.1 new file mode 100644 index 0000000..4dcfc0e --- /dev/null +++ b/manpages/lh_bootstrap.1 @@ -0,0 +1,42 @@ +.TH LH_BOOTSTRAP 1 "2007\-03\-19" "1.0~a2" "live\-helper" + +.SH NAME +lh_bootstrap \- meta-helper for lh_bootstrap_* + +.SH SYNOPSIS +.B lh_bootstrap [\fIlive\-helper\ options\fR\|] + +.SH DESCRIPTION +lh_bootstrap is a meta-helper. It calls all necessary helpers to complete the bootstrap stage. + +.SH CONFIGURATION FILE +lh_bootstrap reads config/common if available. See ENVIRONMENT for the correct environment variables to use. + +.SH ENVIRONMENT +lh_bootstrap respects the following environment variables if available, otherwise uses default values for it. +.IP "\fI$LH_BOOTSTRAP\fR" 4 +select the bootstrap program (Default: cdebootstrap) + +.SH OPTIONS +lh_bootstrap has no options (FIXME). + +.SH BOOTSTRAP HELPERS +Here is the complete list of available bootstrap helper commands. See their man pages for additional documentation. +.IP "\fIlh_bootstrap_cdebootstrap\fR(1)" 4 +bootstraps system with cdebootstrap. +.IP "\fIlh_bootstrap_debootstrap\fR(1)" 4 +bootstraps system with debootstrap. + +.SH SEE ALSO +\fIlive\-helper\fR(7) +.PP +This program is a part of live-helper. + +.SH BUGS +Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR>. + +.SH HOMEPAGE +More information about the Debian Live project can be found at <\fIhttp://debian\-live.alioth.debian.org/\fR> and <\fIhttp://wiki.debian.org/DebianLive/\fR>. + +.SH AUTHOR +live\-helper was written by Daniel Baumann <\fIdaniel@debian.org\fR> and Marco Amadori <\fImarco.amadori@gmail.com\fR>, for the Debian project. diff --git a/manpages/lh_bootstrap_cdebootstrap.1 b/manpages/lh_bootstrap_cdebootstrap.1 new file mode 100644 index 0000000..812bc37 --- /dev/null +++ b/manpages/lh_bootstrap_cdebootstrap.1 @@ -0,0 +1,49 @@ +.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "2007\-03\-19" "1.0~a2" "live\-helper" + +.SH NAME +lh_bootstrap_cdebootstrap \- bootstrap a Debian system with \fIcdebootstrap\fR(1) + +.SH SYNOPSIS +.B lh_bootstrap_cdebootstrap [\fIlive\-helper\ options\fR\|] + +.SH DESCRIPTION +lh_bootstrap_cdebootstrap uses \fIcdebootstrap\fR(1) to create a Debian base system from scratch. + +.SH CONFIGURATION FILE +lh_bootstrap_cdebootstrap reads config/common and config/bootstrap if available. See ENVIRONMENT for the correct environment variables to use. + +.SH ENVIRONMENT +lh_bootstrap_cdebootstrap respects the following environment variables if available, otherwise uses default values for it. +.IP "\fI$LH_CACHE\fR" 4 +control if downloaded packages should be cached (Default: enabled) +.IP "\fI$LH_ROOT\fR" 4 +set the root directory (Default: debian-live) +.IP "\fI$LIVE_ARCHITECTURE\fR" 4 +select the chroot architecture (Default: autodetected) +.IP "\fI$LIVE_DISTRIBUTION\fR" 4 +select the distribution to use (Default: sid) +.IP "\fI$LIVE_DISTRIBUTION_CONFIG\fR" 4 +set distribution config directory (Default: empty) +.IP "\fI$LIVE_FLAVOUR\fR" 4 +select the flavour to use (Default: standard) +.IP "\fI$LIVE_MIRROR_LOCAL\fR" 4 +set the local mirror to use (Default: http://ftp.debian.org/debian/) + +.SH OPTIONS +lh_bootstrap_cdebootstrap has no options (FIXME). + +.SH SEE ALSO +\fIcdebootstrap\fR(1) +.PP +\fIlive\-helper\fR(7) +.PP +This program is a part of live-helper. + +.SH BUGS +Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR>. + +.SH HOMEPAGE +More information about the Debian Live project can be found at <\fIhttp://debian\-live.alioth.debian.org/\fR> and <\fIhttp://wiki.debian.org/DebianLive/\fR>. + +.SH AUTHOR +live\-helper was written by Daniel Baumann <\fIdaniel@debian.org\fR> and Marco Amadori <\fImarco.amadori@gmail.com\fR>, for the Debian project. diff --git a/manpages/lh_bootstrap_debootstrap.1 b/manpages/lh_bootstrap_debootstrap.1 new file mode 100644 index 0000000..3ccb509 --- /dev/null +++ b/manpages/lh_bootstrap_debootstrap.1 @@ -0,0 +1,49 @@ +.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "2007\-03\-19" "1.0~a2" "live\-helper" + +.SH NAME +lh_bootstrap_debootstrap \- bootstrap a Debian system with \fIdebootstrap\fR(8) + +.SH SYNOPSIS +.B lh_bootstrap_debootstrap [\fIlive\-helper\ options\fR\|] + +.SH DESCRIPTION +lh_bootstrap_debootstrap uses \fIdebootstrap\fR(8) to create a Debian base system from scratch. + +.SH CONFIGURATION FILE +lh_bootstrap_debootstrap reads config/common and config/bootstrap if available. See ENVIRONMENT for the correct environment variables to use. + +.SH ENVIRONMENT +lh_bootstrap_debootstrap respects the following environment variables if available, otherwise uses default values for it. +.IP "\fI$LH_CACHE\fR" 4 +control if downloaded packages should be cached (Default: enabled) +.IP "\fI$LH_ROOT\fR" 4 +set the root directory (Default: debian-live) +.IP "\fI$LIVE_ARCHITECTURE\fR" 4 +select the chroot architecture (Default: autodetected) +.IP "\fI$LIVE_DISTRIBUTION\fR" 4 +select the distribution to use (Default: sid) +.IP "\fI$LIVE_DISTRIBUTION_CONFIG\fR" 4 +set distribution config directory (Default: empty) +.IP "\fI$LIVE_FLAVOUR\fR" 4 +select the flavour to use (Default: standard) +.IP "\fI$LIVE_MIRROR_LOCAL\fR" 4 +set the local mirror to use (Default: http://ftp.debian.org/debian/) + +.SH OPTIONS +lh_bootstrap_debootstrap has no options (FIXME). + +.SH SEE ALSO +\fIdebootstrap\fR(8) +.PP +\fIlive\-helper\fR(7) +.PP +This program is a part of live-helper. + +.SH BUGS +Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR>. + +.SH HOMEPAGE +More information about the Debian Live project can be found at <\fIhttp://debian\-live.alioth.debian.org/\fR> and <\fIhttp://wiki.debian.org/DebianLive/\fR>. + +.SH AUTHOR +live\-helper was written by Daniel Baumann <\fIdaniel@debian.org\fR> and Marco Amadori <\fImarco.amadori@gmail.com\fR>, for the Debian project. diff --git a/manpages/lh_clean.1 b/manpages/lh_clean.1 new file mode 100644 index 0000000..d520a28 --- /dev/null +++ b/manpages/lh_clean.1 @@ -0,0 +1,27 @@ +.TH LH_CLEAN 1 "2007\-03\-19" "1.0~a2" "live\-helper" + +.SH NAME +lh_clean \- clean up system build directories + +.SH SYNOPSIS +.B lh_clean [\fIlive\-helper\ options\fR\|] + +.SH DESCRIPTION +lh_clean is a live\-helper program that is responsible for cleaning up after a system is built. It removes the system build directories, and removes some other files including stage files, and any detritus left behind by other live\-helper commands. + +.SH OPTIONS +lh_clean has no options (FIXME). + +.SH SEE ALSO +\fIlive\-helper\fR(7) +.PP +This program is a part of live-helper. + +.SH BUGS +Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR>. + +.SH HOMEPAGE +More information about the Debian Live project can be found at <\fIhttp://debian\-live.alioth.debian.org/\fR> and <\fIhttp://wiki.debian.org/DebianLive/\fR>. + +.SH AUTHOR +live\-helper was written by Daniel Baumann <\fIdaniel@debian.org\fR> and Marco Amadori <\fImarco.amadori@gmail.com\fR>, for the Debian project. diff --git a/manpages/lh_testroot.1 b/manpages/lh_testroot.1 new file mode 100644 index 0000000..76ff772 --- /dev/null +++ b/manpages/lh_testroot.1 @@ -0,0 +1,27 @@ +.TH LH_TESTROOT 1 "2007\-03\-19" "1.0~a2" "live\-helper" + +.SH NAME +lh_testroot \- ensure that a system is built as root + +.SH SYNOPSIS +.B lh_testroot [\fIlive\-helper\ options\fR\|] + +.SH DESCRIPTION +lh_testroot simply checks to see if you are root. If not, it exits with an error. Debian Live images must currently be built as real root, \fIfakeroot\fR(1) or \fIsudo\fR(8) does not work. + +.SH OPTIONS +lh_testroot has no options (FIXME). + +.SH SEE ALSO +\fIlive\-helper\fR(7) +.PP +This program is a part of live-helper. + +.SH BUGS +Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR>. + +.SH HOMEPAGE +More information about the Debian Live project can be found at <\fIhttp://debian\-live.alioth.debian.org/\fR> and <\fIhttp://wiki.debian.org/DebianLive/\fR>. + +.SH AUTHOR +live\-helper was written by Daniel Baumann <\fIdaniel@debian.org\fR> and Marco Amadori <\fImarco.amadori@gmail.com\fR>, for the Debian project. diff --git a/manpages/live-helper.7 b/manpages/live-helper.7 new file mode 100644 index 0000000..4f5587f --- /dev/null +++ b/manpages/live-helper.7 @@ -0,0 +1,140 @@ +.TH LIVE\-HELPER 7 "2007\-03\-19" "1.0~a2" "live\-helper" + +.SH NAME +live\-helper \- Debian Live helper programs + +.SH SYNOPSIS +.B lh_* [\fIlive\-helper\ options\fR\|] + +.SH DESCRIPTION +Live\-helper is a collection of programs that can be used to build Debian Live system images. The philosophy behind live\-helper is to provide a collection of small, simple, and easily understood tools that can be used in your own program to automate building of a Live system. +.PP +A typical program that uses live\-helper will call several live\-helper commands in sequence. Live\-helper commands are all named with a "lh_" prefix. Examples of such a program that uses live\-helper is \fImake\-live\fR(1). + +.\" .SH CONFIGURATION FILE +.\" live-helper reads debian-live/config/live-helper if available. See ENVIRONMENT for the correct environment variables to use. + +.\" .SH ENVIRONMENT +.\" Every live-helper command respects the following environment variables if available. +.\" .IP "\fI$LH_DEBUG\fR" 4 +.\" enables debug (Default: false) +.\" .IP "\fI$LH_QUIET\fR" 4 +.\" be quiet (Default: false) +.\" .IP "\fI$LH_VERBOSE\fR" 4 +.\" be verbose (Default: false) + +.SH LIVE\-HELPER COMMANDS +Here is the complete list of available live\-helper commands. See their man pages for additional documentation. +.IP "\fIlh_binary\fR(1)" 4 +meta-helper for lh_binary_*. +.IP "\fIlh_binary_encryption\fR(1)" 4 +encrypts the root filesystem. +.IP "\fIlh_binary_includes\fR(1)" 4 +copies files into the binary image. +.IP "\fIlh_binary_hdd\fR(1)" 4 +creates the harddisk binary tarball. +.IP "\fIlh_binary_iso\fR(1)" 4 +creates the CD/DVD binary image. +.IP "\fIlh_binary_linuximage\fR(1)" 4 +copies linux-image into the binary image. +.IP "\fIlh_binary_localincludes\fR(1)" 4 +copies local files into the binary image. +.IP "\fIlh_binary_manifest\fR(1)" 4 +creates the package list of the root filesystem. +.IP "\fIlh_binary_md5sum\fR(1)" 4 +creates md5sum.txt in the binary image. +.IP "\fIlh_binary_memtest86\fR(1)" 4 +copies memtest86 into the binary image. +.IP "\fIlh_binary_net\fR(1)" 4 +creates the netboot binary tarball. +.IP "\fIlh_binary_rootfs\fR(1)" 4 +creates the root filesystem. +.IP "\fIlh_binary_syslinux\fR(1)" 4 +copies syslinux into the binary image. +.IP "\fIlh_binary_usb\fR(1)" 4 +creates the USB binary image. +.IP "\fIlh_bootstrap\fR(1)" 4 +meta-helper for lh_bootstrap_*. +.IP "\fIlh_bootstrap_cdebootstrap\fR(1)" 4 +bootstraps system with cdebootstrap. +.IP "\fIlh_bootstrap_debootstrap\fR(1)" 4 +bootstraps system with debootstrap. +.IP "\fIlh_build\fR(1)" 4 +meta-helper for lh_bootstrap, lh_chroot, lh_binary and lh_source. +.IP "\fIlh_chroot\fR(1)" 4 +meta-helper for lh_chroot_*. +.IP "\fIlh_chroot_apt\fR(1)" 4 +configures /etc/apt/apt.conf in chroot. +.IP "\fIlh_chroot_debianchroot\fR(1)" 4 +configures /etc/debian_chroot in chroot. +.IP "\fIlh_chroot_hacks\fR(1)" 4 +does evil (temporary) hacks in the chroot. +.IP "\fIlh_chroot_hooks\fR(1)" 4 +executes additional commands in the chroot. +.IP "\fIlh_chroot_hosts\fR(1)" 4 +configures /etc/hosts in the chroot. +.IP "\fIlh_chroot_linuximage\fR(1)" 4 +configures /etc/kernel-img.conf in the chroot. +.IP "\fIlh_chroot_localhooks\fR(1)" 4 +executes additional local commands in the chroot. +.IP "\fIlh_chroot_localincludes\fR(1)" 4 +copies local files into the binary image. +.IP "\fIlh_chroot_localization\fR(1)" 4 +installs localization packages in the chroot. +.IP "\fIlh_chroot_localpackages\fR(1)" 4 +installs local packages in the chroot. +.IP "\fIlh_chroot_localpackageslist\fR(1)" 4 +installs local packages lists in the chroot. +.IP "\fIlh_chroot_packages\fR(1)" 4 +installs packages in the chroot. +.IP "\fIlh_chroot_packageslist\fR(1)" 4 +installs packages lists in the chroot. +.IP "\fIlh_chroot_proc\fR(1)" 4 +mounts /proc in the chroot. +.IP "\fIlh_chroot_resolv\fR(1)" 4 +configures /etc/resolf.conf in the chroot. +.IP "\fIlh_chroot_sources\fR(1)" 4 +configures /etc/apt/sources.list in the chroot. +.IP "\fIlh_chroot_symlinks\fR(1)" 4 +converts symlinks in the chroot. +.IP "\fIlh_chroot_sysfs\fR(1)" 4 +mounts /sys in the chroot. +.IP "\fIlh_chroot_sysvinit\fR(1)" 4 +minimizes daemon startup in the chroot. +.IP "\fIlh_chroot_sysvrc\fR(1)" 4 +installs policy-id hack in the chroot. +.IP "\fIlh_chroot_tasks\fR(1)" 4 +installs packages tasks in the chroot. +.IP "\fIlh_clean\fR(1)" 4 +cleans up build directory. +.IP "\fIlh_config\fR(1)" 4 +creates sample configuration. +.IP "\fIlh_losetup\fR(1)" 4 +manages loop device handling +.IP "\fIlh_source\fR(1)" 4 +meta-helper for lh_source_*. +.IP "\fIlh_source_config\fR(1)" 4 +copies config into source directory. +.IP "\fIlh_source_download\fR(1)" 4 +downloads source packages. +.IP "\fIlh_source_hdd\fR(1)" 4 +creates harddisk source tarball. +.IP "\fIlh_source_generic\fR(1)" 4 +creates generic source tarball. +.IP "\fIlh_source_iso\fR(1)" 4 +creates CD/DVD source image. +.IP "\fIlh_source_net\fR(1)" 4 +creates netboot source tarball. +.IP "\fIlh_source_usb\fR(1)" 4 +creates USB source image. +.IP "\fIlh_testroot\fR(1)" 4 +checks for root privileges. + +.SH BUGS +Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR>. + +.SH HOMEPAGE +More information about the Debian Live project can be found at <\fIhttp://debian\-live.alioth.debian.org/\fR> and <\fIhttp://wiki.debian.org/DebianLive/\fR>. + +.SH AUTHOR +live\-helper was written by Daniel Baumann <\fIdaniel@debian.org\fR> and Marco Amadori <\fImarco.amadori@gmail.com\fR>, for the Debian project. diff --git a/templates/syslinux/f10.txt b/templates/syslinux/f10.txt index 33f6f11..a85b41c 100644 --- a/templates/syslinux/f10.txt +++ b/templates/syslinux/f10.txt @@ -13,9 +13,9 @@ permitted by applicable law. --- This Debian Live system was built with live-helper, version LIVE_VERSION. -live-helper was written by Daniel Baumann <daniel@debian.org> and -Marco Amadori <marco.amadori@gmail.com>. +More information about the Debian Live project can be found at +<http://debian-live.alioth.debian.org/>. diff --git a/templates/syslinux/pxelinux.cfg b/templates/syslinux/pxelinux.cfg index 9a49d7d..0a1ba53 100644 --- a/templates/syslinux/pxelinux.cfg +++ b/templates/syslinux/pxelinux.cfg @@ -16,12 +16,12 @@ label cifslegacy append initrd=initrd.gz boot=casper root=/dev/cifs nfsroot=LIVE_SERVER_ADDRESS:LIVE_SERVER_PATH LIVE_BOOTAPPEND label memtest kernel memtest -display isolinux.txt +display pxelinux.cfg/isolinux.txt timeout 0 prompt 1 -f1 f1.txt -f3 f3.txt -f4 f4.txt -f8 f8.txt -f9 f9.txt -f0 f10.txt +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 |