From 97c3a13dcc9becf93cb7c2aa89ea3e00f06b9179 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 23 Sep 2007 10:05:09 +0200 Subject: Adding live-helper 1.0~a10-1. --- Makefile | 76 +++-- contrib/casper-manpage/casper-snapshot.1 | 70 ---- contrib/casper-manpage/casper.7 | 111 ------ debian/changelog | 7 + debian/control | 1 + debian/cron.daily | 182 +++++----- debian/default | 20 +- debian/postrm | 25 -- debian/preinst | 25 -- debian/rules | 2 +- doc/AUTHORS | 4 - doc/BUGS | 51 --- doc/CREDITS | 36 -- doc/ChangeLog | 488 --------------------------- doc/ChangeLog.old | 474 -------------------------- doc/DOWNLOAD | 43 --- doc/FAQ | 70 ---- doc/NEWS | 37 -- doc/README | 93 ------ doc/TODO | 16 - docs/AUTHORS | 4 + docs/BUGS | 51 +++ docs/CREDITS | 36 ++ docs/ChangeLog | 558 +++++++++++++++++++++++++++++++ docs/ChangeLog.old | 474 ++++++++++++++++++++++++++ docs/DOWNLOAD | 43 +++ docs/FAQ | 70 ++++ docs/NEWS | 40 +++ docs/README | 93 ++++++ docs/TODO | 51 +++ examples/beryl-hook.sh | 50 --- examples/beryl.sources.list | 14 - examples/bpo.sources.list | 9 - examples/cron/daily.sh | 166 +++++++++ examples/cron/etch+beryl.sh | 175 ++++++++++ examples/cron/etch.sh | 166 +++++++++ examples/cron/snapshots.sh | 130 +++++++ examples/cron/weekly.sh | 166 +++++++++ examples/daily-cron.sh | 140 -------- examples/edu.sources.list | 11 - examples/etch+beryl-cron.sh | 150 --------- examples/etch-cron.sh | 140 -------- examples/fai.sources.list | 9 - examples/hooks/beryl.sh | 78 +++++ examples/hooks/ipw2100.sh | 28 ++ examples/hooks/ipw2200.sh | 28 ++ examples/hooks/ipw3945.sh | 23 ++ examples/hooks/madwifi.sh | 23 ++ examples/hooks/nvidia-legacy.sh | 51 +++ examples/hooks/rt2570.sh | 15 + examples/hooks/rt2x00.sh | 24 ++ examples/hooks/sun-java5.sh | 15 + examples/hooks/sun-java6.sh | 15 + examples/java-hook.sh | 15 - examples/live.sources.list | 11 - examples/sources.list/beryl | 14 + examples/sources.list/debian-backports | 9 + examples/sources.list/debian-edu | 11 + examples/sources.list/fai | 9 + examples/sources.list/live-backports | 11 + examples/sources.list/live-snapshot | 9 + examples/weekly-cron.sh | 140 -------- functions/chroot.sh | 2 + functions/common.sh | 2 +- functions/defaults.sh | 93 +++--- functions/echo.sh | 2 +- helpers/lh_binary | 4 +- helpers/lh_binary_debian-installer | 18 +- helpers/lh_binary_encryption | 14 +- helpers/lh_binary_grub | 38 ++- helpers/lh_binary_hdd | 2 +- helpers/lh_binary_includes | 8 +- helpers/lh_binary_iso | 36 +- helpers/lh_binary_linux-image | 100 ++++++ helpers/lh_binary_linuximage | 100 ------ helpers/lh_binary_local-includes | 64 ++++ helpers/lh_binary_localincludes | 64 ---- helpers/lh_binary_md5sum | 4 +- helpers/lh_binary_memtest | 6 +- helpers/lh_binary_net | 12 +- helpers/lh_binary_rootfs | 12 +- helpers/lh_binary_syslinux | 88 ++--- helpers/lh_binary_usb-hdd | 2 +- helpers/lh_binary_yaboot | 38 ++- helpers/lh_bootstrap_cdebootstrap | 9 +- helpers/lh_bootstrap_debootstrap | 9 +- helpers/lh_chroot | 12 +- helpers/lh_chroot_apt | 2 + helpers/lh_chroot_hacks | 2 +- helpers/lh_chroot_linux-image | 115 +++++++ helpers/lh_chroot_linuximage | 115 ------- helpers/lh_chroot_local-hooks | 72 ++++ helpers/lh_chroot_local-includes | 58 ++++ helpers/lh_chroot_local-packages | 81 +++++ helpers/lh_chroot_local-packageslists | 79 +++++ helpers/lh_chroot_localhooks | 72 ---- helpers/lh_chroot_localincludes | 58 ---- helpers/lh_chroot_localpackages | 81 ----- helpers/lh_chroot_localpackageslists | 79 ----- helpers/lh_chroot_sources | 94 +++--- helpers/lh_config | 92 ++--- helpers/lh_source | 4 +- helpers/lh_source_config | 73 ---- helpers/lh_source_debian | 90 +++++ helpers/lh_source_debian-live | 73 ++++ helpers/lh_source_download | 90 ----- helpers/lh_source_generic | 4 +- helpers/lh_source_hdd | 4 +- helpers/lh_source_iso | 36 +- helpers/lh_source_md5sum | 5 +- helpers/lh_source_net | 4 +- helpers/lh_source_usb-hdd | 4 +- helpers/make-live | 50 +-- includes/lenny | 1 + includes/stable | 1 + includes/testing | 1 + includes/unstable | 1 + manpages/lh_binary.1.de | 61 ---- manpages/lh_binary.1.en | 61 ---- manpages/lh_binary.de.1 | 61 ++++ manpages/lh_binary.en.1 | 61 ++++ manpages/lh_bootstrap.1.de | 31 -- manpages/lh_bootstrap.1.en | 31 -- manpages/lh_bootstrap.de.1 | 31 ++ manpages/lh_bootstrap.en.1 | 31 ++ manpages/lh_bootstrap_cdebootstrap.1.de | 47 --- manpages/lh_bootstrap_cdebootstrap.1.en | 47 --- manpages/lh_bootstrap_cdebootstrap.de.1 | 47 +++ manpages/lh_bootstrap_cdebootstrap.en.1 | 47 +++ manpages/lh_bootstrap_debootstrap.1.de | 47 --- manpages/lh_bootstrap_debootstrap.1.en | 47 --- manpages/lh_bootstrap_debootstrap.de.1 | 47 +++ manpages/lh_bootstrap_debootstrap.en.1 | 47 +++ manpages/lh_build.1.de | 35 -- manpages/lh_build.1.en | 35 -- manpages/lh_build.de.1 | 35 ++ manpages/lh_build.en.1 | 35 ++ manpages/lh_chroot.1.de | 71 ---- manpages/lh_chroot.1.en | 71 ---- manpages/lh_chroot.de.1 | 71 ++++ manpages/lh_chroot.en.1 | 71 ++++ manpages/lh_clean.1.de | 44 --- manpages/lh_clean.1.en | 44 --- manpages/lh_clean.de.1 | 44 +++ manpages/lh_clean.en.1 | 44 +++ manpages/lh_source.1.de | 43 --- manpages/lh_source.1.en | 43 --- manpages/lh_source.de.1 | 43 +++ manpages/lh_source.en.1 | 43 +++ manpages/lh_testroot.1.de | 24 -- manpages/lh_testroot.1.en | 24 -- manpages/lh_testroot.de.1 | 24 ++ manpages/lh_testroot.en.1 | 24 ++ manpages/live-helper.7.de | 175 ---------- manpages/live-helper.7.en | 173 ---------- manpages/live-helper.de.7 | 178 ++++++++++ manpages/live-helper.en.7 | 176 ++++++++++ manpages/make-live.1.de | 88 ----- manpages/make-live.1.en | 88 ----- manpages/make-live.de.1 | 88 +++++ manpages/make-live.en.1 | 88 +++++ templates/grub/menu.lst | 4 +- templates/syslinux/isolinux.cfg | 4 +- templates/syslinux/pxelinux.cfg | 10 +- templates/yaboot/yaboot.conf | 4 +- 165 files changed, 5233 insertions(+), 4741 deletions(-) delete mode 100644 contrib/casper-manpage/casper-snapshot.1 delete mode 100644 contrib/casper-manpage/casper.7 delete mode 100644 debian/postrm delete mode 100644 debian/preinst delete mode 100644 doc/AUTHORS delete mode 100644 doc/BUGS delete mode 100644 doc/CREDITS delete mode 100644 doc/ChangeLog delete mode 100644 doc/ChangeLog.old delete mode 100644 doc/DOWNLOAD delete mode 100644 doc/FAQ delete mode 100644 doc/NEWS delete mode 100644 doc/README delete mode 100644 doc/TODO create mode 100644 docs/AUTHORS create mode 100644 docs/BUGS create mode 100644 docs/CREDITS create mode 100644 docs/ChangeLog create mode 100644 docs/ChangeLog.old create mode 100644 docs/DOWNLOAD create mode 100644 docs/FAQ create mode 100644 docs/NEWS create mode 100644 docs/README create mode 100644 docs/TODO delete mode 100755 examples/beryl-hook.sh delete mode 100644 examples/beryl.sources.list delete mode 100644 examples/bpo.sources.list create mode 100755 examples/cron/daily.sh create mode 100755 examples/cron/etch+beryl.sh create mode 100755 examples/cron/etch.sh create mode 100755 examples/cron/snapshots.sh create mode 100755 examples/cron/weekly.sh delete mode 100755 examples/daily-cron.sh delete mode 100644 examples/edu.sources.list delete mode 100755 examples/etch+beryl-cron.sh delete mode 100755 examples/etch-cron.sh delete mode 100644 examples/fai.sources.list create mode 100755 examples/hooks/beryl.sh create mode 100755 examples/hooks/ipw2100.sh create mode 100755 examples/hooks/ipw2200.sh create mode 100755 examples/hooks/ipw3945.sh create mode 100755 examples/hooks/madwifi.sh create mode 100755 examples/hooks/nvidia-legacy.sh create mode 100755 examples/hooks/rt2570.sh create mode 100755 examples/hooks/rt2x00.sh create mode 100755 examples/hooks/sun-java5.sh create mode 100755 examples/hooks/sun-java6.sh delete mode 100755 examples/java-hook.sh delete mode 100644 examples/live.sources.list create mode 100644 examples/sources.list/beryl create mode 100644 examples/sources.list/debian-backports create mode 100644 examples/sources.list/debian-edu create mode 100644 examples/sources.list/fai create mode 100644 examples/sources.list/live-backports create mode 100644 examples/sources.list/live-snapshot delete mode 100755 examples/weekly-cron.sh create mode 100755 helpers/lh_binary_linux-image delete mode 100755 helpers/lh_binary_linuximage create mode 100755 helpers/lh_binary_local-includes delete mode 100755 helpers/lh_binary_localincludes create mode 100755 helpers/lh_chroot_linux-image delete mode 100755 helpers/lh_chroot_linuximage create mode 100755 helpers/lh_chroot_local-hooks create mode 100755 helpers/lh_chroot_local-includes create mode 100755 helpers/lh_chroot_local-packages create mode 100755 helpers/lh_chroot_local-packageslists delete mode 100755 helpers/lh_chroot_localhooks delete mode 100755 helpers/lh_chroot_localincludes delete mode 100755 helpers/lh_chroot_localpackages delete mode 100755 helpers/lh_chroot_localpackageslists delete mode 100755 helpers/lh_source_config create mode 100755 helpers/lh_source_debian create mode 100755 helpers/lh_source_debian-live delete mode 100755 helpers/lh_source_download create mode 120000 includes/lenny create mode 120000 includes/stable create mode 120000 includes/testing create mode 120000 includes/unstable delete mode 100644 manpages/lh_binary.1.de delete mode 100644 manpages/lh_binary.1.en create mode 100644 manpages/lh_binary.de.1 create mode 100644 manpages/lh_binary.en.1 delete mode 100644 manpages/lh_bootstrap.1.de delete mode 100644 manpages/lh_bootstrap.1.en create mode 100644 manpages/lh_bootstrap.de.1 create mode 100644 manpages/lh_bootstrap.en.1 delete mode 100644 manpages/lh_bootstrap_cdebootstrap.1.de delete mode 100644 manpages/lh_bootstrap_cdebootstrap.1.en create mode 100644 manpages/lh_bootstrap_cdebootstrap.de.1 create mode 100644 manpages/lh_bootstrap_cdebootstrap.en.1 delete mode 100644 manpages/lh_bootstrap_debootstrap.1.de delete mode 100644 manpages/lh_bootstrap_debootstrap.1.en create mode 100644 manpages/lh_bootstrap_debootstrap.de.1 create mode 100644 manpages/lh_bootstrap_debootstrap.en.1 delete mode 100644 manpages/lh_build.1.de delete mode 100644 manpages/lh_build.1.en create mode 100644 manpages/lh_build.de.1 create mode 100644 manpages/lh_build.en.1 delete mode 100644 manpages/lh_chroot.1.de delete mode 100644 manpages/lh_chroot.1.en create mode 100644 manpages/lh_chroot.de.1 create mode 100644 manpages/lh_chroot.en.1 delete mode 100644 manpages/lh_clean.1.de delete mode 100644 manpages/lh_clean.1.en create mode 100644 manpages/lh_clean.de.1 create mode 100644 manpages/lh_clean.en.1 delete mode 100644 manpages/lh_source.1.de delete mode 100644 manpages/lh_source.1.en create mode 100644 manpages/lh_source.de.1 create mode 100644 manpages/lh_source.en.1 delete mode 100644 manpages/lh_testroot.1.de delete mode 100644 manpages/lh_testroot.1.en create mode 100644 manpages/lh_testroot.de.1 create mode 100644 manpages/lh_testroot.en.1 delete mode 100644 manpages/live-helper.7.de delete mode 100644 manpages/live-helper.7.en create mode 100644 manpages/live-helper.de.7 create mode 100644 manpages/live-helper.en.7 delete mode 100644 manpages/make-live.1.de delete mode 100644 manpages/make-live.1.en create mode 100644 manpages/make-live.de.1 create mode 100644 manpages/make-live.en.1 diff --git a/Makefile b/Makefile index 98782a4..07e821e 100644 --- a/Makefile +++ b/Makefile @@ -1,13 +1,18 @@ -#!/usr/bin/make -f +# Makefile -all: install +TRANSLATIONS="de" + +all: build test: - set -e; for SCRIPT in functions/* examples/*.sh helpers/* hooks/*; \ + set -e; for SCRIPT in functions/* examples/*/*.sh helpers/* hooks/*; \ do \ - sh -n $$SCRIPT || exit 1; \ + sh -n $$SCRIPT; \ done +build: + @echo "Nothing to build." + install: test # Installing executables mkdir -p $(DESTDIR)/usr/bin @@ -19,27 +24,29 @@ install: test # Installing documentation mkdir -p $(DESTDIR)/usr/share/doc/live-helper - cp -r COPYING doc/* $(DESTDIR)/usr/share/doc/live-helper + cp -r COPYING docs/* $(DESTDIR)/usr/share/doc/live-helper # Installing manpages - set -e; for MANPAGE in manpages/*.1.en; \ - do \ - install -D -m 0644 $$MANPAGE $(DESTDIR)/usr/share/man/man1/`basename $$MANPAGE .en`; \ - done - - set -e; for MANPAGE in manpages/*.7.en; \ + set -e; for MANPAGE in manpages/*.en.1; \ do \ - install -D -m 0644 $$MANPAGE $(DESTDIR)/usr/share/man/man7/`basename $$MANPAGE .en`; \ + install -D -m 0644 $$MANPAGE $(DESTDIR)/usr/share/man/man1/`basename $$MANPAGE .en.1`.1; \ done - set -e; for MANPAGE in manpages/*.1.de; \ + set -e; for MANPAGE in manpages/*.en.7; \ do \ - install -D -m 0644 $$MANPAGE $(DESTDIR)/usr/share/man/de/man1/`basename $$MANPAGE .de`; \ + install -D -m 0644 $$MANPAGE $(DESTDIR)/usr/share/man/man7/`basename $$MANPAGE .en.7`.7; \ done - set -e; for MANPAGE in manpages/*.7.de; \ + set -e; for TRANSLATIONS in $$TRANSLATIONS; \ do \ - install -D -m 0644 $$MANPAGE $(DESTDIR)/usr/share/man/de/man7/`basename $$MANPAGE .de`; \ + for MANPAGE in manpages/*.$$TRANSLATION.1; \ + do \ + install -D -m 0644 $$MANPAGE $(DESTDIR)/usr/share/man/$$TRANSLATION/man1/`basename $$MANPAGE .$$TRANSLATION.1`.1; \ + done; \ + for MANPAGE in manpages/*.$$TRANSLATION.7; \ + do \ + install -D -m 0644 $$MANPAGE $(DESTDIR)/usr/share/man/$$TRANSLATION/man7/`basename $$MANPAGE .$$TRANSLATION.7`.7; \ + done; \ done uninstall: @@ -56,36 +63,41 @@ uninstall: rm -rf $(DESTDIR)/usr/share/doc/live-helper # Uninstalling manpages - set -e; for MANPAGE in manpages/*.1.en; \ + set -e; for MANPAGE in manpages/*.en.1; \ do \ - rm -f $(DESTDIR)/usr/share/man/man1/`basename $$MANPAGE .en`; \ + rm -f $(DESTDIR)/usr/share/man/man1/`basename $$MANPAGE .en.1`.1; \ done - set -e; for MANPAGE in manpages/*.7.en; \ + set -e; for MANPAGE in manpages/*.en.7; \ do \ - rm -f $(DESTDIR)/usr/share/man/man7/`basename $$MANPAGE .en`; \ + rm -f $(DESTDIR)/usr/share/man/man7/`basename $$MANPAGE .en.7`.7; \ done - set -e; for MANPAGE in manpages/*.1.de; \ + set -e; for TRANSLATIONS in $$TRANSLATIONS; \ do \ - rm -f $(DESTDIR)/usr/share/man/de/man1/`basename $$MANPAGE .de`; \ - done - - set -e; for MANPAGE in manpages/*.7.de; \ - do \ - rm -f $(DESTDIR)/usr/share/man/de/man7/`basename $$MANPAGE .de`; \ + for MANPAGE in manpages/*.$$TRANSLATION.1; \ + do \ + rm -f $(DESTDIR)/usr/share/man/$$TRANSLATION/man1/`basename $$MANPAGE .$$TRANSLATION.1`.1; \ + done; \ + for MANPAGE in manpages/*.$$TRANSLATION.7; \ + do \ + rm -f $(DESTDIR)/usr/share/man/$$TRANSLATION/man7/`basename $$MANPAGE .de.7`.7; \ + done; \ done update: - for MANPAGE in manpages/*.de manpages/*.en; \ + set -e; for MANPAGE in manpages/*.de.* manpages/*.en.*; \ do \ - sed -i -e 's/30.04.2007/07.05.2007/' \ - -e 's/2007\\-04\\-30/2007\\-05\\-07/' \ - -e 's/1.0~a8/1.0~a9/' \ + sed -i -e 's/2007\\-05\\-07/2007\\-05\\-14/' \ + -e 's/07.05.2007/14.05.2007/' \ + -e 's/1.0~a9/1.0~a10/' \ $$MANPAGE; \ done - sed -i -e 's/1.0~a8/1.0~a9/' functioins/common.sh + sed -i -e 's/1.0~a9/1.0~a10/' functions/common.sh + + sed -i -e 's/1.0~a9/1.0~a10/' examples/cron/etch.sh + sed -i -e 's/1.0~a9/1.0~a10/' examples/cron/etch+beryl.sh clean: diff --git a/contrib/casper-manpage/casper-snapshot.1 b/contrib/casper-manpage/casper-snapshot.1 deleted file mode 100644 index 8f27412..0000000 --- a/contrib/casper-manpage/casper-snapshot.1 +++ /dev/null @@ -1,70 +0,0 @@ -.TH "CASPER-SNAPSHOT" 1 "Thu, 28 Sep 2006" "0.0.1" "User commands" - -.SH NAME -casper-snapshot \- a simple script to ease persistence usage. - -.SH SYNOPSIS -.B casper-snapshot -.RB [\| \-c \||\| \-\-cow -.IR DIRECTORY \|] -.RB [\| \-d \||\| \-\-device -.IR DEVICE \|] -.RB [\| \-e \||\| \-\-exclude\-list -.IR FILE \|] -.RB [\| \-o \||\| \-\-output -.IR FILE \|] -.RB [\| \-t \||\| \-\-type -.IR TYPE \|] -.PP -.B casper-snapshot -.RB \-r \||\| \-\-resync\-string -.IR STRING -.br -.B casper-snapshot -.RB \-h \||\| \-\-help -.br -.B casper-snapshot -.RB \-u \||\| \-\-usage -.br -.B casper-snapshot -.RB \-v \||\| \-\-version - -.SH DESCRIPTION -Casper-snapshot is a script which can be used to build the right types of persistent image files supported by casper. It is also used on exit by the casper init script to resync the boot-found snapshots devices. - -.SH OPTIONS -.TP -.BI "\-c, \-\-cow" DIRECTORY -specifies the input directory to be cloned in the image file. -Its default value "/cow" should be right for most uses. However it could be handy to specify "/home" and type ext2 for the type to prepare an image file suited to be directly mounted by casper as home. -.TP -.BI "\-d, \-\-device" DEVICE -sets the device where the media which the snapshot/persistence file/partition will be put. If it is not specified, a tmpfs will be used and linked to the user's desktop to move it where it is needed. If the device has no filesystem, an ext2 fs will be automatically created and labelled according to the values specified after the "--output" value or with a sane default. -.TP -.BI "\-e, \-\-exclude\-list" FILE -a file containing a list of filenames/paths that should not be saved. This exclude list will be remebered on the target snapshot media for reuse. -.TP -.BI "\-o, \-\-output" FILE -the filename/label used for the output file/partition. If left blank, casper-snapshot will search for a proper file on the device or use the whole partition. -.TP -.BI "\-r, \-\-resync\-string" STRING -internally used on resyncs. -.TP -.BI "\-t, \-\-type" TYPE -Type could be one of "cpio", "squashfs" or "ext2". - -.SH BUGS -.B casper-snapshot -Time (and BTS) will tell. - -.SH HOMEPAGE -Debian Live project - -.SH SEE ALSO -.BR casper(7) - -.SH AUTHOR -casper-snapshot was written Marco Amadori . -.TP -This manual page was written by Marco Amadori , -for the Debian project (but may be used by others). diff --git a/contrib/casper-manpage/casper.7 b/contrib/casper-manpage/casper.7 deleted file mode 100644 index 9ebbd40..0000000 --- a/contrib/casper-manpage/casper.7 +++ /dev/null @@ -1,111 +0,0 @@ -.TH CASPER 7 "Thu, 28 Sep 2006" "1.69" "Initramfs-tools hook" - -.SH NAME -casper \- a hook for initramfs-tools to boot live systems. - -.SH SYNOPSIS -.B BOOT=casper -As kernel parameter boot prompt. - -.SH DESCRIPTION -Casper is a hook for initramfs-tools used to generate an initramfs capable to boot live systems as those created by make-live. This includes the Debian-Live isos, netboot tarballs, and usb stick images and Ubuntu live cds. At boot time it will look for a (read-only) media containing a "/casper" directory where a root filesystems (often a compressed squashfs) is stored. If found, it will create a writable environment, using unionfs, for debian like systems to boot from. - -.SH RECOGNIZED BOOT OPTIONS -.TP -.BI "access=" ACCESS -Set the accessibility level for physically or visually impared users. -ACCESS must be one of v1, v2, v3, m1, or m2. v1=lesser visual impairment, v2=moderate visual impairment, v3=blindness, m1=minor motor difficulties, m2=moderate motor difficulties. -.TP -.B casper-getty -This changes the auto-login on virtual terminals to use the (experimental) casper-getty code. -With this option set the standard kernel argument "console=" is parsed and if a serial console is specified then casper-getty is used to autologin on the serial console. -.TP -.BI "console=" TTY "," SPEED -Set the default console to be used with the "casper-getty" option. -Example: "console=ttyS0,115200" -.TP -.BI "hostname=" HOSTNAME " , userfullname=" USERFULLNAME " , username=" USERNAME -Those parameters lets you override values read from the config file. -.TP -.BI "{keyb|kbd-chooser/method}=" KEYBOARD " , {klayout|console-setup/layoutcode}=" LAYOUT " , {kvariant|console-setup/variantcode}=" VARIANT " , {kmodel|console-setup/modelcode}=" CODE " , koptions=" OPTIONS -Configure the running keyboard as specified, if this one misses casper behaves as if "keyb=us" was specified. It will be interfered from "locale=" if locale is only 2 lowecase letters as a special case. You could also specify console layout, variant, code, and options (no defaults). -.TP -.B integrity-check -If specified, an MD5 sum is calculated on the live media during boot and compared to the value found in md5sum.txt found in the root directory of that partition. -.TP -.BI ip= IFACE,ADDRESS,NETMASK,GATEWAY [ :IFACE,ADDRESS,NETMASK,GATEWAY "]*" -Let you specify the name(s) and the options of the interface(s) that should be configured at boot time. Do not specify this if you want to use dhcp (default). -.TP -.BR ip[= frommedia ] -If this variable is set, dhcp and static configuration are just skipped and the system will use the (must be) media-preconfigured /etc/network/interfaces instead. -.TP -.BI "{live-media|bootfrom}=" DEVICE -If you specify one of this two equivalent forms, casper will first try to find this device for the "/casper" directory where the read-only root filesystem should reside. If it did not find something usable, the normal scan for block devices is performed. -.TP -.BI "{live-media-encryption|encryption}=" TYPE -Casper will mount the encrypted rootfs TYPE, asking the passphrase, useful to build paranoid live systems :-). TYPE supported so far are "aes" for loop-aes encryption type. -.TP -.BI "live-media-offset=" BYTES -This way you could tell casper that your image starts at offset BYTES in the above specified or autodiscovered device, this could be useful to hide the debian-live iso or image inside another iso or image, to create "clean" images. -.TP -.BI "live-media-timeout=" SECONDS -Set the timeout in seconds for the device specified by "live-media=" to become ready before giving up. -.TP -.BI "locale=" LOCALE " | debian-installer/locale=" LOCALE -Configure the running locale as specified, if not present the live-media rootfs configured locale will be used and if also this one misses casper behave as "locale=en_US.UTF-8" was specified. If only 2 lowercase letter are specified (like "it"), the "maybe wanted" locale is generated (like it:IT.UTF-8), in this case if also "keyb=" is unspecified is set with those 2 lowercase letters (keyb=it). Beside that facility, only UTF8 locales are supported by casper. -.TP -.BI "module=" NAME -Instead of using the default optional file "order.lst" (see below) another file could be specified without the extension ".lst"; it should be placed on /casper/ directory of the live medium. -.TP -.BR "netboot[=" nfs "|" cifs ] -This tells casper to perform a network mount. The parameter "nfsroot=" (with optional "nfsopts="), should specify where is the location of the root filesystem. With no args, will try cifs first, and if it fails nfs. -.TP -.B persistent -Casper will look for persistent and snapshot partitions or files labeled "casper-rw", "home-rw", and files called "casper-sn*", "home-sn*" and will try to, in order: mount as /cow the first, mount the second in /home, and just copy the contents of the latter in appropriate locations (snapshots). Snapshots will be tried to be updated on reboot/shutdown. Look at casper-snapshot(1) for more informations. -.TP -.B nopersistent -disables the above mentioned "persistent" feature, useful if the bootloader (like syslinux) has been installed with persistent enabled. -.TP -.B quickreboot -This option causes casper to reboot without attempting to eject the media and without asking the user to remove the boot media. -.TP -.B "showmounts" -This parameter will make casper to show on "/" the ro filesystems (mostly compressed) on /casper. This is not enabled by default because could lead to problems by applications like "mono" which store binary paths on installation. -.TP -.BI "todisk=" DEVICE -Adding this parameter, casper will try to copy the entire read-only media to the specified device before mounting the root filesystem. It probably needs a lot of free space. Subsequent boots should then skip this step and just specify the "live-media=DEVICE" boot parameter with the same DEVICE used this time. -.TP -.B toram -Adding this parameter, casper will try to copy the whole read-only media to the computer's RAM before mounting the root filesystem. This could need a lot of ram, according to the space used by the read-only media. -.TP -.BI "{preseed/file|file}=" FILE -A path to a file present on the rootfs could be used to preseed debconf database. -.TP -.BI "package/question=" VALUE -All debian installed packages could be preseeded from command-line that way, beware of blanks spaces, they will interfere with parsing, use a preseed file in this case. -.TP -.B xdebconf -uses xdebconfigurator, if present on the rootfs, to configure X instead of the standard procedure (experimental). -.TP - -.SH FILES -.B /etc/casper.conf -some variables can be configured via this config file. -.TP -.B /casper/order.lst -This optional file contains a list of white-space or carriage-return-separated file names corresponding to disk images in the /casper directory. If this file exists, only images listed here will be merged into the root unionfs, and they will be loaded in the order listed here. The first entry in this file will be the "lowest" point in the unionfs, and the last file in this list will be on the "top" of the unionfs, directly below /cow. Without this file, any images in the /casper directory are loaded in alphanumeric order. -.SH BUGS -.B casper -works fully on amd64, i386 and ppc, it should also run on other archs. - -.SH HOMEPAGE -Debian Live project - -.SH SEE ALSO -.BR casper-snapshot(1), initramfs-tools(8), make-live(8), make-live.conf(5) - -.SH AUTHOR -casper was written by Tollen Fog Heen , Matt Zimmerman , and Marco Amadori . -.TP -This manual page was written by Marco Amadori , -for the Debian project (but may be used by others). diff --git a/debian/changelog b/debian/changelog index 5c84dd1..d9ac447 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +live-helper (1.0~a10-1) unstable; urgency=medium + + * New upstream release: + - really removed forgotten set -x in the cron (Closes: #421105). + + -- Daniel Baumann Mon, 14 May 2007 00:00:00 +0200 + live-helper (1.0~a9-1) unstable; urgency=medium * New upstream release. diff --git a/debian/control b/debian/control index 88cd721..2e2aac1 100644 --- a/debian/control +++ b/debian/control @@ -6,6 +6,7 @@ Uploaders: Daniel Baumann , Marco Amadori = 5) Standards-Version: 3.7.2 XS-Vcs-Svn: svn://svn.debian.org/debian-live/dists/trunk/live-helper/ +XS-VCS-Browse: http://svn.debian.org/wsvn/debian-live/dists/trunk/live-helper/ Package: live-helper Architecture: all diff --git a/debian/cron.daily b/debian/cron.daily index 633cc25..f7e205b 100644 --- a/debian/cron.daily +++ b/debian/cron.daily @@ -1,16 +1,16 @@ -#!/bin/sh -x +#!/bin/sh set -e BUILD="daily" -# Check for live-helper availability +# Checking for live-helper availability if [ ! -x /usr/bin/make-live ] then exit 0 fi -# Check for live-helper defaults +# Checking for live-helper defaults if [ -r /etc/default/live-helper ] then . /etc/default/live-helper @@ -19,114 +19,130 @@ else exit 1 fi -# Check for autobuild +# Checking for autobuild if [ "${AUTOBUILD}" != "enabled" ] then exit 0 fi -# Check for build directory -if [ ! -d "${AUTOBUILD_TEMPDIR}" ] +# Checking for build directory +if [ ! -d "${TEMPDIR}" ] then - mkdir -p "${AUTOBUILD_TEMPDIR}"/debian-live + mkdir -p "${TEMPDIR}"/debian-live else # FIXME: maybe we should just remove the left overs. - echo "E: ${AUTOBUILD_TEMPDIR} needs cleanup." + echo "E: ${TEMPDIR} needs cleanup." exit 1 fi -for ARCHITECTURE in ${AUTOBUILD_ARCHITECTURES} +for ARCHITECTURE in ${ARCHITECTURES} do - for DISTRIBUTION in ${AUTOBUILD_DISTRIBUTIONS} + for DISTRIBUTION in ${DISTRIBUTIONS} do - for PACKAGES_LIST in ${AUTOBUILD_PACKAGES_LISTS} + for PACKAGES_LIST in ${PACKAGES_LISTS} do - if [ ! -f "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-iso-log.txt ] - then - # Generating images - mkdir -p "${AUTOBUILD_TEMPDIR}"/debian-live - cd "${AUTOBUILD_TEMPDIR}" - echo "Begin: `date -R`" > "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt - make-live -b iso -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-build ${AUTOBUILD_MIRROR} --mirror-build-security ${AUTOBUILD_MIRROR_SECURITY} --source enabled ${AUTOBUILD_OPTIONS} >> "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt 2>&1 - echo "End: `date -R`" >> "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt - fi - - if [ -f "${AUTOBUILD_TEMPDIR}"/debian-live/binary.iso ] && [ -f "${AUTOBUILD_TEMPDIR}"/debian-live/source.tar ] - then - # Moving logs - mkdir -p "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log - mv "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-iso-log.txt - mv "${AUTOBUILD_TEMPDIR}"/debian-live/packages.txt "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-iso-packages.txt - - # Moving images - mkdir -p "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/${ARCHITECTURE} - mv "${AUTOBUILD_TEMPDIR}"/debian-live/binary.iso "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/${ARCHITECTURE}/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}.iso - - mkdir -p "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/source - mv "${AUTOBUILD_TEMPDIR}"/debian-live/source.tar "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/source/debian-live-${DISTRIBUTION}-source-${PACKAGES_LIST}.tar - fi - - if [ ! -f "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-usb-log.txt ] - then - # Workaround of missing multi-binary support in live-helper - mv "${AUTOBUILD_TEMPDIR}"/debian-live/binary/casper "${AUTOBUILD_TEMPDIR}"/debian-live/casper.tmp - rm -rf "${AUTOBUILD_TEMPDIR}"/debian-live/binary* "${AUTOBUILD_TEMPDIR}"/debian-live/.stage/binary_* - mkdir "${AUTOBUILD_TEMPDIR}"/debian-live/binary - mv "${AUTOBUILD_TEMPDIR}"/debian-live/casper.tmp "${AUTOBUILD_TEMPDIR}"/debian-live/binary/casper - touch "${AUTOBUILD_TEMPDIR}"/debian-live/.stage/binary_chroot - touch "${AUTOBUILD_TEMPDIR}"/debian-live/.stage/binary_rootfs - - # Generating images - mkdir -p "${AUTOBUILD_TEMPDIR}"/debian-live - cd "${AUTOBUILD_TEMPDIR}" - echo "Begin: `date -R`" > "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt - make-live -b usb -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-build ${AUTOBUILD_MIRROR} --mirror-build-security ${AUTOBUILD_MIRROR_SECURITY} --source disabled ${AUTOBUILD_OPTIONS} >> "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt 2>&1 - echo "End: `date -R`" >> "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt - fi - - if [ -f "${AUTOBUILD_TEMPDIR}"/debian-live/binary.img ] - then - # Moving logs - mkdir -p "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log - mv "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-usb-log.txt - cp "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-iso-packages.txt "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-usb-packages.txt - - # Moving images - mkdir -p "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/${ARCHITECTURE} - mv "${AUTOBUILD_TEMPDIR}"/debian-live/binary.img "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/${ARCHITECTURE}/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}.img - fi - - # Cleanup - cd "${AUTOBUILD_TEMPDIR}"/debian-live - lh_clean + if [ ! -f "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-log.txt ] + then + # Creating build directory + mkdir -p "${TEMPDIR}"/debian-live + + cd "${TEMPDIR}" + echo "Begin: `date -R`" > "${TEMPDIR}"/debian-live/log.txt + + # Generating images + make-live -b iso -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source enabled ${OPTIONS} >> "${TEMPDIR}"/debian-live/log.txt 2>&1 + + echo "End: `date -R`" >> "${TEMPDIR}"/debian-live/log.txt + fi + + if [ -f "${TEMPDIR}"/debian-live/binary.iso ] && [ -f "${TEMPDIR}"/debian-live/source.tar ] + then + # Creating log directory + mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log + + # Moving logs + mv "${TEMPDIR}"/debian-live/log.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-log.txt + mv "${TEMPDIR}"/debian-live/packages.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-packages.txt + + # Creating images directory + mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE} + mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/source + + # Moving images + mv "${TEMPDIR}"/debian-live/binary.iso "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}.iso + mv "${TEMPDIR}"/debian-live/source.tar "${DESTDIR}"/"${BUILD}"-builds/${DATE}/source/debian-live-${DISTRIBUTION}-source-${PACKAGES_LIST}.tar + fi + + if [ ! -f "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-usb-hdd-log.txt ] + then + # Workaround of missing multi-binary support in live-helper + mv "${TEMPDIR}"/debian-live/binary/casper "${TEMPDIR}"/debian-live/casper.tmp + rm -rf "${TEMPDIR}"/debian-live/binary* "${TEMPDIR}"/debian-live/.stage/binary_* + mkdir "${TEMPDIR}"/debian-live/binary + mv "${TEMPDIR}"/debian-live/casper.tmp "${TEMPDIR}"/debian-live/binary/casper + touch "${TEMPDIR}"/debian-live/.stage/binary_chroot + touch "${TEMPDIR}"/debian-live/.stage/binary_rootfs + + # Creating build directory + mkdir -p "${TEMPDIR}"/debian-live + + cd "${TEMPDIR}" + echo "Begin: `date -R`" > "${TEMPDIR}"/debian-live/log.txt + + # Generating images + make-live -b usb-hdd -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source disabled ${OPTIONS} >> "${TEMPDIR}"/debian-live/log.txt 2>&1 + + echo "End: `date -R`" >> "${TEMPDIR}"/debian-live/log.txt + fi + + if [ -f "${TEMPDIR}"/debian-live/binary.img ] + then + # Creating log directory + mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log + + # Moving logs + mv "${TEMPDIR}"/debian-live/log.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-usb-hdd-log.txt + cp "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-packages.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-usb-hdd-packages.txt + + # Creating image directory + mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE} + + # Moving images + mv "${TEMPDIR}"/debian-live/binary.img "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}.img + fi + + # Cleanup + cd "${TEMPDIR}"/debian-live + lh_clean done - # Cleanup - cd "${AUTOBUILD_TEMPDIR}"/debian-live - lh_clean purge + # Cleanup + cd "${TEMPDIR}"/debian-live + lh_clean purge done done -# Cleanup -if [ -e "${AUTOBUILD_TEMPDIR}"/debian-live/chroot/proc/version ] +# Cleaning up +if [ -f "${TEMPDIR}"/debian-live/chroot/proc/version ] then - umount "${AUTOBUILD_TEMPDIR}"/debian-live/chroot/proc + umount "${TEMPDIR}"/debian-live/chroot/proc fi -if [ -d "${AUTOBUILD_TEMPDIR}"/debian-live/chroot/sys/kernel ] +if [ -d "${TEMPDIR}"/debian-live/chroot/sys/kernel ] then - umount "${AUTOBUILD_TEMPDIR}"/debian-live/chroot/sys + umount "${TEMPDIR}"/debian-live/chroot/sys fi -rm -rf "${AUTOBUILD_TEMPDIR}" +# Removing build directory +rm -rf "${TEMPDIR}" -# md5sums -for DIRECTORY in "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/* +# Creating md5sums +for DIRECTORY in "${DESTDIR}"/"${BUILD}"-builds/${DATE}/* do cd "${DIRECTORY}" md5sum * > MD5SUMS done -# Current symlink -rm -f "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/current -ln -s ${AUTOBUILD_DATE} "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/current +# Creating current symlink +rm -f "${DESTDIR}"/"${BUILD}"-builds/current +ln -s ${DATE} "${DESTDIR}"/"${BUILD}"-builds/current diff --git a/debian/default b/debian/default index 5d26a72..8aebe5a 100644 --- a/debian/default +++ b/debian/default @@ -2,14 +2,16 @@ AUTOBUILD="disabled" -AUTOBUILD_ARCHITECTURES="`dpkg --print-architecture`" -AUTOBUILD_DISTRIBUTIONS="sid" -AUTOBUILD_PACKAGES_LISTS="standard gnome-desktop kde-desktop xfce-desktop" -AUTOBUILD_OPTIONS="--apt-recommends disabled" +DATE="`date +%Y%m%d`" +DESTDIR="/srv/debian-live" +TEMPDIR="/srv/tmp/live-helper" -AUTOBUILD_DATE="`date +%Y%m%d`" -AUTOBUILD_DESTDIR="/srv/debian-live" -AUTOBUILD_TEMPDIR="/srv/tmp" +OPTIONS="--binary-indices disabled" -AUTOBUILD_MIRROR="http://ftp.debian.org/debian/" -AUTOBUILD_MIRROR_SECURITY="http://security.debian.org/" +ARCHITECTURES="`dpkg --print-architecture`" +DISTRIBUTIONS="sid" +MIRROR_BOOTSTRAP="http://ftp.debian.org/debian/" +MIRROR_BOOTSTRAP_SECURITY="http://security.debian.org/" +MIRROR_BINARY="http://ftp.debian.org/debian/" +MIRROR_BINARY_SECURITY="http://security.debian.org/" +PACKAGES_LISTS="standard gnome-desktop kde-desktop xfce-desktop" diff --git a/debian/postrm b/debian/postrm deleted file mode 100644 index 08e1cb3..0000000 --- a/debian/postrm +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh - -set -e - -case "${1}" in - remove) - for FILE in /usr/share/man/man7/casper.7.gz /usr/share/man/man1/casper-snapshot.1.gz - do - dpkg-divert --package live-helper --remove --rename --divert ${FILE}.casper ${FILE} - done - ;; - - purge|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) - - ;; - - *) - echo "postrm called with unknown argument \`${1}'" >&2 - exit 1 - ;; -esac - -#DEBHELPER# - -exit 0 diff --git a/debian/preinst b/debian/preinst deleted file mode 100644 index 6ea28e5..0000000 --- a/debian/preinst +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh - -set -e - -case "${1}" in - install) - for FILE in /usr/share/man/man7/casper.7.gz /usr/share/man/man1/casper-snapshot.1.gz - do - dpkg-divert --package live-helper --add --rename --divert ${FILE}.casper ${FILE} - done - ;; - - upgrade|abort-upgrade) - - ;; - - *) - echo "preinst called with unknown argument \`${1}'" >&2 - exit 1 - ;; -esac - -#DEBHELPER# - -exit 0 diff --git a/debian/rules b/debian/rules index 687cd3c..a635706 100755 --- a/debian/rules +++ b/debian/rules @@ -39,7 +39,7 @@ binary-arch: build install binary-indep: build install dh_testdir dh_testroot - dh_installchangelogs doc/ChangeLog + dh_installchangelogs docs/ChangeLog dh_installdocs dh_install dh_installcron diff --git a/doc/AUTHORS b/doc/AUTHORS deleted file mode 100644 index ce0a01a..0000000 --- a/doc/AUTHORS +++ /dev/null @@ -1,4 +0,0 @@ -Main Authors: - - * Daniel Baumann - * Marco Amadori diff --git a/doc/BUGS b/doc/BUGS deleted file mode 100644 index 5d9d295..0000000 --- a/doc/BUGS +++ /dev/null @@ -1,51 +0,0 @@ -How to report a bug in Debian Live -================================== - -"No software is perfect... we need your help!" - -Debian Live is far from being perfect, but we want to make it as close as -possible to perfect - with your help. - -Do not hesitate to report a bug: it is better to fill a report twice than never. -However, here are some recommendations how to file good bug reports. - - -1. Where does the bug appear? ------------------------------ - -...at build time while bootstrapping? - -make-live first bootstraps a basic Debian system with cdebootstrap(1) or -debootstrap(8). Depending on both cdebootstrap/debootstrap and the Debian -distribution it is bootstrapping, it runs sucessful or not. If a bug appears -here, check if the error is related to a specific Debian package (most likely), -or if it is related to cdebootstrap/debootstrap itself. - -In both cases, this is not a bug in Debian Live, but rather in Debian itself. We -can not fix this directly. Instead, report such a bug against the cdebootstrap -package, or the failing package. - - -...at build time while installing packages? - -Debian Live installs additional packages from the Debian archive. Depending on -the Debian distribution used and the daily archive state, it can fail. If a bug -appears here, check if the error is also reproducible on a normal system. - -If this is the case, this is not a bug in Debian Live, but rather in Debian -again. Report it against the failing package. - - -...at run time? - -If a package was successfully installed, but fails while actually running the -Live system, this is probably a bug in Debian Live. - - -2. Where to send the bug report? --------------------------------- - -Report error logs of build time errors to live-package and run time errors to -casper in the Debian Bug Tracking System. If you are unsure or need more help -before submitting a bug report, you can always send a message to -. We will help you to figure it out. diff --git a/doc/CREDITS b/doc/CREDITS deleted file mode 100644 index 48b4014..0000000 --- a/doc/CREDITS +++ /dev/null @@ -1,36 +0,0 @@ -Patches (alphabetical order): - - * Alex Owen - * Bas Wijnen - * Ben Armstrong - * Cedric Lucantis - * Frederic Lehobey - * Guerkan Senguen - * Hadar Weiss - * Inigo Tejedor Arrondo - * Jason D. Clinton - * Kai Hendry - * Marcelo D. Re - * Markus Bauer - * Mathieu Geli - * Otavio Salvador - * Richard Nelson - * Scott Edwards - * Sebastian Raveau - -Donations (alphaetical order): - - * Gracie - -Special thanks (alphabetical order): - - * Ben Armstrong for his IRC support. - * Jason D. Clinton for his work on netboot type. - * Otavio Salvador for his QA patches. - * Richard Nelson for live-webbuilder. - * Sebastian Raveau for his work on encryption - support. - * Scott Edwards for his work on d-i/g-i integration. - -...and countless other people showed up on the #debian-live IRC channel since -February 2006: thanks for all your help, ideas, and wishes. diff --git a/doc/ChangeLog b/doc/ChangeLog deleted file mode 100644 index 6269da3..0000000 --- a/doc/ChangeLog +++ /dev/null @@ -1,488 +0,0 @@ -2007-05-06 Daniel Baumann - - * templates/syslinux: - - Updated again. - * helpers/lh_config: - - Fixed overwriting of LH_* options. - * helpers/lh_binary_includes: - - Fixed a quoting typo. - - Working arround symlinks on usb-hdd binary images. - -2007-04-31 Daniel Baumann - - * helpers/*: - - Added LH_INITRAMFS. - - Splitted config/image into config/binary and config/source. - * Uploaded 1.0~a8-1. - -2007-04-26 Daniel Baumann - - * helpers/*: - - Implemented paranoid caching with LIVE_CACHE_INDICES, - LIVE_CACHE_PACKAGES and LIVE_CACHE_STAGES. This allows to build - images offline from the cache. - -2007-04-25 Daniel Baumann - - * helpers/lh_binary_usb, lh_source_usb: - - In preparation of adding support for usb-zip images, the usb binary - type is renamed to usb-hdd. - -2007-04-24 Daniel Baumann - - * functions/stagefile.sh: - - Requite_stagefile can require more than one stage. - * helpers/lh_binary_debian-installer: - - Added. - -2007-04-23 Daniel Baumann - - * helpers/lh_binary_includes, lh_binary_usb, lh_source_usb: - - Added workaround for vfat limitations. - -2007-04-23 Daniel Baumann - - * Makefile: - - Added simple test rule. - * functions/*, helpers/*: - - Added LH_ROOT_COMMAND to support sudo. - * functions/package.sh: - - Added. Helper dependencies in-chroot can now be handled by - functions. - * helpers/make-live: - - Added trap to unmount proc and sys on exit and failure. - * Uploaded 1.0~a7-1. - -2007-04-22 Daniel Baumann - - * functions/defaults.sh: - - In ubuntu mode, setting default sections to main restricted. - * helpers/lh_binary_grub: - - Making copy call of grub arch independent. - * helpers/lh_chroot_sources: - - In debian mode, checking for non-sid rather than if-etch. - - Fixed wrong Ubuntu security URL. - -2007-04-20 Daniel Baumann - - * helpers/lh_binary_rootfs, lh_binary_iso: - - Added mksquashfs/genisoimage quiet/verbose options. - -2007-04-19 Daniel Baumann - - * helpers/lh_binary_grub, lh_binary_syslinux: - - Added check for splash in config directory. - -2007-04-18 Daniel Baumann - - * debian/cron.daily, default: - - Added. - * doc/BUGS, DOWNLOAD: - - Added. - * examples/edu.sources.list, fai.sources.list: - - Added. - * manpages/*: - - Added language suffix. - - Added German translations. - -2007-04-17 Daniel Baumann - - * helpers/lh_chroot_hooks: - - Also check for tasks specific hooks, not just for package lists. - * helpers/lh_chroot_tasks: - - Allowing to use either aptitude or tasksel. - * hooks/kde-desktop: - - Added. - * manpages/lh_build.1, lh_source.1: - - Added. - -2007-04-16 Daniel Baumann - - * functions/defaults.sh: - - Using lsb_release, if existing, to set default mode to ubuntu on - ubuntu systems. - - Moved desktop task to the end, so that gdm doesn't take - gnome-session as default. - * helpers/lh_chroot_hooks: - - Added simple --hooks for easy testing. - * Uploaded 1.0~a6-1. - -2007-04-15 Daniel Baumann - - * functions/defaults.sh: - - Set LH_APT to apt-get when using mini or minimal. - * helpers/lh_chroot_sources: - - Excluding comments from local sources lists. - * helpers/lh_bootstrap_cdebootstrap: - - Removing imported configuration files by cdebootstrap. - -2007-04-13 Daniel Baumann - - * Moved examples from /usr/share/doc to /usr/share/live-helper. - * examples/bpo.sources.list: - - Added. - * functions/defaults.sh: - - Setting LH_GENISOIMAGE on ubuntu to legacy mkisofs. - * helpers/lh_clean: - - Added missing removal of generic source. - -2007-04-12 Daniel Baumann - - * helpers/lh_config, make-live: - - Adding --config. - * helpers/lh_binary_memtester86: - - Renamed to lh_binary_memtest, made more generic. - * functions/defaults.sh: - - Setting default distribution to etch until 2.6.20 has setteled in - unstable. - -2007-04-11 Daniel Baumann - - * Merging from sidux fllbuilder 1.0.4: - - functions/chroot: Added LH_DEBCONF_NOWARNINGS. - - helpers/lh_chroot_linuximage: Added additional options to - kernel-img.conf. - - helpers/lh_chroot_proc: Made binfmt umount conditional. - * contrib/grub-splash/*, templates/grub/splash.xpm.gz: - - Added. - * helpers/lh_binary_grub, lh_binary_syslinux: - - Added failsafe kernel entries. - * helpers/lh_chroot_apt: - - Using apt.conf.d also for apt, not just for aptitude. - - Minor code cleanup. - * helpers/lh_source_*: - - Minor code cleanup. - * helpers/lh_source_download: - - Added LIVE_BOOTLOADER to the list of source packages. - * contrib/grub-splash/*, templates/grub/splash.xpm.gz: - - Added. - -2007-04-10 Daniel Baumann - - * helpers/lh_binary_includes, includes/*: - - Redone. - -2007-04-09 Daniel Baumann - - * helpers/lh_binary_yaboot, templates/yaboot: - - Added. - -2007-04-09 Daniel Baumann - - * helpers/lh_config, make-live, functions/defaults.sh: - - Added mode to distinguish between Debian and Ubuntu. - * helpers/lh_chroot_sources: - - Added check for LIVE_MIRROR_BUILD* to be equal to - LIVE_MIRROR_IMAGE*. - * Uploaded 1.0~a5-1. - -2007-04-08 Daniel Baumann - - * helpers/lh_binary_net: - - Added check for namespace collision with LIVE_SERVER_PATH. - * helpers/lh_binary_grub: - - Added functionality for usb|hdd images. - -2007-04-07 Daniel Baumann - - * helpers/lh_chroot_sources: - - Moved check for local source lists from - config/sources.lists.{build,image} to - config/chroot_sources/*.{build,image}. - - Added check for local gpg keys in - config/chroot_sources/*.{build,image}.gpg. - - Added check for local keyring packages in - config/chroot_sources/*.deb. - - Added LIVE_KEYRING_PACKAGES. - -2007-04-06 Daniel Baumann - - * functions/breakpoints.sh, helpers/*: - - Added initial breakpoints. - * functions/chroot.sh: - - Adding /usr/local to path. - * functions/lockfile.sh: - - Added additional signals to the trap. - * helpers/lh_binary_includes: - - Respect LIVE_INCLUDES=none. - * manpages/*: - - Updated. - -2007-04-05 Daniel Baumann - - * helpers/lh_binary_grub, templates/grub/menu.lst: - - Added splash functionality. - * Uploaded 1.0~a4-1. - -2007-04-03 Daniel Baumann - - * helpers/lh_binary_grub, lh_binary_grub: - - Added check for LIVE_TEMPLATES to be existing. - * helpers/lh_binary_includes: - - Added check for LIVE_INCLUDES to be existing. - -2007-04-02 Daniel Baumann - - * functions/*, helpers/*: - - Merged LIVE_SYSLINUX and LIVE_GRUB into LIVE_BOOTLOADER. - * helpers/lh_binary_iso: - - Added exclude for the bootloader from the iso image content. - -2007-04-01 Daniel Baumann - - * helper/lh_binary_grub: - - Added. - -2007-03-30 Daniel Baumann - - * helper/lh_chroot_localincludes: - - Fixed wrong path for hook removal. - -2007-03-29 Daniel Baumann - - * functions/common.sh, echo.sh: - - Added. - * doc/README, helpers/lh_source, manpages/lh_binary.1, live-helper.7: - - Added forgotten helpers. - * doc/FAQ: - - Added. - * lists/mini, minimal: - - Added --yes to apt call to make them non-interactive. - * manpages/lh_chroot.1: - - Added. - -2007-03-28 Daniel Baumann - - * helpers/lh_bootstrap_cdebootstrap, lh_bootstrap_debootstrap: - - Added --debug, --quiet, and --verbose. - -2007-03-27 Daniel Baumann - - * helpers/lh_binary_linuximage, lh_binary_memtest86: - - Added missing Read_conffiles to fix foreign architecture builds. - -2007-03-26 Daniel Baumann - - * helpers/lh_bootstrap_cdebootstrap, lh_bootstrap_debootstrap, - lh_clean: - - Added routine to cache bootstrapped chroot as suggested by Kai - Hendry . - * helpers/lh_chroot_rootfs: - - Fixed typo in net type. - * lists/gnome*, kde*, standard-x11, xfce*: - - Added menu. - -2007-03-26 Daniel Baumann - - * functions/defaults.sh: - - Fixed handling of desktop list variable loop. - * Uploaded 1.0~a3-1. - -2007-03-25 Daniel Baumann - - * functions/*, helpers/*: - - Renamed LIVE_FLAVOUR to LIVE_BOOTSTRAP_FLAVOUR. - - Renamed LIVE_PACKAGES_LIST to LIVE_PACKAGES_LISTS. - * functions/cache.sh: - - Added. - * helpers/lh_bootstrap_cdebootstrap: - - Added removal of cdebootstrap-helper-diverts. - * helpers/lh_binary_chroot: - - Added. - * helpers/lh_binary_rootfs: - - Moved filesystem routines into chroot. - * helpers/lh_chroot_localization, lh_chroot_localpackages, - lh_chroot_localpackageslists, lh_chroot_packages, - lh_chroot_packageslists, lh_chroot_tasks: - - Added check for LH_CACHE. - * helpers/lh_chroot_apt: - - Removing old apt.conf if existing as suggested by Ben Armstrong - . - * helpers/lh_chroot_hacks: - - Added check for already installed smbfs. - - Added check for already configured initramfs.conf as suggested by - Ben Armstrong . - * helpers/lh_chroot_interactive: - - Added. - * helpers/lh_chroot_tasks: - - Added routine for LH_APT=apt. - * lists/minimal-net: - - Minimized. - -2007-03-24 Daniel Baumann - - * functions/*, helpers/*, hooks/*: - - Added GPL blurb. - * functions/arguments.sh, helpers/*: - - Added common arguments. - * functions/arguments.sh, stagefile.sh, helpers/*, - manpages/live-helper.7: - - Added --force option. - * functions/defaults.sh, helpers/lh_binary_syslinux, lh_config, - make-live: - - Added LIVE_USERNAME and LIVE_HOSTNAME. - * helpers/lh_binary_linuximage, lh_binary_memtest86, - lh_binary_syslinux: - - Moved kernel directory to live. - * helpers/lh_clean: - - Added purge. - -2007-03-23 Daniel Baumann - - * helpers/make-live: - - Calling Arguments twice to catch case with non-default root. - -2007-03-22 Daniel Baumann - - * functions/default.sh, helpers/*: - - Renamed lh_chroot_packageslist to lh_chroot_packageslists and - lh_chroot_localpackageslist to lh_chroot_localpackageslists - * helpers/lh_binary_includes: - - Using LIVE_INCLUDES now. - * helpers/lh_chroot_apt: - - Added LH_APT_SECURE. - * helpers/lh_chroot_linuximage: - - Added check for LIVE_KERNEL_PACKGES=none to allow kernel packages as - local packages. - -2007-03-21 Daniel Baumann - - * helpers/lh_binary_hdd, lh_binary_iso, lh_binary_net, lh_binary_usb: - - Checking earlier if there is something todo. - * helpers/lh_binary_linuximage, lh_binary_syslinux, - lh_chroot_linuximage, templates/syslinux/isolinux.cfg: - - Extended to support multiple kernels at once. - * helpers/lh_binary_includes, lh_binary_localincludes, - lh_chroot_localincludes: - - Replaced path with variable as suggested Kai Hendry . - * helpers/lh_source_md5sum: - - Added. - * helpers/make-live: - - Added short options in ARGUMENTS. - * functions/defaults.sh, helpers/*: - - Renamed LIVE_KERNEL to LIVE_KERNEL_FLAVOUR. - - Renamed LIVE_MIRROR_LOCAL to LIVE_MIRROR_BUILD and - LIVE_MIRROR_GENERIC to LIVE_MIRROR_IMAGE. - -2007-03-20 Daniel Baumann - - * helpers/make-live: - - Fixed typo in ARGUMENTS. - -2007-03-19 Daniel Baumann - - * lists/gnome*, kde*, standard-x11, xfce*: - - Added alsa-base, alsa-oss, alsa-utils, and discover. - -2007-03-19 Daniel Baumann - - * Uploaded 1.0~a2-1. - -2007-03-18 Daniel Baumann - - * functions/defaults.sh: - - Quoted date call in LIVE_ISO_VOLUME. - * manpages/lh_clean.1: - - Added. - -2007-03-17 Daniel Baumann - - * 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, submitted by Inigo Tejedor Arrondo . - * 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 - - * helpers/lh_binary_usb: Corrected stagefile creation. - -2007-03-15 Daniel Baumann - - * 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 - - * 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 - - * helpers/lh_chroot_hacks: - - Added removal of udev persistent-net rule. - * Uploaded 1.0~a1-3. - -2007-03-14 Daniel Baumann - - * 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 - - * Rewritten live-package. - * Uploaded 1.0~a1-1. diff --git a/doc/ChangeLog.old b/doc/ChangeLog.old deleted file mode 100644 index 03dba64..0000000 --- a/doc/ChangeLog.old +++ /dev/null @@ -1,474 +0,0 @@ -2007-03-10 Daniel Baumann - - * Added knoppix and knoppix-dvd package lists. - -2007-03-09 Daniel Baumann - - * Getting free loopdevice from inside the chroot, not outside. - -2007-03-09 Daniel Baumann - - * Added kbd to all !minimal lists. - * Uploaded 0.99.25. - -2007-03-08 Otavio Salvador - - * helpers/lh_configapt: Fix aptitude configuration to really avoid - recommended packages to get installed. - * src/scripts/02defaults.sh: Export LIVE_ISOLINUX_SPLASH. - -2007-03-04 Daniel Baumann - - * Replaced removal of kernel on minimal flavours with excludes on the - mksquashfs call. - * Added LIVE_INCLUDE_CHROOT to the manual exported variables as reported - by Mathieu Geli . - * Exported CODENAME_* manually as reported by Cédric Lucantis - . - * Fixed typo s/aptiude/aptitude/ as reported by Kai Hendry - . - * Uploaded 0.99.24. - -2007-02-22 Daniel Baumann - - * Added xresprobe to all x11 lists. - -2007-02-22 Daniel Baumann - - * Applied patches from Otavio Salvador : - - add and cleanup variable exporting in defaults. - - add LIVE_BOOTSTRAP_CONFIG to lh_debootstrap. - * Uploaded 0.99.23. - -2007-02-21 Daniel Baumann - - * Added gnome-junior, kde-junior and xfce-junior lists. - * Uploaded 0.99.22. - -2007-02-19 Daniel Baumann - - * Fixed manifest. - -2007-02-15 Daniel Baumann - - * Applied patch from Sebastian Raveau to - add support for filesystem images encrypted with loop-aes. - -2007-02-13 Daniel Baumann - - * Broken out scripts into modularized lh_* subscripts. - -2007-02-12 Daniel Baumann - - * Added some code as suggested by Alex Owen to - check if the depends (syslinux, memtest etc.) are intentionally - installed in the chroot, and hence, don't remove them. - * Moved some depends into the chroot. - * Uploaded 0.99.21. - -2007-02-11 Daniel Baumann - - * Added mini flavour. - -2007-02-10 Daniel Baumann - - * Added legacy code for genisoimage. - * Uploaded 0.99.20. - -2007-02-09 Daniel Baumann - - * Added usb type. - -2007-02-08 Daniel Baumann - - * Added desktop task to the *-desktop flavours. - -2007-02-07 Daniel Baumann - - * Extended cron job a bit. - * Fixed manual pruning in minimal flavour as suggested by Bas Wijnen - - -2007-02-02 Daniel Baumann - - * Added "--without-daemons". - -2007-02-01 Daniel Baumann - - * Added "--tasks". - * Added desktop-base to all desktop package lists. - -2007-01-31 Daniel Baumann - - * Changed vars in autobuilding script to be able to source - make-live.conf. - * Uploaded 0.99.19. - -2007-01-30 Daniel Baumann - - * Added cron job for autobuilding images. - -2007-01-25 Daniel Baumann - - * Added additional pruning to minimal flavour. - * Using interactive frontend while processing --hook. - * Uploaded 0.99.18. - -2007-01-24 Daniel Baumann - - * Applied patches from Otavio Salvador : - - adding "--keyring" flag. - - adding LIVE_DISK_VOLUME. - - adding start-stop-daemon wrapper to avoid daemons to be started. - - adding workaround to prevent binfmt locking /proc. - - adding LIVE_ISOLINUX_SPLASH. - * Uploaded 0.99.17. - -2007-01-19 Daniel Baumann - - * Replacing mkisofs with genisoimage. - -2007-01-18 Daniel Baumann - - * Cleanups. - * Uploaded 0.99.16. - -2007-01-16 Daniel Baumann - - * Switched default distribution back to unstable, as unstable is usable - again from the kernel point of view. - * Added file to the minimal package list. - * Uploaded 0.99.15. - -2007-01-04 Daniel Baumann - - * Added workaround for new xorg packages by including - xserver-xorg-input-all and xserver-xorg-video-all in all X11 package - lists. See #405639 for more information. - * Added xdebconfigurator to all X11 package lists. - * Adding workaround for initrd backup files. - -2006-11-06 Daniel Baumann - - * Uploaded 0.99.14. - -2006-11-05 Daniel Baumann - - * Applied patch from Markus Bauer : - - fixing script sourcing to exclude files in .svn - -2006-11-03 Daniel Baumann - - * Fixed typo in the policy-rc.d hack. - -2006-11-02 Daniel Baumann - - * Using aptitude instead of apt-get. - * Added '--with-recommends' and '--without-recommends'. - -2006-11-01 Daniel Baumann - - * Fixed regression when using -d ${CODENAME} wrt/ kernel packages. - -2006-10-30 Daniel Baumann - - * Uploaded 0.99.13. - -2006-10-29 Daniel Baumann - - * Added minimal-net flavour. - -2006-10-28 Daniel Baumann - - * Added console-common to standard selection. - -2006-10-27 Daniel Baumann - - * Added patch from Otavio Salvador : - - fixing preseeding error-handling. - -2006-10-26 Daniel Baumann - - * Added gnustep package selection based on the suggestion of - Guerkan Senguen . - -2006-10-25 Daniel Baumann - - * Applied patch from Marcelo D. Re : - - skip deb-src source-list entries when building images with - --without-source. - * Applied patches from Otavio Salvador : - - adding '--bootstrap-config' to support cdebootstraps - '--suite-config'. - - allowing override of ${BASE}. - - adjust sourcing of scripts, so that only the real scripts are - sourced and not other (backup) files. - - allowing override of kernel-packages. - * Reverted mangling of LIVE_DISTRIBUTION for sources.list generation. - -2006-10-23 Daniel Baumann - - * Uploaded 0.99.12. - -2006-10-18 Daniel Baumann - - * Autodetecting proxy now. - -2006-10-16 Daniel Baumann - - * Readded and slightly changed --clone and --preseed. - * Uploaded 0.99.11. - -2006-10-09 Daniel Baumann - - * Cleanups. - * Uploaded 0.99.10. - -2006-10-02 Daniel Baumann - - * Uploaded 0.99.9. - -2006-10-01 Daniel Baumann - - * Added multiple repositories. - * Using LIVE_PROXY_* also for bootstraping. - -2006-09-27 Daniel Baumann - - * Changing manpage section. - -2006-09-26 Daniel Baumann - - * Added default flavour hooks. - * minimal flavour does not install debian-archive-keyring to save space. - * Adjusted network patch. - -2006-09-25 Daniel Baumann - - * Removed now unused initramfs-tools hack. - * Simplified xorg check based on distribution rather than version. - * Added fix from Bas Wijnen for space handling in - arguments. - * Fixed package list handling similar to the fix suggested by Alex Owen - . - * Uploaded 0.99.8. - -2006-09-24 Marco Amadori - - * 13hack.sh: initramfs-tools hack, check added for xorg. - -2006-09-18 Daniel Baumann - - * Uploaded 0.99.7. - -2006-09-15 Daniel Baumann - - * Added eject to minimal package selection. - -2006-09-14 Daniel Baumann - - * Adjustements for linux 2.6.17 testing propagation. - -2006-09-11 Daniel Baumann - - * Uploaded 0.99.6. - -2006-09-08 Marco Amadori - - * 23net.sh: Fixed binary missing directory creation. - * templates/iso: Moved common files to templates/common. - -2006-09-07 Daniel Baumann - - * Minor cleanups. - * Fixed dist target. - -2006-09-06 Marco Amadori - - * 14chroot.sh, main.sh: Added manifest support. - * 23net.sh: Added 2 variables for basenames to ease readability. - * main.sh, 02default.sh: Modified Usage() uses. - -2006-09-04 Daniel Baumann - - * Uploaded 0.99.5. - -2006-09-03 Daniel Baumann - - * Added dist parameter to easily pull images for live.debian.net. - * Added "--output" to specify the image name prefix. - * Exclude iso templates for minimal flavour. - -2006-09-02 Daniel Baumann - - * Added experimental as distribution. - * Added source image generation. - * Using dpkg instead of dpkg-architecture, removed dpkg-dev dependency. - -2006-08-31 Daniel Baumann - - * Added "--disable-generic-indices" and "--enable-generic-indices". - * Fixed i18n lists. - * Rewritten all lists, comments are now possible. - * Lists must be now explicitly given with --package-list, no longer as - last argument of the make-live call. - * Setting default sources.list while the image generation, restoring - customized ones afterwards. - -2006-08-30 Daniel Baumann - - * Cleanups: - - moved 14patch_packages.sh to 13hack.sh. - - simplified 13hack.sh. - -2006-08-29 Marco Amadori - - * pxelinux.cfg: Updated to right defaults, first cifs then nfs or - select your favorite way. Rationale: /dev/nfs is for kernel - discovering, not for initramfs discover, casper will be just fine - with "netboot". - * 13chroot.sh, 14patch_packages.sh: Added a simple system for patching - packages, mainly for xserver-xorg so far. - -2006-08-28 Daniel Baumann - - * Updated documentation. - * Added patch from Alex Owen to update - pxelinux.cfg for NFS root in casper. - * Uploaded 0.99.4. - -2006-08-27 Daniel Baumann - - * Cleanups. - -2006-08-27 Marco Amadori - - * Added sysv init blocking policy. - -2006-08-22 Daniel Baumann - - * Reorganised sources. - * Added staging support. - * Cleaned up parameter names. - * testing is now supported. - -2006-08-21 Daniel Baumann - - * Uploaded 0.99.3. - -2006-08-02 Marco Amadori - - * Rewrote netboot support. - * Added support for pure directory rootfs images. - -2006-07-31 Daniel Baumann - - * Uploaded 0.99.2. - -2006-07-28 Daniel Baumann - - * Added DEBIAN_FRONTEND to chroots(), now completely non-interactive. - * Fixed wrong chroot patch. - -2006-07-27 Marco Amadori - - * Changed amd64 kernel naming scheme. - -2006-07-24 Daniel Baumann - - * Uploaded 0.99.1. - -2006-07-19 Daniel Baumann - - * Bugfixes. - -2006-07-18 Daniel Baumann - - * Added iso templates. - -2006-07-17 Daniel Baumann - - * Added chroot to 01-patch.sh. - * Added "--logfile". - * Uploaded 0.99. - -2006-07-01 Daniel Baumann - - * Added "--flavour". - -2006-06-28 Daniel Baumann - - * Added "--debug" and "--verbose". - -2006-06-23 Daniel Baumann - - * Rewritten manpages. - -2006-06-19 Marco Amadori - - * Added "--templates" options. - * Fixed some typos. - -2006-06-15 Daniel Baumann - - * General fixes. - -2006-06-18 Marco Amadori - - * Added "-a|--architecture" and "-p|--package-list" options. - * Reworked how lists works. - -2006-06-15 Daniel Baumann - - * General cleanup. - -2006-06-14 Marco Amadori - - * Re-added "-f|--filesystem". - -2006-06-12 Marco Amadori - - * Added "--conffile", "--preseed", "--clone", and "--rootfs" options. - -2006-06-12 Daniel Baumann - - * Added new splash.rle. - * Added memtest86+. - * Added "--distribution", and "--section" options. - * Moved /etc/default/make-live to /etc/make-live.conf. - -2006-06-11 Marco Amadori - - * Added handling of md5sums. - -2006-06-09 Marco Amadori - - * Added splashy support. - * Added ext2 rootfs support. - * Added external hook and path support. - * Swiched to getopt. - -2006-06-02 Daniel Baumann - - * Added patch from Jason D. Clinton : - - Added netboot flavour. - - Thanks to SafeDesk Solutions . - -2006-06-01 Daniel Baumann - - * Moved syslinux inside the chroot. - -2006-05-31 Daniel Baumann - - * Added kde-*i18n and standard-i18n lists. - -2006-05-28 Daniel Baumann - - * Added patch from Frederic Lehobey : - - Added locales to LIVE_PACKAGES. - - Added LIVE_MIRROR_KEY, LIVE_REPOSITORY, LIVE_REPOSITORY_KEY, and - LIVE_BOOTAPPEND. - -2006-05-27 Daniel Baumann - - * Initial release. diff --git a/doc/DOWNLOAD b/doc/DOWNLOAD deleted file mode 100644 index 60b6753..0000000 --- a/doc/DOWNLOAD +++ /dev/null @@ -1,43 +0,0 @@ -Download of prebuilt images -=========================== - -Although Debian Live is about creating your own customized Live system, we offer -some prebuilt images as well. Currently, builds for the three desktop -environments GNOME[0], KDE[1] and Xfce[2] as well as the standard system are -available. Builds based on testing are created every week and the ones based on -unstable are build daily. For stable, we build update them when needed. - -Currently, the following flavours are autobuilt here (.iso for CD/DVD images, -.img for USB stick images): - - * debian-live-${DIST}-${ARCH}-standard - - only packages of priority standard or higher and a few live specific - packages (eject, file and sudo). - - * debian-live-${DIST}-${ARCH}-gnome-desktop - - the standard system, laptop related packages (laptop task) and the GNOME[1] - desktop environment (desktop and gnome-desktop tasks). - - * debian-live-${DIST}-${ARCH}-kde-desktop - - the standard system, laptop related packages (laptop task) and the KDE[2] - desktop environment (desktop and kde-desktop tasks). - - * debian-live-${DIST}-${ARCH}-xfce-desktop - - the standard system, laptop related packages (laptop task) and the Xfce[3] - desktop environment (desktop and xfce-desktop tasks). - -Note: Currently, we build images for lenny (aka "testing") and sid (aka -"unstable"). Due to the nature of unreleased Debian versions, it is possible -that no or not all images could be built because of uninstallable packages. -Please be patient then and wait for the next builds, use the previous, or do it -on your own by using live-helper. If you want something which works for sure, -use the etch (aka "stable") builds. - - [0] http://packages.debian.org/live-helper - [1] http://www.gnome.org/ - [2] http://www.kde.org/ - [3] http://www.xfce.org/ diff --git a/doc/FAQ b/doc/FAQ deleted file mode 100644 index ceb87d6..0000000 --- a/doc/FAQ +++ /dev/null @@ -1,70 +0,0 @@ -Frequently Asked Questions (FAQ) -================================ - -Build Time ----------- - -Q: Is live-helper/make-live Debian specific? -A: live-helper supports Debian and Ubuntu right now. Adding automatic defaults - for other Debian derivatives is easy - let us know about them and we may - include it. - - -Q: How can I build images with an unprevileged user account? -A: You can use --root-command sudo or set LH_ROOT_COMMAND="sudo" in - config/common. - - *BIG* *FAT* *WARNING*: Building an image as non-root can make your image - different compared to a regular Debian system (different owners of files). It - is *NOT* recommended to build images as non-root. Do *NOT* use this feature - yet. - - -Q: How do I drop in to a shell during make-live chroot process? -A: Use "--interactive shell", then exit with 'logout' when you have made the - setting changes you want and the build process will continue. - - -Q: Where to set the username or the hostname? -A: casper uses default username 'casper' and hostname 'live'. You can specify - them by passing 'username=' and 'hostname=' as kernel parameters. - - live-helper automatically sets the username to 'user' and the hostname to - 'debian'. If you want to change this at build time, pass --username and - --hostname to make-live, or alter LIVE_USERNAME and LIVE_HOSTNAME in - config/image. - - -Q: How can I make my own grub bootsplash? -A: To add a grub splash screen, you can use --grub-splash FILE, or copy your - custom splash to config/binary_grub/splash.xpm.gz. - - Documentation about creating a bootsplash for grub can be found at: - - - -Q: How can I make my own syslinux bootsplash? -A: To add a syslinux splash screen, you can use --syslinux-splash FILE, or copy - your custom splash to config/binary_syslinux/splash.rle. - - Documentation about creating a bootsplash for grub can be found at: - - contrib/syslinux-splash/COPYING in the live-helper sources. - - Basically, you need to install netpbm and syslinux, and run this: - anytopnm < $your_splash > $your_splash.pnm - pnmcolormap 15 < $your_splash.pnm > $your_splash.map - pnmremap -map=$your_splash.map $your_splash.pnm | \ - ppmtolss16 '#ffffff=7' > splash.rle - - -Run Time --------- - -Q: What is the root password? -A: There is none set. You can switch to root with 'sudo -i' or set a password - with 'sudo passwd'. - - -Q: What is the user password? -A: The password for the default user is 'live'. diff --git a/doc/NEWS b/doc/NEWS deleted file mode 100644 index ebcd8a0..0000000 --- a/doc/NEWS +++ /dev/null @@ -1,37 +0,0 @@ -News: - - * 2006-02-14: Project announcement. - http://blog.daniel-baumann.ch/2006/02/14#20060214_debian-live-initiative - - * 2006-02-28: Setup project resources. - http://blog.daniel-baumann.ch/2006/02/28#20060228_debian-live-resources - - * 2006-03-16: Added support for ISO image generation. - http://lists.alioth.debian.org/pipermail/debian-live-devel/2006-March/000048.html - - * 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 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. - http://lists.alioth.debian.org/pipermail/debian-live-devel/2007-February/000764.html - - * 2007-02-10: Added support for USB image generation. - http://lists.alioth.debian.org/pipermail/debian-live-devel/2007-February/000790.html - - * 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 first live-helper to Debian unstable. - http://packages.debian.org/changelogs/pool/main/l/live-helper/current/changelog#versionversion1.0_a1-1 - - * 2007-03-14: live-package is dead, long lives live-helper - http://lists.alioth.debian.org/pipermail/debian-live-devel/2007-March/000998.html - - * 2007-04-19: Google Summer of Code 2007 - http://lists.alioth.debian.org/pipermail/debian-live-devel/2007-April/001221.html - - * 2007-04-26: New website design - http://www.chris-lamb.co.uk/blog/2007/04/26/pimp-your-webpage/ diff --git a/doc/README b/doc/README deleted file mode 100644 index dec5fe7..0000000 --- a/doc/README +++ /dev/null @@ -1,93 +0,0 @@ - * lh_config - - * lh_bootstrap - |_ lh_cdebootstrap - |_ lh_debootstrap - - * lh_chroot - |_ lh_chroot_proc install - |_ lh_chroot_sysfs install - |_ lh_chroot_debianchroot install - |_ lh_chroot_sysvrc install - |_ lh_chroot_hosts install - |_ lh_chroot_resolv install - |_ lh_chroot_apt install - |_ lh_chroot_sources install - |_ lh_chroot_linuximage install - | - |_ lh_chroot_tasks - |_ lh_chroot_packageslists - |_ lh_chroot_packages - |_ lh_chroot_localpackages - |_ lh_chroot_localpackageslists - |_ lh_chroot_localization - |_ lh_chroot_hacks - |_ lh_chroot_localincludes - |_ lh_chroot_sysvinit - |_ lh_chroot_hooks - |_ lh_chroot_localhooks - |_ lh_chroot_symlinks - |_ lh_chroot_interactive - | - |_ lh_chroot_linuximage remove - |_ lh_chroot_sources remove - |_ lh_chroot_apt remove - |_ lh_chroot_resolv remove - |_ lh_chroot_hosts remove - |_ lh_chroot_sysvrc remove - |_ lh_chroot_debianchroot remove - |_ lh_chroot_sysfs remove - |_ lh_chroot_proc remove - - * lh_binary - |_ lh_binary_chroot - | - |_ lh_chroot_proc install - |_ lh_chorot_sysfs install - |_ lh_chroot_hosts install - |_ lh_chroot_resolv install - |_ lh_chroot_sources install - | - |_ lh_binary_rootfs - |_ lh_binary_manifest - |_ lh_binary_encryption - | - |_ lh_binary_linuximage - |_ lh_binary_memtest86 - |_ lh_binary_grub - |_ lh_binary_syslinux - |_ lh_binary_includes - |_ lh_binary_localincludes - |_ lh_binary_md5sum - | - |_ lh_binary_hdd - |_ lh_binary_iso - |_ lh_binary_net - |_ lh_binary_usb-hdd - | - |_ rm -f .stage/chroot_sources - |_ lh_chroot_resolv remove - |_ lh_chroot_hosts remove - |_ lh_chroot_sysfs remove - |_ lh_chroot_proc remove - - * lh_source - |_ lh_chroot_hosts install - |_ lh_chroot_resolv install - |_ lh_chroot_sources install - | - |_ lh_source_config - |_ lh_source_download - |_ lh_source_md5sum - | - |_ lh_source_generic - |_ lh_source_hdd - |_ lh_source_iso - |_ lh_source_net - |_ lh_source_usb-hdd - | - |_ rm -f .stage/chroot_sources - |_ lh_chroot_resolv remove - |_ lh_chroot_hosts remove - - * lh_clean diff --git a/doc/TODO b/doc/TODO deleted file mode 100644 index 5d31464..0000000 --- a/doc/TODO +++ /dev/null @@ -1,16 +0,0 @@ -Fixme: - - * check all Require_stagefile calls - * make helpers call required stuff when needed - * integrate lh_chroot_hacks - * cleanup variable names - -Todo: - - * write manpage and documentation - * write lh_binary_di and lh_binary_gi - -Later: - * Add win32 autorun like - http://morphix.svn.sourceforge.net/viewvc/morphix/trunk/cdrom-misc/autorun/ - * Add loadlin batch diff --git a/docs/AUTHORS b/docs/AUTHORS new file mode 100644 index 0000000..ce0a01a --- /dev/null +++ b/docs/AUTHORS @@ -0,0 +1,4 @@ +Main Authors: + + * Daniel Baumann + * Marco Amadori diff --git a/docs/BUGS b/docs/BUGS new file mode 100644 index 0000000..28baa98 --- /dev/null +++ b/docs/BUGS @@ -0,0 +1,51 @@ +How to report a bug in Debian Live +================================== + +"No software is perfect... we need your help!" + +Debian Live is far from being perfect, but we want to make it as close as +possible to perfect - with your help. + +Do not hesitate to report a bug: it is better to fill a report twice than never. +However, here are some recommendations how to file good bug reports. + + +1. Where does the bug appear? +----------------------------- + +...at build time while bootstrapping? + +make-live first bootstraps a basic Debian system with cdebootstrap(1) or +debootstrap(8). Depending on both cdebootstrap/debootstrap and the Debian +distribution it is bootstrapping, it runs sucessful or not. If a bug appears +here, check if the error is related to a specific Debian package (most likely), +or if it is related to cdebootstrap/debootstrap itself. + +In both cases, this is not a bug in Debian Live, but rather in Debian itself. We +can not fix this directly. Instead, report such a bug against the cdebootstrap +package, or the failing package. + + +...at build time while installing packages? + +Debian Live installs additional packages from the Debian archive. Depending on +the Debian distribution used and the daily archive state, it can fail. If a bug +appears here, check if the error is also reproducible on a normal system. + +If this is the case, this is not a bug in Debian Live, but rather in Debian +again. Report it against the failing package. + + +...at run time? + +If a package was successfully installed, but fails while actually running the +Live system, this is probably a bug in Debian Live. + + +2. Where to send the bug report? +-------------------------------- + +Report error logs of build time errors to live-helper and run time errors to +casper in the Debian Bug Tracking System. If you are unsure or need more help +before submitting a bug report, you can always send a message to +. We will help you to figure it out. diff --git a/docs/CREDITS b/docs/CREDITS new file mode 100644 index 0000000..48b4014 --- /dev/null +++ b/docs/CREDITS @@ -0,0 +1,36 @@ +Patches (alphabetical order): + + * Alex Owen + * Bas Wijnen + * Ben Armstrong + * Cedric Lucantis + * Frederic Lehobey + * Guerkan Senguen + * Hadar Weiss + * Inigo Tejedor Arrondo + * Jason D. Clinton + * Kai Hendry + * Marcelo D. Re + * Markus Bauer + * Mathieu Geli + * Otavio Salvador + * Richard Nelson + * Scott Edwards + * Sebastian Raveau + +Donations (alphaetical order): + + * Gracie + +Special thanks (alphabetical order): + + * Ben Armstrong for his IRC support. + * Jason D. Clinton for his work on netboot type. + * Otavio Salvador for his QA patches. + * Richard Nelson for live-webbuilder. + * Sebastian Raveau for his work on encryption + support. + * Scott Edwards for his work on d-i/g-i integration. + +...and countless other people showed up on the #debian-live IRC channel since +February 2006: thanks for all your help, ideas, and wishes. diff --git a/docs/ChangeLog b/docs/ChangeLog new file mode 100644 index 0000000..6ae509c --- /dev/null +++ b/docs/ChangeLog @@ -0,0 +1,558 @@ +2007-05-18 Daniel Baumann + + * helpers/*: + - Renamed LIVE_KERNEL_FLAVOUR to LIVE_LINUX_FLAVOURS. + - Renamed LIVE_KERNEL_PACKAGES to LIVE_LINUX_PACKAGES. + - Renamed LIVE_BINARY_IMAGE to LIVE_BINARY_IMAGES. + - Renamed LIVE_SOURCE_IMAGE to LIVE_SOURCE_IMAGES. + - Renamed LIVE_FILESYSTEM to LIVE_CHROOT_FILESYSTEM. + - Renamed LIVE_SERVER_ADDRESS to LIVE_NET_SERVER. + - Renamed LIVE_SERVER_PATH to LIVE_NET_PATH. + * Uploaded 1.0~a10-1. + +2007-05-18 Mathieu Geli + + * examples/hooks/* + - Added new hooks for non-free/contrib drivers + Intel : ipw3945, ipw2100, ipw2200 + Nvidia : nvidia-legacy + Ralink : rt2x00, rt2570 + - Changed behavior of beryl hook: autostart beryl + if video driver allows it (minimal detection based on glxinfo) + +2007-05-17 Daniel Baumann + + * helpers/lh_binary_md5sum, lh_source,md5sum: + - Fixed accidentally inclusion of md5sum.txt itself into + binary/md5sum.txt. + +2007-05-16 Daniel Baumann + + * helpers/*: + - Added check for local includes and templates. + - Renamed LH_APT_GENERIC to LIVE_BINARY_INDICES. + - Renamed lh_binary_localincludes to lh_binary_local-includes. + - Renamed lh_chroot_localhooks to lh_chroot_local-hooks. + - Renamed lh_chroot_localincludes to lh_chroot_local-includes. + - Renamed lh_chroot_localpackages to lh_chroot_local-packages. + - Renamed lh_chroot_localpackageslists to + lh_chroot_local-packageslists. + - Renamed lh_source_download to lh_source_debian. + - Renamed lh_source_config to lh_source_debian-live. + +2007-05-09 Daniel Baumann + + * helpers/*: + - Renamed LH_MIRROR*_BUILD to LH_MIRROR*_BOOTSTRAP. + - Renamed LH_MIRROR*_IMAGE to LH_MIRROR*_BINARY. + * helpers/lh_chroot_sources: + - Added aptitude overwrite for untrusted sources. + - Changed checks for *.build/*.image to *.bootstrap/*.binary. + +2007-05-08 Daniel Baumann + + * helpers/*: + - Renamed lh_binary_linuximage to lh_binary_linux-image. + - Renamed lh_chroot_linuximage to lh_chroot_linux-image. + * helpers/lh_bootstrap_cdebootstrap, lh_bootstrap_debootstrap: + - Added missing cache directory when only caching stages. + * helpers/lh_binary_debian-installer, lh_binary_linux-image, + lh_binary_memtest: + - Changed kernel installation directories. + +2007-05-07 Daniel Baumann + + * examples/snapshot-build.sh, live-snapshot.sources.list: + - Added. + * helpers/lh_binary_rootfs: + - Fixed wrong order of squashfs options. + +2007-05-06 Daniel Baumann + + * templates/syslinux: + - Updated again. + * helpers/lh_config: + - Fixed overwriting of LH_* options. + * helpers/lh_binary_includes: + - Fixed a quoting typo. + - Working arround symlinks on usb-hdd binary images. + * Uploaded 1.0~a9-1. + +2007-04-31 Daniel Baumann + + * helpers/*: + - Added LH_INITRAMFS. + - Splitted config/image into config/binary and config/source. + * Uploaded 1.0~a8-1. + +2007-04-26 Daniel Baumann + + * helpers/*: + - Implemented paranoid caching with LIVE_CACHE_INDICES, + LIVE_CACHE_PACKAGES and LIVE_CACHE_STAGES. This allows to build + images offline from the cache. + +2007-04-25 Daniel Baumann + + * helpers/lh_binary_usb, lh_source_usb: + - In preparation of adding support for usb-zip images, the usb binary + type is renamed to usb-hdd. + +2007-04-24 Daniel Baumann + + * functions/stagefile.sh: + - Requite_stagefile can require more than one stage. + * helpers/lh_binary_debian-installer: + - Added. + +2007-04-23 Daniel Baumann + + * helpers/lh_binary_includes, lh_binary_usb, lh_source_usb: + - Added workaround for vfat limitations. + +2007-04-23 Daniel Baumann + + * Makefile: + - Added simple test rule. + * functions/*, helpers/*: + - Added LH_ROOT_COMMAND to support sudo. + * functions/package.sh: + - Added. Helper dependencies in-chroot can now be handled by + functions. + * helpers/make-live: + - Added trap to unmount proc and sys on exit and failure. + * Uploaded 1.0~a7-1. + +2007-04-22 Daniel Baumann + + * functions/defaults.sh: + - In ubuntu mode, setting default sections to main restricted. + * helpers/lh_binary_grub: + - Making copy call of grub arch independent. + * helpers/lh_chroot_sources: + - In debian mode, checking for non-sid rather than if-etch. + - Fixed wrong Ubuntu security URL. + +2007-04-20 Daniel Baumann + + * helpers/lh_binary_rootfs, lh_binary_iso: + - Added mksquashfs/genisoimage quiet/verbose options. + +2007-04-19 Daniel Baumann + + * helpers/lh_binary_grub, lh_binary_syslinux: + - Added check for splash in config directory. + +2007-04-18 Daniel Baumann + + * debian/cron.daily, default: + - Added. + * doc/BUGS, DOWNLOAD: + - Added. + * examples/edu.sources.list, fai.sources.list: + - Added. + * manpages/*: + - Added language suffix. + - Added German translations. + +2007-04-17 Daniel Baumann + + * helpers/lh_chroot_hooks: + - Also check for tasks specific hooks, not just for package lists. + * helpers/lh_chroot_tasks: + - Allowing to use either aptitude or tasksel. + * hooks/kde-desktop: + - Added. + * manpages/lh_build.1, lh_source.1: + - Added. + +2007-04-16 Daniel Baumann + + * functions/defaults.sh: + - Using lsb_release, if existing, to set default mode to ubuntu on + ubuntu systems. + - Moved desktop task to the end, so that gdm doesn't take + gnome-session as default. + * helpers/lh_chroot_hooks: + - Added simple --hooks for easy testing. + * Uploaded 1.0~a6-1. + +2007-04-15 Daniel Baumann + + * functions/defaults.sh: + - Set LH_APT to apt-get when using mini or minimal. + * helpers/lh_chroot_sources: + - Excluding comments from local sources lists. + * helpers/lh_bootstrap_cdebootstrap: + - Removing imported configuration files by cdebootstrap. + +2007-04-13 Daniel Baumann + + * Moved examples from /usr/share/doc to /usr/share/live-helper. + * examples/bpo.sources.list: + - Added. + * functions/defaults.sh: + - Setting LH_GENISOIMAGE on ubuntu to legacy mkisofs. + * helpers/lh_clean: + - Added missing removal of generic source. + +2007-04-12 Daniel Baumann + + * helpers/lh_config, make-live: + - Adding --config. + * helpers/lh_binary_memtester86: + - Renamed to lh_binary_memtest, made more generic. + * functions/defaults.sh: + - Setting default distribution to etch until 2.6.20 has setteled in + unstable. + +2007-04-11 Daniel Baumann + + * Merging from sidux fllbuilder 1.0.4: + - functions/chroot: Added LH_DEBCONF_NOWARNINGS. + - helpers/lh_chroot_linuximage: Added additional options to + kernel-img.conf. + - helpers/lh_chroot_proc: Made binfmt umount conditional. + * contrib/grub-splash/*, templates/grub/splash.xpm.gz: + - Added. + * helpers/lh_binary_grub, lh_binary_syslinux: + - Added failsafe kernel entries. + * helpers/lh_chroot_apt: + - Using apt.conf.d also for apt, not just for aptitude. + - Minor code cleanup. + * helpers/lh_source_*: + - Minor code cleanup. + * helpers/lh_source_download: + - Added LIVE_BOOTLOADER to the list of source packages. + * contrib/grub-splash/*, templates/grub/splash.xpm.gz: + - Added. + +2007-04-10 Daniel Baumann + + * helpers/lh_binary_includes, includes/*: + - Redone. + +2007-04-09 Daniel Baumann + + * helpers/lh_binary_yaboot, templates/yaboot: + - Added. + +2007-04-09 Daniel Baumann + + * helpers/lh_config, make-live, functions/defaults.sh: + - Added mode to distinguish between Debian and Ubuntu. + * helpers/lh_chroot_sources: + - Added check for LIVE_MIRROR_BUILD* to be equal to + LIVE_MIRROR_IMAGE*. + * Uploaded 1.0~a5-1. + +2007-04-08 Daniel Baumann + + * helpers/lh_binary_net: + - Added check for namespace collision with LIVE_SERVER_PATH. + * helpers/lh_binary_grub: + - Added functionality for usb|hdd images. + +2007-04-07 Daniel Baumann + + * helpers/lh_chroot_sources: + - Moved check for local source lists from + config/sources.lists.{build,image} to + config/chroot_sources/*.{build,image}. + - Added check for local gpg keys in + config/chroot_sources/*.{build,image}.gpg. + - Added check for local keyring packages in + config/chroot_sources/*.deb. + - Added LIVE_KEYRING_PACKAGES. + +2007-04-06 Daniel Baumann + + * functions/breakpoints.sh, helpers/*: + - Added initial breakpoints. + * functions/chroot.sh: + - Adding /usr/local to path. + * functions/lockfile.sh: + - Added additional signals to the trap. + * helpers/lh_binary_includes: + - Respect LIVE_INCLUDES=none. + * manpages/*: + - Updated. + +2007-04-05 Daniel Baumann + + * helpers/lh_binary_grub, templates/grub/menu.lst: + - Added splash functionality. + * Uploaded 1.0~a4-1. + +2007-04-03 Daniel Baumann + + * helpers/lh_binary_grub, lh_binary_grub: + - Added check for LIVE_TEMPLATES to be existing. + * helpers/lh_binary_includes: + - Added check for LIVE_INCLUDES to be existing. + +2007-04-02 Daniel Baumann + + * functions/*, helpers/*: + - Merged LIVE_SYSLINUX and LIVE_GRUB into LIVE_BOOTLOADER. + * helpers/lh_binary_iso: + - Added exclude for the bootloader from the iso image content. + +2007-04-01 Daniel Baumann + + * helper/lh_binary_grub: + - Added. + +2007-03-30 Daniel Baumann + + * helper/lh_chroot_localincludes: + - Fixed wrong path for hook removal. + +2007-03-29 Daniel Baumann + + * functions/common.sh, echo.sh: + - Added. + * doc/README, helpers/lh_source, manpages/lh_binary.1, live-helper.7: + - Added forgotten helpers. + * doc/FAQ: + - Added. + * lists/mini, minimal: + - Added --yes to apt call to make them non-interactive. + * manpages/lh_chroot.1: + - Added. + +2007-03-28 Daniel Baumann + + * helpers/lh_bootstrap_cdebootstrap, lh_bootstrap_debootstrap: + - Added --debug, --quiet, and --verbose. + +2007-03-27 Daniel Baumann + + * helpers/lh_binary_linuximage, lh_binary_memtest86: + - Added missing Read_conffiles to fix foreign architecture builds. + +2007-03-26 Daniel Baumann + + * helpers/lh_bootstrap_cdebootstrap, lh_bootstrap_debootstrap, + lh_clean: + - Added routine to cache bootstrapped chroot as suggested by Kai + Hendry . + * helpers/lh_chroot_rootfs: + - Fixed typo in net type. + * lists/gnome*, kde*, standard-x11, xfce*: + - Added menu. + +2007-03-26 Daniel Baumann + + * functions/defaults.sh: + - Fixed handling of desktop list variable loop. + * Uploaded 1.0~a3-1. + +2007-03-25 Daniel Baumann + + * functions/*, helpers/*: + - Renamed LIVE_FLAVOUR to LIVE_BOOTSTRAP_FLAVOUR. + - Renamed LIVE_PACKAGES_LIST to LIVE_PACKAGES_LISTS. + * functions/cache.sh: + - Added. + * helpers/lh_bootstrap_cdebootstrap: + - Added removal of cdebootstrap-helper-diverts. + * helpers/lh_binary_chroot: + - Added. + * helpers/lh_binary_rootfs: + - Moved filesystem routines into chroot. + * helpers/lh_chroot_localization, lh_chroot_localpackages, + lh_chroot_localpackageslists, lh_chroot_packages, + lh_chroot_packageslists, lh_chroot_tasks: + - Added check for LH_CACHE. + * helpers/lh_chroot_apt: + - Removing old apt.conf if existing as suggested by Ben Armstrong + . + * helpers/lh_chroot_hacks: + - Added check for already installed smbfs. + - Added check for already configured initramfs.conf as suggested by + Ben Armstrong . + * helpers/lh_chroot_interactive: + - Added. + * helpers/lh_chroot_tasks: + - Added routine for LH_APT=apt. + * lists/minimal-net: + - Minimized. + +2007-03-24 Daniel Baumann + + * functions/*, helpers/*, hooks/*: + - Added GPL blurb. + * functions/arguments.sh, helpers/*: + - Added common arguments. + * functions/arguments.sh, stagefile.sh, helpers/*, + manpages/live-helper.7: + - Added --force option. + * functions/defaults.sh, helpers/lh_binary_syslinux, lh_config, + make-live: + - Added LIVE_USERNAME and LIVE_HOSTNAME. + * helpers/lh_binary_linuximage, lh_binary_memtest86, + lh_binary_syslinux: + - Moved kernel directory to live. + * helpers/lh_clean: + - Added purge. + +2007-03-23 Daniel Baumann + + * helpers/make-live: + - Calling Arguments twice to catch case with non-default root. + +2007-03-22 Daniel Baumann + + * functions/default.sh, helpers/*: + - Renamed lh_chroot_packageslist to lh_chroot_packageslists and + lh_chroot_localpackageslist to lh_chroot_localpackageslists + * helpers/lh_binary_includes: + - Using LIVE_INCLUDES now. + * helpers/lh_chroot_apt: + - Added LH_APT_SECURE. + * helpers/lh_chroot_linuximage: + - Added check for LIVE_KERNEL_PACKGES=none to allow kernel packages as + local packages. + +2007-03-21 Daniel Baumann + + * helpers/lh_binary_hdd, lh_binary_iso, lh_binary_net, lh_binary_usb: + - Checking earlier if there is something todo. + * helpers/lh_binary_linuximage, lh_binary_syslinux, + lh_chroot_linuximage, templates/syslinux/isolinux.cfg: + - Extended to support multiple kernels at once. + * helpers/lh_binary_includes, lh_binary_localincludes, + lh_chroot_localincludes: + - Replaced path with variable as suggested Kai Hendry . + * helpers/lh_source_md5sum: + - Added. + * helpers/make-live: + - Added short options in ARGUMENTS. + * functions/defaults.sh, helpers/*: + - Renamed LIVE_KERNEL to LIVE_KERNEL_FLAVOUR. + - Renamed LIVE_MIRROR_LOCAL to LIVE_MIRROR_BUILD and + LIVE_MIRROR_GENERIC to LIVE_MIRROR_IMAGE. + +2007-03-20 Daniel Baumann + + * helpers/make-live: + - Fixed typo in ARGUMENTS. + +2007-03-19 Daniel Baumann + + * lists/gnome*, kde*, standard-x11, xfce*: + - Added alsa-base, alsa-oss, alsa-utils, and discover. + +2007-03-19 Daniel Baumann + + * Uploaded 1.0~a2-1. + +2007-03-18 Daniel Baumann + + * functions/defaults.sh: + - Quoted date call in LIVE_ISO_VOLUME. + * manpages/lh_clean.1: + - Added. + +2007-03-17 Daniel Baumann + + * 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, submitted by Inigo Tejedor Arrondo . + * 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 + + * helpers/lh_binary_usb: Corrected stagefile creation. + +2007-03-15 Daniel Baumann + + * 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 + + * 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 + + * helpers/lh_chroot_hacks: + - Added removal of udev persistent-net rule. + * Uploaded 1.0~a1-3. + +2007-03-14 Daniel Baumann + + * 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 + + * Rewritten live-package. + * Uploaded 1.0~a1-1. diff --git a/docs/ChangeLog.old b/docs/ChangeLog.old new file mode 100644 index 0000000..03dba64 --- /dev/null +++ b/docs/ChangeLog.old @@ -0,0 +1,474 @@ +2007-03-10 Daniel Baumann + + * Added knoppix and knoppix-dvd package lists. + +2007-03-09 Daniel Baumann + + * Getting free loopdevice from inside the chroot, not outside. + +2007-03-09 Daniel Baumann + + * Added kbd to all !minimal lists. + * Uploaded 0.99.25. + +2007-03-08 Otavio Salvador + + * helpers/lh_configapt: Fix aptitude configuration to really avoid + recommended packages to get installed. + * src/scripts/02defaults.sh: Export LIVE_ISOLINUX_SPLASH. + +2007-03-04 Daniel Baumann + + * Replaced removal of kernel on minimal flavours with excludes on the + mksquashfs call. + * Added LIVE_INCLUDE_CHROOT to the manual exported variables as reported + by Mathieu Geli . + * Exported CODENAME_* manually as reported by Cédric Lucantis + . + * Fixed typo s/aptiude/aptitude/ as reported by Kai Hendry + . + * Uploaded 0.99.24. + +2007-02-22 Daniel Baumann + + * Added xresprobe to all x11 lists. + +2007-02-22 Daniel Baumann + + * Applied patches from Otavio Salvador : + - add and cleanup variable exporting in defaults. + - add LIVE_BOOTSTRAP_CONFIG to lh_debootstrap. + * Uploaded 0.99.23. + +2007-02-21 Daniel Baumann + + * Added gnome-junior, kde-junior and xfce-junior lists. + * Uploaded 0.99.22. + +2007-02-19 Daniel Baumann + + * Fixed manifest. + +2007-02-15 Daniel Baumann + + * Applied patch from Sebastian Raveau to + add support for filesystem images encrypted with loop-aes. + +2007-02-13 Daniel Baumann + + * Broken out scripts into modularized lh_* subscripts. + +2007-02-12 Daniel Baumann + + * Added some code as suggested by Alex Owen to + check if the depends (syslinux, memtest etc.) are intentionally + installed in the chroot, and hence, don't remove them. + * Moved some depends into the chroot. + * Uploaded 0.99.21. + +2007-02-11 Daniel Baumann + + * Added mini flavour. + +2007-02-10 Daniel Baumann + + * Added legacy code for genisoimage. + * Uploaded 0.99.20. + +2007-02-09 Daniel Baumann + + * Added usb type. + +2007-02-08 Daniel Baumann + + * Added desktop task to the *-desktop flavours. + +2007-02-07 Daniel Baumann + + * Extended cron job a bit. + * Fixed manual pruning in minimal flavour as suggested by Bas Wijnen + + +2007-02-02 Daniel Baumann + + * Added "--without-daemons". + +2007-02-01 Daniel Baumann + + * Added "--tasks". + * Added desktop-base to all desktop package lists. + +2007-01-31 Daniel Baumann + + * Changed vars in autobuilding script to be able to source + make-live.conf. + * Uploaded 0.99.19. + +2007-01-30 Daniel Baumann + + * Added cron job for autobuilding images. + +2007-01-25 Daniel Baumann + + * Added additional pruning to minimal flavour. + * Using interactive frontend while processing --hook. + * Uploaded 0.99.18. + +2007-01-24 Daniel Baumann + + * Applied patches from Otavio Salvador : + - adding "--keyring" flag. + - adding LIVE_DISK_VOLUME. + - adding start-stop-daemon wrapper to avoid daemons to be started. + - adding workaround to prevent binfmt locking /proc. + - adding LIVE_ISOLINUX_SPLASH. + * Uploaded 0.99.17. + +2007-01-19 Daniel Baumann + + * Replacing mkisofs with genisoimage. + +2007-01-18 Daniel Baumann + + * Cleanups. + * Uploaded 0.99.16. + +2007-01-16 Daniel Baumann + + * Switched default distribution back to unstable, as unstable is usable + again from the kernel point of view. + * Added file to the minimal package list. + * Uploaded 0.99.15. + +2007-01-04 Daniel Baumann + + * Added workaround for new xorg packages by including + xserver-xorg-input-all and xserver-xorg-video-all in all X11 package + lists. See #405639 for more information. + * Added xdebconfigurator to all X11 package lists. + * Adding workaround for initrd backup files. + +2006-11-06 Daniel Baumann + + * Uploaded 0.99.14. + +2006-11-05 Daniel Baumann + + * Applied patch from Markus Bauer : + - fixing script sourcing to exclude files in .svn + +2006-11-03 Daniel Baumann + + * Fixed typo in the policy-rc.d hack. + +2006-11-02 Daniel Baumann + + * Using aptitude instead of apt-get. + * Added '--with-recommends' and '--without-recommends'. + +2006-11-01 Daniel Baumann + + * Fixed regression when using -d ${CODENAME} wrt/ kernel packages. + +2006-10-30 Daniel Baumann + + * Uploaded 0.99.13. + +2006-10-29 Daniel Baumann + + * Added minimal-net flavour. + +2006-10-28 Daniel Baumann + + * Added console-common to standard selection. + +2006-10-27 Daniel Baumann + + * Added patch from Otavio Salvador : + - fixing preseeding error-handling. + +2006-10-26 Daniel Baumann + + * Added gnustep package selection based on the suggestion of + Guerkan Senguen . + +2006-10-25 Daniel Baumann + + * Applied patch from Marcelo D. Re : + - skip deb-src source-list entries when building images with + --without-source. + * Applied patches from Otavio Salvador : + - adding '--bootstrap-config' to support cdebootstraps + '--suite-config'. + - allowing override of ${BASE}. + - adjust sourcing of scripts, so that only the real scripts are + sourced and not other (backup) files. + - allowing override of kernel-packages. + * Reverted mangling of LIVE_DISTRIBUTION for sources.list generation. + +2006-10-23 Daniel Baumann + + * Uploaded 0.99.12. + +2006-10-18 Daniel Baumann + + * Autodetecting proxy now. + +2006-10-16 Daniel Baumann + + * Readded and slightly changed --clone and --preseed. + * Uploaded 0.99.11. + +2006-10-09 Daniel Baumann + + * Cleanups. + * Uploaded 0.99.10. + +2006-10-02 Daniel Baumann + + * Uploaded 0.99.9. + +2006-10-01 Daniel Baumann + + * Added multiple repositories. + * Using LIVE_PROXY_* also for bootstraping. + +2006-09-27 Daniel Baumann + + * Changing manpage section. + +2006-09-26 Daniel Baumann + + * Added default flavour hooks. + * minimal flavour does not install debian-archive-keyring to save space. + * Adjusted network patch. + +2006-09-25 Daniel Baumann + + * Removed now unused initramfs-tools hack. + * Simplified xorg check based on distribution rather than version. + * Added fix from Bas Wijnen for space handling in + arguments. + * Fixed package list handling similar to the fix suggested by Alex Owen + . + * Uploaded 0.99.8. + +2006-09-24 Marco Amadori + + * 13hack.sh: initramfs-tools hack, check added for xorg. + +2006-09-18 Daniel Baumann + + * Uploaded 0.99.7. + +2006-09-15 Daniel Baumann + + * Added eject to minimal package selection. + +2006-09-14 Daniel Baumann + + * Adjustements for linux 2.6.17 testing propagation. + +2006-09-11 Daniel Baumann + + * Uploaded 0.99.6. + +2006-09-08 Marco Amadori + + * 23net.sh: Fixed binary missing directory creation. + * templates/iso: Moved common files to templates/common. + +2006-09-07 Daniel Baumann + + * Minor cleanups. + * Fixed dist target. + +2006-09-06 Marco Amadori + + * 14chroot.sh, main.sh: Added manifest support. + * 23net.sh: Added 2 variables for basenames to ease readability. + * main.sh, 02default.sh: Modified Usage() uses. + +2006-09-04 Daniel Baumann + + * Uploaded 0.99.5. + +2006-09-03 Daniel Baumann + + * Added dist parameter to easily pull images for live.debian.net. + * Added "--output" to specify the image name prefix. + * Exclude iso templates for minimal flavour. + +2006-09-02 Daniel Baumann + + * Added experimental as distribution. + * Added source image generation. + * Using dpkg instead of dpkg-architecture, removed dpkg-dev dependency. + +2006-08-31 Daniel Baumann + + * Added "--disable-generic-indices" and "--enable-generic-indices". + * Fixed i18n lists. + * Rewritten all lists, comments are now possible. + * Lists must be now explicitly given with --package-list, no longer as + last argument of the make-live call. + * Setting default sources.list while the image generation, restoring + customized ones afterwards. + +2006-08-30 Daniel Baumann + + * Cleanups: + - moved 14patch_packages.sh to 13hack.sh. + - simplified 13hack.sh. + +2006-08-29 Marco Amadori + + * pxelinux.cfg: Updated to right defaults, first cifs then nfs or + select your favorite way. Rationale: /dev/nfs is for kernel + discovering, not for initramfs discover, casper will be just fine + with "netboot". + * 13chroot.sh, 14patch_packages.sh: Added a simple system for patching + packages, mainly for xserver-xorg so far. + +2006-08-28 Daniel Baumann + + * Updated documentation. + * Added patch from Alex Owen to update + pxelinux.cfg for NFS root in casper. + * Uploaded 0.99.4. + +2006-08-27 Daniel Baumann + + * Cleanups. + +2006-08-27 Marco Amadori + + * Added sysv init blocking policy. + +2006-08-22 Daniel Baumann + + * Reorganised sources. + * Added staging support. + * Cleaned up parameter names. + * testing is now supported. + +2006-08-21 Daniel Baumann + + * Uploaded 0.99.3. + +2006-08-02 Marco Amadori + + * Rewrote netboot support. + * Added support for pure directory rootfs images. + +2006-07-31 Daniel Baumann + + * Uploaded 0.99.2. + +2006-07-28 Daniel Baumann + + * Added DEBIAN_FRONTEND to chroots(), now completely non-interactive. + * Fixed wrong chroot patch. + +2006-07-27 Marco Amadori + + * Changed amd64 kernel naming scheme. + +2006-07-24 Daniel Baumann + + * Uploaded 0.99.1. + +2006-07-19 Daniel Baumann + + * Bugfixes. + +2006-07-18 Daniel Baumann + + * Added iso templates. + +2006-07-17 Daniel Baumann + + * Added chroot to 01-patch.sh. + * Added "--logfile". + * Uploaded 0.99. + +2006-07-01 Daniel Baumann + + * Added "--flavour". + +2006-06-28 Daniel Baumann + + * Added "--debug" and "--verbose". + +2006-06-23 Daniel Baumann + + * Rewritten manpages. + +2006-06-19 Marco Amadori + + * Added "--templates" options. + * Fixed some typos. + +2006-06-15 Daniel Baumann + + * General fixes. + +2006-06-18 Marco Amadori + + * Added "-a|--architecture" and "-p|--package-list" options. + * Reworked how lists works. + +2006-06-15 Daniel Baumann + + * General cleanup. + +2006-06-14 Marco Amadori + + * Re-added "-f|--filesystem". + +2006-06-12 Marco Amadori + + * Added "--conffile", "--preseed", "--clone", and "--rootfs" options. + +2006-06-12 Daniel Baumann + + * Added new splash.rle. + * Added memtest86+. + * Added "--distribution", and "--section" options. + * Moved /etc/default/make-live to /etc/make-live.conf. + +2006-06-11 Marco Amadori + + * Added handling of md5sums. + +2006-06-09 Marco Amadori + + * Added splashy support. + * Added ext2 rootfs support. + * Added external hook and path support. + * Swiched to getopt. + +2006-06-02 Daniel Baumann + + * Added patch from Jason D. Clinton : + - Added netboot flavour. + - Thanks to SafeDesk Solutions . + +2006-06-01 Daniel Baumann + + * Moved syslinux inside the chroot. + +2006-05-31 Daniel Baumann + + * Added kde-*i18n and standard-i18n lists. + +2006-05-28 Daniel Baumann + + * Added patch from Frederic Lehobey : + - Added locales to LIVE_PACKAGES. + - Added LIVE_MIRROR_KEY, LIVE_REPOSITORY, LIVE_REPOSITORY_KEY, and + LIVE_BOOTAPPEND. + +2006-05-27 Daniel Baumann + + * Initial release. diff --git a/docs/DOWNLOAD b/docs/DOWNLOAD new file mode 100644 index 0000000..60b6753 --- /dev/null +++ b/docs/DOWNLOAD @@ -0,0 +1,43 @@ +Download of prebuilt images +=========================== + +Although Debian Live is about creating your own customized Live system, we offer +some prebuilt images as well. Currently, builds for the three desktop +environments GNOME[0], KDE[1] and Xfce[2] as well as the standard system are +available. Builds based on testing are created every week and the ones based on +unstable are build daily. For stable, we build update them when needed. + +Currently, the following flavours are autobuilt here (.iso for CD/DVD images, +.img for USB stick images): + + * debian-live-${DIST}-${ARCH}-standard + + only packages of priority standard or higher and a few live specific + packages (eject, file and sudo). + + * debian-live-${DIST}-${ARCH}-gnome-desktop + + the standard system, laptop related packages (laptop task) and the GNOME[1] + desktop environment (desktop and gnome-desktop tasks). + + * debian-live-${DIST}-${ARCH}-kde-desktop + + the standard system, laptop related packages (laptop task) and the KDE[2] + desktop environment (desktop and kde-desktop tasks). + + * debian-live-${DIST}-${ARCH}-xfce-desktop + + the standard system, laptop related packages (laptop task) and the Xfce[3] + desktop environment (desktop and xfce-desktop tasks). + +Note: Currently, we build images for lenny (aka "testing") and sid (aka +"unstable"). Due to the nature of unreleased Debian versions, it is possible +that no or not all images could be built because of uninstallable packages. +Please be patient then and wait for the next builds, use the previous, or do it +on your own by using live-helper. If you want something which works for sure, +use the etch (aka "stable") builds. + + [0] http://packages.debian.org/live-helper + [1] http://www.gnome.org/ + [2] http://www.kde.org/ + [3] http://www.xfce.org/ diff --git a/docs/FAQ b/docs/FAQ new file mode 100644 index 0000000..ceb87d6 --- /dev/null +++ b/docs/FAQ @@ -0,0 +1,70 @@ +Frequently Asked Questions (FAQ) +================================ + +Build Time +---------- + +Q: Is live-helper/make-live Debian specific? +A: live-helper supports Debian and Ubuntu right now. Adding automatic defaults + for other Debian derivatives is easy - let us know about them and we may + include it. + + +Q: How can I build images with an unprevileged user account? +A: You can use --root-command sudo or set LH_ROOT_COMMAND="sudo" in + config/common. + + *BIG* *FAT* *WARNING*: Building an image as non-root can make your image + different compared to a regular Debian system (different owners of files). It + is *NOT* recommended to build images as non-root. Do *NOT* use this feature + yet. + + +Q: How do I drop in to a shell during make-live chroot process? +A: Use "--interactive shell", then exit with 'logout' when you have made the + setting changes you want and the build process will continue. + + +Q: Where to set the username or the hostname? +A: casper uses default username 'casper' and hostname 'live'. You can specify + them by passing 'username=' and 'hostname=' as kernel parameters. + + live-helper automatically sets the username to 'user' and the hostname to + 'debian'. If you want to change this at build time, pass --username and + --hostname to make-live, or alter LIVE_USERNAME and LIVE_HOSTNAME in + config/image. + + +Q: How can I make my own grub bootsplash? +A: To add a grub splash screen, you can use --grub-splash FILE, or copy your + custom splash to config/binary_grub/splash.xpm.gz. + + Documentation about creating a bootsplash for grub can be found at: + + + +Q: How can I make my own syslinux bootsplash? +A: To add a syslinux splash screen, you can use --syslinux-splash FILE, or copy + your custom splash to config/binary_syslinux/splash.rle. + + Documentation about creating a bootsplash for grub can be found at: + + contrib/syslinux-splash/COPYING in the live-helper sources. + + Basically, you need to install netpbm and syslinux, and run this: + anytopnm < $your_splash > $your_splash.pnm + pnmcolormap 15 < $your_splash.pnm > $your_splash.map + pnmremap -map=$your_splash.map $your_splash.pnm | \ + ppmtolss16 '#ffffff=7' > splash.rle + + +Run Time +-------- + +Q: What is the root password? +A: There is none set. You can switch to root with 'sudo -i' or set a password + with 'sudo passwd'. + + +Q: What is the user password? +A: The password for the default user is 'live'. diff --git a/docs/NEWS b/docs/NEWS new file mode 100644 index 0000000..7a7be26 --- /dev/null +++ b/docs/NEWS @@ -0,0 +1,40 @@ +News: + + * 2006-02-14: Project announcement. + http://blog.daniel-baumann.ch/2006/02/14#20060214_debian-live-initiative + + * 2006-02-28: Setup project resources. + http://blog.daniel-baumann.ch/2006/02/28#20060228_debian-live-resources + + * 2006-03-16: Added support for ISO image generation. + http://lists.alioth.debian.org/pipermail/debian-live-devel/2006-March/000048.html + + * 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 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. + http://lists.alioth.debian.org/pipermail/debian-live-devel/2007-February/000764.html + + * 2007-02-10: Added support for USB image generation. + http://lists.alioth.debian.org/pipermail/debian-live-devel/2007-February/000790.html + + * 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 first live-helper to Debian unstable. + http://packages.debian.org/changelogs/pool/main/l/live-helper/current/changelog#versionversion1.0_a1-1 + + * 2007-03-14: live-package is dead, long lives live-helper + http://lists.alioth.debian.org/pipermail/debian-live-devel/2007-March/000998.html + + * 2007-04-19: Google Summer of Code 2007 + http://lists.alioth.debian.org/pipermail/debian-live-devel/2007-April/001221.html + + * 2007-04-26: New website design + http://www.chris-lamb.co.uk/blog/2007/04/26/pimp-your-webpage/ + + * 2007-04-30: Uploaded first live-initramfs to Debian unstable. + http://packages.debian.org/changelogs/pool/main/l/live-initramfs/current/changelog#versionversion1.87.1-1 diff --git a/docs/README b/docs/README new file mode 100644 index 0000000..f5dc649 --- /dev/null +++ b/docs/README @@ -0,0 +1,93 @@ + * lh_config + + * lh_bootstrap + |_ lh_cdebootstrap + |_ lh_debootstrap + + * lh_chroot + |_ lh_chroot_proc install + |_ lh_chroot_sysfs install + |_ lh_chroot_debianchroot install + |_ lh_chroot_sysvrc install + |_ lh_chroot_hosts install + |_ lh_chroot_resolv install + |_ lh_chroot_apt install + |_ lh_chroot_sources install + |_ lh_chroot_linux-image install + | + |_ lh_chroot_tasks + |_ lh_chroot_packageslists + |_ lh_chroot_packages + |_ lh_chroot_localpackages + |_ lh_chroot_localpackageslists + |_ lh_chroot_localization + |_ lh_chroot_hacks + |_ lh_chroot_local-includes + |_ lh_chroot_sysvinit + |_ lh_chroot_hooks + |_ lh_chroot_localhooks + |_ lh_chroot_symlinks + |_ lh_chroot_interactive + | + |_ lh_chroot_linux-image remove + |_ lh_chroot_sources remove + |_ lh_chroot_apt remove + |_ lh_chroot_resolv remove + |_ lh_chroot_hosts remove + |_ lh_chroot_sysvrc remove + |_ lh_chroot_debianchroot remove + |_ lh_chroot_sysfs remove + |_ lh_chroot_proc remove + + * lh_binary + |_ lh_binary_chroot + | + |_ lh_chroot_proc install + |_ lh_chorot_sysfs install + |_ lh_chroot_hosts install + |_ lh_chroot_resolv install + |_ lh_chroot_sources install + | + |_ lh_binary_rootfs + |_ lh_binary_manifest + |_ lh_binary_encryption + | + |_ lh_binary_linux-image + |_ lh_binary_memtest86 + |_ lh_binary_grub + |_ lh_binary_syslinux + |_ lh_binary_includes + |_ lh_binary_local-includes + |_ lh_binary_md5sum + | + |_ lh_binary_hdd + |_ lh_binary_iso + |_ lh_binary_net + |_ lh_binary_usb-hdd + | + |_ rm -f .stage/chroot_sources + |_ lh_chroot_resolv remove + |_ lh_chroot_hosts remove + |_ lh_chroot_sysfs remove + |_ lh_chroot_proc remove + + * lh_source + |_ lh_chroot_hosts install + |_ lh_chroot_resolv install + |_ lh_chroot_sources install + | + |_ lh_source_config + |_ lh_source_download + |_ lh_source_md5sum + | + |_ lh_source_generic + |_ lh_source_hdd + |_ lh_source_iso + |_ lh_source_net + |_ lh_source_usb-hdd + | + |_ rm -f .stage/chroot_sources + |_ lh_chroot_resolv remove + |_ lh_chroot_hosts remove + + * lh_clean diff --git a/docs/TODO b/docs/TODO new file mode 100644 index 0000000..780925f --- /dev/null +++ b/docs/TODO @@ -0,0 +1,51 @@ +TODO list for live-helper +------------------------- + +This file lists only outstanding tasks. Any additions/comments/questions and +help is welcome. Write to . + +1.0~a11-1: + * add compat code for old syslinux + * reordering content of configuration files + +ALPHA series: + +FIXME + * xfce flavours seem to be damaged again + * multi-kernel syslinux fuckup + * d-i/g-i pool generation on the media + * yaboot (powerpc) boot support + * grub (i386/amd64) boot support on usb* binary images + * grub (i386/amd64) boot support on net binary images + * multi-binary builds in one shot + * vmlinu[xz] + * breakpoints (yes/no/all/type) + * check unset variables + +ADDME + * vmware binary image flavour + * usb-zip binary image flavour + * support splitted/partial squashfs images + * a fetch everything, then build option + * introduce package groups + * multi-arch for amd64/i386/powerpc on one medium + * logfiles + * re-import lh_clone/lh_preseed + * Add win32 loader + +BETA series: + +FIXME + * check all Require_stagefile calls + * make helpers call required stages when needed + * integrate lh_chroot_hacks + * cleanup variable names + * write manpage and documentation/manual + +POST 1.0: + + * Add win32 autorun like + http://morphix.svn.sourceforge.net/viewvc/morphix/trunk/cdrom-misc/autorun/ + * Add loadlin or qemu batch + * Adding colinux? + * exec wrapper for output hiding/handling diff --git a/examples/beryl-hook.sh b/examples/beryl-hook.sh deleted file mode 100755 index a58056d..0000000 --- a/examples/beryl-hook.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/sh - -# This is a hook for live-helper(7) to install beryl and enable aixgl. -# It was originally written by Inigo Tejedor Arrondo . -# -# To enable it, copy this hook into your config/chroot_localhooks directory. -# At boot prompt, type 'live aixgl', press enter and have fun. - -# 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-settings beryl-settings-bindings beryl-settings-simple" -#beryl-plugins-unsupported - -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/examples/beryl.sources.list b/examples/beryl.sources.list deleted file mode 100644 index 8295230..0000000 --- a/examples/beryl.sources.list +++ /dev/null @@ -1,14 +0,0 @@ -## This is a sources.list for live-helper(7) to use packages from the -## Beryl Etch repository. -## -## To enable it, copy this file to your config/chroot_sources directory, once -## as e.g. beryl.build and once as beryl.image. -## Additionally, you need to copy the beryl-hook.sh file to your -## config/chroot_localhooks directory. -## -## Remeber to also import http://debian.beryl-project.org/root@lupine.me.uk.gpg -## into your trusted keyring. - -# Beryl packages for Etch -deb http://debian.beryl-project.org/ etch main -deb-src http://debian.beryl-project.org/ etch main diff --git a/examples/bpo.sources.list b/examples/bpo.sources.list deleted file mode 100644 index 461c66f..0000000 --- a/examples/bpo.sources.list +++ /dev/null @@ -1,9 +0,0 @@ -## This is a sources.list for live-helper(7) to use packages from the -## Debian Etch backports repository. -## -## To enable it, copy this file to your config/chroot_sources directory, once -## as e.g. bpo.build and once as bpo.image. - -# Debian backports for Etch -deb http://www.backports.org/debian/ etch-backports main -deb-src http://www.backports.org/debian/ etch-backports main diff --git a/examples/cron/daily.sh b/examples/cron/daily.sh new file mode 100755 index 0000000..3d93a33 --- /dev/null +++ b/examples/cron/daily.sh @@ -0,0 +1,166 @@ +#!/bin/sh -x + +set -e + +BUILD="daily" + +# Begin custom defaults +AUTOBUILD="enabled" + +DATE="`date +%Y%m%d`" +DESTDIR="/srv/debian-unofficial/ftp/debian-live" +TEMPDIR="/srv/tmp/live-helper" + +OPTIONS="--binary-indices disabled" + +ARCHITECTURES="`dpkg --print-architecture`" +DISTRIBUTIONS="sid" +MIRROR_BOOTSTRAP="http://ftp.de.debian.org/debian/" +MIRROR_BOOTSTRAP_SECURITY="http://ftp.de.debian.org/debian-security/" +MIRROR_BINARY="http://ftp.debian.org/debian/" +MIRROR_BINARY_SECURITY="http://security.debian.org/" +PACKAGES_LISTS="standard gnome-desktop kde-desktop xfce-desktop" +# End custom defaults + +# Checking for live-helper availability +if [ ! -x /usr/bin/make-live ] +then + exit 0 +fi + +# Checking for live-helper defaults +#if [ -r /etc/default/live-helper ] +#then +# . /etc/default/live-helper +#else +# echo "E: /etc/default/live-helper missing." +# exit 1 +#fi + +# Checking for autobuild +if [ "${AUTOBUILD}" != "enabled" ] +then + exit 0 +fi + +# Checking for build directory +if [ ! -d "${TEMPDIR}" ] +then + mkdir -p "${TEMPDIR}"/debian-live +else + # FIXME: maybe we should just remove the left overs. + echo "E: ${TEMPDIR} needs cleanup." + exit 1 +fi + +for ARCHITECTURE in ${ARCHITECTURES} +do + for DISTRIBUTION in ${DISTRIBUTIONS} + do + for PACKAGES_LIST in ${PACKAGES_LISTS} + do + if [ ! -f "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-log.txt ] + then + # Creating build directory + mkdir -p "${TEMPDIR}"/debian-live + + cd "${TEMPDIR}" + echo "Begin: `date -R`" > "${TEMPDIR}"/debian-live/log.txt + + # Generating images + make-live -b iso -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source enabled ${OPTIONS} >> "${TEMPDIR}"/debian-live/log.txt 2>&1 + + echo "End: `date -R`" >> "${TEMPDIR}"/debian-live/log.txt + fi + + if [ -f "${TEMPDIR}"/debian-live/binary.iso ] && [ -f "${TEMPDIR}"/debian-live/source.tar ] + then + # Creating log directory + mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log + + # Moving logs + mv "${TEMPDIR}"/debian-live/log.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-log.txt + mv "${TEMPDIR}"/debian-live/packages.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-packages.txt + + # Creating images directory + mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE} + mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/source + + # Moving images + mv "${TEMPDIR}"/debian-live/binary.iso "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}.iso + mv "${TEMPDIR}"/debian-live/source.tar "${DESTDIR}"/"${BUILD}"-builds/${DATE}/source/debian-live-${DISTRIBUTION}-source-${PACKAGES_LIST}.tar + fi + + if [ ! -f "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-usb-hdd-log.txt ] + then + # Workaround of missing multi-binary support in live-helper + mv "${TEMPDIR}"/debian-live/binary/casper "${TEMPDIR}"/debian-live/casper.tmp + rm -rf "${TEMPDIR}"/debian-live/binary* "${TEMPDIR}"/debian-live/.stage/binary_* + mkdir "${TEMPDIR}"/debian-live/binary + mv "${TEMPDIR}"/debian-live/casper.tmp "${TEMPDIR}"/debian-live/binary/casper + touch "${TEMPDIR}"/debian-live/.stage/binary_chroot + touch "${TEMPDIR}"/debian-live/.stage/binary_rootfs + + # Creating build directory + mkdir -p "${TEMPDIR}"/debian-live + + cd "${TEMPDIR}" + echo "Begin: `date -R`" > "${TEMPDIR}"/debian-live/log.txt + + # Generating images + make-live -b usb-hdd -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source disabled ${OPTIONS} >> "${TEMPDIR}"/debian-live/log.txt 2>&1 + + echo "End: `date -R`" >> "${TEMPDIR}"/debian-live/log.txt + fi + + if [ -f "${TEMPDIR}"/debian-live/binary.img ] + then + # Creating log directory + mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log + + # Moving logs + mv "${TEMPDIR}"/debian-live/log.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-usb-hdd-log.txt + cp "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-packages.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-usb-hdd-packages.txt + + # Creating image directory + mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE} + + # Moving images + mv "${TEMPDIR}"/debian-live/binary.img "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}.img + fi + + # Cleanup + cd "${TEMPDIR}"/debian-live + lh_clean + done + + # Cleanup + cd "${TEMPDIR}"/debian-live + lh_clean purge + done +done + +# Cleaning up +if [ -f "${TEMPDIR}"/debian-live/chroot/proc/version ] +then + umount "${TEMPDIR}"/debian-live/chroot/proc +fi + +if [ -d "${TEMPDIR}"/debian-live/chroot/sys/kernel ] +then + umount "${TEMPDIR}"/debian-live/chroot/sys +fi + +# Removing build directory +rm -rf "${TEMPDIR}" + +# Creating md5sums +for DIRECTORY in "${DESTDIR}"/"${BUILD}"-builds/${DATE}/* +do + cd "${DIRECTORY}" + md5sum * > MD5SUMS +done + +# Creating current symlink +rm -f "${DESTDIR}"/"${BUILD}"-builds/current +ln -s ${DATE} "${DESTDIR}"/"${BUILD}"-builds/current diff --git a/examples/cron/etch+beryl.sh b/examples/cron/etch+beryl.sh new file mode 100755 index 0000000..a3d3def --- /dev/null +++ b/examples/cron/etch+beryl.sh @@ -0,0 +1,175 @@ +#!/bin/sh -x + +set -e + +BUILD="etch+beryl" + +# Begin custom defaults +AUTOBUILD="enabled" + +DATE="r0_1.0~a10-1" +DESTDIR="/srv/debian-unofficial/ftp/debian-live" +TEMPDIR="/srv/tmp/live-helper" + +OPTIONS="--binary-indices disabled" + +ARCHITECTURES="`dpkg --print-architecture`" +DISTRIBUTIONS="etch" +MIRROR_BOOTSTRAP="http://ftp.de.debian.org/debian/" +MIRROR_BOOTSTRAP_SECURITY="http://ftp.de.debian.org/debian-security/" +MIRROR_BINARY="http://ftp.debian.org/debian/" +MIRROR_BINARY_SECURITY="http://security.debian.org/" +PACKAGES_LISTS="standard gnome-desktop kde-desktop xfce-desktop" +# End custom defaults + +# Checking for live-helper availability +if [ ! -x /usr/bin/make-live ] +then + exit 0 +fi + +# Checking for live-helper defaults +#if [ -r /etc/default/live-helper ] +#then +# . /etc/default/live-helper +#else +# echo "E: /etc/default/live-helper missing." +# exit 1 +#fi + +# Checking for autobuild +if [ "${AUTOBUILD}" != "enabled" ] +then + exit 0 +fi + +# Checking for build directory +if [ ! -d "${TEMPDIR}" ] +then + mkdir -p "${TEMPDIR}"/debian-live +else + # FIXME: maybe we should just remove the left overs. + echo "E: ${TEMPDIR} needs cleanup." + exit 1 +fi + +for ARCHITECTURE in ${ARCHITECTURES} +do + for DISTRIBUTION in ${DISTRIBUTIONS} + do + for PACKAGES_LIST in ${PACKAGES_LISTS} + do + if [ ! -f "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-log.txt ] + then + # Creating build directory + mkdir -p "${TEMPDIR}"/debian-live + + cd "${TEMPDIR}" + echo "Begin: `date -R`" > "${TEMPDIR}"/debian-live/log.txt + + # Beryl hook + mkdir -p debian-live/config/chroot_local-hooks + cp /usr/share/live-helper/examples/hooks/beryl.sh debian-live/config/chroot_local-hooks/beryl.sh + mkdir -p debian-live/config/chroot_sources + wget http://debian.beryl-project.org/root@lupine.me.uk.gpg -O debian-live/config/chroot_sources/beryl.build.gpg + wget http://debian.beryl-project.org/root@lupine.me.uk.gpg -O debian-live/config/chroot_sources/beryl.image.gpg + cp /usr/share/live-helper/examples/sources.list/beryl debian-live/config/chroot_sources/beryl.build + cp /usr/share/live-helper/examples/sources.list/beryl debian-live/config/chroot_sources/beryl.image + + # Generating images + make-live -b iso -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source enabled ${OPTIONS} >> "${TEMPDIR}"/debian-live/log.txt 2>&1 + + echo "End: `date -R`" >> "${TEMPDIR}"/debian-live/log.txt + fi + + if [ -f "${TEMPDIR}"/debian-live/binary.iso ] && [ -f "${TEMPDIR}"/debian-live/source.tar ] + then + # Creating log directory + mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log + + # Moving logs + mv "${TEMPDIR}"/debian-live/log.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-log.txt + mv "${TEMPDIR}"/debian-live/packages.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-packages.txt + + # Creating images directory + mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE} + mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/source + + # Moving images + mv "${TEMPDIR}"/debian-live/binary.iso "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}.iso + mv "${TEMPDIR}"/debian-live/source.tar "${DESTDIR}"/"${BUILD}"-builds/${DATE}/source/debian-live-etch+beryl-source-${PACKAGES_LIST}.tar + fi + + if [ ! -f "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-usb-hdd-log.txt ] + then + # Workaround of missing multi-binary support in live-helper + mv "${TEMPDIR}"/debian-live/binary/casper "${TEMPDIR}"/debian-live/casper.tmp + rm -rf "${TEMPDIR}"/debian-live/binary* "${TEMPDIR}"/debian-live/.stage/binary_* + mkdir "${TEMPDIR}"/debian-live/binary + mv "${TEMPDIR}"/debian-live/casper.tmp "${TEMPDIR}"/debian-live/binary/casper + touch "${TEMPDIR}"/debian-live/.stage/binary_chroot + touch "${TEMPDIR}"/debian-live/.stage/binary_rootfs + + # Creating build directory + mkdir -p "${TEMPDIR}"/debian-live + + cd "${TEMPDIR}" + echo "Begin: `date -R`" > "${TEMPDIR}"/debian-live/log.txt + + # Generating images + make-live -b usb-hdd -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source disabled ${OPTIONS} >> "${TEMPDIR}"/debian-live/log.txt 2>&1 + + echo "End: `date -R`" >> "${TEMPDIR}"/debian-live/log.txt + fi + + if [ -f "${TEMPDIR}"/debian-live/binary.img ] + then + # Creating log directory + mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log + + # Moving logs + mv "${TEMPDIR}"/debian-live/log.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-usb-hdd-log.txt + cp "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-packages.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-usb-hdd-packages.txt + + # Creating image directory + mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE} + + # Moving images + mv "${TEMPDIR}"/debian-live/binary.img "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}.img + fi + + # Cleanup + cd "${TEMPDIR}"/debian-live + lh_clean + done + + # Cleanup + cd "${TEMPDIR}"/debian-live + lh_clean purge + done +done + +# Cleaning up +if [ -f "${TEMPDIR}"/debian-live/chroot/proc/version ] +then + umount "${TEMPDIR}"/debian-live/chroot/proc +fi + +if [ -d "${TEMPDIR}"/debian-live/chroot/sys/kernel ] +then + umount "${TEMPDIR}"/debian-live/chroot/sys +fi + +# Removing build directory +rm -rf "${TEMPDIR}" + +# Creating md5sums +for DIRECTORY in "${DESTDIR}"/"${BUILD}"-builds/${DATE}/* +do + cd "${DIRECTORY}" + md5sum * > MD5SUMS +done + +# Creating current symlink +rm -f "${DESTDIR}"/"${BUILD}"-builds/current +ln -s ${DATE} "${DESTDIR}"/"${BUILD}"-builds/current diff --git a/examples/cron/etch.sh b/examples/cron/etch.sh new file mode 100755 index 0000000..a53452c --- /dev/null +++ b/examples/cron/etch.sh @@ -0,0 +1,166 @@ +#!/bin/sh -x + +set -e + +BUILD="etch" + +# Begin custom defaults +AUTOBUILD="enabled" + +DATE="r0_1.0~a10-1" +DESTDIR="/srv/debian-unofficial/ftp/debian-live" +TEMPDIR="/srv/tmp/live-helper" + +OPTIONS="--binary-indices disabled" + +ARCHITECTURES="`dpkg --print-architecture`" +DISTRIBUTIONS="etch" +MIRROR_BOOTSTRAP="http://ftp.de.debian.org/debian/" +MIRROR_BOOTSTRAP_SECURITY="http://ftp.de.debian.org/debian-security/" +MIRROR_BINARY="http://ftp.debian.org/debian/" +MIRROR_BINARY_SECURITY="http://security.debian.org/" +PACKAGES_LISTS="standard gnome-desktop kde-desktop xfce-desktop" +# End custom defaults + +# Checking for live-helper availability +if [ ! -x /usr/bin/make-live ] +then + exit 0 +fi + +# Checking for live-helper defaults +#if [ -r /etc/default/live-helper ] +#then +# . /etc/default/live-helper +#else +# echo "E: /etc/default/live-helper missing." +# exit 1 +#fi + +# Checking for autobuild +if [ "${AUTOBUILD}" != "enabled" ] +then + exit 0 +fi + +# Checking for build directory +if [ ! -d "${TEMPDIR}" ] +then + mkdir -p "${TEMPDIR}"/debian-live +else + # FIXME: maybe we should just remove the left overs. + echo "E: ${TEMPDIR} needs cleanup." + exit 1 +fi + +for ARCHITECTURE in ${ARCHITECTURES} +do + for DISTRIBUTION in ${DISTRIBUTIONS} + do + for PACKAGES_LIST in ${PACKAGES_LISTS} + do + if [ ! -f "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-log.txt ] + then + # Creating build directory + mkdir -p "${TEMPDIR}"/debian-live + + cd "${TEMPDIR}" + echo "Begin: `date -R`" > "${TEMPDIR}"/debian-live/log.txt + + # Generating images + make-live -b iso -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source enabled ${OPTIONS} >> "${TEMPDIR}"/debian-live/log.txt 2>&1 + + echo "End: `date -R`" >> "${TEMPDIR}"/debian-live/log.txt + fi + + if [ -f "${TEMPDIR}"/debian-live/binary.iso ] && [ -f "${TEMPDIR}"/debian-live/source.tar ] + then + # Creating log directory + mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log + + # Moving logs + mv "${TEMPDIR}"/debian-live/log.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-log.txt + mv "${TEMPDIR}"/debian-live/packages.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-packages.txt + + # Creating images directory + mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE} + mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/source + + # Moving images + mv "${TEMPDIR}"/debian-live/binary.iso "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}.iso + mv "${TEMPDIR}"/debian-live/source.tar "${DESTDIR}"/"${BUILD}"-builds/${DATE}/source/debian-live-${DISTRIBUTION}-source-${PACKAGES_LIST}.tar + fi + + if [ ! -f "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-usb-hdd-log.txt ] + then + # Workaround of missing multi-binary support in live-helper + mv "${TEMPDIR}"/debian-live/binary/casper "${TEMPDIR}"/debian-live/casper.tmp + rm -rf "${TEMPDIR}"/debian-live/binary* "${TEMPDIR}"/debian-live/.stage/binary_* + mkdir "${TEMPDIR}"/debian-live/binary + mv "${TEMPDIR}"/debian-live/casper.tmp "${TEMPDIR}"/debian-live/binary/casper + touch "${TEMPDIR}"/debian-live/.stage/binary_chroot + touch "${TEMPDIR}"/debian-live/.stage/binary_rootfs + + # Creating build directory + mkdir -p "${TEMPDIR}"/debian-live + + cd "${TEMPDIR}" + echo "Begin: `date -R`" > "${TEMPDIR}"/debian-live/log.txt + + # Generating images + make-live -b usb-hdd -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source disabled ${OPTIONS} >> "${TEMPDIR}"/debian-live/log.txt 2>&1 + + echo "End: `date -R`" >> "${TEMPDIR}"/debian-live/log.txt + fi + + if [ -f "${TEMPDIR}"/debian-live/binary.img ] + then + # Creating log directory + mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log + + # Moving logs + mv "${TEMPDIR}"/debian-live/log.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-usb-hdd-log.txt + cp "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-packages.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-usb-hdd-packages.txt + + # Creating image directory + mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE} + + # Moving images + mv "${TEMPDIR}"/debian-live/binary.img "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}.img + fi + + # Cleanup + cd "${TEMPDIR}"/debian-live + lh_clean + done + + # Cleanup + cd "${TEMPDIR}"/debian-live + lh_clean purge + done +done + +# Cleaning up +if [ -f "${TEMPDIR}"/debian-live/chroot/proc/version ] +then + umount "${TEMPDIR}"/debian-live/chroot/proc +fi + +if [ -d "${TEMPDIR}"/debian-live/chroot/sys/kernel ] +then + umount "${TEMPDIR}"/debian-live/chroot/sys +fi + +# Removing build directory +rm -rf "${TEMPDIR}" + +# Creating md5sums +for DIRECTORY in "${DESTDIR}"/"${BUILD}"-builds/${DATE}/* +do + cd "${DIRECTORY}" + md5sum * > MD5SUMS +done + +# Creating current symlink +rm -f "${DESTDIR}"/"${BUILD}"-builds/current +ln -s ${DATE} "${DESTDIR}"/"${BUILD}"-builds/current diff --git a/examples/cron/snapshots.sh b/examples/cron/snapshots.sh new file mode 100755 index 0000000..199dc29 --- /dev/null +++ b/examples/cron/snapshots.sh @@ -0,0 +1,130 @@ +#!/bin/sh + +# Needs: build-essential fakeroot lsb-release svn [...] + +# Static variables +PACKAGES="live-helper live-initramfs live-webbuilder" + +DEBEMAIL="debian-live-devel@lists.alioth.debian.org" +EMAIL="debian-live-devel@lists.alioth.debian.org" +DEBFULLNAME="Debian Live Autobuilder" +NAME="Debian Live Autobuilder" + +export DEBEMAIL EMAIL DEBFULLNAME NAME + +TEMPDIR="/srv/tmp/svn-snapshots" +SERVER="/srv/debian-unofficial/ftp/debian-live/debian-snapshots" + +DATE_START="`date -R`" + +# Checking lock file +if [ -f "${SERVER}"/Archive-Update-in-Progress ] +then + echo "E: locked." + exit 1 +fi + +# Creating server directory +if [ ! -d "${SERVER}" ] +then + mkdir -p "${SERVER}" +fi + +# Creating lock trap +trap "test -f ${SERVER}/Archive-Update-in-Progress && rm -f ${SERVER}/Archive-Update-in-Progress; exit 0" 0 1 2 3 9 15 + +# Creating lock file +echo "${DATE_START}" > "${SERVER}"/Archive-Update-in-Progress + +# Processing packages +for PACKAGE in ${PACKAGES} +do + # Cleaning build directory + if [ -d "${TEMPDIR}" ] + then + rm -rf "${TEMPDIR}" + fi + + # Creating build directory + mkdir -p "${TEMPDIR}" + + # Getting sources + cd "${TEMPDIR}" + svn co svn://svn.debian.org/debian-live/dists/trunk/${PACKAGE} ${PACKAGE} + + # Getting version + cd "${TEMPDIR}"/${PACKAGE} + VERSION="`dpkg-parsechangelog | awk '/Version:/ { print $2 }' | awk -F- '{ print $1 }'`" + + # Getting revision + cd "${TEMPDIR}"/${PACKAGE} + REVISION="`svn info | awk '/Last Changed Rev:/ { print $4 }'`" + + # Check for existing package + if [ ! -f "${SERVER}"/${PACKAGE}_${VERSION}~${REVISION}.dsc ] || [ "${1}" = "--force" ] + then + UPDATE_INDICES="true" + + # Renaming directory + mv "${TEMPDIR}"/${PACKAGE} "${TEMPDIR}"/${PACKAGE}-${VERSION}~${REVISION} + + # Building package + cd "${TEMPDIR}"/${PACKAGE}-${VERSION}~${REVISION} + find . -type d -name .svn | xargs rm -rf + dch --force-bad-version --newversion ${VERSION}~${REVISION} --distribution UNRELEASED Autobuild snapshot of SVN r${REVISION}. + dpkg-buildpackage -rfakeroot -sa -uc -us + + # Removing sources + rm -rf "${TEMPDIR}"/${PACKAGE}-${VERSION}~${REVISION} + + # Creating directory + if [ ! -d "${SERVER}" ] + then + mkdir -p "${SERVER}" + fi + + # Removing old packages + if ls "${SERVER}"/"${PACKAGE}"* &> /dev/null + then + rm -f "${SERVER}"/"${PACKAGE}"* + fi + + # Moving packages + mv "${TEMPDIR}"/${PACKAGE}* "${SERVER}" + else + # Remove sources + rm -rf "${TEMPDIR}"/${PACKAGE} + fi +done + +if [ "${UPDATE_INDICES}" = "true" ] +then + LAST_UPDATE="`date -R`" + + cd "${SERVER}" + + # Updating binary indices + apt-ftparchive packages ./ > Packages + gzip -9 -c Packages > Packages.gz + + # Updating source indices + apt-ftparchive sources ./ > Sources + gzip -9 -c Sources > Sources.gz +fi + +# Reading timestamp +if [ -z "${LAST_UPDATE}" ] +then + LAST_UPDATE="`awk -F: '/Last update:/ { print $2":"$3":"$4 }' ${SERVER}/LAST_BUILD | sed -e 's/ //'`" +fi + +# Writing timestamp +cat > "${SERVER}"/LAST_BUILD << EOF +Last run begin: ${DATE_START} +Last run end: `date -R` + +Last update: ${LAST_UPDATE} +EOF + +# Removing build directory +rm -rf "${TEMPDIR}" diff --git a/examples/cron/weekly.sh b/examples/cron/weekly.sh new file mode 100755 index 0000000..98bd7ff --- /dev/null +++ b/examples/cron/weekly.sh @@ -0,0 +1,166 @@ +#!/bin/sh -x + +set -e + +BUILD="weekly" + +# Begin custom defaults +AUTOBUILD="enabled" + +DATE="`date +%Y%m%d`" +DESTDIR="/srv/debian-unofficial/ftp/debian-live" +TEMPDIR="/srv/tmp/live-helper" + +OPTIONS="--binary-indices disabled" + +ARCHITECTURES="`dpkg --print-architecture`" +DISTRIBUTIONS="lenny" +MIRROR_BOOTSTRAP="http://ftp.de.debian.org/debian/" +MIRROR_BOOTSTRAP_SECURITY="http://ftp.de.debian.org/debian-security/" +MIRROR_BINARY="http://ftp.debian.org/debian/" +MIRROR_BINARY_SECURITY="http://security.debian.org/" +PACKAGES_LISTS="standard gnome-desktop kde-desktop xfce-desktop" +# End custom defaults + +# Checking for live-helper availability +if [ ! -x /usr/bin/make-live ] +then + exit 0 +fi + +# Checking for live-helper defaults +#if [ -r /etc/default/live-helper ] +#then +# . /etc/default/live-helper +#else +# echo "E: /etc/default/live-helper missing." +# exit 1 +#fi + +# Checking for autobuild +if [ "${AUTOBUILD}" != "enabled" ] +then + exit 0 +fi + +# Checking for build directory +if [ ! -d "${TEMPDIR}" ] +then + mkdir -p "${TEMPDIR}"/debian-live +else + # FIXME: maybe we should just remove the left overs. + echo "E: ${TEMPDIR} needs cleanup." + exit 1 +fi + +for ARCHITECTURE in ${ARCHITECTURES} +do + for DISTRIBUTION in ${DISTRIBUTIONS} + do + for PACKAGES_LIST in ${PACKAGES_LISTS} + do + if [ ! -f "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-log.txt ] + then + # Creating build directory + mkdir -p "${TEMPDIR}"/debian-live + + cd "${TEMPDIR}" + echo "Begin: `date -R`" > "${TEMPDIR}"/debian-live/log.txt + + # Generating images + make-live -b iso -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source enabled ${OPTIONS} >> "${TEMPDIR}"/debian-live/log.txt 2>&1 + + echo "End: `date -R`" >> "${TEMPDIR}"/debian-live/log.txt + fi + + if [ -f "${TEMPDIR}"/debian-live/binary.iso ] && [ -f "${TEMPDIR}"/debian-live/source.tar ] + then + # Creating log directory + mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log + + # Moving logs + mv "${TEMPDIR}"/debian-live/log.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-log.txt + mv "${TEMPDIR}"/debian-live/packages.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-packages.txt + + # Creating images directory + mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE} + mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/source + + # Moving images + mv "${TEMPDIR}"/debian-live/binary.iso "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}.iso + mv "${TEMPDIR}"/debian-live/source.tar "${DESTDIR}"/"${BUILD}"-builds/${DATE}/source/debian-live-${DISTRIBUTION}-source-${PACKAGES_LIST}.tar + fi + + if [ ! -f "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-usb-hdd-log.txt ] + then + # Workaround of missing multi-binary support in live-helper + mv "${TEMPDIR}"/debian-live/binary/casper "${TEMPDIR}"/debian-live/casper.tmp + rm -rf "${TEMPDIR}"/debian-live/binary* "${TEMPDIR}"/debian-live/.stage/binary_* + mkdir "${TEMPDIR}"/debian-live/binary + mv "${TEMPDIR}"/debian-live/casper.tmp "${TEMPDIR}"/debian-live/binary/casper + touch "${TEMPDIR}"/debian-live/.stage/binary_chroot + touch "${TEMPDIR}"/debian-live/.stage/binary_rootfs + + # Creating build directory + mkdir -p "${TEMPDIR}"/debian-live + + cd "${TEMPDIR}" + echo "Begin: `date -R`" > "${TEMPDIR}"/debian-live/log.txt + + # Generating images + make-live -b usb-hdd -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source disabled ${OPTIONS} >> "${TEMPDIR}"/debian-live/log.txt 2>&1 + + echo "End: `date -R`" >> "${TEMPDIR}"/debian-live/log.txt + fi + + if [ -f "${TEMPDIR}"/debian-live/binary.img ] + then + # Creating log directory + mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log + + # Moving logs + mv "${TEMPDIR}"/debian-live/log.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-usb-hdd-log.txt + cp "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-packages.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-usb-hdd-packages.txt + + # Creating image directory + mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE} + + # Moving images + mv "${TEMPDIR}"/debian-live/binary.img "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}.img + fi + + # Cleanup + cd "${TEMPDIR}"/debian-live + lh_clean + done + + # Cleanup + cd "${TEMPDIR}"/debian-live + lh_clean purge + done +done + +# Cleaning up +if [ -f "${TEMPDIR}"/debian-live/chroot/proc/version ] +then + umount "${TEMPDIR}"/debian-live/chroot/proc +fi + +if [ -d "${TEMPDIR}"/debian-live/chroot/sys/kernel ] +then + umount "${TEMPDIR}"/debian-live/chroot/sys +fi + +# Removing build directory +rm -rf "${TEMPDIR}" + +# Creating md5sums +for DIRECTORY in "${DESTDIR}"/"${BUILD}"-builds/${DATE}/* +do + cd "${DIRECTORY}" + md5sum * > MD5SUMS +done + +# Creating current symlink +rm -f "${DESTDIR}"/"${BUILD}"-builds/current +ln -s ${DATE} "${DESTDIR}"/"${BUILD}"-builds/current diff --git a/examples/daily-cron.sh b/examples/daily-cron.sh deleted file mode 100755 index 9dbe245..0000000 --- a/examples/daily-cron.sh +++ /dev/null @@ -1,140 +0,0 @@ -#!/bin/sh -x - -set -e - -BUILD="daily" - -AUTOBUILD_ARCHITECTURES="`dpkg --print-architecture`" -AUTOBUILD_DISTRIBUTIONS="sid" -AUTOBUILD_PACKAGES_LISTS="standard gnome-desktop kde-desktop xfce-desktop" -AUTOBUILD_OPTIONS="--apt-recommends disabled" - -AUTOBUILD_DATE="`date +%Y%m%d`" -AUTOBUILD_DESTDIR="/srv/debian-unofficial/ftp/debian-live" -AUTOBUILD_TEMPDIR="/srv/tmp" - -AUTOBUILD_MIRROR="http://ftp.de.debian.org/debian/" -AUTOBUILD_MIRROR_SECURITY="http://ftp.de.debian.org/debian-security/" - -# Check for live-helper availability -if [ ! -x /usr/bin/make-live ] -then - exit 0 -fi - -# Check for live-helper defaults -#if [ -r /etc/default/live-helper ] -#then -# . /etc/default/live-helper -#else -# echo "E: /etc/default/live-helper missing." -# exit 1 -#fi - -# Check for autobuild -#if [ "${AUTOBUILD}" != "enabled" ] -#then -# exit 0 -#fi - -# Check for build directory -if [ ! -d "${AUTOBUILD_TEMPDIR}" ] -then - mkdir -p "${AUTOBUILD_TEMPDIR}"/debian-live -else - # FIXME: maybe we should just remove the left overs. - echo "E: ${AUTOBUILD_TEMPDIR} needs cleanup." - exit 1 -fi - -for ARCHITECTURE in ${AUTOBUILD_ARCHITECTURES} -do - for DISTRIBUTION in ${AUTOBUILD_DISTRIBUTIONS} - do - for PACKAGES_LIST in ${AUTOBUILD_PACKAGES_LISTS} - do - if [ ! -f "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-iso-log.txt ] - then - # Generating images - mkdir -p "${AUTOBUILD_TEMPDIR}"/debian-live - cd "${AUTOBUILD_TEMPDIR}" - echo "Begin: `date -R`" > "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt - make-live -b iso -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-build ${AUTOBUILD_MIRROR} --mirror-build-security ${AUTOBUILD_MIRROR_SECURITY} --source enabled ${AUTOBUILD_OPTIONS} >> "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt 2>&1 - echo "End: `date -R`" >> "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt - fi - - if [ -f "${AUTOBUILD_TEMPDIR}"/debian-live/binary.iso ] && [ -f "${AUTOBUILD_TEMPDIR}"/debian-live/source.tar ] - then - # Moving logs - mkdir -p "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log - mv "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-iso-log.txt - mv "${AUTOBUILD_TEMPDIR}"/debian-live/packages.txt "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-iso-packages.txt - - # Moving images - mkdir -p "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/${ARCHITECTURE} - mv "${AUTOBUILD_TEMPDIR}"/debian-live/binary.iso "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/${ARCHITECTURE}/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}.iso - - mkdir -p "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/source - mv "${AUTOBUILD_TEMPDIR}"/debian-live/source.tar "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/source/debian-live-${DISTRIBUTION}-source-${PACKAGES_LIST}.tar - fi - - if [ ! -f "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-usb-hdd-log.txt ] - then - # Workaround of missing multi-binary support in live-helper - mv "${AUTOBUILD_TEMPDIR}"/debian-live/binary/casper "${AUTOBUILD_TEMPDIR}"/debian-live/casper.tmp - rm -rf "${AUTOBUILD_TEMPDIR}"/debian-live/binary* "${AUTOBUILD_TEMPDIR}"/debian-live/.stage/binary_* - mkdir "${AUTOBUILD_TEMPDIR}"/debian-live/binary - mv "${AUTOBUILD_TEMPDIR}"/debian-live/casper.tmp "${AUTOBUILD_TEMPDIR}"/debian-live/binary/casper - touch "${AUTOBUILD_TEMPDIR}"/debian-live/.stage/binary_chroot - touch "${AUTOBUILD_TEMPDIR}"/debian-live/.stage/binary_rootfs - - # Generating images - mkdir -p "${AUTOBUILD_TEMPDIR}"/debian-live - cd "${AUTOBUILD_TEMPDIR}" - echo "Begin: `date -R`" > "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt -make-live -b usb-hdd -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-build ${AUTOBUILD_MIRROR} --mirror-build-security ${AUTOBUILD_MIRROR_SECURITY} --source disabled ${AUTOBUILD_OPTIONS} >> "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt 2>&1 - echo "End: `date -R`" >> "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt - fi - - if [ -f "${AUTOBUILD_TEMPDIR}"/debian-live/binary.img ] - then - # Moving logs - mkdir -p "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log - mv "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-usb-hdd-log.txt - cp "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-iso-packages.txt "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-usb-hdd-packages.txt - - # Moving images - mkdir -p "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/${ARCHITECTURE} - mv "${AUTOBUILD_TEMPDIR}"/debian-live/binary.img "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/${ARCHITECTURE}/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}.img - fi - - # Cleanup - cd "${AUTOBUILD_TEMPDIR}"/debian-live - lh_clean - done - done -done - -# Cleanup -if [ -e "${AUTOBUILD_TEMPDIR}"/debian-live/chroot/proc/version ] -then - umount "${AUTOBUILD_TEMPDIR}"/debian-live/chroot/proc -fi - -if [ -d "${AUTOBUILD_TEMPDIR}"/debian-live/chroot/sys/kernel ] -then - umount "${AUTOBUILD_TEMPDIR}"/debian-live/chroot/sys -fi - -rm -rf "${AUTOBUILD_TEMPDIR}" - -# md5sums -for DIRECTORY in "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/* -do - cd "${DIRECTORY}" - md5sum * > MD5SUMS -done - -# Current symlink -rm -f "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/current -ln -s ${AUTOBUILD_DATE} "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/current diff --git a/examples/edu.sources.list b/examples/edu.sources.list deleted file mode 100644 index 79acacd..0000000 --- a/examples/edu.sources.list +++ /dev/null @@ -1,11 +0,0 @@ -## This is a sources.list for live-helper(7) to use packages from the -## Debian Edu/Skolelinux repository. -## -## To enable it, copy this file to your config/chroot_sources directory, once -## as e.g. edu.build and once as edu.image. -## -## Remeber to add debian-edu-archive-keyring to your package selection. - -# Debian Edu/Skolelinux -deb http://ftp.skolelinux.org/skolelinux/ etch-test local -deb-src http://ftp.skolelinux.org/skolelinux/ etch-test local diff --git a/examples/etch+beryl-cron.sh b/examples/etch+beryl-cron.sh deleted file mode 100755 index 372f7e2..0000000 --- a/examples/etch+beryl-cron.sh +++ /dev/null @@ -1,150 +0,0 @@ -#!/bin/sh -x - -set -e - -BUILD="etch+beryl" - -AUTOBUILD_ARCHITECTURES="`dpkg --print-architecture`" -AUTOBUILD_DISTRIBUTIONS="etch" -AUTOBUILD_PACKAGES_LISTS="gnome-desktop kde-desktop xfce-desktop" -AUTOBUILD_OPTIONS="--apt-recommends disabled" - -AUTOBUILD_DATE="r0_1.0~a8-1" -AUTOBUILD_DESTDIR="/srv/debian-unofficial/ftp/debian-live" -AUTOBUILD_TEMPDIR="/srv/tmp" - -AUTOBUILD_MIRROR="http://ftp.de.debian.org/debian/" -AUTOBUILD_MIRROR_SECURITY="http://ftp.de.debian.org/debian-security/" - -# Check for live-helper availability -if [ ! -x /usr/bin/make-live ] -then - exit 0 -fi - -# Check for live-helper defaults -#if [ -r /etc/default/live-helper ] -#then -# . /etc/default/live-helper -#else -# echo "E: /etc/default/live-helper missing." -# exit 1 -#fi - -# Check for autobuild -#if [ "${AUTOBUILD}" != "enabled" ] -#then -# exit 0 -#fi - -# Check for build directory -if [ ! -d "${AUTOBUILD_TEMPDIR}" ] -then - mkdir -p "${AUTOBUILD_TEMPDIR}"/debian-live -else - # FIXME: maybe we should just remove the left overs. - echo "E: ${AUTOBUILD_TEMPDIR} needs cleanup." - exit 1 -fi - -for ARCHITECTURE in ${AUTOBUILD_ARCHITECTURES} -do - for DISTRIBUTION in ${AUTOBUILD_DISTRIBUTIONS} - do - for PACKAGES_LIST in ${AUTOBUILD_PACKAGES_LISTS} - do - if [ ! -f "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-iso-log.txt ] - then - # Generating images - mkdir -p "${AUTOBUILD_TEMPDIR}"/debian-live - cd "${AUTOBUILD_TEMPDIR}" - - # Beryl hook - mkdir -p debian-live/config/chroot_localhooks - cp /usr/share/live-helper/examples/beryl-hook.sh debian-live/config/chroot_localhooks/beryl.sh - mkdir -p debian-live/config/chroot_sources - wget http://debian.beryl-project.org/root@lupine.me.uk.gpg -O debian-live/config/chroot_sources/beryl.build.gpg - wget http://debian.beryl-project.org/root@lupine.me.uk.gpg -O debian-live/config/chroot_sources/beryl.image.gpg - cp /usr/share/live-helper/examples/beryl.sources.list debian-live/config/chroot_sources/beryl.build - cp /usr/share/live-helper/examples/beryl.sources.list debian-live/config/chroot_sources/beryl.image - - echo "Begin: `date -R`" > "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt - make-live -b iso -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-build ${AUTOBUILD_MIRROR} --mirror-build-security ${AUTOBUILD_MIRROR_SECURITY} --source enabled ${AUTOBUILD_OPTIONS} >> "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt 2>&1 - echo "End: `date -R`" >> "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt - fi - - if [ -f "${AUTOBUILD_TEMPDIR}"/debian-live/binary.iso ] && [ -f "${AUTOBUILD_TEMPDIR}"/debian-live/source.tar ] - then - # Moving logs - mkdir -p "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log - mv "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-iso-log.txt - mv "${AUTOBUILD_TEMPDIR}"/debian-live/packages.txt "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-iso-packages.txt - - # Moving images - mkdir -p "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/${ARCHITECTURE} - mv "${AUTOBUILD_TEMPDIR}"/debian-live/binary.iso "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/${ARCHITECTURE}/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}.iso - - mkdir -p "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/source - mv "${AUTOBUILD_TEMPDIR}"/debian-live/source.tar "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/source/debian-live-etch+beryl-source-${PACKAGES_LIST}.tar - fi - - if [ ! -f "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-usb-hdd-log.txt ] - then - # Workaround of missing multi-binary support in live-helper - mv "${AUTOBUILD_TEMPDIR}"/debian-live/binary/casper "${AUTOBUILD_TEMPDIR}"/debian-live/casper.tmp - rm -rf "${AUTOBUILD_TEMPDIR}"/debian-live/binary* "${AUTOBUILD_TEMPDIR}"/debian-live/.stage/binary_* - mkdir "${AUTOBUILD_TEMPDIR}"/debian-live/binary - mv "${AUTOBUILD_TEMPDIR}"/debian-live/casper.tmp "${AUTOBUILD_TEMPDIR}"/debian-live/binary/casper - touch "${AUTOBUILD_TEMPDIR}"/debian-live/.stage/binary_chroot - touch "${AUTOBUILD_TEMPDIR}"/debian-live/.stage/binary_rootfs - - # Generating images - mkdir -p "${AUTOBUILD_TEMPDIR}"/debian-live - cd "${AUTOBUILD_TEMPDIR}" - echo "Begin: `date -R`" > "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt - make-live -b usb-hdd -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-build ${AUTOBUILD_MIRROR} --mirror-build-security ${AUTOBUILD_MIRROR_SECURITY} --source disabled ${AUTOBUILD_OPTIONS} >> "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt 2>&1 - echo "End: `date -R`" >> "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt - fi - - if [ -f "${AUTOBUILD_TEMPDIR}"/debian-live/binary.img ] - then - # Moving logs - mkdir -p "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log - mv "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-usb-hdd-log.txt - cp "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-iso-packages.txt "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-usb-hdd-packages.txt - - # Moving images - mkdir -p "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/${ARCHITECTURE} - mv "${AUTOBUILD_TEMPDIR}"/debian-live/binary.img "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/${ARCHITECTURE}/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}.img - fi - - # Cleanup - cd "${AUTOBUILD_TEMPDIR}"/debian-live - lh_clean - done - done -done - -# Cleanup -if [ -e "${AUTOBUILD_TEMPDIR}"/debian-live/chroot/proc/version ] -then - umount "${AUTOBUILD_TEMPDIR}"/debian-live/chroot/proc -fi - -if [ -d "${AUTOBUILD_TEMPDIR}"/debian-live/chroot/sys/kernel ] -then - umount "${AUTOBUILD_TEMPDIR}"/debian-live/chroot/sys -fi - -rm -rf "${AUTOBUILD_TEMPDIR}" - -# md5sums -for DIRECTORY in "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/* -do - cd "${DIRECTORY}" - md5sum * > MD5SUMS -done - -# Current symlink -rm -f "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/current -ln -s ${AUTOBUILD_DATE} "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/current diff --git a/examples/etch-cron.sh b/examples/etch-cron.sh deleted file mode 100755 index 0e526f7..0000000 --- a/examples/etch-cron.sh +++ /dev/null @@ -1,140 +0,0 @@ -#!/bin/sh -x - -set -e - -BUILD="etch" - -AUTOBUILD_ARCHITECTURES="`dpkg --print-architecture`" -AUTOBUILD_DISTRIBUTIONS="etch" -AUTOBUILD_PACKAGES_LISTS="standard gnome-desktop kde-desktop xfce-desktop" -AUTOBUILD_OPTIONS="--apt-recommends disabled" - -AUTOBUILD_DATE="r0_1.0~a8-1" -AUTOBUILD_DESTDIR="/srv/debian-unofficial/ftp/debian-live" -AUTOBUILD_TEMPDIR="/srv/tmp" - -AUTOBUILD_MIRROR="http://ftp.de.debian.org/debian/" -AUTOBUILD_MIRROR_SECURITY="http://ftp.de.debian.org/debian-security/" - -# Check for live-helper availability -if [ ! -x /usr/bin/make-live ] -then - exit 0 -fi - -# Check for live-helper defaults -#if [ -r /etc/default/live-helper ] -#then -# . /etc/default/live-helper -#else -# echo "E: /etc/default/live-helper missing." -# exit 1 -#fi - -# Check for autobuild -#if [ "${AUTOBUILD}" != "enabled" ] -#then -# exit 0 -#fi - -# Check for build directory -if [ ! -d "${AUTOBUILD_TEMPDIR}" ] -then - mkdir -p "${AUTOBUILD_TEMPDIR}"/debian-live -else - # FIXME: maybe we should just remove the left overs. - echo "E: ${AUTOBUILD_TEMPDIR} needs cleanup." - exit 1 -fi - -for ARCHITECTURE in ${AUTOBUILD_ARCHITECTURES} -do - for DISTRIBUTION in ${AUTOBUILD_DISTRIBUTIONS} - do - for PACKAGES_LIST in ${AUTOBUILD_PACKAGES_LISTS} - do - if [ ! -f "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-iso-log.txt ] - then - # Generating images - mkdir -p "${AUTOBUILD_TEMPDIR}"/debian-live - cd "${AUTOBUILD_TEMPDIR}" - echo "Begin: `date -R`" > "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt - make-live -b iso -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-build ${AUTOBUILD_MIRROR} --mirror-build-security ${AUTOBUILD_MIRROR_SECURITY} --source enabled ${AUTOBUILD_OPTIONS} >> "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt 2>&1 - echo "End: `date -R`" >> "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt - fi - - if [ -f "${AUTOBUILD_TEMPDIR}"/debian-live/binary.iso ] && [ -f "${AUTOBUILD_TEMPDIR}"/debian-live/source.tar ] - then - # Moving logs - mkdir -p "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log - mv "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-iso-log.txt - mv "${AUTOBUILD_TEMPDIR}"/debian-live/packages.txt "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-iso-packages.txt - - # Moving images - mkdir -p "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/${ARCHITECTURE} - mv "${AUTOBUILD_TEMPDIR}"/debian-live/binary.iso "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/${ARCHITECTURE}/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}.iso - - mkdir -p "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/source - mv "${AUTOBUILD_TEMPDIR}"/debian-live/source.tar "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/source/debian-live-${DISTRIBUTION}-source-${PACKAGES_LIST}.tar - fi - - if [ ! -f "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-usb-hdd-log.txt ] - then - # Workaround of missing multi-binary support in live-helper - mv "${AUTOBUILD_TEMPDIR}"/debian-live/binary/casper "${AUTOBUILD_TEMPDIR}"/debian-live/casper.tmp - rm -rf "${AUTOBUILD_TEMPDIR}"/debian-live/binary* "${AUTOBUILD_TEMPDIR}"/debian-live/.stage/binary_* - mkdir "${AUTOBUILD_TEMPDIR}"/debian-live/binary - mv "${AUTOBUILD_TEMPDIR}"/debian-live/casper.tmp "${AUTOBUILD_TEMPDIR}"/debian-live/binary/casper - touch "${AUTOBUILD_TEMPDIR}"/debian-live/.stage/binary_chroot - touch "${AUTOBUILD_TEMPDIR}"/debian-live/.stage/binary_rootfs - - # Generating images - mkdir -p "${AUTOBUILD_TEMPDIR}"/debian-live - cd "${AUTOBUILD_TEMPDIR}" - echo "Begin: `date -R`" > "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt - make-live -b usb-hdd -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-build ${AUTOBUILD_MIRROR} --mirror-build-security ${AUTOBUILD_MIRROR_SECURITY} --source disabled ${AUTOBUILD_OPTIONS} >> "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt 2>&1 - echo "End: `date -R`" >> "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt - fi - - if [ -f "${AUTOBUILD_TEMPDIR}"/debian-live/binary.img ] - then - # Moving logs - mkdir -p "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log - mv "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-usb-hdd-log.txt - cp "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-iso-packages.txt "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-usb-hdd-packages.txt - - # Moving images - mkdir -p "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/${ARCHITECTURE} - mv "${AUTOBUILD_TEMPDIR}"/debian-live/binary.img "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/${ARCHITECTURE}/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}.img - fi - - # Cleanup - cd "${AUTOBUILD_TEMPDIR}"/debian-live - lh_clean - done - done -done - -# Cleanup -if [ -e "${AUTOBUILD_TEMPDIR}"/debian-live/chroot/proc/version ] -then - umount "${AUTOBUILD_TEMPDIR}"/debian-live/chroot/proc -fi - -if [ -d "${AUTOBUILD_TEMPDIR}"/debian-live/chroot/sys/kernel ] -then - umount "${AUTOBUILD_TEMPDIR}"/debian-live/chroot/sys -fi - -rm -rf "${AUTOBUILD_TEMPDIR}" - -# md5sums -for DIRECTORY in "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/* -do - cd "${DIRECTORY}" - md5sum * > MD5SUMS -done - -# Current symlink -rm -f "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/current -ln -s ${AUTOBUILD_DATE} "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/current diff --git a/examples/fai.sources.list b/examples/fai.sources.list deleted file mode 100644 index 2c6e80f..0000000 --- a/examples/fai.sources.list +++ /dev/null @@ -1,9 +0,0 @@ -## This is a sources.list for live-helper(7) to use packages from the -## FAI - Fully Automated Install repository. -## -## To enable it, copy this file to your config/chroot_sources directory, once -## as e.g. fai.build and once as fai.image. - -# FAI - Fully Automated Install -deb http://www.informatik.uni-koeln.de/fai/download/ etch koeln -deb-src http://www.informatik.uni-koeln.de/fai/download/ etch koeln diff --git a/examples/hooks/beryl.sh b/examples/hooks/beryl.sh new file mode 100755 index 0000000..e201d81 --- /dev/null +++ b/examples/hooks/beryl.sh @@ -0,0 +1,78 @@ +#!/bin/sh + +# This is a hook for live-helper(7) to install beryl and enable aiglx. +# It was originally written by Inigo Tejedor Arrondo . +# +# To enable it, copy this hook into your config/chroot_local-hooks directory. +# for forcing aiglx activation type at boot prompt "live forceaiglx" +# for forcing aiglx deactivation type "live noaiglx" + +# Importing archive signing key +wget -O - http://debian.beryl-project.org/root@lupine.me.uk.gpg | apt-key add - + +# Updating indices +apt-get update + +# Installing packages +PACKAGES="beryl beryl-core beryl-manager beryl-plugins beryl-settings beryl-settings-bindings beryl-settings-simple mesa-utils" + +dpkg -s gnome-core > /dev/null 2>&1 && PACKAGES="${PACKAGES} emerald emerald-themes heliodor" +dpkg -s kde-core > /dev/null 2>&1 && PACKAGES="${PACKAGES} aquamarine" + +apt-get install --yes ${PACKAGES} + +# Adding init script +cat > /etc/init.d/aiglx << EOF +#!/bin/sh +activate_3d() +{ + activate_aiglx + activate_beryl +} + +activate_aiglx() +{ + 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 +} + +activate_beryl() +{ + # http://standards.freedesktop.org/autostart-spec/autostart-spec-latest.html + ! [ -d /etc/xdg/autostart ] && mkdir -p /etc/xdg/autostart + +cat > /etc/xdg/autostart/beryl-manager.desktop << EOS +[Desktop Entry] +Encoding=UTF-8 +Name=Beryl Manager +GenericName=3D Window Manager +Comment=Beryl Manager daemon +Icon= +Exec=beryl-starter +Terminal=false +Type=Application +Categories= +EOS + +cat > /usr/local/bin/beryl-starter << EOS +#!/bin/sh +glxinfo > /dev/null 2>&1 && beryl-manager +EOS + +chmod 0755 /usr/local/bin/beryl-starter +} + +if ! cat /proc/cmdline | grep noaiglx > /dev/null +then + echo "Configuring xorg for aiglx..." + activate_3d +fi +EOF + +chmod 0755 /etc/init.d/aiglx +update-rc.d aiglx defaults diff --git a/examples/hooks/ipw2100.sh b/examples/hooks/ipw2100.sh new file mode 100755 index 0000000..fc9e033 --- /dev/null +++ b/examples/hooks/ipw2100.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +# This is a hook for live-helper(7) to install ipw2100 drivers +# To enable it, copy this hook into your config/chroot_local-hooks directory. + +# IMPORTANT: for apt-get to locate the required packages you need to +# add "contrib" sections and the 686 flavour. +# +# e.g with make-live : --sections "main contrib" --kernel-flavour 686 + +# Updating indices +apt-get update + +# Building kernel module +which module-assistant || apt-get install --yes module-assistant +module-assistant update +module-assistant --non-inter --quiet auto-install ipw2100 +module-assistant clean ipw2100 + +# Installing firmware (http://ipw2100.sourceforge.net/firmware.php) +# grabbing 0.55 (Wed May 16 15:17:38 -- matth) +wget --referer "http://ipw2100.sourceforge.net/firmware.php" "http://ipw2100.sourceforge.net/firmware.php?i_agree_to_the_license=yes&f=ipw2100-fw-1.3.tgz" -O /tmp/ipw2100-fw-1.3.tgz + +cd /tmp +tar xfvz ipw2100-fw-1.3.tgz +mv ipw2100-1.3* /lib/firmware +rm -f ipw2100-fw-1.3.tgz +cd ${OLDPWD} diff --git a/examples/hooks/ipw2200.sh b/examples/hooks/ipw2200.sh new file mode 100755 index 0000000..fd2fc99 --- /dev/null +++ b/examples/hooks/ipw2200.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +# This is a hook for live-helper(7) to install nvidia-legacy drivers +# To enable it, copy this hook into your config/chroot_local-hooks directory. + +# IMPORTANT: for apt-get to locate the required packages you need to +# add "contrib" sections and the 686 flavour. +# +# e.g with make-live : --sections "main contrib" --kernel-flavour 686 + +# Updating indices +apt-get update + +# Building kernel mdoule +which module-assistant || apt-get install --yes module-assistant +module-assistant update +module-assistant --non-inter --quiet auto-install ipw2200 +module-assistant clean ipw2200 + +# Installing firmware (http://ipw2200.sourceforge.net/firmware.php) +# grabbing 3.0 (Wed May 16 15:17:38 -- matth) +wget --referer "http://ipw2200.sourceforge.net/firmware.php" "http://ipw2200.sourceforge.net/firmware.php?i_agree_to_the_license=yes&f=ipw2200-fw-3.0.tgz" -O /tmp/ipw2200-fw-3.0.tgz + +cd /tmp +tar xfvz ipw2200-fw-3.0.tgz +cp ipw2200-fw-3.0/*.fw /lib/firmware/ +rm -rf ipw2200-fw-3.0* +cd ${OLDPWD} diff --git a/examples/hooks/ipw3945.sh b/examples/hooks/ipw3945.sh new file mode 100755 index 0000000..04d235b --- /dev/null +++ b/examples/hooks/ipw3945.sh @@ -0,0 +1,23 @@ +#!/bin/sh + +# This is a hook for live-helper(7) to install ipw3945 drivers +# To enable it, copy this hook into your config/chroot_local-hooks directory. + +# IMPORTANT: for apt-get to locate the required packages you need to +# add "non-free" sections +# +# e.g with make-live : --sections "main non-free" + +# Updating indices +apt-get update + +# Building kernel module +which module-assistant || apt-get install --yes module-assistant +module-assistant update +module-assistant auto-install ipw3945 # interactive mode for now +module-assistant clean ipw3945 + +apt-get install ipw3945d firmware-ipw3945 + +# hackish, autorun regulatory daemon, update-rc.d will reject that +ln -s /etc/init.d/ipw3945d /etc/rc2.d/S19ipw3945d diff --git a/examples/hooks/madwifi.sh b/examples/hooks/madwifi.sh new file mode 100755 index 0000000..f45b968 --- /dev/null +++ b/examples/hooks/madwifi.sh @@ -0,0 +1,23 @@ +#!/bin/sh + +# This is a hook for live-helper(7) to install madwifi drivers +# To enable it, copy this hook into your config/chroot_localhooks directory. + +# IMPORTANT: for apt-get to locate the required packages you need to +# add "non-free" sections +# +# e.g with make-live : --sections "main non-free" + +# NOTE: it runs in interactive mode + +# Updating indices +apt-get update + +# Building kernel module +which module-assistant || apt-get install --yes module-assistant +module-assistant update +module-assistant auto-install madwifi +module-assistant clean madwifi + +# Installing aditional stuff +apt-get install --yes madwifi-tools madwifi-doc diff --git a/examples/hooks/nvidia-legacy.sh b/examples/hooks/nvidia-legacy.sh new file mode 100755 index 0000000..cc1ceb4 --- /dev/null +++ b/examples/hooks/nvidia-legacy.sh @@ -0,0 +1,51 @@ +#!/bin/sh + +# This is a hook for live-helper(7) to install nvidia-legacy drivers +# To enable it, copy this hook into your config/chroot_localhooks directory. + +# IMPORTANT: for apt-get to locate the required packages you need to +# add "contrib non-free" sections. +# +# e.g with make-live : --sections "main contrib non-free" + +# Updating indices +apt-get update + +# Building kernel module +which module-assistant || apt-get install --yes module-assistant nvidia-kernel-common +module-assistant update +module-assistant --non-inter --quiet auto-install nvidia-kernel-legacy +module-assistant clean nvidia-kernel-legacy + +# Installing aditional stuff +apt-get install --yes nvidia-glx-legacy nvidia-xconfig discover + +# fixup (#421028) +if [ -f /usr/lib/xorg/modules/drivers/nvidia_drv.o ] +then + cd /usr/lib/xorg/modules/drivers + gcc -shared -o nvidia_drv.so nvidia_drv.o + cd ${OLDPWD} +fi + +# Adding init script +cat > /etc/init.d/nvidia-debian-live << EOF +#!/bin/sh +# script that modify xorg configuration enabling +# the nvidia proprietary module if the card is detected +# as an NVidia + +if discover --type-summary display | grep -i nvidia +then + # forcing depth to 24, bad detection on some card (e.g my GeForce4 440 Go) + echo "Configuring Xorg for nvidia ..." + nvidia-xconfig -d 24 +else + # not with nvidia h/w ? remove those GLX diversions + # (FIXME) + apt-get --quiet --yes remove nvidia-glx-legacy +fi +EOF + +chmod 0755 /etc/init.d/nvidia-debian-live +update-rc.d nvidia-debian-live defaults diff --git a/examples/hooks/rt2570.sh b/examples/hooks/rt2570.sh new file mode 100755 index 0000000..bbf79c1 --- /dev/null +++ b/examples/hooks/rt2570.sh @@ -0,0 +1,15 @@ +#!/bin/sh + +# This is a hook for live-helper(7) to install ralink rt2570 drivers +# To enable it, copy this hook into your config/chroot_local-hooks directory. + +# NOTE: it runs in interactive mode + +# Updating indices +apt-get update + +# Building kernel module +which module-assistant || apt-get install --yes module-assistant +module-assistant update +module-assistant auto-install rt2570-source +module-assistant clean rt2570-source diff --git a/examples/hooks/rt2x00.sh b/examples/hooks/rt2x00.sh new file mode 100755 index 0000000..8c5153c --- /dev/null +++ b/examples/hooks/rt2x00.sh @@ -0,0 +1,24 @@ +#!/bin/sh + +# This is a hook for live-helper(7) to install ralink rt2x00 drivers +# To enable it, copy this hook into your config/chroot_local-hooks directory. + +# NOTE: it runs in interactive mode + +# Updating indices +apt-get update + +# Building kernel modules +which module-assistant || apt-get install --yes module-assistant +module-assistant update +module-assistant auto-install rt2x00-source +module-assistant clean rt2x00-source + +# Installing firmware for rt73usb +wget "http://www.ralinktech.com.tw/data/RT73_Linux_STA_Drv1.0.4.0.tar.gz" -O /tmp/RT73_Linux_STA_Drv1.0.4.0.tar.gz + +cd /tmp +tar xfvz RT73_Linux_STA_Drv1.0.4.0.tar.gz +cp RT73_Linux_STA_Drv1.0.4.0/Module/rt73.bin /lib/firmware +rm -rf RT73_Linux_STA_Drv* +cd ${OLDPWD} diff --git a/examples/hooks/sun-java5.sh b/examples/hooks/sun-java5.sh new file mode 100755 index 0000000..987b0b2 --- /dev/null +++ b/examples/hooks/sun-java5.sh @@ -0,0 +1,15 @@ +#!/bin/sh + +# This is a hook for live-helper(7) to install sun-java. +# +# To enable it, copy this hook into your config/chroot_local-hooks directory and +# don't forget to enable non-free in LIVE_SECTIONS. +# +# live-helper sets DEBIAN_FRONTEND to 'noninteractive' to advise debconf to not +# ask any questions while installing packages. Suns redistribution terms for +# Java do not allow this, therefore we need to overwrite DEBIAN_FRONTEND for +# this apt-get call only. + +DEBIAN_FRONTEND="dialog" apt-get install --yes sun-java5-bin sun-java5-demo \ + sun-java5-doc sun-java5-fonts sun-java5-jdk sun-java5-jre \ + sun-java5-plugin sun-java5-source diff --git a/examples/hooks/sun-java6.sh b/examples/hooks/sun-java6.sh new file mode 100755 index 0000000..f400b4d --- /dev/null +++ b/examples/hooks/sun-java6.sh @@ -0,0 +1,15 @@ +#!/bin/sh + +# This is a hook for live-helper(7) to install sun-java. +# +# To enable it, copy this hook into your config/chroot_local-hooks directory and +# don't forget to enable non-free in LIVE_SECTIONS. +# +# live-helper sets DEBIAN_FRONTEND to 'noninteractive' to advise debconf to not +# ask any questions while installing packages. Suns redistribution terms for +# Java do not allow this, therefore we need to overwrite DEBIAN_FRONTEND for +# this apt-get call only. + +DEBIAN_FRONTEND="dialog" apt-get install --yes sun-java6-bin sun-java6-demo \ + sun-java6-doc sun-java6-fonts sun-java6-jdk sun-java6-jre \ + sun-java6-plugin sun-java6-source diff --git a/examples/java-hook.sh b/examples/java-hook.sh deleted file mode 100755 index 77c931b..0000000 --- a/examples/java-hook.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - -# This is a hook for live-helper(7) to install sun-java. -# -# To enable it, copy this hook into your config/chroot_localhooks directory and -# don't forget to enable non-free in LIVE_SECTIONS. -# -# live-helper sets DEBIAN_FRONTEND to 'noninteractive' to advise debconf to not -# ask any questions while installing packages. Suns redistribution terms for -# Java do not allow this, therefore we need to overwrite DEBIAN_FRONTEND for -# this apt-get call only. - -DEBIAN_FRONTEND="dialog" apt-get install --yes sun-java6-bin sun-java6-demo \ - sun-java6-doc sun-java6-fonts sun-java6-jdk sun-java6-jre \ - sun-java6-plugin sun-java6-source diff --git a/examples/live.sources.list b/examples/live.sources.list deleted file mode 100644 index 98212f1..0000000 --- a/examples/live.sources.list +++ /dev/null @@ -1,11 +0,0 @@ -## This is a sources.list for live-helper(7) to use packages from the -## Debian Live Etch backports repository. -## -## To enable it, copy this file to your config/chroot_sources directory, once -## as e.g. live.build and once as live.image. -## -## Remeber to add debian-unofficial-archive-keyring to your package selection. - -# Debian Live backports for Etch -deb http://live.debian.net/debian/ etch main -deb-src http://live.debian.net/debian/ etch main diff --git a/examples/sources.list/beryl b/examples/sources.list/beryl new file mode 100644 index 0000000..9c1cd2e --- /dev/null +++ b/examples/sources.list/beryl @@ -0,0 +1,14 @@ +## This is a sources.list for live-helper(7) to use packages from the +## Beryl Etch repository. +## +## To enable it, copy this file to your config/chroot_sources directory, once +## as e.g. beryl.bootstrap and once as beryl.binary. +## Additionally, you need to copy the beryl.sh file to your +## config/chroot_local-hooks directory. +## +## Remeber to also import http://debian.beryl-project.org/root@lupine.me.uk.gpg +## into your trusted keyring. + +# Beryl packages for Etch +deb http://debian.beryl-project.org/ etch main +deb-src http://debian.beryl-project.org/ etch main diff --git a/examples/sources.list/debian-backports b/examples/sources.list/debian-backports new file mode 100644 index 0000000..04362f0 --- /dev/null +++ b/examples/sources.list/debian-backports @@ -0,0 +1,9 @@ +## This is a sources.list for live-helper(7) to use packages from the +## Debian Etch backports repository. +## +## To enable it, copy this file to your config/chroot_sources directory, once +## as e.g. debian-backports.bootstrap and once as debian-backports.binary. + +# Debian backports for Etch +deb http://www.backports.org/debian/ etch-backports main +deb-src http://www.backports.org/debian/ etch-backports main diff --git a/examples/sources.list/debian-edu b/examples/sources.list/debian-edu new file mode 100644 index 0000000..9fb05e1 --- /dev/null +++ b/examples/sources.list/debian-edu @@ -0,0 +1,11 @@ +## This is a sources.list for live-helper(7) to use packages from the +## Debian Edu/Skolelinux repository. +## +## To enable it, copy this file to your config/chroot_sources directory, once +## as e.g. edu.bootstrap and once as edu.binary. +## +## Remeber to add debian-edu-archive-keyring to your package selection. + +# Debian Edu/Skolelinux +deb http://ftp.skolelinux.org/skolelinux/ etch-test local +deb-src http://ftp.skolelinux.org/skolelinux/ etch-test local diff --git a/examples/sources.list/fai b/examples/sources.list/fai new file mode 100644 index 0000000..7d2d7ec --- /dev/null +++ b/examples/sources.list/fai @@ -0,0 +1,9 @@ +## This is a sources.list for live-helper(7) to use packages from the +## FAI - Fully Automated Install repository. +## +## To enable it, copy this file to your config/chroot_sources directory, once +## as e.g. fai.bootstrap and once as fai.binary. + +# FAI - Fully Automated Install +deb http://www.informatik.uni-koeln.de/fai/download/ etch koeln +deb-src http://www.informatik.uni-koeln.de/fai/download/ etch koeln diff --git a/examples/sources.list/live-backports b/examples/sources.list/live-backports new file mode 100644 index 0000000..3c1a2c1 --- /dev/null +++ b/examples/sources.list/live-backports @@ -0,0 +1,11 @@ +## This is a sources.list for live-helper(7) to use packages from the +## Debian Live Etch backports repository. +## +## To enable it, copy this file to your config/chroot_sources directory, once +## as e.g. live-backports.bootstrap and once as live-backports.binary. +## +## Remeber to add debian-unofficial-archive-keyring to your package selection. + +# Debian Live backports for Etch +deb http://live.debian.net/debian/ etch main +deb-src http://live.debian.net/debian/ etch main diff --git a/examples/sources.list/live-snapshot b/examples/sources.list/live-snapshot new file mode 100644 index 0000000..763deda --- /dev/null +++ b/examples/sources.list/live-snapshot @@ -0,0 +1,9 @@ +## This is a sources.list for live-helper(7) to use packages from the +## Debian Live Snapshot repository. +## +## To enable it, copy this file to your config/chroot_sources directory, once +## as e.g. live-snapshots.bootstrap and once as live-snapshots.binary. + +# Debian Live Snapshots +deb http://live.debian.net/debian-snapshots/ ./ +deb-src http://live.debian.net/debian-snapshots/ ./ diff --git a/examples/weekly-cron.sh b/examples/weekly-cron.sh deleted file mode 100755 index 4d87671..0000000 --- a/examples/weekly-cron.sh +++ /dev/null @@ -1,140 +0,0 @@ -#!/bin/sh -x - -set -e - -BUILD="weekly" - -AUTOBUILD_ARCHITECTURES="`dpkg --print-architecture`" -AUTOBUILD_DISTRIBUTIONS="lenny" -AUTOBUILD_PACKAGES_LISTS="standard gnome-desktop kde-desktop xfce-desktop" -AUTOBUILD_OPTIONS="--apt-recommends disabled" - -AUTOBUILD_DATE="`date +%Y%m%d`" -AUTOBUILD_DESTDIR="/srv/debian-unofficial/ftp/debian-live" -AUTOBUILD_TEMPDIR="/srv/tmp" - -AUTOBUILD_MIRROR="http://ftp.de.debian.org/debian/" -AUTOBUILD_MIRROR_SECURITY="http://ftp.de.debian.org/debian-security/" - -# Check for live-helper availability -if [ ! -x /usr/bin/make-live ] -then - exit 0 -fi - -# Check for live-helper defaults -#if [ -r /etc/default/live-helper ] -#then -# . /etc/default/live-helper -#else -# echo "E: /etc/default/live-helper missing." -# exit 1 -#fi - -# Check for autobuild -#if [ "${AUTOBUILD}" != "enabled" ] -#then -# exit 0 -#fi - -# Check for build directory -if [ ! -d "${AUTOBUILD_TEMPDIR}" ] -then - mkdir -p "${AUTOBUILD_TEMPDIR}"/debian-live -else - # FIXME: maybe we should just remove the left overs. - echo "E: ${AUTOBUILD_TEMPDIR} needs cleanup." - exit 1 -fi - -for ARCHITECTURE in ${AUTOBUILD_ARCHITECTURES} -do - for DISTRIBUTION in ${AUTOBUILD_DISTRIBUTIONS} - do - for PACKAGES_LIST in ${AUTOBUILD_PACKAGES_LISTS} - do - if [ ! -f "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-iso-log.txt ] - then - # Generating images - mkdir -p "${AUTOBUILD_TEMPDIR}"/debian-live - cd "${AUTOBUILD_TEMPDIR}" - echo "Begin: `date -R`" > "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt - make-live -b iso -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-build ${AUTOBUILD_MIRROR} --mirror-build-security ${AUTOBUILD_MIRROR_SECURITY} --source enabled ${AUTOBUILD_OPTIONS} >> "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt 2>&1 - echo "End: `date -R`" >> "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt - fi - - if [ -f "${AUTOBUILD_TEMPDIR}"/debian-live/binary.iso ] && [ -f "${AUTOBUILD_TEMPDIR}"/debian-live/source.tar ] - then - # Moving logs - mkdir -p "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log - mv "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-iso-log.txt - mv "${AUTOBUILD_TEMPDIR}"/debian-live/packages.txt "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-iso-packages.txt - - # Moving images - mkdir -p "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/${ARCHITECTURE} - mv "${AUTOBUILD_TEMPDIR}"/debian-live/binary.iso "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/${ARCHITECTURE}/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}.iso - - mkdir -p "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/source - mv "${AUTOBUILD_TEMPDIR}"/debian-live/source.tar "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/source/debian-live-${DISTRIBUTION}-source-${PACKAGES_LIST}.tar - fi - - if [ ! -f "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-usb-hdd-log.txt ] - then - # Workaround of missing multi-binary support in live-helper - mv "${AUTOBUILD_TEMPDIR}"/debian-live/binary/casper "${AUTOBUILD_TEMPDIR}"/debian-live/casper.tmp - rm -rf "${AUTOBUILD_TEMPDIR}"/debian-live/binary* "${AUTOBUILD_TEMPDIR}"/debian-live/.stage/binary_* - mkdir "${AUTOBUILD_TEMPDIR}"/debian-live/binary - mv "${AUTOBUILD_TEMPDIR}"/debian-live/casper.tmp "${AUTOBUILD_TEMPDIR}"/debian-live/binary/casper - touch "${AUTOBUILD_TEMPDIR}"/debian-live/.stage/binary_chroot - touch "${AUTOBUILD_TEMPDIR}"/debian-live/.stage/binary_rootfs - - # Generating images - mkdir -p "${AUTOBUILD_TEMPDIR}"/debian-live - cd "${AUTOBUILD_TEMPDIR}" - echo "Begin: `date -R`" > "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt - make-live -b usb-hdd -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-build ${AUTOBUILD_MIRROR} --mirror-build-security ${AUTOBUILD_MIRROR_SECURITY} --source disabled ${AUTOBUILD_OPTIONS} >> "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt 2>&1 - echo "End: `date -R`" >> "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt - fi - - if [ -f "${AUTOBUILD_TEMPDIR}"/debian-live/binary.img ] - then - # Moving logs - mkdir -p "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log - mv "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-usb-hdd-log.txt - cp "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-iso-packages.txt "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-usb-hdd-packages.txt - - # Moving images - mkdir -p "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/${ARCHITECTURE} - mv "${AUTOBUILD_TEMPDIR}"/debian-live/binary.img "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/${ARCHITECTURE}/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}.img - fi - - # Cleanup - cd "${AUTOBUILD_TEMPDIR}"/debian-live - lh_clean - done - done -done - -# Cleanup -if [ -e "${AUTOBUILD_TEMPDIR}"/debian-live/chroot/proc/version ] -then - umount "${AUTOBUILD_TEMPDIR}"/debian-live/chroot/proc -fi - -if [ -d "${AUTOBUILD_TEMPDIR}"/debian-live/chroot/sys/kernel ] -then - umount "${AUTOBUILD_TEMPDIR}"/debian-live/chroot/sys -fi - -rm -rf "${AUTOBUILD_TEMPDIR}" - -# md5sums -for DIRECTORY in "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/* -do - cd "${DIRECTORY}" - md5sum * > MD5SUMS -done - -# Current symlink -rm -f "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/current -ln -s ${AUTOBUILD_DATE} "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/current diff --git a/functions/chroot.sh b/functions/chroot.sh index 77232a1..26ecec9 100755 --- a/functions/chroot.sh +++ b/functions/chroot.sh @@ -16,4 +16,6 @@ Chroot () # Executing commands in chroot Echo_debug "Executing: ${COMMANDS}" ${LH_ROOT_COMMAND} chroot chroot /usr/bin/env -i HOME="/root" PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" TERM="${TERM}" ftp_proxy="${LH_APT_FTPPROXY}" http_proxy="${LH_APT_HTTPPROXY}" DEBIAN_FRONTEND="${LH_DEBCONF_FRONTEND}" DEBIAN_PRIORITY="${LH_DEBCONF_PRIORITY}" DEBCONF_NOWARNINGS="${LH_DEBCONF_NOWARNINGS}" ${COMMANDS} + + return "${?}" } diff --git a/functions/common.sh b/functions/common.sh index 88a883a..d97ce04 100755 --- a/functions/common.sh +++ b/functions/common.sh @@ -10,4 +10,4 @@ set -e PROGRAM="`basename ${0}`" -VERSION="1.0~a9" +VERSION="1.0~a10" diff --git a/functions/defaults.sh b/functions/defaults.sh index 0c923b6..0cbbfeb 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -61,9 +61,9 @@ Set_defaults () fi # Setting apt indices - if [ -z "${LH_APT_GENERIC}" ] + if [ -z "${LIVE_BINARY_INDICES}" ] then - LH_APT_GENERIC="enabled" + LIVE_BINARY_INDICES="enabled" fi # Setting apt pdiffs @@ -189,7 +189,12 @@ Set_defaults () # Setting initramfs generator if [ -z "${LH_INITRAMFS}" ] then - LH_INITRAMFS="casper" + if [ "${LIVE_DISTRIBUTION}" = "etch" ] + then + LH_INITRAMFS="casper" + else + LH_INITRAMFS="live-initramfs" + fi fi # Setting root directory @@ -287,57 +292,57 @@ Set_defaults () fi # Setting mirror to fetch packages from - if [ -z "${LIVE_MIRROR_BUILD}" ] + if [ -z "${LIVE_MIRROR_BOOTSTRAP}" ] then case "${LH_MODE}" in debian) - LIVE_MIRROR_BUILD="http://ftp.debian.org/debian/" + LIVE_MIRROR_BOOTSTRAP="http://ftp.debian.org/debian/" ;; ubuntu) - LIVE_MIRROR_BUILD="http://archive.ubuntu.com/ubuntu/" + LIVE_MIRROR_BOOTSTRAP="http://archive.ubuntu.com/ubuntu/" ;; esac fi # Setting security mirror to fetch packages from - if [ -z "${LIVE_MIRROR_BUILD_SECURITY}" ] + if [ -z "${LIVE_MIRROR_BOOTSTRAP_SECURITY}" ] then case "${LH_MODE}" in debian) - LIVE_MIRROR_BUILD_SECURITY="http://security.debian.org/" + LIVE_MIRROR_BOOTSTRAP_SECURITY="http://security.debian.org/" ;; ubuntu) - LIVE_MIRROR_BUILD_SECURITY="http://security.ubuntu.org/ubuntu/" + LIVE_MIRROR_BOOTSTRAP_SECURITY="http://security.ubuntu.org/ubuntu/" ;; esac fi # Setting mirror which ends up in the image - if [ -z "${LIVE_MIRROR_IMAGE}" ] + if [ -z "${LIVE_MIRROR_BINARY}" ] then case "${LH_MODE}" in debian) - LIVE_MIRROR_IMAGE="http://ftp.debian.org/debian/" + LIVE_MIRROR_BINARY="http://ftp.debian.org/debian/" ;; ubuntu) - LIVE_MIRROR_IMAGE="http://archive.ubuntu.com/ubuntu/" + LIVE_MIRROR_BINARY="http://archive.ubuntu.com/ubuntu/" ;; esac fi # Setting security mirror which ends up in the image - if [ -z "${LIVE_MIRROR_IMAGE_SECURITY}" ] + if [ -z "${LIVE_MIRROR_BINARY_SECURITY}" ] then case "${LH_MODE}" in debian) - LIVE_MIRROR_IMAGE_SECURITY="http://security.debian.org/" + LIVE_MIRROR_BINARY_SECURITY="http://security.debian.org/" ;; ubuntu) - LIVE_MIRROR_IMAGE_SECURITY="http://security.ubuntu.com/ubuntu/" + LIVE_MIRROR_BINARY_SECURITY="http://security.ubuntu.com/ubuntu/" ;; esac fi @@ -365,21 +370,21 @@ Set_defaults () fi # Setting kernel flavour string - if [ -z "${LIVE_KERNEL_FLAVOUR}" ] + if [ -z "${LIVE_LINUX_FLAVOURS}" ] then case "${LIVE_ARCHITECTURE}" in alpha) - LIVE_KERNEL_FLAVOUR="alpha-generic" + LIVE_LINUX_FLAVOURS="alpha-generic" ;; amd64) case "${LH_MODE}" in debian) - LIVE_KERNEL_FLAVOUR="amd64" + LIVE_LINUX_FLAVOURS="amd64" ;; ubuntu) - LIVE_KERNEL_FLAVOUR="amd64-generic" + LIVE_LINUX_FLAVOURS="amd64-generic" ;; esac ;; @@ -390,46 +395,46 @@ Set_defaults () ;; hppa) - LIVE_KERNEL_FLAVOUR="parisc" + LIVE_LINUX_FLAVOURS="parisc" ;; i386) case "${LH_MODE}" in debian) - LIVE_KERNEL_FLAVOUR="486" + LIVE_LINUX_FLAVOURS="486" ;; ubuntu) - LIVE_KERNEL_FLAVOUR="386" + LIVE_LINUX_FLAVOURS="386" ;; esac ;; ia64) - LIVE_KERNEL_FLAVOUR="itanium" + LIVE_LINUX_FLAVOURS="itanium" ;; m68k) - LIVE_KERNEL_FLAVOUR="E: You need to specify the linux kernel flavour manually on m68k." + LIVE_LINUX_FLAVOURS="E: You need to specify the linux kernel flavour manually on m68k." exit 1 ;; powerpc) - LIVE_KERNEL_FLAVOUR="powerpc" + LIVE_LINUX_FLAVOURS="powerpc" ;; s390) - LIVE_KERNEL_FLAVOUR="s390" + LIVE_LINUX_FLAVOURS="s390" ;; sparc) case "${LH_MODE}" in debian) - LIVE_KERNEL_FLAVOUR="sparc32" + LIVE_LINUX_FLAVOURS="sparc32" ;; ubuntu) - LIVE_KERNEL_FLAVOUR="sparc64" + LIVE_LINUX_FLAVOURS="sparc64" ;; esac ;; @@ -441,21 +446,21 @@ Set_defaults () fi # Set kernel packages - if [ -z "${LIVE_KERNEL_PACKAGES}" ] + if [ -z "${LIVE_LINUX_PACKAGES}" ] then case "${LH_MODE}" in debian) - LIVE_KERNEL_PACKAGES="linux-image-2.6 squashfs-modules-2.6 unionfs-modules-2.6" + LIVE_LINUX_PACKAGES="linux-image-2.6 squashfs-modules-2.6 unionfs-modules-2.6" ;; ubuntu) - LIVE_KERNEL_PACKAGES="linux-image" + LIVE_LINUX_PACKAGES="linux-image" ;; esac if [ -n "${LIVE_ENCRYPTION}" ] then - LIVE_KERNEL_PACKAGES="${LIVE_KERNEL_PACKAGES} loop-aes-modules-2.6" + LIVE_LINUX_PACKAGES="${LIVE_LINUX_PACKAGES} loop-aes-modules-2.6" fi fi @@ -554,21 +559,21 @@ Set_defaults () fi # Setting image type - if [ -z "${LIVE_BINARY_IMAGE}" ] + if [ -z "${LIVE_BINARY_IMAGES}" ] then - LIVE_BINARY_IMAGE="iso" + LIVE_BINARY_IMAGES="iso" fi # Setting image type - if [ -z "${LIVE_SOURCE_IMAGE}" ] + if [ -z "${LIVE_SOURCE_IMAGES}" ] then - LIVE_SOURCE_IMAGE="generic" + LIVE_SOURCE_IMAGES="generic" fi - # Setting filesystem - if [ -z "${LIVE_FILESYSTEM}" ] + # Setting chroot filesystem + if [ -z "${LIVE_CHROOT_FILESYSTEM}" ] then - LIVE_FILESYSTEM="squashfs" + LIVE_CHROOT_FILESYSTEM="squashfs" fi # Setting memtest option @@ -598,21 +603,21 @@ Set_defaults () fi # Setting netboot server address - if [ -z "${LIVE_SERVER_ADDRESS}" ] + if [ -z "${LIVE_NET_SERVER}" ] then - LIVE_SERVER_ADDRESS="192.168.1.1" + LIVE_NET_SERVER="192.168.1.1" fi # Setting netboot server path - if [ -z "${LIVE_SERVER_PATH}" ] + if [ -z "${LIVE_NET_PATH}" ] then case "${LH_MODE}" in debian) - LIVE_SERVER_PATH="/srv/debian-live" + LIVE_NET_PATH="/srv/debian-live" ;; ubuntu) - LIVE_SERVER_PATH="/srv/ubuntu-live" + LIVE_NET_PATH="/srv/ubuntu-live" ;; esac fi diff --git a/functions/echo.sh b/functions/echo.sh index f28879c..f304381 100755 --- a/functions/echo.sh +++ b/functions/echo.sh @@ -23,7 +23,7 @@ Echo_error () { STRING="${1}" - echo "E: ${STRING}" + echo "E: ${STRING}" >&2 } Echo_message () diff --git a/helpers/lh_binary b/helpers/lh_binary index 038a19a..45c405a 100755 --- a/helpers/lh_binary +++ b/helpers/lh_binary @@ -41,14 +41,14 @@ lh_binary_manifest ${*} lh_binary_encryption ${*} # Prepare images -lh_binary_linuximage ${*} +lh_binary_linux-image ${*} lh_binary_debian-installer ${*} lh_binary_memtest ${*} lh_binary_grub ${*} lh_binary_syslinux ${*} lh_binary_yaboot ${*} lh_binary_includes ${*} -lh_binary_localincludes ${*} +lh_binary_local-includes ${*} lh_binary_md5sum ${*} # Building images diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer index b5927a0..0344303 100755 --- a/helpers/lh_binary_debian-installer +++ b/helpers/lh_binary_debian-installer @@ -52,7 +52,7 @@ Check_lockfile .lock Create_lockfile .lock # Setting destination directory -case "${LIVE_BINARY_IMAGE}" in +case "${LIVE_BINARY_IMAGES}" in iso) DESTDIR="binary/install" DESTDIR_INSTALLER="cdrom" @@ -67,13 +67,13 @@ case "${LIVE_BINARY_IMAGE}" in ;; usb-hdd|hdd) - DESTDIR="binary" + DESTDIR="binary/install" DESTDIR_INSTALLER="hd-media" ;; esac # Temporary check for broken syslinux -if [ "${LIVE_BINARY_IMAGE}" = "iso" ] +if [ "${LIVE_BINARY_IMAGES}" = "iso" ] then # Assemble multi-arch if [ -n "${MULTIARCH}" ] @@ -97,16 +97,16 @@ fi # Downloading debian-installer mkdir -p "${DESTDIR}" -wget --no-clobber -O "${DESTDIR}"/vmlinuz "${LIVE_MIRROR_BUILD}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/vmlinuz -wget --no-clobber -O "${DESTDIR}"/initrd.gz "${LIVE_MIRROR_BUILD}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/initrd.gz +wget --no-clobber -O "${DESTDIR}"/vmlinuz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/vmlinuz +wget --no-clobber -O "${DESTDIR}"/initrd.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/initrd.gz # Downloading graphical-installer if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ] then mkdir -p "${DESTDIR}"/gtk - wget --no-clobber -O "${DESTDIR}"/gtk/vmlinuz "${LIVE_MIRROR_BUILD}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/vmlinuz - wget --no-clobber -O "${DESTDIR}"/gtk/initrd.gz "${LIVE_MIRROR_BUILD}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/initrd.gz + wget --no-clobber -O "${DESTDIR}"/gtk/vmlinuz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/vmlinuz + wget --no-clobber -O "${DESTDIR}"/gtk/initrd.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/initrd.gz fi FIXME () @@ -114,7 +114,7 @@ FIXME () # Downloading udebs mkdir -p binary/dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}" cd binary/dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}" -wget "${LIVE_MIRROR_BUILD}"/dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}"/Packages.gz +wget "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}"/Packages.gz gunzip -c Packages.gz > Packages cd "${OLDPWD}" @@ -132,7 +132,7 @@ for UDEB in ${UDEBS} do mkdir -p binary/`dirname ${UDEB}` cd binary/`dirname ${UDEB}` - wget "${LIVE_MIRROR_BUILD}"/${UDEB} + wget "${LIVE_MIRROR_BOOTSTRAP}"/${UDEB} cd "${OLDPWD}" done diff --git a/helpers/lh_binary_encryption b/helpers/lh_binary_encryption index e404207..f055a07 100755 --- a/helpers/lh_binary_encryption +++ b/helpers/lh_binary_encryption @@ -62,7 +62,7 @@ case "${LH_INITRAMFS}" in ;; esac -case "${LIVE_FILESYSTEM}" in +case "${LIVE_CHROOT_FILESYSTEM}" in ext2) ROOTFS="ext2" ;; @@ -84,14 +84,14 @@ Check_package chroot/usr/bin/aespipe aespipe Install_package # Moving image -mv binary/${INITFS}/filesystem.${LIVE_FILESYSTEM} chroot +mv binary/${INITFS}/filesystem.${LIVE_CHROOT_FILESYSTEM} chroot echo "Encrypting binary/${INITFS}/filesystem.${ROOTFS} with ${LIVE_ENCRYPTION}..." -cat >> chroot/encrypt << EOF +cat >> chroot/encrypt.sh << EOF while true do - cat filesystem.${ROOTFS} | aespipe -e ${LIVE_ENCRYPTION} -T > filesystem.${ROOTFS} && break + cat filesystem.${ROOTFS} | aespipe -e ${LIVE_ENCRYPTION} -T > filesystem.${ROOTFS}.tmp && mv filesystem.${ROOTFS}.tmp filesystem.${ROOTFS} && break echo -n "Something went wrong... Retry? [YES/no] " @@ -105,11 +105,11 @@ do done EOF -Chroot "sh encrypt" +Chroot "sh encrypt.sh" # Move image -mv chroot/filesystem.${LIVE_FILESYSTEM} binary/${INITFS} -rm -f chroot/encrypt +mv chroot/filesystem.${LIVE_CHROOT_FILESYSTEM} binary/${INITFS} +rm -f chroot/encrypt.sh # Removing depends Remove_package diff --git a/helpers/lh_binary_grub b/helpers/lh_binary_grub index 35e3e48..6476f0c 100755 --- a/helpers/lh_binary_grub +++ b/helpers/lh_binary_grub @@ -57,7 +57,7 @@ then exit 0 fi -# Check templates +# Check user templates if [ ! -d "${LIVE_TEMPLATES}" ] then if [ -d ../"${LIVE_TEMPLATES}" ] @@ -69,6 +69,12 @@ then fi fi +# Check local templates +if [ -d config/templates/grub ] +then + LIVE_TEMPLATES="config/templates" +fi + # Checking depends Check_package chroot/usr/sbin/grub grub @@ -86,7 +92,7 @@ case "${LH_INITRAMFS}" in esac # Setting destination directory -case "${LIVE_BINARY_IMAGE}" in +case "${LIVE_BINARY_IMAGES}" in iso|usb-hdd|hdd) DESTDIR_LIVE="binary/live" DESTDIR_INSTALL="binary/install" @@ -99,7 +105,7 @@ case "${LIVE_BINARY_IMAGE}" in esac # Temporary check for broken syslinux -if [ "${LIVE_BINARY_IMAGE}" = "iso" ] +if [ "${LIVE_BINARY_IMAGES}" = "iso" ] then # Assemble multi-arch if [ -n "${MULTIARCH}" ] @@ -146,12 +152,12 @@ LIVE_BOOTAPPEND="`echo ${LIVE_BOOTAPPEND} | sed -e 's/ //'`" FAILSAFE="noapic noapm nodma nomce nolapic nosmp vga=normal" # Assembling kernel configuration -DEFAULT_FLAVOUR="`echo ${LIVE_KERNEL_FLAVOUR} | awk '{ print $1 }'`" +DEFAULT_FLAVOUR="`echo ${LIVE_LINUX_FLAVOURS} | awk '{ print $1 }'`" LINUX="title\t\tDebian GNU/Linux - live\nkernel\t\t/`basename ${DESTDIR_LIVE}`/`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}` boot=${INITFS} LIVE_BOOTAPPEND\ninitrd\t\t/`basename ${DESTDIR_LIVE}`/initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'`" LINUX="${LINUX}\n\ntitle\t\tDebian GNU/Linux - live (fail-safe mode)\nkernel\t\t/`basename ${DESTDIR_LIVE}`/`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}\ninitrd\t\t/`basename ${DESTDIR_LIVE}`/initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'`" -if [ "`echo ${LIVE_KERNEL_FLAVOUR} | wc -w`" -gt "1" ] +if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ] then for KERNEL in chroot/boot/vmlinuz* do @@ -173,15 +179,15 @@ if [ "${LIVE_DEBIAN_INSTALLER}" = "enabled" ] then LINUX="title\t\tLive:\nroot\n\n${LINUX}" - LIVE_KERNEL_INSTALL="title\t\tInstaller:\nroot" - LIVE_KERNEL_INSTALL="${LIVE_KERNEL_INSTALL}\n\ntitle\t\tDebian GNU/Linux - install\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz vga=normal -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/initrd.gz" - LIVE_KERNEL_INSTALL="${LIVE_KERNEL_INSTALL}\n\ntitle\t\tDebian GNU/Linux - installgui\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz video=vesa:ywrap,mtrr vga=788 -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz" - LIVE_KERNEL_INSTALL="${LIVE_KERNEL_INSTALL}\n\ntitle\t\tDebian GNU/Linux - expert\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz priority=low vga=normal -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/initrd.gz" - LIVE_KERNEL_INSTALL="${LIVE_KERNEL_INSTALL}\n\ntitle\t\tDebian GNU/Linux - expertgui\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz priority=low video=vesa:ywrap,mtrr vga=788\ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz" - LIVE_KERNEL_INSTALL="${LIVE_KERNEL_INSTALL}\n\ntitle\t\tDebian GNU/Linux - rescue\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz vga=normal rescue/enable=true -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/initrd.gz" - LIVE_KERNEL_INSTALL="${LIVE_KERNEL_INSTALL}\n\ntitle\t\tDebian GNU/Linux - rescuegui\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz video=vesa:ywrap,mtrr vga=788 rescue/enable=true --\ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz" - LIVE_KERNEL_INSTALL="${LIVE_KERNEL_INSTALL}\n\ntitle\t\tDebian GNU/Linux - auto\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz auto=true priority=critical vga=normal -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/initrd.gz" - LIVE_KERNEL_INSTALL="${LIVE_KERNEL_INSTALL}\n\ntitle\t\tDebian GNU/Linux - autogui\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz auto=true priority=critical video=vesa:ywrap,mtrr vga=788 -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz" + LIVE_LINUX_INSTALL="title\t\tInstaller:\nroot" + LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - install\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz vga=normal -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/initrd.gz" + LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - installgui\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz video=vesa:ywrap,mtrr vga=788 -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz" + LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - expert\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz priority=low vga=normal -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/initrd.gz" + LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - expertgui\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz priority=low video=vesa:ywrap,mtrr vga=788\ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz" + LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - rescue\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz vga=normal rescue/enable=true -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/initrd.gz" + LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - rescuegui\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz video=vesa:ywrap,mtrr vga=788 rescue/enable=true --\ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz" + LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - auto\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz auto=true priority=critical vga=normal -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/initrd.gz" + LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - autogui\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz auto=true priority=critical video=vesa:ywrap,mtrr vga=788 -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz" fi # Assembling memtest configuration @@ -196,7 +202,7 @@ mkdir -p binary/boot/grub cp -r "${LIVE_TEMPLATES}"/grub/* binary/boot/grub # Copyring grub -case ${LIVE_BINARY_IMAGE} in +case ${LIVE_BINARY_IMAGES} in iso) cp chroot/usr/lib/grub/*/stage2_eltorito binary/boot/grub ;; @@ -236,7 +242,7 @@ root LIVE_MEMTEST EOF -sed -i -e "s#LIVE_KERNEL_LIVE#${LINUX}#" -e "s#LIVE_KERNEL_INSTALL#${LIVE_KERNEL_INSTALL}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" binary/boot/grub/menu.lst +sed -i -e "s#LIVE_LINUX_LIVE#${LINUX}#" -e "s#LIVE_LINUX_INSTALL#${LIVE_LINUX_INSTALL}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" binary/boot/grub/menu.lst sed -i -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" binary/boot/grub/menu.lst # Removing depends diff --git a/helpers/lh_binary_hdd b/helpers/lh_binary_hdd index a3af088..8841d15 100755 --- a/helpers/lh_binary_hdd +++ b/helpers/lh_binary_hdd @@ -33,7 +33,7 @@ Read_conffile config/source Set_defaults -for IMAGE in ${LIVE_BINARY_IMAGE} +for IMAGE in ${LIVE_BINARY_IMAGES} do if [ "${IMAGE}" = "hdd" ] then diff --git a/helpers/lh_binary_includes b/helpers/lh_binary_includes index 4a1bc93..92b6a68 100755 --- a/helpers/lh_binary_includes +++ b/helpers/lh_binary_includes @@ -51,7 +51,7 @@ Check_lockfile .lock # Creating lock file Create_lockfile .lock -# Check includes +# Check user includes if [ ! -d "${LIVE_INCLUDES}" ] then if [ -d ../"${LIVE_INCLUDES}" ] @@ -63,6 +63,12 @@ then fi fi +# Checking local includes +if [ -d config/includes/"${LIVE_DISTRIBUTION}" ] +then + LIVE_INCLUDES="config/includes" +fi + # Assemble architecture case "${LIVE_ARCHITECTURE}" in amd64) diff --git a/helpers/lh_binary_iso b/helpers/lh_binary_iso index a949ff6..2f9fc2e 100755 --- a/helpers/lh_binary_iso +++ b/helpers/lh_binary_iso @@ -32,7 +32,7 @@ Read_conffile config/binary Read_conffile config/source Set_defaults -for IMAGE in ${LIVE_BINARY_IMAGE} +for IMAGE in ${LIVE_BINARY_IMAGES} do if [ "${IMAGE}" = "iso" ] then @@ -75,23 +75,41 @@ do then case "${LIVE_BOOTLOADER}" in grub) - Chroot "${LH_GENISOIMAGE} ${GENISOIMAGE_OPTIONS} -o binary.iso -r -J -l -cache-inodes -b boot/grub/stage2_eltorito -m boot/grub/stage2_eltorito -no-emul-boot -boot-load-size 4 -boot-info-table binary" + GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -b boot/grub/stage2_eltorito" + + if [ "${LIVE_PACKAGES_LISTS}" = "mini" ] || [ "${LIVE_PACKAGES_LISTS}" = "minimal" ] + then + GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -m boot/grub/stage2_eltorito" + fi ;; syslinux) - #Chroot "${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 binary.iso -r -J -l -V \"${LIVE_ISO_VOLUME}\" -cache-inodes -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table binary" - Chroot "${LH_GENISOIMAGE} ${GENISOIMAGE_OPTIONS} -o binary.iso -r -J -l -cache-inodes -b isolinux/isolinux.bin -m isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table binary" + GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -b isolinux/isolinux.bin -c isolinux/boot.cat" + + if [ "${LIVE_PACKAGES_LISTS}" = "mini" ] || [ "${LIVE_PACKAGES_LISTS}" = "minimal" ] + then + GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -m isolinux/isolinux.bin" + fi + ;; + + *) + Echo_warning "Bootloader on your architecture not yet supported (Continuing in 5 seconds)." + sleep 5 ;; esac - else - Echo_warning "Bootloader on your architecture not yet supported (Continuing in 5 seconds)." - sleep 5 - #Chroot "${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 binary.iso -r -J -l -V \"${LIVE_ISO_VOLUME}\" binary" - Chroot "${LH_GENISOIMAGE} ${GENISOIMAGE} -o binary.iso -r -J -l binary -cache-inodes" + + GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -no-emul-boot -boot-load-size 4 -boot-info-table" fi +cat >> chroot/binary.sh << EOF +${LH_GENISOIMAGE} ${GENISOIMAGE_OPTIONS} -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" -V "${LIVE_ISO_VOLUME}" -o binary.iso -r -J -l -cache-inodes binary +EOF + + Chroot "sh binary.sh" + # Move image mv chroot/binary chroot/binary.iso ./ + rm -f chroot/binary.sh # Removing depends Remove_package diff --git a/helpers/lh_binary_linux-image b/helpers/lh_binary_linux-image new file mode 100755 index 0000000..c7e5dd6 --- /dev/null +++ b/helpers/lh_binary_linux-image @@ -0,0 +1,100 @@ +#!/bin/sh + +# lh_binary_linux-image(1) - install linux-image into binary +# Copyright (C) 2006-2007 Daniel Baumann +# +# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING. +# This is free software, and you are welcome to redistribute it +# under certain conditions; see COPYING for details. + +set -e + +# Source common functions +for FUNCTION in /usr/share/live-helper/functions/*.sh +do + . ${FUNCTION} +done + +# Set static variables +DESCRIPTION="install linux-image into binary" +HELP="" +USAGE="${PROGRAM} [--force]" + +Arguments "${@}" + +Echo_debug "Init ${PROGRAM}" + +# Reading configuration files +Read_conffile config/common +Read_conffile config/bootstrap +Read_conffile config/chroot +Read_conffile config/binary +Read_conffile config/source +Set_defaults + +Breakpoint "binary_linux-image: Init" + +# Requiring stage file +Require_stagefile .stage/bootstrap + +# Checking stage file +Check_stagefile .stage/binary_linux-image + +# Checking lock file +Check_lockfile .lock + +# Creating lock file +Create_lockfile .lock + +# Removing initrd backup files +rm -f chroot/boot/initrd*bak* + +# Setting destination directory +case "${LIVE_BINARY_IMAGES}" in + iso) + DESTDIR="binary/live" + ;; + + net) + DESTDIR="tftpboot" + ;; + + usb-hdd|hdd) + DESTDIR="binary/live" + ;; +esac + +# Temporary check for broken syslinux +if [ "${LIVE_BINARY_IMAGES}" = "iso" ] +then + # Assemble multi-arch + if [ -n "${MULTIARCH}" ] + then + case "${LIVE_ARCHITECTURE}" in + amd64) + DESTDIR="${DESTDIR}.amd" + ;; + + i386) + DESTDIR="${DESTDIR}.386" + ;; + + powerpc) + DESTDIR="${DESTDIR}.ppc" + ;; + esac + fi +fi + +# Creating directory +if [ ! -d "${DESTDIR}" ] +then + mkdir -p "${DESTDIR}" +fi + +# Installing linux-image +cp chroot/boot/vmlinuz* "${DESTDIR}" +cp chroot/boot/initrd.img* "${DESTDIR}" + +# Creating stage file +Create_stagefile .stage/binary_linux-image diff --git a/helpers/lh_binary_linuximage b/helpers/lh_binary_linuximage deleted file mode 100755 index 629ef77..0000000 --- a/helpers/lh_binary_linuximage +++ /dev/null @@ -1,100 +0,0 @@ -#!/bin/sh - -# lh_binary_linuximage(1) - install linux-image into binary -# Copyright (C) 2006-2007 Daniel Baumann -# -# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING. -# This is free software, and you are welcome to redistribute it -# under certain conditions; see COPYING for details. - -set -e - -# Source common functions -for FUNCTION in /usr/share/live-helper/functions/*.sh -do - . ${FUNCTION} -done - -# Set static variables -DESCRIPTION="install linux-image into binary" -HELP="" -USAGE="${PROGRAM} [--force]" - -Arguments "${@}" - -Echo_debug "Init ${PROGRAM}" - -# Reading configuration files -Read_conffile config/common -Read_conffile config/bootstrap -Read_conffile config/chroot -Read_conffile config/binary -Read_conffile config/source -Set_defaults - -Breakpoint "binary_linuximage: Init" - -# Requiring stage file -Require_stagefile .stage/bootstrap - -# Checking stage file -Check_stagefile .stage/binary_linuximage - -# Checking lock file -Check_lockfile .lock - -# Creating lock file -Create_lockfile .lock - -# Removing initrd backup files -rm -f chroot/boot/initrd*bak* - -# Setting destination directory -case "${LIVE_BINARY_IMAGE}" in - iso) - DESTDIR="binary/live" - ;; - - net) - DESTDIR="tftpboot" - ;; - - usb-hdd|hdd) - DESTDIR="binary" - ;; -esac - -# Temporary check for broken syslinux -if [ "${LIVE_BINARY_IMAGE}" = "iso" ] -then - # Assemble multi-arch - if [ -n "${MULTIARCH}" ] - then - case "${LIVE_ARCHITECTURE}" in - amd64) - DESTDIR="${DESTDIR}.amd" - ;; - - i386) - DESTDIR="${DESTDIR}.386" - ;; - - powerpc) - DESTDIR="${DESTDIR}.ppc" - ;; - esac - fi -fi - -# Creating directory -if [ ! -d "${DESTDIR}" ] -then - mkdir -p "${DESTDIR}" -fi - -# Installing linux-image -cp chroot/boot/vmlinuz* "${DESTDIR}" -cp chroot/boot/initrd.img* "${DESTDIR}" - -# Creating stage file -Create_stagefile .stage/binary_linuximage diff --git a/helpers/lh_binary_local-includes b/helpers/lh_binary_local-includes new file mode 100755 index 0000000..8b6e5aa --- /dev/null +++ b/helpers/lh_binary_local-includes @@ -0,0 +1,64 @@ +#!/bin/sh + +# lh_binary_local-includes(1) - copy files into binary +# Copyright (C) 2006-2007 Daniel Baumann +# +# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING. +# This is free software, and you are welcome to redistribute it +# under certain conditions; see COPYING for details. + +set -e + +# Source common functions +for FUNCTION in /usr/share/live-helper/functions/*.sh +do + . ${FUNCTION} +done + +# Set static variables +DESCRIPTION="copy files into binary" +HELP="" +USAGE="${PROGRAM} [--force]" + +Arguments "${@}" + +Echo_debug "Init ${PROGRAM}" + +# Reading configuration files +Read_conffile config/common +Read_conffile config/bootstrap +Read_conffile config/chroot +Read_conffile config/binary +Read_conffile config/source +Set_defaults + +Breakpoint "binary_local-includes: Init" + +# Requiring stage file +Require_stagefile .stage/bootstrap + +# Checking stage file +Check_stagefile .stage/binary_local-includes + +# Checking lock file +Check_lockfile .lock + +# Creating lock file +Create_lockfile .lock + +if ls config/binary_local-includes/* &> /dev/null +then + # Copying includes + cd config/binary_local-includes + find . | cpio -dmpu "${OLDPWD}"/binary + cd "${OLDPWD}" + + # Removing symlinks + if [ "${LIVE_BINARY_IMAGES}" = "usb-hdd" ] + then + find binary -type l | xargs rm -f + fi + + # Creating stage file + Create_stagefile .stage/binary_local-includes +fi diff --git a/helpers/lh_binary_localincludes b/helpers/lh_binary_localincludes deleted file mode 100755 index 66504c1..0000000 --- a/helpers/lh_binary_localincludes +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/sh - -# lh_binary_localincludes(1) - copy files into binary -# Copyright (C) 2006-2007 Daniel Baumann -# -# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING. -# This is free software, and you are welcome to redistribute it -# under certain conditions; see COPYING for details. - -set -e - -# Source common functions -for FUNCTION in /usr/share/live-helper/functions/*.sh -do - . ${FUNCTION} -done - -# Set static variables -DESCRIPTION="copy files into binary" -HELP="" -USAGE="${PROGRAM} [--force]" - -Arguments "${@}" - -Echo_debug "Init ${PROGRAM}" - -# Reading configuration files -Read_conffile config/common -Read_conffile config/bootstrap -Read_conffile config/chroot -Read_conffile config/binary -Read_conffile config/source -Set_defaults - -Breakpoint "binary_localincludes: Init" - -# Requiring stage file -Require_stagefile .stage/bootstrap - -# Checking stage file -Check_stagefile .stage/binary_localincludes - -# Checking lock file -Check_lockfile .lock - -# Creating lock file -Create_lockfile .lock - -if ls config/binary_localincludes/* &> /dev/null -then - # Copying includes - cd config/binary_localincludes - find . | cpio -dmpu "${OLDPWD}"/binary - cd "${OLDPWD}" - - # Removing symlinks - if [ "${LIVE_BINARY_IMAGE}" = "usb-hdd" ] - then - find binary -type l | xargs rm -f - fi - - # Creating stage file - Create_stagefile .stage/binary_localincludes -fi diff --git a/helpers/lh_binary_md5sum b/helpers/lh_binary_md5sum index 8964593..e044406 100755 --- a/helpers/lh_binary_md5sum +++ b/helpers/lh_binary_md5sum @@ -54,7 +54,9 @@ fi # Calculating md5sums cd binary -find . -type f -print0 | xargs -0 md5sum > md5sum.txt +find . -type f | sort | grep -v 'isolinux/isolinux.bin' | grep -v 'boot/grub/stage2_eltorito' | xargs md5sum > ../md5sum.txt +mv ../md5sum.txt ./ + cd "${OLDPWD}" # Creating stage file diff --git a/helpers/lh_binary_memtest b/helpers/lh_binary_memtest index edf3830..eedc054 100755 --- a/helpers/lh_binary_memtest +++ b/helpers/lh_binary_memtest @@ -72,7 +72,7 @@ esac Install_package # Setting destination directory -case "${LIVE_BINARY_IMAGE}" in +case "${LIVE_BINARY_IMAGES}" in iso) DESTDIR="binary/live" ;; @@ -82,12 +82,12 @@ case "${LIVE_BINARY_IMAGE}" in ;; usb-hdd|hdd) - DESTDIR="binary" + DESTDIR="binary/live" ;; esac # Temporary check for broken syslinux -if [ "${LIVE_BINARY_IMAGE}" = "iso" ] +if [ "${LIVE_BINARY_IMAGES}" = "iso" ] then # Assemble multi-arch if [ -n "${MULTIARCH}" ] diff --git a/helpers/lh_binary_net b/helpers/lh_binary_net index 47ed7d2..6ebe7ea 100755 --- a/helpers/lh_binary_net +++ b/helpers/lh_binary_net @@ -34,7 +34,7 @@ Set_defaults Breakpoint "binary_net: Init" -for IMAGE in ${LIVE_BINARY_IMAGE} +for IMAGE in ${LIVE_BINARY_IMAGES} do if [ "${IMAGE}" = "net" ] then @@ -57,21 +57,21 @@ do fi # Creating image file - if [ "`basename ${LIVE_SERVER_PATH}`" = "chroot" ] + if [ "`basename ${LIVE_NET_PATH}`" = "chroot" ] then mv chroot chroot.tmp fi - mv binary "`basename ${LIVE_SERVER_PATH}`" + mv binary "`basename ${LIVE_NET_PATH}`" cd .. - tar cfz binary-net.tar.gz "`basename ${OLDPWD}`/`basename ${LIVE_SERVER_PATH}`" "`basename ${OLDPWD}`/tftpboot" + tar cfz binary-net.tar.gz "`basename ${OLDPWD}`/`basename ${LIVE_NET_PATH}`" "`basename ${OLDPWD}`/tftpboot" mv binary-net.tar.gz "${OLDPWD}" cd "${OLDPWD}" - mv "`basename ${LIVE_SERVER_PATH}`" binary + mv "`basename ${LIVE_NET_PATH}`" binary - if [ "`basename ${LIVE_SERVER_PATH}`" = "chroot" ] + if [ "`basename ${LIVE_NET_PATH}`" = "chroot" ] then mv chroot.tmp chroot fi diff --git a/helpers/lh_binary_rootfs b/helpers/lh_binary_rootfs index ce93038..47529a2 100755 --- a/helpers/lh_binary_rootfs +++ b/helpers/lh_binary_rootfs @@ -63,7 +63,7 @@ then mkdir -p binary/${INITFS} fi -case "${LIVE_FILESYSTEM}" in +case "${LIVE_CHROOT_FILESYSTEM}" in ext2) # Checking depends Check_package chroot/usr/bin/genext2fs genext2fs @@ -119,17 +119,17 @@ case "${LIVE_FILESYSTEM}" in if [ "${LH_VERBOSE}" = "enabled" ] then - MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -i" + MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -info" fi - # Create image if [ "${LIVE_PACKAGES_LISTS}" != "minimal" ] && [ "${LIVE_PACKAGES_LISTS}" != "mini" ] then - Chroot "mksquashfs ${MKSQUASHFS_OPTIONS} chroot filesystem.squashfs" - else - Chroot "mksquashfs ${MKSQUASHFS_OPTIONS} chroot filesystem.squashfs -e chroot/boot/vmlinuz* chroot/boot/initrd.img* chroot/vmlinuz* chroot/initrd.img* chroot/boot/config-* chroot/boot/System.map-*" + MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -e chroot/boot/vmlinuz* chroot/boot/initrd.img* chroot/vmlinuz* chroot/initrd.img* chroot/boot/config-* chroot/boot/System.map-*" fi + # Create image + Chroot "mksquashfs chroot filesystem.squashfs ${MKSQUASHFS_OPTIONS}" + # Move image ${LH_ROOT_COMMAND} mv chroot/filesystem.squashfs binary/${INITFS} ${LH_ROOT_COMMAND} rm -rf chroot/chroot diff --git a/helpers/lh_binary_syslinux b/helpers/lh_binary_syslinux index 4ca6408..ea78c86 100755 --- a/helpers/lh_binary_syslinux +++ b/helpers/lh_binary_syslinux @@ -57,7 +57,7 @@ then exit 0 fi -# Checking templates +# Checking user templates if [ ! -d "${LIVE_TEMPLATES}" ] then if [ -d ../"${LIVE_TEMPLATES}" ] @@ -69,6 +69,12 @@ then fi fi +# Check local templates +if [ -d config/templates/syslinux ] +then + LIVE_TEMPLATES="config/templates" +fi + # Checking depends Check_package chroot/usr/bin/syslinux syslinux @@ -86,7 +92,7 @@ case "${LH_INITRAMFS}" in esac # Setting destination directory -case "${LIVE_BINARY_IMAGE}" in +case "${LIVE_BINARY_IMAGES}" in iso) DESTDIR_LIVE="binary/live" DESTDIR_INSTALL="binary/install" @@ -98,13 +104,13 @@ case "${LIVE_BINARY_IMAGE}" in ;; usb-hdd|hdd) - DESTDIR_LIVE="binary" - DESTDIR_INSTALL="binary" + DESTDIR_LIVE="binary/live" + DESTDIR_INSTALL="binary/install" ;; esac # Temporary check for broken syslinux -if [ "${LIVE_BINARY_IMAGE}" = "iso" ] +if [ "${LIVE_BINARY_IMAGES}" = "iso" ] then # Assembling multi-arch if [ -n "${MULTIARCH}" ] @@ -151,24 +157,24 @@ LIVE_BOOTAPPEND="`echo ${LIVE_BOOTAPPEND} | sed -e 's/ //'`" FAILSAFE="noapic noapm nodma nomce nolapic nosmp vga=normal" # Assembling kernel configuration -if [ "${LIVE_BINARY_IMAGE}" = "iso" ] +if [ "${LIVE_BINARY_IMAGES}" != "net" ] then - DEFAULT_FLAVOUR="`echo ${LIVE_KERNEL_FLAVOUR} | awk '{ print $1 }'`" + DEFAULT_FLAVOUR="`echo ${LIVE_LINUX_FLAVOURS} | awk '{ print $1 }'`" LINUX="LABEL live\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND" LINUX="${LINUX}\n\nLABEL live-failsafe\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}" else - DEFAULT_FLAVOUR="`echo ${LIVE_KERNEL_FLAVOUR} | awk '{ print $1 }'`" + DEFAULT_FLAVOUR="`echo ${LIVE_LINUX_FLAVOURS} | awk '{ print $1 }'`" LINUX="LABEL live\n\tkernel `basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tappend initrd=initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND" LINUX="${LINUX}\n\nLABEL live-failsafe\n\tkernel `basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tappend initrd=initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}" fi -if [ "`echo ${LIVE_KERNEL_FLAVOUR} | wc -w`" -gt "1" ] +if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ] then for KERNEL in chroot/boot/vmlinuz* do if [ -z "${LINUX}" ] then - if [ "${LIVE_BINARY_IMAGE}" = "iso" ] + if [ "${LIVE_BINARY_IMAGES}" = "iso" ] then LINUX="LABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND" LINUX="${LINUX}\n\nLABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`-failsafe\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}" @@ -177,7 +183,7 @@ then LINUX="${LINUX}\n\nLABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n\tkernel `basename ${KERNEL}`\n\tappend initrd=initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}" fi else - if [ "${LIVE_BINARY_IMAGE}" = "iso" ] + if [ "${LIVE_BINARY_IMAGES}" = "iso" ] then LINUX="${LINUX}\n\nLABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND" LINUX="${LINUX}\n\nLABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`-failsafe\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}" @@ -195,21 +201,21 @@ LINUX="`echo ${LINUX} | sed -e 's#//#/#g'`" # Assembling debian-installer configuration if [ "${LIVE_DEBIAN_INSTALLER}" = "enabled" ] then - LIVE_KERNEL_INSTALL="LABEL install\n\tkernel /`basename ${DESTDIR_INSTALL}`/vmlinuz\n\tappend vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/initrd.gz -- " - LIVE_KERNEL_INSTALL="${LIVE_KERNEL_INSTALL}\n\nLABEL linux\n\tkernel /`basename ${DESTDIR_INSTALL}`/vmlinuz\n\tappend vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/initrd.gz -- \n\n" - LIVE_KERNEL_INSTALL="${LIVE_KERNEL_INSTALL}\n\nLABEL installgui\n\tkernel /`basename ${DESTDIR_INSTALL}`/vmlinuz\n\tappend video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz -- " - LIVE_KENREL_INSTALL="${LIVE_KERNEL_INSTALL}\n\nLABEL expert\n\tkernel /`basename ${DESTDIR_INSTALL}`/vmlinuz\n\tappend priority=low vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/initrd.gz -- " - LIVE_KERNEL_INSTALL="${LIVE_KERNEL_INSTALL}\n\nLABEL expertgui\n\tkernel /`basename ${DESTDIR_INSTALL}`/vmlinuz\n\tappend priority=low video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz -- " - LIVE_KERNEL_INSTALL="${LIVE_KERNEL_INSTALL}\n\nLABEL rescue\n\tkernel /`basename ${DESTDIR_INSTALL}`/vmlinuz\n\tappend vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/initrd.gz rescue/enable=true -- " - LIVE_KERNEL_INSTALL="${LIVE_KERNEL_INSTALL}\n\nLABEL rescuegui\n\tkernel /`basename ${DESTDIR_INSTALL}`/vmlinuz\n\tappend video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz rescue/enable=true -- " - LIVE_KERNEL_INSTALL="${LIVE_KERNEL_INSTALL}\n\nLABEL auto\n\tkernel /`basename ${DESTDIR_INSTALL}`/vmlinuz\n\tappend auto=true priority=critical vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/initrd.gz -- " - LIVE_KERNEL_INSTALL="${LIVE_KERNEL_INSTALL}\n\nLABEL autogui\n\tkernel /`basename ${DESTDIR_INSTALL}`/vmlinuz\n\tappend auto=true priority=critical video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz -- " + LIVE_LINUX_INSTALL="LABEL install\n\tkernel /`basename ${DESTDIR_INSTALL}`/vmlinuz\n\tappend vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/initrd.gz -- " + LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL linux\n\tkernel /`basename ${DESTDIR_INSTALL}`/vmlinuz\n\tappend vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/initrd.gz -- " + LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL installgui\n\tkernel /`basename ${DESTDIR_INSTALL}`/gtk/vmlinuz\n\tappend video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz -- " + LIVE_KENREL_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL expert\n\tkernel /`basename ${DESTDIR_INSTALL}`/vmlinuz\n\tappend priority=low vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/initrd.gz -- " + LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL expertgui\n\tkernel /`basename ${DESTDIR_INSTALL}`/gtk/vmlinuz\n\tappend priority=low video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz -- " + LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL rescue\n\tkernel /`basename ${DESTDIR_INSTALL}`/vmlinuz\n\tappend vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/initrd.gz rescue/enable=true -- " + LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL rescuegui\n\tkernel /`basename ${DESTDIR_INSTALL}`/gtk/vmlinuz\n\tappend video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz rescue/enable=true -- " + LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL auto\n\tkernel /`basename ${DESTDIR_INSTALL}`/vmlinuz\n\tappend auto=true priority=critical vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/initrd.gz -- " + LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL autogui\n\tkernel /`basename ${DESTDIR_INSTALL}`/gtk/vmlinuz\n\tappend auto=true priority=critical video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz -- " fi # Assembling memtest configuration if [ -f "${DESTDIR_LIVE}"/memtest ] then - if [ "${LIVE_BINARY_IMAGE}" = "iso" ] + if [ "${LIVE_BINARY_IMAGES}" = "iso" ] then MEMTEST="LABEL memtest\n\tkernel /`basename ${DESTDIR_LIVE}`/memtest" MEMTEST="`echo ${MEMTEST} | sed -e 's#//#/#g'`" @@ -218,7 +224,7 @@ then fi fi -case "${LIVE_BINARY_IMAGE}" in +case "${LIVE_BINARY_IMAGES}" in iso) # Copying syslinux mkdir -p binary/isolinux @@ -243,7 +249,7 @@ case "${LIVE_BINARY_IMAGE}" in fi # Configure syslinux templates - sed -i -e "s#LIVE_KERNEL_LIVE#${LINUX}#" -e "s#LIVE_KERNEL_INSTALL#${LIVE_KERNEL_INSTALL}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" binary/isolinux/isolinux.cfg + sed -i -e "s#LIVE_LINUX_LIVE#${LINUX}#" -e "s#LIVE_LINUX_INSTALL#${LIVE_LINUX_INSTALL}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" binary/isolinux/isolinux.cfg sed -i -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" binary/isolinux/isolinux.cfg sed -i -e "s/LIVE_DATE/`date +%Y%m%d`/" binary/isolinux/f1.txt sed -i -e "s/LIVE_VERSION/${VERSION}/" binary/isolinux/f10.txt @@ -252,9 +258,9 @@ case "${LIVE_BINARY_IMAGE}" in rm -f binary/isolinux/pxelinux.cfg # Working arround syslinux 8.3 limitation - if [ "`echo ${LIVE_KERNEL_FLAVOUR} | wc -w`" -gt "1" ] + if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ] then - for FLAVOUR in ${LIVE_KERNEL_FLAVOUR} + for FLAVOUR in ${LIVE_LINUX_FLAVOURS} do NUMBER=$(($NUMBER + 1)) @@ -263,9 +269,9 @@ case "${LIVE_BINARY_IMAGE}" in sed -i -e "s/vmlinuz-.*-${FLAVOUR}/vmlinuz${NUMBER}/g" -e "s/initrd.img-.*-${FLAVOUR}/initrd${NUMBER}.img/g" binary/isolinux/isolinux.cfg done else - mv "${DESTDIR_LIVE}"/vmlinuz-*-${LIVE_KERNEL_FLAVOUR} "${DESTDIR_LIVE}"/vmlinuz - mv "${DESTDIR_LIVE}"/initrd.img-*-${LIVE_KERNEL_FLAVOUR} "${DESTDIR_LIVE}"/initrd.img - sed -i -e "s/vmlinuz-.*-${LIVE_KERNEL_FLAVOUR}/vmlinuz/g" -e "s/initrd.img-.*-${LIVE_KERNEL_FLAVOUR}/initrd.img/g" binary/isolinux/isolinux.cfg + mv "${DESTDIR_LIVE}"/vmlinuz-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/vmlinuz + mv "${DESTDIR_LIVE}"/initrd.img-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/initrd.img + sed -i -e "s/vmlinuz-.*-${LIVE_LINUX_FLAVOURS}/vmlinuz/g" -e "s/initrd.img-.*-${LIVE_LINUX_FLAVOURS}/initrd.img/g" binary/isolinux/isolinux.cfg fi ;; @@ -297,8 +303,8 @@ case "${LIVE_BINARY_IMAGE}" in fi # Configure syslinux templates - sed -i -e "s#LIVE_KERNEL_LIVE#${LINUX}#" -e "s#LIVE_KERNEL_INSTALL#${LIVE_KERNEL_INSTALL}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" tftpboot/pxelinux.cfg/default - 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_LINUX_LIVE#${LINUX}#" -e "s#LIVE_LINUX_INSTALL#${LIVE_LINUX_INSTALL}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" tftpboot/pxelinux.cfg/default + sed -i -e "s/LIVE_NET_SERVER/${LIVE_NET_SERVER}/" -e "s#LIVE_NET_PATH#${LIVE_NET_PATH}#" -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" tftpboot/pxelinux.cfg/default sed -i -e "s/LIVE_DATE/`date +%Y%m%d`/" tftpboot/pxelinux.cfg/f1.txt sed -i -e "s/LIVE_VERSION/${VERSION}/" tftpboot/pxelinux.cfg/f10.txt @@ -306,9 +312,9 @@ case "${LIVE_BINARY_IMAGE}" in rm -f tftpboot/pxelinux.cfg/isolinux.cfg # Working arround syslinux 8.3 limitation - if [ "`echo ${LIVE_KERNEL_FLAVOUR} | wc -w`" -gt "1" ] + if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ] then - for FLAVOUR in ${LIVE_KERNEL_FLAVOUR} + for FLAVOUR in ${LIVE_LINUX_FLAVOURS} do NUMBER=$(($NUMBER + 1)) @@ -317,9 +323,9 @@ case "${LIVE_BINARY_IMAGE}" in sed -i -e "s/vmlinuz-.*-${FLAVOUR}/vmlinuz${NUMBER}/g" -e "s/initrd.img-.*-${FLAVOUR}/initrd${NUMBER}.img/g" binary/isolinux/isolinux.cfg done else - mv "${DESTDIR_LIVE}"/vmlinuz-*-${LIVE_KERNEL_FLAVOUR} "${DESTDIR_LIVE}"/vmlinuz - mv "${DESTDIR_LIVE}"/initrd.img-*-${LIVE_KERNEL_FLAVOUR} "${DESTDIR_LIVE}"/initrd.img - sed -i -e "s/vmlinuz-.*-${LIVE_KERNEL_FLAVOUR}/vmlinuz/g" -e "s/initrd.img-.*-${LIVE_KERNEL_FLAVOUR}/initrd.img/g" binary/isolinux/isolinux.cfg + mv "${DESTDIR_LIVE}"/vmlinuz-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/vmlinuz + mv "${DESTDIR_LIVE}"/initrd.img-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/initrd.img + sed -i -e "s/vmlinuz-.*-${LIVE_LINUX_FLAVOURS}/vmlinuz/g" -e "s/initrd.img-.*-${LIVE_LINUX_FLAVOURS}/initrd.img/g" binary/isolinux/isolinux.cfg fi ;; @@ -348,7 +354,7 @@ case "${LIVE_BINARY_IMAGE}" in fi # Configure syslinux templates - sed -i -e "s#LIVE_KERNEL_LIVE#${LINUX}#" -e "s#LIVE_KERNEL_INSTALL#${LIVE_KERNEL_INSTALL}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" binary/syslinux.cfg + sed -i -e "s#LIVE_LINUX_LIVE#${LINUX}#" -e "s#LIVE_LINUX_INSTALL#${LIVE_LINUX_INSTALL}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" binary/syslinux.cfg 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 @@ -357,9 +363,9 @@ case "${LIVE_BINARY_IMAGE}" in rm -f binary/pxelinux.cfg # Working arround syslinux 8.3 limitation - if [ "`echo ${LIVE_KERNEL_FLAVOUR} | wc -w`" -gt "1" ] + if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ] then - for FLAVOUR in ${LIVE_KERNEL_FLAVOUR} + for FLAVOUR in ${LIVE_LINUX_FLAVOURS} do NUMBER=$(($NUMBER + 1)) @@ -368,9 +374,9 @@ case "${LIVE_BINARY_IMAGE}" in sed -i -e "s/vmlinuz-.*-${FLAVOUR}/vmlinuz${NUMBER}/g" -e "s/initrd.img-.*-${FLAVOUR}/initrd${NUMBER}.img/g" binary/syslinux.cfg done else - mv "${DESTDIR_LIVE}"/vmlinuz-*-${LIVE_KERNEL_FLAVOUR} "${DESTDIR_LIVE}"/vmlinuz - mv "${DESTDIR_LIVE}"/initrd.img-*-${LIVE_KERNEL_FLAVOUR} "${DESTDIR_LIVE}"/initrd.img - sed -i -e "s/vmlinuz-.*-${LIVE_KERNEL_FLAVOUR}/vmlinuz/g" -e "s/initrd.img-.*-${LIVE_KERNEL_FLAVOUR}/initrd.img/g" binary/syslinux.cfg + mv "${DESTDIR_LIVE}"/vmlinuz-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/vmlinuz + mv "${DESTDIR_LIVE}"/initrd.img-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/initrd.img + sed -i -e "s/vmlinuz-.*-${LIVE_LINUX_FLAVOURS}/vmlinuz/g" -e "s/initrd.img-.*-${LIVE_LINUX_FLAVOURS}/initrd.img/g" binary/syslinux.cfg fi ;; esac diff --git a/helpers/lh_binary_usb-hdd b/helpers/lh_binary_usb-hdd index e643966..5185a95 100755 --- a/helpers/lh_binary_usb-hdd +++ b/helpers/lh_binary_usb-hdd @@ -34,7 +34,7 @@ Set_defaults Breakpoint "binary_usb-hdd: Init" -for IMAGE in ${LIVE_BINARY_IMAGE} +for IMAGE in ${LIVE_BINARY_IMAGES} do if [ "${IMAGE}" = "usb-hdd" ] then diff --git a/helpers/lh_binary_yaboot b/helpers/lh_binary_yaboot index 7f82d40..b8da499 100755 --- a/helpers/lh_binary_yaboot +++ b/helpers/lh_binary_yaboot @@ -57,7 +57,7 @@ then exit 0 fi -# Check templates +# Check user templates if [ ! -d "${LIVE_TEMPLATES}" ] then if [ -d ../"${LIVE_TEMPLATES}" ] @@ -69,6 +69,12 @@ then fi fi +# Checking local templates +if [ -d config/templates/yaboot ] +then + LIVE_TEMPLATES="config/templates" +fi + # Checking depends Check_package chroot/usr/lib/yaboot/yaboot yaboot @@ -86,7 +92,7 @@ case "${LH_INITRAMFS}" in esac # Setting destination directory -case "${LIVE_BINARY_IMAGE}" in +case "${LIVE_BINARY_IMAGES}" in iso) DESTDIR="binary/live" ;; @@ -97,7 +103,7 @@ case "${LIVE_BINARY_IMAGE}" in esac # Temporary check for broken yaboot -if [ "${LIVE_BINARY_IMAGE}" = "iso" ] +if [ "${LIVE_BINARY_IMAGES}" = "iso" ] then case "${LIVE_ARCHITECTURE}" in powerpc) @@ -131,30 +137,30 @@ fi LIVE_BOOTAPPEND="`echo ${LIVE_BOOTAPPEND} | sed -e 's/ //'`" # Assembling kernel configuration -if [ "${LIVE_BINARY_IMAGE}" = "iso" ] +if [ "${LIVE_BINARY_IMAGES}" = "iso" ] then - DEFAULT_FLAVOUR="`echo ${LIVE_KERNEL_FLAVOUR} | awk '{ print $1 }'`" + DEFAULT_FLAVOUR="`echo ${LIVE_LINUX_FLAVOURS} | awk '{ print $1 }'`" LINUX="image=/`basename ${DESTDIR}`/`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tinitrd=/`basename ${DESTDIR}`/initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'`\n\tlabel=LIVE\n\tappend=\"boot=${INITFS} LIVE_BOOTAPPEND\"\n\tinitrd-size=1048576\n\tread-only" else - DEFAULT_FLAVOUR="`echo ${LIVE_KERNEL_FLAVOUR} | awk '{ print $1 }'`" + DEFAULT_FLAVOUR="`echo ${LIVE_LINUX_FLAVOURS} | awk '{ print $1 }'`" LINUX="image=`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tinitrd=initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'`\n\tlabel=LIVE\n\tappend=\"boot=${INITFS} LIVE_BOOTAPPEND\"\n\tinitrd-size=1048576\n\tread-only" fi # FIXME -if [ "`echo ${LIVE_KERNEL_FLAVOUR} | wc -w`" -gt "1" ] +if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ] then for KERNEL in chroot/boot/vmlinuz* do if [ -z "${LINUX}" ] then - if [ "${LIVE_BINARY_IMAGE}" = "iso" ] + if [ "${LIVE_BINARY_IMAGES}" = "iso" ] then LINUX="label LIVE-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n kernel /`basename ${DESTDIR}`/`basename ${KERNEL}`\n append initrd=/`basename ${DESTDIR}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND" else LINUX="label LIVE-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n kernel `basename ${KERNEL}`\n append initrd=initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND" fi else - if [ "${LIVE_BINARY_IMAGE}" = "iso" ] + if [ "${LIVE_BINARY_IMAGES}" = "iso" ] then LINUX="${LINUX}\nlabel LIVE-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n kernel /`basename ${DESTDIR}`/`basename ${KERNEL}`\n append initrd=/`basename ${DESTDIR}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND" else @@ -166,7 +172,7 @@ fi LINUX="`echo ${LINUX} | sed -e 's#//#/#g'`" -case "${LIVE_BINARY_IMAGE}" in +case "${LIVE_BINARY_IMAGES}" in iso) # Copying yaboot mkdir -p binary/install @@ -174,14 +180,14 @@ case "${LIVE_BINARY_IMAGE}" in cp -r "${LIVE_TEMPLATES}"/yaboot/* binary/yaboot # Configure yaboot templates - sed -i -e "s#LIVE_KERNEL_LIVE#${LINUX}#" -e "s#LIVE_KERNEL_INSTALL#${LIVE_KERNEL_INSTALL}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" binary/install/yaboot.conf + sed -i -e "s#LIVE_LINUX_LIVE#${LINUX}#" -e "s#LIVE_LINUX_INSTALL#${LIVE_LINUX_INSTALL}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" binary/install/yaboot.conf sed -i -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" binary/yaboot/yaboot.conf sed -i -e "s/LIVE_DATE/`date +%Y%m%d`/" -e "s/LIVE_VERSION/${VERSION}/" binary/yaboot/boot.msg # Working arround yaboot 8.3 limitation - if [ "`echo ${LIVE_KERNEL_FLAVOUR} | wc -w`" -gt "1" ] + if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ] then - for FLAVOUR in ${LIVE_KERNEL_FLAVOUR} + for FLAVOUR in ${LIVE_LINUX_FLAVOURS} do NUMBER=$(($NUMBER + 1)) @@ -190,9 +196,9 @@ case "${LIVE_BINARY_IMAGE}" in sed -i -e "s/LIVE.*-${FLAVOUR}/live${NUMBER}/g" -e "s/vmlinuz-.*-${FLAVOUR}/vmlinuz${NUMBER}/g" -e "s/initrd.img-.*-${FLAVOUR}/initrd${NUMBER}.img/g" -e "s/LIVE/live/" binary/install/yaboot.conf done else - mv "${DESTDIR}"/vmlinuz-*-${LIVE_KERNEL_FLAVOUR} "${DESTDIR}"/vmlinuz - mv "${DESTDIR}"/initrd.img-*-${LIVE_KERNEL_FLAVOUR} "${DESTDIR}"/initrd.img - sed -i -e "s/LIVE.*-${LIVE_KERNEL_FLAVOUR}/live/g" -e "s/vmlinuz-.*-${LIVE_KERNEL_FLAVOUR}/vmlinuz/g" -e "s/initrd.img-.*-${LIVE_KERNEL_FLAVOUR}/initrd.img/g" -e "s/LIVE/live/" binary/install/yaboot.conf + mv "${DESTDIR}"/vmlinuz-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR}"/vmlinuz + mv "${DESTDIR}"/initrd.img-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR}"/initrd.img + sed -i -e "s/LIVE.*-${LIVE_LINUX_FLAVOURS}/live/g" -e "s/vmlinuz-.*-${LIVE_LINUX_FLAVOURS}/vmlinuz/g" -e "s/initrd.img-.*-${LIVE_LINUX_FLAVOURS}/initrd.img/g" -e "s/LIVE/live/" binary/install/yaboot.conf fi ;; esac diff --git a/helpers/lh_bootstrap_cdebootstrap b/helpers/lh_bootstrap_cdebootstrap index cc7ffca..dad8948 100755 --- a/helpers/lh_bootstrap_cdebootstrap +++ b/helpers/lh_bootstrap_cdebootstrap @@ -120,7 +120,7 @@ then fi # Executing cdebootstrap (download-only) - ${LH_ROOT_COMMAND} cdebootstrap ${CDEBOOTSTRAP_OPTIONS} --download-only "${LIVE_DISTRIBUTION}" chroot "${LIVE_MIRROR_BUILD}" + ${LH_ROOT_COMMAND} cdebootstrap ${CDEBOOTSTRAP_OPTIONS} --download-only "${LIVE_DISTRIBUTION}" chroot "${LIVE_MIRROR_BOOTSTRAP}" if [ -n "${LH_ROOT_COMMAND}" ] then @@ -143,7 +143,7 @@ then fi # Executing cdebootstrap (regular run) - ${LH_ROOT_COMMAND} cdebootstrap ${CDEBOOTSTRAP_OPTIONS} "${LIVE_DISTRIBUTION}" chroot "${LIVE_MIRROR_BUILD}" + ${LH_ROOT_COMMAND} cdebootstrap ${CDEBOOTSTRAP_OPTIONS} "${LIVE_DISTRIBUTION}" chroot "${LIVE_MIRROR_BOOTSTRAP}" if [ -n "${LH_ROOT_COMMAND}" ] then @@ -174,6 +174,11 @@ then rm -rf cache/stages_bootstrap fi + if [ ! -d cache ] + then + mkdir cache + fi + ${LH_ROOT_COMMAND} cp -a chroot cache/stages_bootstrap if [ -n "${LH_ROOT_COMMAND}" ] diff --git a/helpers/lh_bootstrap_debootstrap b/helpers/lh_bootstrap_debootstrap index 0538422..c3e4cad 100755 --- a/helpers/lh_bootstrap_debootstrap +++ b/helpers/lh_bootstrap_debootstrap @@ -103,7 +103,7 @@ then fi # Executing debootstrap (download-only) - ${LH_ROOT_COMMAND} debootstrap ${DEBOOTSTRAP_OPTIONS} --download-only "${LIVE_DISTRIBUTION}" chroot "${LIVE_MIRROR_BUILD}" "${LIVE_DEBOOTSTRAP_SCRIPT}" + ${LH_ROOT_COMMAND} debootstrap ${DEBOOTSTRAP_OPTIONS} --download-only "${LIVE_DISTRIBUTION}" chroot "${LIVE_MIRROR_BOOTSTRAP}" "${LIVE_DEBOOTSTRAP_SCRIPT}" if [ -n "${LH_ROOT_COMMAND}" ] then @@ -126,7 +126,7 @@ then fi # Executing debootstrap (regular run) - ${LH_ROOT_COMMAND} debootstrap ${DEBOOTSTRAP_OPTIONS} "${LIVE_DISTRIBUTION}" chroot "${LIVE_MIRROR_BUILD}" "${LIVE_DEBOOTSTRAP_SCRIPT}" + ${LH_ROOT_COMMAND} debootstrap ${DEBOOTSTRAP_OPTIONS} "${LIVE_DISTRIBUTION}" chroot "${LIVE_MIRROR_BOOTSTRAP}" "${LIVE_DEBOOTSTRAP_SCRIPT}" if [ -n "${LH_ROOT_COMMAND}" ] then @@ -146,6 +146,11 @@ then rm -rf cache/stages_bootstrap fi + if [ ! -d cache ] + then + mkdir cache + fi + ${LH_ROOT_COMMAND} cp -a chroot cache/stages_bootstrap if [ -n "${LH_ROOT_COMMAND}" ] diff --git a/helpers/lh_chroot b/helpers/lh_chroot index 451a6b4..7c0015e 100755 --- a/helpers/lh_chroot +++ b/helpers/lh_chroot @@ -43,25 +43,25 @@ lh_chroot_hosts install ${*} lh_chroot_resolv install ${*} lh_chroot_apt install ${*} lh_chroot_sources install ${*} -lh_chroot_linuximage install ${*} +lh_chroot_linux-image install ${*} # Customizing chroot lh_chroot_tasks ${*} lh_chroot_packageslists ${*} lh_chroot_packages ${*} -lh_chroot_localpackages ${*} -lh_chroot_localpackageslists ${*} +lh_chroot_local-packageslists ${*} +lh_chroot_local-packages ${*} lh_chroot_localization ${*} -lh_chroot_localincludes ${*} +lh_chroot_local-includes ${*} lh_chroot_sysvinit ${*} lh_chroot_hooks ${*} -lh_chroot_localhooks ${*} +lh_chroot_local-hooks ${*} lh_chroot_symlinks ${*} lh_chroot_hacks ${*} lh_chroot_interactive ${*} # Deconfiguring chroot -lh_chroot_linuximage remove ${*} +lh_chroot_linux-image remove ${*} lh_chroot_sources remove ${*} lh_chroot_apt remove ${*} lh_chroot_resolv remove ${*} diff --git a/helpers/lh_chroot_apt b/helpers/lh_chroot_apt index c7cce89..97d7087 100755 --- a/helpers/lh_chroot_apt +++ b/helpers/lh_chroot_apt @@ -94,10 +94,12 @@ case "${1}" in case "${LH_APT_SECURE}" in enabled) echo "APT::Get::AllowUnauthenticated \"true\";" > chroot/etc/apt/apt.conf.d/00secure + echo "Aptitude::CmdLine::Ignore-Trust-Violations \"false\";" >> chroot/etc/apt/apt.conf.d/00secure ;; disabled) echo "APT::Get::AllowUnauthenticated \"false\";" > chroot/etc/apt/apt.conf.d/00secure + echo "Aptitude::CmdLine::Ignore-Trust-Violations \"true\";" >> chroot/etc/apt/apt.conf.d/00secure ;; esac diff --git a/helpers/lh_chroot_hacks b/helpers/lh_chroot_hacks index ea74666..1c828dc 100755 --- a/helpers/lh_chroot_hacks +++ b/helpers/lh_chroot_hacks @@ -49,7 +49,7 @@ Create_lockfile .lock # Removing udev mac caching rule Chroot "rm -f /etc/udev/rules.d/z25_persistent-net.rules" -case "${LIVE_BINARY_IMAGE}" in +case "${LIVE_BINARY_IMAGES}" in net) if [ ! -f chroot/usr/bin/smbmount ] then diff --git a/helpers/lh_chroot_linux-image b/helpers/lh_chroot_linux-image new file mode 100755 index 0000000..660ae40 --- /dev/null +++ b/helpers/lh_chroot_linux-image @@ -0,0 +1,115 @@ +#!/bin/sh + +# lh_chroot_linux-image(1) - manage /etc/kernel-img.conf +# Copyright (C) 2006-2007 Daniel Baumann +# +# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING. +# This is free software, and you are welcome to redistribute it +# under certain conditions; see COPYING for details. + +set -e + +# Source common functions +for FUNCTION in /usr/share/live-helper/functions/*.sh +do + . ${FUNCTION} +done + +# Set static variables +DESCRIPTION="manage /etc/kernel-img.conf" +HELP="" +USAGE="${PROGRAM} {install|remove} [--force]" + +Arguments "${@}" + +Echo_debug "Init ${PROGRAM}" + +# Reading configuration files +Read_conffile config/common +Read_conffile config/bootstrap +Read_conffile config/chroot +Read_conffile config/binary +Read_conffile config/source +Set_defaults + +Breakpoint "chroot_linux-image: Init" + +# Requiring stage file +Require_stagefile .stage/bootstrap + +case "${1}" in + install) + # Checking stage file + Check_stagefile .stage/chroot_linux-image + + # Checking lock file + Check_lockfile .lock + + # Creating lock file + Create_lockfile .lock + + if [ -f chroot/etc/kernel-img.conf ] + then + # Saving kernel-img.conf + cp chroot/etc/kernel-img.conf chroot/etc/kernel-img.conf.old + fi + + # Configuring kernel-img.conf +cat >> chroot/etc/kernel-img.conf << EOF +do_bootloader = No +do_initrd = Yes +warn_initrd = No +EOF + + if [ "${LIVE_LINUX_PACKAGES}" != "none" ] + then + for FLAVOUR in ${LIVE_LINUX_FLAVOURS} + do + for PACKAGE in ${LIVE_LINUX_PACKAGES} + do + PACKAGES="${PACKAGES} ${PACKAGE}-${FLAVOUR}" + done + done + fi + + PACKAGES="${PACKAGES} ${LH_INITRAMFS}" + + # Installing linux-image, modules and ${LH_INITRAMFS} + case "${LH_APT}" in + apt|apt-get) + Chroot "apt-get install --yes ${PACKAGES}" + ;; + + aptitude) + Chroot "aptitude install --assume-yes ${PACKAGES}" + ;; + esac + + # Creating stage file + Create_stagefile .stage/chroot_linux-image + ;; + + remove) + # Checking lock file + Check_lockfile .lock + + # Creating lock file + Create_lockfile .lock + + if [ -f chroot/etc/kernel-img.conf.old ] + then + # Restoring kernel-img.conf file + mv chroot/etc/kernel-img.conf.old chroot/etc/kernel-img.conf + else + # Removing kernel-img.conf file + rm -f chroot/etc/kernel-img.conf + fi + + # Removing stage file + rm -f .stage/chroot_linux-image + ;; + + *) + Usage + ;; +esac diff --git a/helpers/lh_chroot_linuximage b/helpers/lh_chroot_linuximage deleted file mode 100755 index bd0c228..0000000 --- a/helpers/lh_chroot_linuximage +++ /dev/null @@ -1,115 +0,0 @@ -#!/bin/sh - -# lh_chroot_linuximage(1) - manage /etc/kernel-img.conf -# Copyright (C) 2006-2007 Daniel Baumann -# -# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING. -# This is free software, and you are welcome to redistribute it -# under certain conditions; see COPYING for details. - -set -e - -# Source common functions -for FUNCTION in /usr/share/live-helper/functions/*.sh -do - . ${FUNCTION} -done - -# Set static variables -DESCRIPTION="manage /etc/kernel-img.conf" -HELP="" -USAGE="${PROGRAM} {install|remove} [--force]" - -Arguments "${@}" - -Echo_debug "Init ${PROGRAM}" - -# Reading configuration files -Read_conffile config/common -Read_conffile config/bootstrap -Read_conffile config/chroot -Read_conffile config/binary -Read_conffile config/source -Set_defaults - -Breakpoint "chroot_linuximage: Init" - -# Requiring stage file -Require_stagefile .stage/bootstrap - -case "${1}" in - install) - # Checking stage file - Check_stagefile .stage/chroot_linuximage - - # Checking lock file - Check_lockfile .lock - - # Creating lock file - Create_lockfile .lock - - if [ -f chroot/etc/kernel-img.conf ] - then - # Saving kernel-img.conf - cp chroot/etc/kernel-img.conf chroot/etc/kernel-img.conf.old - fi - - # Configuring kernel-img.conf -cat >> chroot/etc/kernel-img.conf << EOF -do_bootloader = No -do_initrd = Yes -warn_initrd = No -EOF - - if [ "${LIVE_KERNEL_PACKAGES}" != "none" ] - then - for FLAVOUR in ${LIVE_KERNEL_FLAVOUR} - do - for PACKAGE in ${LIVE_KERNEL_PACKAGES} - do - PACKAGES="${PACKAGES} ${PACKAGE}-${FLAVOUR}" - done - done - fi - - PACKAGES="${PACKAGES} ${LH_INITRAMFS}" - - # Installing linux-image, modules and ${LH_INITRAMFS} - case "${LH_APT}" in - apt|apt-get) - Chroot "apt-get install --yes ${PACKAGES}" - ;; - - aptitude) - Chroot "aptitude install --assume-yes ${PACKAGES}" - ;; - esac - - # Creating stage file - Create_stagefile .stage/chroot_linuximage - ;; - - remove) - # Checking lock file - Check_lockfile .lock - - # Creating lock file - Create_lockfile .lock - - if [ -f chroot/etc/kernel-img.conf.old ] - then - # Restoring kernel-img.conf file - mv chroot/etc/kernel-img.conf.old chroot/etc/kernel-img.conf - else - # Removing kernel-img.conf file - rm -f chroot/etc/kernel-img.conf - fi - - # Removing stage file - rm -f .stage/chroot_linuximage - ;; - - *) - Usage - ;; -esac diff --git a/helpers/lh_chroot_local-hooks b/helpers/lh_chroot_local-hooks new file mode 100755 index 0000000..953a1f1 --- /dev/null +++ b/helpers/lh_chroot_local-hooks @@ -0,0 +1,72 @@ +#!/bin/sh + +# lh_chroot_local-hooks(1) - execute local hooks in chroot +# Copyright (C) 2006-2007 Daniel Baumann +# +# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING. +# This is free software, and you are welcome to redistribute it +# under certain conditions; see COPYING for details. + +set -e + +# Source common functions +for FUNCTION in /usr/share/live-helper/functions/*.sh +do + . ${FUNCTION} +done + +# Set static variables +DESCRIPTION="execute local hooks in chroot" +HELP="" +USAGE="${PROGRAM} [--force]" + +Arguments "${@}" + +Echo_debug "Init ${PROGRAM}" + +# Reading configuration files +Read_conffile config/common +Read_conffile config/bootstrap +Read_conffile config/chroot +Read_conffile config/binary +Read_conffile config/source +Set_defaults + +Breakpoint "chroot_local-hooks: Init" + +# Requiring stage file +Require_stagefile .stage/bootstrap + +# Checking stage file +Check_stagefile .stage/chroot_local-hooks + +# Checking lock file +Check_lockfile .lock + +# Creating lock file +Create_lockfile .lock + +# Processing local-hooks +if ls config/chroot_local-hooks/* &> /dev/null +then + for HOOK in config/chroot_local-hooks/* + do + # Copying hook + cp "${HOOK}" chroot/root + + # Making hook executable + if [ ! -x chroot/root/"`basename ${HOOK}`" ] + then + chmod +x chroot/root/"`basename ${HOOK}`" + fi + + # Executing hook + Chroot "/root/`basename ${HOOK}`" + + # Removing hook + rm -f chroot/root/"`basename ${HOOK}`" + done + + # Creating stage file + Create_stagefile .stage/chroot_local-hooks +fi diff --git a/helpers/lh_chroot_local-includes b/helpers/lh_chroot_local-includes new file mode 100755 index 0000000..0d94703 --- /dev/null +++ b/helpers/lh_chroot_local-includes @@ -0,0 +1,58 @@ +#!/bin/sh + +# lh_chroot_local-includes(1) - copy local files into chroot +# Copyright (C) 2006-2007 Daniel Baumann +# +# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING. +# This is free software, and you are welcome to redistribute it +# under certain conditions; see COPYING for details. + +set -e + +# Source common functions +for FUNCTION in /usr/share/live-helper/functions/*.sh +do + . ${FUNCTION} +done + +# Set static variables +DESCRIPTION="copy local files into chroot" +HELP="" +USAGE="${PROGRAM} [--force]" + +Arguments "${@}" + +Echo_debug "Init ${PROGRAM}" + +# Reading configuration files +Read_conffile config/common +Read_conffile config/bootstrap +Read_conffile config/chroot +Read_conffile config/binary +Read_conffile config/source +Set_defaults + +Breakpoint "chroot_local-includes: Init" + +# Requiring stage file +Require_stagefile .stage/bootstrap + +# Checking stage file +Check_stagefile .stage/chroot_local-includes + +# Checking lock file +Check_lockfile .lock + +# Creating lock file +Create_lockfile .lock + +if ls config/chroot_local-includes/* &> /dev/null +then + # Copying includes + cd config/chroot_local-includes + find . | cpio -dmpu "${OLDPWD}"/chroot + cd "${OLDPWD}" + + # Creating stage file + Create_stagefile .stage/chroot_local-includes +fi diff --git a/helpers/lh_chroot_local-packages b/helpers/lh_chroot_local-packages new file mode 100755 index 0000000..07c9eb2 --- /dev/null +++ b/helpers/lh_chroot_local-packages @@ -0,0 +1,81 @@ +#!/bin/sh + +# lh_chroot_local-packages(1) - install local packages into chroot +# Copyright (C) 2006-2007 Daniel Baumann +# +# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING. +# This is free software, and you are welcome to redistribute it +# under certain conditions; see COPYING for details. + +set -e + +# Source common functions +for FUNCTION in /usr/share/live-helper/functions/*.sh +do + . ${FUNCTION} +done + +# Set static variables +DESCRIPTION="install local packages into chroot" +HELP="" +USAGE="${PROGRAM} [--force]" + +Arguments "${@}" + +Echo_debug "Init ${PROGRAM}" + +# Reading configuration files +Read_conffile config/common +Read_conffile config/bootstrap +Read_conffile config/chroot +Read_conffile config/binary +Read_conffile config/source +Set_defaults + +Breakpoint "chroot_local-packages: Init" + +# Requiring stage file +Require_stagefile .stage/bootstrap + +# Checking stage file +Check_stagefile .stage/chroot_local-packages + +# Checking lock file +Check_lockfile .lock + +# Creating lock file +Create_lockfile .lock + +if ls config/chroot_local-packages/*.deb &> /dev/null +then + # Restoring cache + Restore_cache cache/packages_local-packages + + # Copying packages + cp config/chroot_local-packages/*.deb chroot/root + + # Installing packages + Chroot "find /root -name *.deb" > chroot/root/local-packages + Chroot "xargs --arg-file=/root/local-packages dpkg -i" || true + + # Cleaning dependencies + case "${LH_APT}" in + apt|apt-get) + Chroot "apt-get install -f --yes" + ;; + + aptitude) + Chroot "aptitude install -f --assume-yes" + ;; + esac + + # Removing package files + rm -f chroot/root/*.deb + rm -f chroot/root/local-packages + + # Saving cache + Save_cache cache/packages_local-packages + + # Creating stage file + Create_stagefile .stage/chroot_local-packages +fi diff --git a/helpers/lh_chroot_local-packageslists b/helpers/lh_chroot_local-packageslists new file mode 100755 index 0000000..f358fca --- /dev/null +++ b/helpers/lh_chroot_local-packageslists @@ -0,0 +1,79 @@ +#!/bin/sh + +# lh_chroot_local-packageslists(1) - install local packages lists into chroot +# Copyright (C) 2006-2007 Daniel Baumann +# +# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING. +# This is free software, and you are welcome to redistribute it +# under certain conditions; see COPYING for details. + +set -e + +# Source common functions +for FUNCTION in /usr/share/live-helper/functions/*.sh +do + . ${FUNCTION} +done + +# Set static variables +DESCRIPTION="install local packages into chroot" +HELP="" +USAGE="${PROGRAM} [--force]" + +Arguments "${@}" + +Echo_debug "Init ${PROGRAM}" + +# Reading configuration files +Read_conffile config/common +Read_conffile config/bootstrap +Read_conffile config/chroot +Read_conffile config/binary +Read_conffile config/source +Set_defaults + +Breakpoint "chroot_local-packageslists: Init" + +# Requiring stage file +Require_stagefile .stage/bootstrap + +# Checking stage file +Check_stagefile .stage/chroot_local-packageslists + +# Checking lock file +Check_lockfile .lock + +# Creating lock file +Create_lockfile .lock + +if ls config/chroot_local-packageslists/* &> /dev/null +then + # Restoring cache + Restore_cache cache/packages_local-packageslists + + for PACKAGESLIST in config/chroot_local-packageslists/* + do + # Copying package list + grep -v "^#" "${PACKAGESLIST}" > chroot/root/"`basename ${PACKAGESLIST}`" + + # Installing package list + case "${LH_APT}" in + apt|apt-get) + Chroot "xargs --arg-file=/root/`basename ${PACKAGESLIST}` apt-get install --yes" + ;; + + aptitude) + Chroot "xargs --arg-file=/root/`basename ${PACKAGESLIST}` aptitude install --assume-yes" + ;; + esac + + # Removing package list + rm -f chroot/root/"`basename ${PACKAGESLIST}`" + done + + # Saving cache + Save_cache cache/packages_local-packageslists + + # Creating stage file + Create_stagefile .stage/chroot_local-packageslists +fi diff --git a/helpers/lh_chroot_localhooks b/helpers/lh_chroot_localhooks deleted file mode 100755 index 2dca7f7..0000000 --- a/helpers/lh_chroot_localhooks +++ /dev/null @@ -1,72 +0,0 @@ -#!/bin/sh - -# lh_chroot_localhooks(1) - execute local hooks in chroot -# Copyright (C) 2006-2007 Daniel Baumann -# -# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING. -# This is free software, and you are welcome to redistribute it -# under certain conditions; see COPYING for details. - -set -e - -# Source common functions -for FUNCTION in /usr/share/live-helper/functions/*.sh -do - . ${FUNCTION} -done - -# Set static variables -DESCRIPTION="execute local hooks in chroot" -HELP="" -USAGE="${PROGRAM} [--force]" - -Arguments "${@}" - -Echo_debug "Init ${PROGRAM}" - -# Reading configuration files -Read_conffile config/common -Read_conffile config/bootstrap -Read_conffile config/chroot -Read_conffile config/binary -Read_conffile config/source -Set_defaults - -Breakpoint "chroot_localhooks: Init" - -# Requiring stage file -Require_stagefile .stage/bootstrap - -# Checking stage file -Check_stagefile .stage/chroot_localhooks - -# Checking lock file -Check_lockfile .lock - -# Creating lock file -Create_lockfile .lock - -# Processing localhooks -if ls config/chroot_localhooks/* &> /dev/null -then - for HOOK in config/chroot_localhooks/* - do - # Copying hook - cp "${HOOK}" chroot/root - - # Making hook executable - if [ ! -x chroot/root/"`basename ${HOOK}`" ] - then - chmod +x chroot/root/"`basename ${HOOK}`" - fi - - # Executing hook - Chroot "/root/`basename ${HOOK}`" - - # Removing hook - rm -f chroot/root/"`basename ${HOOK}`" - done - - # Creating stage file - Create_stagefile .stage/chroot_localhooks -fi diff --git a/helpers/lh_chroot_localincludes b/helpers/lh_chroot_localincludes deleted file mode 100755 index 40e9a76..0000000 --- a/helpers/lh_chroot_localincludes +++ /dev/null @@ -1,58 +0,0 @@ -#!/bin/sh - -# lh_chroot_localincludes(1) - copy local files into chroot -# Copyright (C) 2006-2007 Daniel Baumann -# -# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING. -# This is free software, and you are welcome to redistribute it -# under certain conditions; see COPYING for details. - -set -e - -# Source common functions -for FUNCTION in /usr/share/live-helper/functions/*.sh -do - . ${FUNCTION} -done - -# Set static variables -DESCRIPTION="copy local files into chroot" -HELP="" -USAGE="${PROGRAM} [--force]" - -Arguments "${@}" - -Echo_debug "Init ${PROGRAM}" - -# Reading configuration files -Read_conffile config/common -Read_conffile config/bootstrap -Read_conffile config/chroot -Read_conffile config/binary -Read_conffile config/source -Set_defaults - -Breakpoint "chroot_localincludes: Init" - -# Requiring stage file -Require_stagefile .stage/bootstrap - -# Checking stage file -Check_stagefile .stage/chroot_localincludes - -# Checking lock file -Check_lockfile .lock - -# Creating lock file -Create_lockfile .lock - -if ls config/chroot_localincludes/* &> /dev/null -then - # Copying includes - cd config/chroot_localincludes - find . | cpio -dmpu "${OLDPWD}"/chroot - cd "${OLDPWD}" - - # Creating stage file - Create_stagefile .stage/chroot_localincludes -fi diff --git a/helpers/lh_chroot_localpackages b/helpers/lh_chroot_localpackages deleted file mode 100755 index 516e08a..0000000 --- a/helpers/lh_chroot_localpackages +++ /dev/null @@ -1,81 +0,0 @@ -#!/bin/sh - -# lh_chroot_localpackages(1) - install local packages into chroot -# Copyright (C) 2006-2007 Daniel Baumann -# -# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING. -# This is free software, and you are welcome to redistribute it -# under certain conditions; see COPYING for details. - -set -e - -# Source common functions -for FUNCTION in /usr/share/live-helper/functions/*.sh -do - . ${FUNCTION} -done - -# Set static variables -DESCRIPTION="install local packages into chroot" -HELP="" -USAGE="${PROGRAM} [--force]" - -Arguments "${@}" - -Echo_debug "Init ${PROGRAM}" - -# Reading configuration files -Read_conffile config/common -Read_conffile config/bootstrap -Read_conffile config/chroot -Read_conffile config/binary -Read_conffile config/source -Set_defaults - -Breakpoint "chroot_localpackages: Init" - -# Requiring stage file -Require_stagefile .stage/bootstrap - -# Checking stage file -Check_stagefile .stage/chroot_localpackages - -# Checking lock file -Check_lockfile .lock - -# Creating lock file -Create_lockfile .lock - -if ls config/chroot_localpackages/*.deb &> /dev/null -then - # Restoring cache - Restore_cache cache/packages_localpackages - - # Copying packages - cp config/chroot_localpackages/*.deb chroot/root - - # Installing packages - 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-get) - Chroot "apt-get install -f --yes" - ;; - - aptitude) - Chroot "aptitude install -f --assume-yes" - ;; - esac - - # Removing package files - rm -f chroot/root/*.deb - rm -f chroot/root/localpackages - - # Saving cache - Save_cache cache/packages_localpackages - - # Creating stage file - Create_stagefile .stage/chroot_localpackages -fi diff --git a/helpers/lh_chroot_localpackageslists b/helpers/lh_chroot_localpackageslists deleted file mode 100755 index 4cda34e..0000000 --- a/helpers/lh_chroot_localpackageslists +++ /dev/null @@ -1,79 +0,0 @@ -#!/bin/sh - -# lh_chroot_localpackageslists(1) - install local packages lists into chroot -# Copyright (C) 2006-2007 Daniel Baumann -# -# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING. -# This is free software, and you are welcome to redistribute it -# under certain conditions; see COPYING for details. - -set -e - -# Source common functions -for FUNCTION in /usr/share/live-helper/functions/*.sh -do - . ${FUNCTION} -done - -# Set static variables -DESCRIPTION="install local packages into chroot" -HELP="" -USAGE="${PROGRAM} [--force]" - -Arguments "${@}" - -Echo_debug "Init ${PROGRAM}" - -# Reading configuration files -Read_conffile config/common -Read_conffile config/bootstrap -Read_conffile config/chroot -Read_conffile config/binary -Read_conffile config/source -Set_defaults - -Breakpoint "chroot_localpackageslists: Init" - -# Requiring stage file -Require_stagefile .stage/bootstrap - -# Checking stage file -Check_stagefile .stage/chroot_localpackageslists - -# Checking lock file -Check_lockfile .lock - -# Creating lock file -Create_lockfile .lock - -if ls config/chroot_localpackageslists/* &> /dev/null -then - # Restoring cache - Restore_cache cache/packages_localpackageslists - - for PACKAGESLIST in config/chroot_localpackageslists/* - do - # Copying package list - grep -v "^#" "${PACKAGESLIST}" > chroot/root/"`basename ${PACKAGESLIST}`" - - # Installing package list - case "${LH_APT}" in - apt|apt-get) - Chroot "xargs --arg-file=/root/`basename ${PACKAGESLIST}` apt-get install --yes" - ;; - - aptitude) - Chroot "xargs --arg-file=/root/`basename ${PACKAGESLIST}` aptitude install --assume-yes" - ;; - esac - - # Removing package list - rm -f chroot/root/"`basename ${PACKAGESLIST}`" - done - - # Saving cache - Save_cache cache/packages_localpackageslists - - # Creating stage file - Create_stagefile .stage/chroot_localpackageslists -fi diff --git a/helpers/lh_chroot_sources b/helpers/lh_chroot_sources index cb89627..bdbe856 100755 --- a/helpers/lh_chroot_sources +++ b/helpers/lh_chroot_sources @@ -49,11 +49,11 @@ case "${1}" in Create_lockfile .lock # Configure custom sources.list - echo "deb ${LIVE_MIRROR_BUILD} ${LIVE_DISTRIBUTION} ${LIVE_SECTIONS}" > chroot/etc/apt/sources.list + echo "deb ${LIVE_MIRROR_BOOTSTRAP} ${LIVE_DISTRIBUTION} ${LIVE_SECTIONS}" > chroot/etc/apt/sources.list if [ "${LIVE_SOURCE}" = "enabled" ] then - echo "deb-src ${LIVE_MIRROR_BUILD} ${LIVE_DISTRIBUTION} ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list + echo "deb-src ${LIVE_MIRROR_BOOTSTRAP} ${LIVE_DISTRIBUTION} ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list fi if [ "${LIVE_SECURITY}" = "enabled" ] @@ -62,74 +62,74 @@ case "${1}" in debian) if [ "${LIVE_DISTRIBUTION}" != "sid" ] && [ "${LIVE_DISTRIBUTION}" != "unstable" ] then - echo "deb ${LIVE_MIRROR_BUILD_SECURITY} ${LIVE_DISTRIBUTION}/updates ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list + echo "deb ${LIVE_MIRROR_BOOTSTRAP_SECURITY} ${LIVE_DISTRIBUTION}/updates ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list if [ "${LIVE_SOURCE}" = "enabled" ] then - echo "deb-src ${LIVE_MIRROR_BUILD_SECURITY} ${LIVE_DISTRIBUTION}/updates ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list + echo "deb-src ${LIVE_MIRROR_BOOTSTRAP_SECURITY} ${LIVE_DISTRIBUTION}/updates ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list fi fi ;; ubuntu) - echo "deb ${LIVE_MIRROR_BUILD_SECURITY} ${LIVE_DISTRIBUTION}-security ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list + echo "deb ${LIVE_MIRROR_BOOTSTRAP_SECURITY} ${LIVE_DISTRIBUTION}-security ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list if [ "${LIVE_SOURCE}" = "enabled" ] then - echo "deb-src ${LIVE_MIRROR_BUILD_SECURITY} ${LIVE_DISTRIBUTION}-security ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list + echo "deb-src ${LIVE_MIRROR_BOOTSTRAP_SECURITY} ${LIVE_DISTRIBUTION}-security ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list fi ;; esac fi # Check local sources.list - if ls config/chroot_sources/*.build &> /dev/null + if ls config/chroot_sources/*.bootstrap &> /dev/null then echo "" >> chroot/etc/apt/sources.list echo "# Custom repositories" >> chroot/etc/apt/sources.list - for FILE in config/chroot_sources/*.build + for FILE in config/chroot_sources/*.bootstrap do cat ${FILE} | grep -v "^##" >> chroot/etc/apt/sources.list done fi # Update indices from cache - if [ "${LH_CACHE_INDICES}" = "enabled" ] && [ -d cache/indices_build ] + if [ "${LH_CACHE_INDICES}" = "enabled" ] && [ -d cache/indices_bootstrap ] then - if ls cache/indices_build/secring.gpg* &> /dev/null + if ls cache/indices_bootstrap/secring.gpg* &> /dev/null then - cp -f cache/indices_build/secring.gpg* chroot/etc/apt + cp -f cache/indices_bootstrap/secring.gpg* chroot/etc/apt fi - if ls cache/indices_build/trusted.gpg* &> /dev/null + if ls cache/indices_bootstrap/trusted.gpg* &> /dev/null then - cp -f cache/indices_build/trusted.gpg* chroot/etc/apt + cp -f cache/indices_bootstrap/trusted.gpg* chroot/etc/apt fi - if [ -f cache/indices_build/pkgcache.bin ] + if [ -f cache/indices_bootstrap/pkgcache.bin ] then - cp -f cache/indices_build/pkgcache.bin chroot/var/cache/apt + cp -f cache/indices_bootstrap/pkgcache.bin chroot/var/cache/apt fi - if [ -f cache/indices_build/srcpkgcache.bin ] + if [ -f cache/indices_bootstrap/srcpkgcache.bin ] then - cp -f cache/indices_build/srcpkgcache.bin chroot/var/cache/apt + cp -f cache/indices_bootstrap/srcpkgcache.bin chroot/var/cache/apt fi - if ls cache/indices_build/*_Packages &> /dev/null + if ls cache/indices_bootstrap/*_Packages &> /dev/null then - cp -f cache/indices_build/*_Packages chroot/var/lib/apt/lists + cp -f cache/indices_bootstrap/*_Packages chroot/var/lib/apt/lists fi - if ls cache/indices_build/*_Sources &> /dev/null + if ls cache/indices_bootstrap/*_Sources &> /dev/null then - cp -f cache/indices_build/*_Sources chroot/var/lib/apt/lists + cp -f cache/indices_bootstrap/*_Sources chroot/var/lib/apt/lists fi - if ls cache/indices_build/*_Release* &> /dev/null + if ls cache/indices_bootstrap/*_Release* &> /dev/null then - cp -f cache/indices_build/*_Release* chroot/var/lib/apt/lists + cp -f cache/indices_bootstrap/*_Release* chroot/var/lib/apt/lists fi if [ "${LH_APT}" = "aptitude" ] && [ ! -x /usr/bin/aptitude ] @@ -138,9 +138,9 @@ case "${1}" in fi else # Get fresh indices # Check local gpg keys - if ls config/chroot_sources/*.build.gpg &> /dev/null + if ls config/chroot_sources/*.bootstrap.gpg &> /dev/null then - for FILE in config/chroot_sources/*.build.gpg + for FILE in config/chroot_sources/*.bootstrap.gpg do cp ${FILE} chroot/root Chroot "apt-key add /root/`basename ${FILE}`" @@ -183,20 +183,20 @@ case "${1}" in if [ "${LH_CACHE_INDICES}" = "enabled" ] then - if [ ! -d cache/indices_build ] + if [ ! -d cache/indices_bootstrap ] then - mkdir -p cache/indices_build + mkdir -p cache/indices_bootstrap fi - cp -f chroot/etc/apt/secring.gpg* cache/indices_build - cp -f chroot/etc/apt/trusted.gpg* cache/indices_build + cp -f chroot/etc/apt/secring.gpg* cache/indices_bootstrap + cp -f chroot/etc/apt/trusted.gpg* cache/indices_bootstrap - cp -f chroot/var/cache/apt/pkgcache.bin cache/indices_build - cp -f chroot/var/cache/apt/srcpkgcache.bin cache/indices_build + cp -f chroot/var/cache/apt/pkgcache.bin cache/indices_bootstrap + cp -f chroot/var/cache/apt/srcpkgcache.bin cache/indices_bootstrap - cp -f chroot/var/lib/apt/lists/*_Packages cache/indices_build - cp -f chroot/var/lib/apt/lists/*_Sources cache/indices_build - cp -f chroot/var/lib/apt/*_Release* cache/indices_build + cp -f chroot/var/lib/apt/lists/*_Packages cache/indices_bootstrap + cp -f chroot/var/lib/apt/lists/*_Sources cache/indices_bootstrap + cp -f chroot/var/lib/apt/*_Release* cache/indices_bootstrap fi fi @@ -212,11 +212,11 @@ case "${1}" in Create_lockfile .lock # Configure generic indices - if [ "${LH_APT_GENERIC}" = "enabled" ] + if [ "${LIVE_BINARY_INDICES}" = "enabled" ] then # Don't do anything if it's not required - if [ "${LIVE_MIRROR_BUILD}" = "${LIVE_MIRROR_IMAGE}" ] && \ - [ "${LIVE_MIRROR_BUILD_SECURITY}" = "${LIVE_MIRROR_IMAGE_SECURITY}" ] + if [ "${LIVE_MIRROR_BOOTSTRAP}" = "${LIVE_MIRROR_BINARY}" ] && \ + [ "${LIVE_MIRROR_BOOTSTRAP_SECURITY}" = "${LIVE_MIRROR_BINARY_SECURITY}" ] then exit 0 fi @@ -225,11 +225,11 @@ case "${1}" in rm -rf chroot/var/lib/apt/lists mkdir -p chroot/var/lib/apt/lists/partial - echo "deb ${LIVE_MIRROR_IMAGE} ${LIVE_DISTRIBUTION} ${LIVE_SECTIONS}" > chroot/etc/apt/sources.list + echo "deb ${LIVE_MIRROR_BINARY} ${LIVE_DISTRIBUTION} ${LIVE_SECTIONS}" > chroot/etc/apt/sources.list if [ "${LIVE_SOURCE}" = "enabled" ] then - echo "deb-src ${LIVE_MIRROR_IMAGE} ${LIVE_DISTRIBUTION} ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list + echo "deb-src ${LIVE_MIRROR_BINARY} ${LIVE_DISTRIBUTION} ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list fi if [ "${LIVE_SECURITY}" = "enabled" ] @@ -238,42 +238,42 @@ case "${1}" in debian) if [ "${LIVE_DISTRIBUTION}" != "sid" ] && [ "${LIVE_DISTRIBUTION}" != "unstable" ] then - echo "deb ${LIVE_MIRROR_IMAGE_SECURITY} ${LIVE_DISTRIBUTION}/updates ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list + echo "deb ${LIVE_MIRROR_BINARY_SECURITY} ${LIVE_DISTRIBUTION}/updates ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list if [ "${LIVE_SOURCE}" = "enabled" ] then - echo "deb-src ${LIVE_MIRROR_IMAGE_SECURITY} ${LIVE_DISTRIBUTION}/updates ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list + echo "deb-src ${LIVE_MIRROR_BINARY_SECURITY} ${LIVE_DISTRIBUTION}/updates ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list fi fi ;; ubuntu) - echo "deb ${LIVE_MIRROR_IMAGE_SECURITY} ${LIVE_DISTRIBUTION}-security ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list + echo "deb ${LIVE_MIRROR_BINARY_SECURITY} ${LIVE_DISTRIBUTION}-security ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list if [ "${LIVE_SOURCE}" = "enabled" ] then - echo "deb-src ${LIVE_MIRROR_IMAGE_SECURITY} ${LIVE_DISTRIBUTION}-security ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list + echo "deb-src ${LIVE_MIRROR_BINARY_SECURITY} ${LIVE_DISTRIBUTION}-security ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list fi ;; esac fi # Check local sources.list - if ls config/chroot_sources/*.image &> /dev/null + if ls config/chroot_sources/*.binary &> /dev/null then echo "" >> chroot/etc/apt/sources.list echo "# Custom repositories" >> chroot/etc/apt/sources.list - for FILE in config/chroot_sources/*.image + for FILE in config/chroot_sources/*.binary do cat ${FILE} | grep -v "^##" >> chroot/etc/apt/sources.list done fi # Check local gpg keys - if ls config/chroot_sources/*.image.gpg &> /dev/null + if ls config/chroot_sources/*.binary.gpg &> /dev/null then - for FILE in config/chroot_sources/*.image.gpg + for FILE in config/chroot_sources/*.binary.gpg do cp ${FILE} chroot/root Chroot "apt-key add /root/`basename ${FILE}`" diff --git a/helpers/lh_config b/helpers/lh_config index 8e9e117..5477dd0 100755 --- a/helpers/lh_config +++ b/helpers/lh_config @@ -57,6 +57,8 @@ Breakpoint "config: Init" # Creating configuration directory mkdir -p "${LIVE_ROOT}"/config +mkdir -p "${LIVE_ROOT}"/config/includes +mkdir -p "${LIVE_ROOT}"/config/templates # Creating live-helper configuration cat > "${LIVE_ROOT}"/config/common << EOF @@ -78,10 +80,6 @@ LH_APT_FTPPROXY="${LH_APT_FTPPROXY}" # (Default: autodetected or empty) LH_APT_HTTPPROXY="${LH_APT_HTTPPROXY}" -# \$LH_APT_GENERIC: set apt/aptitude generic indices -# (Default: ${LH_APT_GENERIC}) -LH_APT_GENERIC="${LH_APT_GENERIC}" - # \$LH_APT_PDIFFS: set apt/aptitude pdiff indices # (Default: ${LH_APT_PDIFFS}) LH_APT_PDIFFS="${LH_APT_PDIFFS}" @@ -181,13 +179,21 @@ EOF cat > "${LIVE_ROOT}"/config/chroot << EOF # config/chroot: configuration for lh_chroot_* -# \$LIVE_KERNEL_FLAVOUR: set the kernel flavour to use +# \$LIVE_CHROOT_FILESYSTEM: set chroot filesystem +# (Default: ${LIVE_CHROOT_FILESYSTEM}) +LIVE_CHROOT_FILESYSTEM="${LIVE_CHROOT_FILESYSTEM}" + +# \$LIVE_INTERACTIVE: set interactive build +# (Default: ${LIVE_INTERACTIVE}) +LIVE_INTERACTIVE="${LIVE_INTERACTIVE}" + +# \$LIVE_LINUX_FLAVOURS: set the kernel flavour to use # (Default: autodetected) -LIVE_KERNEL_FLAVOUR="${LIVE_KERNEL_FLAVOUR}" +LIVE_LINUX_FLAVOURS="${LIVE_LINUX_FLAVOURS}" -# \$LIVE_KERNEL_PACKAGES: set the kernel packages to use +# \$LIVE_LINUX_PACKAGES: set the kernel packages to use # (Default: autodetected) -LIVE_KERNEL_PACKAGES="${LIVE_KERNEL_PACKAGES}" +LIVE_LINUX_PACKAGES="${LIVE_LINUX_PACKAGES}" # \$LIVE_KEYRING_PACKAGES: set the keyring packages # (Default: empty) @@ -224,17 +230,13 @@ LIVE_SYMLINKS="${LIVE_SYMLINKS}" # \$LIVE_SYSVINIT: enable sysvinit # (Default: ${LIVE_SYSVINIT}) LIVE_SYSVINIT="${LIVE_SYSVINIT}" - -# \$LIVE_INTERACTIVE: set interactive build -# (Default: ${LIVE_INTERACTIVE}) -LIVE_INTERACTIVE="${LIVE_INTERACTIVE}" EOF # Creating lh_chroot_* directories -mkdir -p "${LIVE_ROOT}"/config/chroot_localhooks -mkdir -p "${LIVE_ROOT}"/config/chroot_localincludes -mkdir -p "${LIVE_ROOT}"/config/chroot_localpackages -mkdir -p "${LIVE_ROOT}"/config/chroot_localpackageslists +mkdir -p "${LIVE_ROOT}"/config/chroot_local-hooks +mkdir -p "${LIVE_ROOT}"/config/chroot_local-includes +mkdir -p "${LIVE_ROOT}"/config/chroot_local-packages +mkdir -p "${LIVE_ROOT}"/config/chroot_local-packageslists mkdir -p "${LIVE_ROOT}"/config/chroot_sources # Creating lh_bootstrap_* configuration @@ -257,21 +259,21 @@ LIVE_DISTRIBUTION_CONFIG="${LIVE_DISTRIBUTION_CONFIG}" # (Default: ${LIVE_BOOTSTRAP_FLAVOUR}) LIVE_BOOTSTRAP_FLAVOUR="${LIVE_BOOTSTRAP_FLAVOUR}" -# \$LIVE_MIRROR_BUILD: set the mirror to fetch packages from -# (Default: ${LIVE_MIRROR_BUILD}) -LIVE_MIRROR_BUILD="${LIVE_MIRROR_BUILD}" +# \$LIVE_MIRROR_BOOTSTRAP: set the mirror to fetch packages from +# (Default: ${LIVE_MIRROR_BOOTSTRAP}) +LIVE_MIRROR_BOOTSTRAP="${LIVE_MIRROR_BOOTSTRAP}" -# \$LIVE_MIRROR_BUILD_SECURITY: set the security mirror to fetch packages from -# (Default: ${LIVE_MIRROR_BUILD_SECURITY}) -LIVE_MIRROR_BUILD_SECURITY="${LIVE_MIRROR_BUILD_SECURITY}" +# \$LIVE_MIRROR_BOOTSTRAP_SECURITY: set the security mirror to fetch packages from +# (Default: ${LIVE_MIRROR_BOOTSTRAP_SECURITY}) +LIVE_MIRROR_BOOTSTRAP_SECURITY="${LIVE_MIRROR_BOOTSTRAP_SECURITY}" -# \$LIVE_MIRROR_IMAGE: set the mirror which ends up in the image -# (Default: ${LIVE_MIRROR_IMAGE}) -LIVE_MIRROR_IMAGE="${LIVE_MIRROR_IMAGE}" +# \$LIVE_MIRROR_BINARY: set the mirror which ends up in the image +# (Default: ${LIVE_MIRROR_BINARY}) +LIVE_MIRROR_BINARY="${LIVE_MIRROR_BINARY}" -# \$LIVE_MIRROR_IMAGE_SECURITY: set the security mirror which ends up in the image -# (Default: ${LIVE_MIRROR_IMAGE_SECURITY}) -LIVE_MIRROR_IMAGE_SECURITY="${LIVE_MIRROR_IMAGE_SECURITY}" +# \$LIVE_MIRROR_BINARY_SECURITY: set the security mirror which ends up in the image +# (Default: ${LIVE_MIRROR_BINARY_SECURITY}) +LIVE_MIRROR_BINARY_SECURITY="${LIVE_MIRROR_BINARY_SECURITY}" # \$LIVE_SECTIONS: select the section(s) to use # (Default: ${LIVE_SECTIONS}) @@ -282,6 +284,10 @@ EOF cat > "${LIVE_ROOT}"/config/binary << EOF # config/chroot: configuration for lh_binary_* +# \$LIVE_BINARY_INDICES: set apt/aptitude generic indices +# (Default: ${LIVE_BINARY_INDICES}) +LIVE_BINARY_INDICES="${LIVE_BINARY_INDICES}" + # \$LIVE_BOOTAPPEND: set boot parameters # (Default: empty) LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND}" @@ -298,10 +304,6 @@ LIVE_USERNAME="${LIVE_USERNAME}" # (Default: ${LIVE_HOSTNAME}) LIVE_HOSTNAME="${LIVE_HOSTNAME}" -# \$LIVE_FILESYSTEM: set filesystem -# (Default: ${LIVE_FILESYSTEM}) -LIVE_FILESYSTEM="${LIVE_FILESYSTEM}" - # \$LIVE_MEMTEST: set memtest # (Default: ${LIVE_MEMTEST}) LIVE_MEMTEST="${LIVE_MEMTEST}" @@ -314,13 +316,13 @@ LIVE_DEBIAN_INSTALLER="${LIVE_DEBIAN_INSTALLER}" # (Default: ${LIVE_ISO_VOLUME}) LIVE_ISO_VOLUME="${LIVE_ISO_VOLUME}" -# \$LIVE_SERVER_ADDRESS: set the netboot server address -# (Default: ${LIVE_SERVER_ADDRESS}) -LIVE_SERVER_ADDRESS="${LIVE_SERVER_ADDRESS}" +# \$LIVE_NET_SERVER: set the netboot server address +# (Default: ${LIVE_NET_SERVER}) +LIVE_NET_SERVER="${LIVE_NET_SERVER}" -# \$LIVE_SERVER_PATH: set the netboot server directory -# (Default: ${LIVE_SERVER_PATH}) -LIVE_SERVER_PATH="${LIVE_SERVER_PATH}" +# \$LIVE_NET_PATH: set the netboot server directory +# (Default: ${LIVE_NET_PATH}) +LIVE_NET_PATH="${LIVE_NET_PATH}" # \$LIVE_BOOTLOADER: set bootloader # (Default: ${LIVE_BOOTLOADER}) @@ -334,9 +336,9 @@ LIVE_GRUB_SPLASH="${LIVE_GRUB_SPLASH}" # (Default: empty) LIVE_SYSLINUX_SPLASH="${LIVE_SYSLINUX_SPLASH}" -# \$LIVE_BINARY_IMAGE: set image type -# (Default: ${LIVE_BINARY_IMAGE}) -LIVE_BINARY_IMAGE="${LIVE_BINARY_IMAGE}" +# \$LIVE_BINARY_IMAGES: set image type +# (Default: ${LIVE_BINARY_IMAGES}) +LIVE_BINARY_IMAGES="${LIVE_BINARY_IMAGES}" EOF # Creating lh_source_* configuration @@ -347,12 +349,12 @@ cat > "${LIVE_ROOT}"/config/source << EOF # (Default: ${LH_SOURCE}) LIVE_SOURCE="${LIVE_SOURCE}" -# \$LIVE_SOURCE_IMAGE: set image type -# (Default: ${LIVE_SOURCE_IMAGE}) -LIVE_SOURCE_IMAGE="${LIVE_SOURCE_IMAGE}" +# \$LIVE_SOURCE_IMAGES: set image type +# (Default: ${LIVE_SOURCE_IMAGES}) +LIVE_SOURCE_IMAGES="${LIVE_SOURCE_IMAGES}" EOF # Creating lh_binary_* directories mkdir -p "${LIVE_ROOT}"/config/binary_grub -mkdir -p "${LIVE_ROOT}"/config/binary_localincludes +mkdir -p "${LIVE_ROOT}"/config/binary_local-includes mkdir -p "${LIVE_ROOT}"/config/binary_syslinux diff --git a/helpers/lh_source b/helpers/lh_source index ff5df20..56c1849 100755 --- a/helpers/lh_source +++ b/helpers/lh_source @@ -40,8 +40,8 @@ lh_chroot_resolv install ${*} lh_chroot_sources install ${*} # Preparing images -lh_source_config ${*} -lh_source_download ${*} +lh_source_debian-live ${*} +lh_source_debian ${*} lh_source_md5sum ${*} # Building images diff --git a/helpers/lh_source_config b/helpers/lh_source_config deleted file mode 100755 index 2c3db26..0000000 --- a/helpers/lh_source_config +++ /dev/null @@ -1,73 +0,0 @@ -#!/bin/sh - -# lh_source_config(1) - copy debian-live config into source -# Copyright (C) 2006-2007 Daniel Baumann -# -# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING. -# This is free software, and you are welcome to redistribute it -# under certain conditions; see COPYING for details. - -set -e - -# Source common functions -for FUNCTION in /usr/share/live-helper/functions/*.sh -do - . ${FUNCTION} -done - -# Set static variables -DESCRIPTION="copy debian-live config into source" -HELP="" -USAGE="${PROGRAM} [--force]" - -Arguments "${@}" - -Echo_debug "Init ${PROGRAM}" - -# Reading configuration files -Read_conffile config/common -Read_conffile config/bootstrap -Read_conffile config/chroot -Read_conffile config/binary -Read_conffile config/source -Set_defaults - -Breakpoint "source_config: Init" - -if [ "${LIVE_SOURCE}" != "enabled" ] -then - exit 0 -fi - -# Requiring stage file -Require_stagefile .stage/bootstrap - -# Checking stage file -Check_stagefile .stage/source_config - -# Checking lock file -Check_lockfile .lock - -# Creating lock file -Create_lockfile .lock - -# 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 diff --git a/helpers/lh_source_debian b/helpers/lh_source_debian new file mode 100755 index 0000000..eb43e18 --- /dev/null +++ b/helpers/lh_source_debian @@ -0,0 +1,90 @@ +#!/bin/sh + +# lh_source_debian(1) - download sources +# Copyright (C) 2006-2007 Daniel Baumann +# +# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING. +# This is free software, and you are welcome to redistribute it +# under certain conditions; see COPYING for details. + +set -e + +# Source common functions +for FUNCTION in /usr/share/live-helper/functions/*.sh +do + . ${FUNCTION} +done + +# Set static variables +DESCRIPTION="debian sources" +HELP="" +USAGE="${PROGRAM} [--force]" + +Arguments "${@}" + +Echo_debug "Init ${PROGRAM}" + +# Reading configuration files +Read_conffile config/common +Read_conffile config/bootstrap +Read_conffile config/chroot +Read_conffile config/binary +Read_conffile config/source +Set_defaults + +Breakpoint "source_debian: Init" + +if [ "${LIVE_SOURCE}" != "enabled" ] +then + exit 0 +fi + +# Requiring stage file +Require_stagefile .stage/bootstrap + +# Checking stage file +Check_stagefile .stage/source_debian + +# Checking lock file +Check_lockfile .lock + +# Creating lock file +Create_lockfile .lock + +# Remove old sources +if [ -d source/debian ] +then + rm -rf source/debian +fi + +# Download sources +Chroot "dpkg --get-selections" | awk '{ print $1 }' > chroot/root/dpkg-selection.txt +echo "${LIVE_BOOTLOADER}" >> 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 chroot/root/dpkg-selection.txt + +# Sort sources +for DSC in chroot/*.dsc +do + SOURCE="`sed -n 's/^Source: //p' ${DSC}`" + + case "${SOURCE}" in + lib?*) + LETTER="`echo ${SOURCE} | sed 's/\(....\).*/\1/'`" + ;; + + *) + LETTER="`echo ${SOURCE} | sed 's/\(.\).*/\1/'`" + ;; + esac + + # Install directory + mkdir -p source/debian/"${LETTER}"/"${SOURCE}" + + # Move files + mv chroot/"${SOURCE}"_* source/debian/"${LETTER}"/"${SOURCE}" +done + +# Creating stage file +Create_stagefile .stage/source_debian diff --git a/helpers/lh_source_debian-live b/helpers/lh_source_debian-live new file mode 100755 index 0000000..06f9d86 --- /dev/null +++ b/helpers/lh_source_debian-live @@ -0,0 +1,73 @@ +#!/bin/sh + +# lh_source_debian-live(1) - copy debian-live config into source +# Copyright (C) 2006-2007 Daniel Baumann +# +# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING. +# This is free software, and you are welcome to redistribute it +# under certain conditions; see COPYING for details. + +set -e + +# Source common functions +for FUNCTION in /usr/share/live-helper/functions/*.sh +do + . ${FUNCTION} +done + +# Set static variables +DESCRIPTION="copy debian-live config into source" +HELP="" +USAGE="${PROGRAM} [--force]" + +Arguments "${@}" + +Echo_debug "Init ${PROGRAM}" + +# Reading configuration files +Read_conffile config/common +Read_conffile config/bootstrap +Read_conffile config/chroot +Read_conffile config/binary +Read_conffile config/source +Set_defaults + +Breakpoint "source_debian-live: Init" + +if [ "${LIVE_SOURCE}" != "enabled" ] +then + exit 0 +fi + +# Requiring stage file +Require_stagefile .stage/bootstrap + +# Checking stage file +Check_stagefile .stage/source_debian-live + +# Checking lock file +Check_lockfile .lock + +# Creating lock file +Create_lockfile .lock + +# 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_debian-live diff --git a/helpers/lh_source_download b/helpers/lh_source_download deleted file mode 100755 index cdae2c9..0000000 --- a/helpers/lh_source_download +++ /dev/null @@ -1,90 +0,0 @@ -#!/bin/sh - -# lh_source_download(1) - download sources -# Copyright (C) 2006-2007 Daniel Baumann -# -# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING. -# This is free software, and you are welcome to redistribute it -# under certain conditions; see COPYING for details. - -set -e - -# Source common functions -for FUNCTION in /usr/share/live-helper/functions/*.sh -do - . ${FUNCTION} -done - -# Set static variables -DESCRIPTION="download sources" -HELP="" -USAGE="${PROGRAM} [--force]" - -Arguments "${@}" - -Echo_debug "Init ${PROGRAM}" - -# Reading configuration files -Read_conffile config/common -Read_conffile config/bootstrap -Read_conffile config/chroot -Read_conffile config/binary -Read_conffile config/source -Set_defaults - -Breakpoint "source_download: Init" - -if [ "${LIVE_SOURCE}" != "enabled" ] -then - exit 0 -fi - -# Requiring stage file -Require_stagefile .stage/bootstrap - -# Checking stage file -Check_stagefile .stage/source_download - -# Checking lock file -Check_lockfile .lock - -# Creating lock file -Create_lockfile .lock - -# Remove old sources -if [ -d source/debian ] -then - rm -rf source/debian -fi - -# Download sources -Chroot "dpkg --get-selections" | awk '{ print $1 }' > chroot/root/dpkg-selection.txt -echo "${LIVE_BOOTLOADER}" >> 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 chroot/root/dpkg-selection.txt - -# Sort sources -for DSC in chroot/*.dsc -do - SOURCE="`sed -n 's/^Source: //p' ${DSC}`" - - case "${SOURCE}" in - lib?*) - LETTER="`echo ${SOURCE} | sed 's/\(....\).*/\1/'`" - ;; - - *) - LETTER="`echo ${SOURCE} | sed 's/\(.\).*/\1/'`" - ;; - esac - - # Install directory - mkdir -p source/debian/"${LETTER}"/"${SOURCE}" - - # Move files - mv chroot/"${SOURCE}"_* source/debian/"${LETTER}"/"${SOURCE}" -done - -# Creating stage file -Create_stagefile .stage/source_download diff --git a/helpers/lh_source_generic b/helpers/lh_source_generic index 6bd2a77..4db80a0 100755 --- a/helpers/lh_source_generic +++ b/helpers/lh_source_generic @@ -39,12 +39,12 @@ then exit 0 fi -for IMAGE in ${LIVE_SOURCE_IMAGE} +for IMAGE in ${LIVE_SOURCE_IMAGES} do if [ "${IMAGE}" = "generic" ] then # Requiring stage file - Require_stagefile .stage/source_download + Require_stagefile .stage/source_debian # Checking stage file Check_stagefile .stage/source_generic diff --git a/helpers/lh_source_hdd b/helpers/lh_source_hdd index ac5ff73..74b8889 100755 --- a/helpers/lh_source_hdd +++ b/helpers/lh_source_hdd @@ -39,12 +39,12 @@ then exit 0 fi -for IMAGE in ${LIVE_SOURCE_IMAGE} +for IMAGE in ${LIVE_SOURCE_IMAGES} do if [ "${IMAGE}" = "hdd" ] then # Requiring stage file - Require_stagefile .stage/source_download + Require_stagefile .stage/source_debian # Checking stage file Check_stagefile .stage/source_hdd diff --git a/helpers/lh_source_iso b/helpers/lh_source_iso index b001727..0784747 100755 --- a/helpers/lh_source_iso +++ b/helpers/lh_source_iso @@ -32,19 +32,19 @@ Read_conffile config/binary Read_conffile config/source Set_defaults -Breakpoint "source_iso: Init" - if [ "${LIVE_SOURCE}" != "enabled" ] then exit 0 fi -for IMAGE in ${LIVE_SOURCE_IMAGE} +for IMAGE in ${LIVE_SOURCE_IMAGES} do if [ "${IMAGE}" = "iso" ] then + Breakpoint "source_iso: Init" + # Requiring stage file - Require_stagefile .stage/source_download + Require_stagefile .stage/source_debian # Checking stage file Check_stagefile .stage/source_iso @@ -55,14 +55,38 @@ do # Creating lock file Create_lockfile .lock + # Checking depends + Check_package chroot/usr/bin/"${LH_GENISOIMAGE}" ${LH_GENISOIMAGE} + + # Installing depends + Install_package + # Remove old source if [ -f source.iso ] then rm -f source.iso fi - # Create 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 source.iso -r -J -l -V "${LIVE_DISK_VOLUME}" source + if [ "${LH_VERBOSE}" = "enabled" ] + then + GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -v" + fi + + # Moving image + mv source chroot + +cat >> chroot/source.sh << EOF +${LH_GENISOIMAGE} ${GENISOIMAGE_OPTIONS} -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" -V "${LIVE_ISO_VOLUME}" -o source.iso -r -J -l -cache-inodes source +EOF + + Chroot "sh source.sh" + + # Move image + mv chroot/source chroot/source.iso ./ + rm -f chroot/source.sh + + # Removing depends + Remove_package # Creating stage file Create_stagefile .stage/source_iso diff --git a/helpers/lh_source_md5sum b/helpers/lh_source_md5sum index 9569c22..e458ed8 100755 --- a/helpers/lh_source_md5sum +++ b/helpers/lh_source_md5sum @@ -40,7 +40,7 @@ then fi # Requiring stage file -Require_stagefile .stage/source_download +Require_stagefile .stage/source_debian # Checking stage file Check_stagefile .stage/source_md5sum @@ -59,7 +59,8 @@ fi # Calculating md5sums cd source -find . -type f -print0 | xargs -0 md5sum > md5sum.txt +find . -type f | sort | xargs md5sum > ../md5sum.txt +mv ../md5sum.txt ./ cd "${OLDPWD}" # Creating stage file diff --git a/helpers/lh_source_net b/helpers/lh_source_net index 4b63bef..90e5191 100755 --- a/helpers/lh_source_net +++ b/helpers/lh_source_net @@ -39,12 +39,12 @@ then exit 0 fi -for IMAGE in ${LIVE_SOURCE_IMAGE} +for IMAGE in ${LIVE_SOURCE_IMAGES} do if [ "${IMAGE}" = "net" ] then # Requiring stage file - Require_stagefile .stage/source_download + Require_stagefile .stage/source_debian # Checking stage file Check_stagefile .stage/source_net diff --git a/helpers/lh_source_usb-hdd b/helpers/lh_source_usb-hdd index 4eca22a..ec853a1 100755 --- a/helpers/lh_source_usb-hdd +++ b/helpers/lh_source_usb-hdd @@ -39,12 +39,12 @@ then exit 0 fi -for IMAGE in ${LIVE_SOURCE_IMAGE} +for IMAGE in ${LIVE_SOURCE_IMAGES} do if [ "${IMAGE}" = "usb-hdd" ] then # Requiring stage file - Require_stagefile .stage/source_download + Require_stagefile .stage/source_debian # Checking stage file Check_stagefile .stage/source_usb-hdd diff --git a/helpers/make-live b/helpers/make-live index 36546dd..08e7cc1 100755 --- a/helpers/make-live +++ b/helpers/make-live @@ -31,13 +31,13 @@ done # Set static variables PROGRAM="`basename ${0}`" DESCRIPTION="utility to build Debian Live systems" -USAGE="${PROGRAM} [config] [--mode MODE] [--config CONFIG] [--apt apt|aptitude] [--apt-ftpproxy URL] [--apt-httpproxy URL] [--apt-generic enabled|disabled] [--apt-pdiffs enabled|disabled] [--apt-recommends enabled|disabled] [--apt-secure enabled|disabled] [--bootstrap cdebootstrap|deboostrap] [--cache enabled|disabled] [--debconf-frontend dialog|readline|noninteractive] [--debconf-priority low|medium|high|critical] [--debconf-nowarnings yes|no] [--genisoimage genisoimage|mkisofs] [--losetup losetup|losetup.org] [--tasksel aptitude|tasksel] [-r|--root DIRECTORY] [-a|--architecture ARCHITECTURE] [-d|--distribution stable|testing|unstable|etch|lenny|sid] [--distribution-config DIRECTORY] [-f|--bootstrap-flavour minimal|standard] [-m|--mirror-build URL] [--mirror-build-security URL] [--mirror-image URL] [--mirror-image-security URL] [--sections SECTION|\"SECTIONS\"] [--interactive shell|x11|xnest] [-k|--kernel-flavour FLAVOUR] [--kernel-packages PACKAGE|\"PACKAGES\"] [--keyring-packages PACKAGE|\"PACKAGES\"] [--hooks \"COMMAND\"|\"COMMANDS\"] [-l|--language LANGUAGE] [--packages PACKAGE|\"PACKAGES\"] [-p|--packages-lists LIST|\"LISTS\"] [--tasks TASK|\"TASKS\"] [--security enabled|disabled] [--symlinks enabled|disabled] [--sysvinit enabled|disabled] [--bootappend KERNEL_PARAMETER|\"KERNEL_PARAMETERS\"] [-e|--encryption ALGORITHM] [--username NAME] [--hostname NAME] [--filesystem ext2|plain|squashfs] [--memtest memtest86|memtest86+] [--iso-volume STRING] [--server-address HOSTNAME|IP] [--server-path DIRECTORY] [--source enabled|disabled] [--bootloader grub|syslinux] [--grub-splash FILE] [--syslinux-splash FILE] [-b|--binary-image hdd|iso|usb-hdd|net] [-s|--source-image generic|hdd|iso|usb-hdd|net] [--includes PATH] [--templates PATH] [--breakpoints] [--debug] [--force] [--quiet] [--verbose] [--root-command sudo]" +USAGE="${PROGRAM} [config] [--mode MODE] [--config CONFIG] [--apt apt|aptitude] [--apt-ftpproxy URL] [--apt-httpproxy URL] [--apt-generic enabled|disabled] [--apt-pdiffs enabled|disabled] [--apt-recommends enabled|disabled] [--apt-secure enabled|disabled] [--bootstrap cdebootstrap|deboostrap] [--cache enabled|disabled] [--debconf-frontend dialog|readline|noninteractive] [--debconf-priority low|medium|high|critical] [--debconf-nowarnings yes|no] [--genisoimage genisoimage|mkisofs] [--losetup losetup|losetup.org] [--tasksel aptitude|tasksel] [-r|--root DIRECTORY] [-a|--architecture ARCHITECTURE] [-d|--distribution stable|testing|unstable|etch|lenny|sid] [--distribution-config DIRECTORY] [-f|--bootstrap-flavour minimal|standard] [-m|--mirror-bootstrap URL] [--mirror-bootstrap-security URL] [--mirror-binary URL] [--mirror-binary-security URL] [--sections SECTION|\"SECTIONS\"] [--interactive shell|x11|xnest] [-k|--linux-flavour FLAVOUR] [--linux-packages PACKAGE|\"PACKAGES\"] [--keyring-packages PACKAGE|\"PACKAGES\"] [--hooks \"COMMAND\"|\"COMMANDS\"] [-l|--language LANGUAGE] [--packages PACKAGE|\"PACKAGES\"] [-p|--packages-lists LIST|\"LISTS\"] [--tasks TASK|\"TASKS\"] [--security enabled|disabled] [--symlinks enabled|disabled] [--sysvinit enabled|disabled] [--bootappend BOOT_PARAMETER|\"BOOT_PARAMETERS\"] [-e|--encryption ALGORITHM] [--username NAME] [--hostname NAME] [--chroot-filesystem ext2|plain|squashfs] [--memtest memtest86|memtest86+] [--iso-volume STRING] [--net-server HOSTNAME|IP] [--net-path DIRECTORY] [--source enabled|disabled] [--bootloader grub|syslinux] [--grub-splash FILE] [--syslinux-splash FILE] [-b|--binary-images hdd|iso|usb-hdd|net] [-s|--source-images generic|hdd|iso|usb-hdd|net] [--includes PATH] [--templates PATH] [--breakpoints] [--debug] [--force] [--quiet] [--verbose] [--root-command sudo]" 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" Local_arguments () { - ARGUMENTS="`getopt --longoptions mode:,config:,apt:,apt-ftpproxy:,apt-httpproxy:,apt-generic:,apt-pdiffs:,apt-recommends:,apt-secure:,bootstrap:,cache:,debconf-frontend:,debconf-priority:,debconf-nowarnings:,genisoimage:,losetup:,tasksel:,root:,architecture:,distribution:,distribution-config:,flavour:,mirror-build:,mirror-build-security:,mirror-image:,mirror-image-security:,sections:,interactive:,kernel:,kernel-packages:,keyring-packages:,hooks:,language:,packages:,packages-lists:,tasks:,security:,symlinks:,sysvinit:,bootappend:,encryption:,username:,hostname:,filesystem:,memtest:,iso-volume:,server-address:,server-path:,source:,bootloader:,grub-splash:,syslinux-splash:,binary-image:,binary-source:,includes:,templates:,help,usage,version,force,breakpoints,debug,quiet,verbose,root-command: --name=${PROGRAM} --options r:a:d:f:m:k:l:p:e:b:s:huv --shell sh -- "${@}"`" + ARGUMENTS="`getopt --longoptions mode:,config:,apt:,apt-ftpproxy:,apt-httpproxy:,apt-generic:,apt-pdiffs:,apt-recommends:,apt-secure:,bootstrap:,cache:,debconf-frontend:,debconf-priority:,debconf-nowarnings:,genisoimage:,losetup:,tasksel:,root:,architecture:,distribution:,distribution-config:,flavour:,mirror-bootstrap:,mirror-bootstrap-security:,mirror-binary:,mirror-binary-security:,sections:,interactive:,kernel:,kernel-packages:,keyring-packages:,hooks:,language:,packages:,packages-lists:,tasks:,security:,symlinks:,sysvinit:,bootappend:,encryption:,username:,hostname:,chroot-filesystem:,memtest:,iso-volume:,server-address:,server-path:,source:,bootloader:,grub-splash:,syslinux-splash:,binary-images:,binary-source:,includes:,templates:,help,usage,version,force,breakpoints,debug,quiet,verbose,root-command: --name=${PROGRAM} --options r:a:d:f:m:k:l:p:e:b:s:huv --shell sh -- "${@}"`" if [ "${?}" != "0" ] then @@ -150,20 +150,20 @@ Local_arguments () LIVE_BOOTSTRAP_FLAVOUR="${2}"; shift 2 ;; - -m|--mirror-build) - LIVE_MIRROR_BUILD="${2}"; shift 2 + -m|--mirror-bootstrap) + LIVE_MIRROR_BOOTSTRAP="${2}"; shift 2 ;; - --mirror-build-security) - LIVE_MIRROR_BUILD_SECURITY="${2}"; shift 2 + --mirror-bootstrap-security) + LIVE_MIRROR_BOOTSTRAP_SECURITY="${2}"; shift 2 ;; - --mirror-image) - LIVE_MIRROR_IMAGE="${2}"; shift 2 + --mirror-binary) + LIVE_MIRROR_BINARY="${2}"; shift 2 ;; - --mirror-image-security) - LIVE_MIRROR_IMAGE_SECURITY="${2}"; shift 2 + --mirror-binary-security) + LIVE_MIRROR_BINARY_SECURITY="${2}"; shift 2 ;; --sections) @@ -175,12 +175,12 @@ Local_arguments () LIVE_INTERACTIVE="${2}"; shift 2 ;; - -k|--kernel-flavour) - LIVE_KERNEL_FLAVOUR="${2}"; shift 2 + -k|--linux-flavours) + LIVE_LINUX_FLAVOURS="${2}"; shift 2 ;; - --kernel-packages) - LIVE_KERNEL_PACKAGES="${2}"; shift 2 + --linux-packages) + LIVE_LINUX_PACKAGES="${2}"; shift 2 ;; --keyring-packages) @@ -236,8 +236,8 @@ Local_arguments () LIVE_HOSTNAME="${2}"; shift 2 ;; - --filesystem) - LIVE_FILESYSTEM="${2}"; shift 2 + --chroot-filesystem) + LIVE_CHROOT_FILESYSTEM="${2}"; shift 2 ;; --memtest) @@ -248,12 +248,12 @@ Local_arguments () LIVE_ISO_VOLUME="${2}"; shift 2 ;; - --server-address) - LIVE_SERVER_ADDRESS="${2}"; shift 2 + --net-server) + LIVE_NET_SERVER="${2}"; shift 2 ;; - --server-path) - LIVE_SERVER_PATH="${2}"; shift 2 + --net-path) + LIVE_NET_PATH="${2}"; shift 2 ;; --source) @@ -272,12 +272,12 @@ Local_arguments () LIVE_SYSLINUX_SPLASH="${2}"; shift 2 ;; - -b|--binary-image) - LIVE_BINARY_IMAGE="${2}"; shift 2 + -b|--binary-images) + LIVE_BINARY_IMAGES="${2}"; shift 2 ;; - -s|--source-image) - LIVE_SOURCE_IMAGE="${2}"; shift 2 + -s|--source-images) + LIVE_SOURCE_IMAGES="${2}"; shift 2 ;; --includes) @@ -353,7 +353,7 @@ Main () Local_arguments "${@}" # Configuring (this is really shit!) - LH_MODE="${LH_MODE}" LH_CONFIG="${LH_CONFIG}" 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_APT_SECURE="${LH_APT_SECURE}" LH_BOOTSTRAP="${LH_BOOTSTRAP}" LH_CACHE="${LH_CACHE}" LH_DEBCONF_FRONTEND="${LH_DEBCONF_FRONTEND}" LH_DEBCONF_PRIORITY="${LH_DEBCONF_PRIORITY}" LH_DEBCONF_NOWARNINGS="${LH_DEBCONF_NOWARNINGS}" LH_GENISOIMAGE="${LH_GENISOIMAGE}" LH_LOSETUP="${LH_LOSETUP}" LH_TASKSEL="${LH_TASKSEL}" LIVE_ROOT="${LIVE_ROOT}" LIVE_ARCHITECTURE="${LIVE_ARCHITECTURE}" LIVE_DISTRIBUTION="${LIVE_DISTRIBUTION}" LIVE_DISTRIBUTION_CONFIG="${LIVE_DISTRIBUTION_CONFIG}" LIVE_BOOTSTRAP_FLAVOUR="${LIVE_BOOTSTRAP_FLAVOUR}" LIVE_MIRROR_BUILD="${LIVE_MIRROR_BUILD}" LIVE_MIRROR_BUILD_SECURITY="${LIVE_MIRROR_BUILD_SECURITY}" LIVE_MIRROR_IMAGE="${LIVE_MIRROR_IMAGE}" LIVE_MIRROR_IMAGE_SECURITY="${LIVE_MIRROR_IMAGE_SECURITY}" LIVE_SECTIONS="${LIVE_SECTIONS}" LIVE_INTERACTIVE="${LIVE_INTERACTIVE}" LIVE_KERNEL_FLAVOUR="${LIVE_KERNEL_FLAVOUR}" LIVE_KERNEL_PACKAGES="${LIVE_KERNEL_PACKAGES}" LIVE_KEYRING_PACKAGES="${LIVE_KEYRING_PACKAGES}" LIVE_HOOKS="${LIVE_HOOKS}" LIVE_LANGUAGE="${LIVE_LANGUAGE}" LIVE_PACKAGES="${LIVE_PACKAGES}" LIVE_PACKAGES_LISTS="${LIVE_PACKAGES_LISTS}" 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_USERNAME="${LIVE_USERNAME}" LIVE_HOSTNAME="${LIVE_HOSTNAME}" LIVE_FILESYSTEM="${LIVE_FILESYSTEM}" LIVE_MEMTEST="${LIVE_MEMTEST}" LIVE_ISO_VOLUME="${LIVE_ISO_VOLUME}" LIVE_SERVER_ADDRESS="${LIVE_SERVER_ADDRESS}" LIVE_SERVER_PATH="${LIVE_SERVER_PATH}" LIVE_SOURCE="${LIVE_SOURCE}" LIVE_BOOTLOADER="${LIVE_BOOTLOADER}" LIVE_GRUB_SPLASH="${LIVE_GRUB_SPLASH}" LIVE_SYSLINUX_SPLASH="${LIVE_SYSLINUX_SPLASH}" LIVE_BINARY_IMAGE="${LIVE_BINARY_IMAGE}" LIVE_SOURCE_IMAGE="${LIVE_SOURCE_IMAGE}" LIVE_INCLUDES="${LIVE_INCLUDES}" LIVE_TEMPLATES="${LIVE_TEMPLATES}" LH_ROOT_COMMAND="${LH_ROOT_COMMAND}" lh_config newconfig + LH_MODE="${LH_MODE}" LH_CONFIG="${LH_CONFIG}" 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_APT_SECURE="${LH_APT_SECURE}" LH_BOOTSTRAP="${LH_BOOTSTRAP}" LH_CACHE="${LH_CACHE}" LH_DEBCONF_FRONTEND="${LH_DEBCONF_FRONTEND}" LH_DEBCONF_PRIORITY="${LH_DEBCONF_PRIORITY}" LH_DEBCONF_NOWARNINGS="${LH_DEBCONF_NOWARNINGS}" LH_GENISOIMAGE="${LH_GENISOIMAGE}" LH_LOSETUP="${LH_LOSETUP}" LH_TASKSEL="${LH_TASKSEL}" LIVE_ROOT="${LIVE_ROOT}" LIVE_ARCHITECTURE="${LIVE_ARCHITECTURE}" LIVE_DISTRIBUTION="${LIVE_DISTRIBUTION}" LIVE_DISTRIBUTION_CONFIG="${LIVE_DISTRIBUTION_CONFIG}" LIVE_BOOTSTRAP_FLAVOUR="${LIVE_BOOTSTRAP_FLAVOUR}" LIVE_MIRROR_BOOTSTRAP="${LIVE_MIRROR_BOOTSTRAP}" LIVE_MIRROR_BOOTSTRAP_SECURITY="${LIVE_MIRROR_BOOTSTRAP_SECURITY}" LIVE_MIRROR_BINARY="${LIVE_MIRROR_BINARY}" LIVE_MIRROR_BINARY_SECURITY="${LIVE_MIRROR_BINARY_SECURITY}" LIVE_SECTIONS="${LIVE_SECTIONS}" LIVE_INTERACTIVE="${LIVE_INTERACTIVE}" LIVE_LINUX_FLAVOURS="${LIVE_LINUX_FLAVOURS}" LIVE_LINUX_PACKAGES="${LIVE_LINUX_PACKAGES}" LIVE_KEYRING_PACKAGES="${LIVE_KEYRING_PACKAGES}" LIVE_HOOKS="${LIVE_HOOKS}" LIVE_LANGUAGE="${LIVE_LANGUAGE}" LIVE_PACKAGES="${LIVE_PACKAGES}" LIVE_PACKAGES_LISTS="${LIVE_PACKAGES_LISTS}" 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_USERNAME="${LIVE_USERNAME}" LIVE_HOSTNAME="${LIVE_HOSTNAME}" LIVE_CHROOT_FILESYSTEM="${LIVE_CHROOT_FILESYSTEM}" LIVE_MEMTEST="${LIVE_MEMTEST}" LIVE_ISO_VOLUME="${LIVE_ISO_VOLUME}" LIVE_NET_SERVER="${LIVE_NET_SERVER}" LIVE_NET_PATH="${LIVE_NET_PATH}" LIVE_SOURCE="${LIVE_SOURCE}" LIVE_BOOTLOADER="${LIVE_BOOTLOADER}" LIVE_GRUB_SPLASH="${LIVE_GRUB_SPLASH}" LIVE_SYSLINUX_SPLASH="${LIVE_SYSLINUX_SPLASH}" LIVE_BINARY_IMAGES="${LIVE_BINARY_IMAGES}" LIVE_SOURCE_IMAGES="${LIVE_SOURCE_IMAGES}" LIVE_INCLUDES="${LIVE_INCLUDES}" LIVE_TEMPLATES="${LIVE_TEMPLATES}" LH_ROOT_COMMAND="${LH_ROOT_COMMAND}" lh_config newconfig if [ "${LH_BREAKPOINTS}" = "enabled" ] then diff --git a/includes/lenny b/includes/lenny new file mode 120000 index 0000000..190cf35 --- /dev/null +++ b/includes/lenny @@ -0,0 +1 @@ +etch \ No newline at end of file diff --git a/includes/stable b/includes/stable new file mode 120000 index 0000000..190cf35 --- /dev/null +++ b/includes/stable @@ -0,0 +1 @@ +etch \ No newline at end of file diff --git a/includes/testing b/includes/testing new file mode 120000 index 0000000..fb5b653 --- /dev/null +++ b/includes/testing @@ -0,0 +1 @@ +lenny \ No newline at end of file diff --git a/includes/unstable b/includes/unstable new file mode 120000 index 0000000..9a63c96 --- /dev/null +++ b/includes/unstable @@ -0,0 +1 @@ +sid \ No newline at end of file diff --git a/manpages/lh_binary.1.de b/manpages/lh_binary.1.de deleted file mode 100644 index ffd6759..0000000 --- a/manpages/lh_binary.1.de +++ /dev/null @@ -1,61 +0,0 @@ -.TH LH_BINARY 1 "07.05.2007" "1.0~a9" "live\-helper" - -.SH NAME -lh_binary \- Meta\-Helper f\[:u]r lh_binary_* - -.SH SYNTAX -.B lh_binary [\fIlive\-helper\ Optionen\fR\|] - -.SH BESCHREIBUNG -lh_binary ist ein Meta\-Helper. Es ruft alle n\[:o]tigen Helper auf um die binary\-Stufe zu vervollst\[:a]ndigen. - -.SH BINARY HELPER -Hier ist eine vollst\[:a]ndige Liste aller verf\[:u]gbaren binary\-Helper Kommandos. Siehe deren Hilfeseiten f\[:u]r zus\[:a]tzliche Dokumentation. -.IP "\fIlh_binary_chroot\fR(1)" 4 -kopiert chroot in chroot. -.IP "\fIlh_binary_debian\-installer\fR(1)" 4 -kopiert debian\-installer in das Binary\-Image. -.IP "\fIlh_binary_encryption\fR(1)" 4 -verschl\[:u]sselt das Root\-Dateisystem. -.IP "\fIlh_binary_grub\fR(1)" 4 -kopiert grub in das Binary\-Image. -.IP "\fIlh_binary_hdd\fR(1)" 4 -erstellt den Festplatten Binary\-Tarball. -.IP "\fIlh_binary_includes\fR(1)" 4 -kopiert Dateien in das Binary\-Image. -.IP "\fIlh_binary_iso\fR(1)" 4 -erstell das CD/DVD Binary\-Image. -.IP "\fIlh_binary_linuximage\fR(1)" 4 -kopiert linux\-image in das Binary\-Image. -.IP "\fIlh_binary_localincludes\fR(1)" 4 -kopiert lokale Dateien in das Binary\-Image. -.IP "\fIlh_binary_manifest\fR(1)" 4 -erstellt die Paketliste des Root\-Dateisystemes. -.IP "\fIlh_binary_md5sum\fR(1)" 4 -erstellt md5sum.txt im Binary\-Image. -.IP "\fIlh_binary_memtest\fR(1)" 4 -kopiert ein memtest in das Binary\-Image. -.IP "\fIlh_binary_net\fR(1)" 4 -erstellt den Netboot Binary\-Tarball. -.IP "\fIlh_binary_rootfs\fR(1)" 4 -erstell das Root\-Dateisystem. -.IP "\fIlh_binary_syslinux\fR(1)" 4 -kopiert syslinux in das Binary\-Image. -.IP "\fIlh_binary_usb-hdd\fR(1)" 4 -erstellt das USB-hdd Binary\-Image. -.IP "\fIlh_binary_yaboot\fR(1)" 4 -kopiert yaboot in das Binary\-Image. - -.SH SIEHE AUCH -\fIlive\-helper\fR(7) -.PP -Dieses Programm ist Teil von live\-helper. - -.SH FEHLER -Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden. - -.SH HOMEPAGE -Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden. - -.SH AUTOR -live\-helper wurde von Daniel Baumann <\fIdaniel@debian.org\fR> f\[:u]r das Debian\-Projekt geschrieben. diff --git a/manpages/lh_binary.1.en b/manpages/lh_binary.1.en deleted file mode 100644 index 0d2bb45..0000000 --- a/manpages/lh_binary.1.en +++ /dev/null @@ -1,61 +0,0 @@ -.TH LH_BINARY 1 "2007\-05\-07" "1.0~a9" "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 BINARY HELPERS -Here is the complete list of available binary helper commands. See their man pages for additional documentation. -.IP "\fIlh_binary_chroot\fR(1)" 4 -copies chroot into chroot. -.IP "\fIlh_binary_debian-installer\fR(1)" 4 -copies debian-installer into the binary image. -.IP "\fIlh_binary_encryption\fR(1)" 4 -encrypts the root filesystem. -.IP "\fIlh_binary_grub\fR(1)" 4 -copies grub into the binary image. -.IP "\fIlh_binary_hdd\fR(1)" 4 -creates the harddisk binary tarball. -.IP "\fIlh_binary_includes\fR(1)" 4 -copies files into the binary image. -.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_memtest\fR(1)" 4 -copies a memtest 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-hdd\fR(1)" 4 -creates the USB-hdd binary image. -.IP "\fIlh_binary_yaboot\fR(1)" 4 -copies yaboot into the 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> for the Debian project. diff --git a/manpages/lh_binary.de.1 b/manpages/lh_binary.de.1 new file mode 100644 index 0000000..5b3e10a --- /dev/null +++ b/manpages/lh_binary.de.1 @@ -0,0 +1,61 @@ +.TH LH_BINARY 1 "14.05.2007" "1.0~a10" "live\-helper" + +.SH NAME +lh_binary \- Meta\-Helper f\[:u]r lh_binary_* + +.SH SYNTAX +.B lh_binary [\fIlive\-helper\ Optionen\fR\|] + +.SH BESCHREIBUNG +lh_binary ist ein Meta\-Helper. Es ruft alle n\[:o]tigen Helper auf um die binary\-Stufe zu vervollst\[:a]ndigen. + +.SH BINARY HELPER +Hier ist eine vollst\[:a]ndige Liste aller verf\[:u]gbaren binary\-Helper Kommandos. Siehe deren Hilfeseiten f\[:u]r zus\[:a]tzliche Dokumentation. +.IP "\fIlh_binary_chroot\fR(1)" 4 +kopiert chroot in chroot. +.IP "\fIlh_binary_debian\-installer\fR(1)" 4 +kopiert debian\-installer in das Binary\-Image. +.IP "\fIlh_binary_encryption\fR(1)" 4 +verschl\[:u]sselt das Root\-Dateisystem. +.IP "\fIlh_binary_grub\fR(1)" 4 +kopiert grub in das Binary\-Image. +.IP "\fIlh_binary_hdd\fR(1)" 4 +erstellt den Festplatten Binary\-Tarball. +.IP "\fIlh_binary_includes\fR(1)" 4 +kopiert Dateien in das Binary\-Image. +.IP "\fIlh_binary_iso\fR(1)" 4 +erstell das CD/DVD Binary\-Image. +.IP "\fIlh_binary_linux-image\fR(1)" 4 +kopiert linux\-image in das Binary\-Image. +.IP "\fIlh_binary_local-includes\fR(1)" 4 +kopiert lokale Dateien in das Binary\-Image. +.IP "\fIlh_binary_manifest\fR(1)" 4 +erstellt die Paketliste des Root\-Dateisystemes. +.IP "\fIlh_binary_md5sum\fR(1)" 4 +erstellt md5sum.txt im Binary\-Image. +.IP "\fIlh_binary_memtest\fR(1)" 4 +kopiert ein memtest in das Binary\-Image. +.IP "\fIlh_binary_net\fR(1)" 4 +erstellt den Netboot Binary\-Tarball. +.IP "\fIlh_binary_rootfs\fR(1)" 4 +erstell das Root\-Dateisystem. +.IP "\fIlh_binary_syslinux\fR(1)" 4 +kopiert syslinux in das Binary\-Image. +.IP "\fIlh_binary_usb-hdd\fR(1)" 4 +erstellt das USB-hdd Binary\-Image. +.IP "\fIlh_binary_yaboot\fR(1)" 4 +kopiert yaboot in das Binary\-Image. + +.SH SIEHE AUCH +\fIlive\-helper\fR(7) +.PP +Dieses Programm ist Teil von live\-helper. + +.SH FEHLER +Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden. + +.SH HOMEPAGE +Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden. + +.SH AUTOR +live\-helper wurde von Daniel Baumann <\fIdaniel@debian.org\fR> f\[:u]r das Debian\-Projekt geschrieben. diff --git a/manpages/lh_binary.en.1 b/manpages/lh_binary.en.1 new file mode 100644 index 0000000..268209a --- /dev/null +++ b/manpages/lh_binary.en.1 @@ -0,0 +1,61 @@ +.TH LH_BINARY 1 "2007\-05\-14" "1.0~a10" "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 BINARY HELPERS +Here is the complete list of available binary helper commands. See their man pages for additional documentation. +.IP "\fIlh_binary_chroot\fR(1)" 4 +copies chroot into chroot. +.IP "\fIlh_binary_debian-installer\fR(1)" 4 +copies debian-installer into the binary image. +.IP "\fIlh_binary_encryption\fR(1)" 4 +encrypts the root filesystem. +.IP "\fIlh_binary_grub\fR(1)" 4 +copies grub into the binary image. +.IP "\fIlh_binary_hdd\fR(1)" 4 +creates the harddisk binary tarball. +.IP "\fIlh_binary_includes\fR(1)" 4 +copies files into the binary image. +.IP "\fIlh_binary_iso\fR(1)" 4 +creates the CD/DVD binary image. +.IP "\fIlh_binary_linux-image\fR(1)" 4 +copies linux\-image into the binary image. +.IP "\fIlh_binary_local-includes\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_memtest\fR(1)" 4 +copies a memtest 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-hdd\fR(1)" 4 +creates the USB-hdd binary image. +.IP "\fIlh_binary_yaboot\fR(1)" 4 +copies yaboot into the 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> for the Debian project. diff --git a/manpages/lh_bootstrap.1.de b/manpages/lh_bootstrap.1.de deleted file mode 100644 index 44269c1..0000000 --- a/manpages/lh_bootstrap.1.de +++ /dev/null @@ -1,31 +0,0 @@ -.TH LH_BOOTSTRAP 1 "07.05.2007" "1.0~a9" "live\-helper" - -.SH NAME -lh_bootstrap \- Meta\-Helper f\[:u]r lh_bootstrap_* - -.SH SYNTAX -.B lh_bootstrap [\fIlive\-helper\ Optionen\fR\|] - -.SH BESCHREIBUNG -lh_bootstrap ist ein Meta\-Helper. Es ruft alle n\[:o]tigen Helper auf um die bootstrap-Stufe zu vervollst\[:a]ndigen. - -.SH BOOTSTRAP HELPER -Hier ist eine vollst\[:a]ndige Liste aller verf\[:u]gbaren bootstrap\-Helper Kommandos. Siehe deren Hilfeseiten f\[:u]r zus\[:a]tzliche Dokumentation. -.IP "\fIlh_bootstrap_cdebootstrap\fR(1)" 4 -erstellt ein Debian-System mit cdebootstrap. -.IP "\fIlh_bootstrap_debootstrap\fR(1)" 4 -erstellt ein Debian-System mit debootstrap. - -.SH SIEHE AUCH -\fIlive\-helper\fR(7) -.PP -Dieses Programm ist Teil von live\-helper. - -.SH FEHLER -Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden. - -.SH HOMEPAGE -Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden. - -.SH AUTOR -live\-helper wurde von Daniel Baumann <\fIdaniel@debian.org\fR> f\[:u]r das Debian\-Projekt geschrieben. diff --git a/manpages/lh_bootstrap.1.en b/manpages/lh_bootstrap.1.en deleted file mode 100644 index af9d414..0000000 --- a/manpages/lh_bootstrap.1.en +++ /dev/null @@ -1,31 +0,0 @@ -.TH LH_BOOTSTRAP 1 "2007\-05\-07" "1.0~a9" "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 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> for the Debian project. diff --git a/manpages/lh_bootstrap.de.1 b/manpages/lh_bootstrap.de.1 new file mode 100644 index 0000000..fcc29a3 --- /dev/null +++ b/manpages/lh_bootstrap.de.1 @@ -0,0 +1,31 @@ +.TH LH_BOOTSTRAP 1 "14.05.2007" "1.0~a10" "live\-helper" + +.SH NAME +lh_bootstrap \- Meta\-Helper f\[:u]r lh_bootstrap_* + +.SH SYNTAX +.B lh_bootstrap [\fIlive\-helper\ Optionen\fR\|] + +.SH BESCHREIBUNG +lh_bootstrap ist ein Meta\-Helper. Es ruft alle n\[:o]tigen Helper auf um die bootstrap-Stufe zu vervollst\[:a]ndigen. + +.SH BOOTSTRAP HELPER +Hier ist eine vollst\[:a]ndige Liste aller verf\[:u]gbaren bootstrap\-Helper Kommandos. Siehe deren Hilfeseiten f\[:u]r zus\[:a]tzliche Dokumentation. +.IP "\fIlh_bootstrap_cdebootstrap\fR(1)" 4 +erstellt ein Debian-System mit cdebootstrap. +.IP "\fIlh_bootstrap_debootstrap\fR(1)" 4 +erstellt ein Debian-System mit debootstrap. + +.SH SIEHE AUCH +\fIlive\-helper\fR(7) +.PP +Dieses Programm ist Teil von live\-helper. + +.SH FEHLER +Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden. + +.SH HOMEPAGE +Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden. + +.SH AUTOR +live\-helper wurde von Daniel Baumann <\fIdaniel@debian.org\fR> f\[:u]r das Debian\-Projekt geschrieben. diff --git a/manpages/lh_bootstrap.en.1 b/manpages/lh_bootstrap.en.1 new file mode 100644 index 0000000..50db5fb --- /dev/null +++ b/manpages/lh_bootstrap.en.1 @@ -0,0 +1,31 @@ +.TH LH_BOOTSTRAP 1 "2007\-05\-14" "1.0~a10" "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 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> for the Debian project. diff --git a/manpages/lh_bootstrap_cdebootstrap.1.de b/manpages/lh_bootstrap_cdebootstrap.1.de deleted file mode 100644 index 7ef881d..0000000 --- a/manpages/lh_bootstrap_cdebootstrap.1.de +++ /dev/null @@ -1,47 +0,0 @@ -.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "07.05.2007" "1.0~a9" "live\-helper" - -.SH NAME -lh_bootstrap_cdebootstrap \- erstellt ein Debian-System mit \fIcdebootstrap\fR(1) - -.SH SYNTAX -.B lh_bootstrap_cdebootstrap [\fIlive\-helper\ Optionen\fR\|] - -.SH BESCHREIBUNG -lh_bootstrap_cdebootstrap benutzt \fIcdebootstrap\fR(1) um ein Debian Grundsystem zu erstellen. - -.SH KONFIGURATIONSDATEI -lh_bootstrap_cdebootstrap liest config/common und config/bootstrap wenn verf\[:ugbar]. Siehe UMGEBUNG zur Benutzung der korrekten Umgebungsvariablen. - -.SH UMGEBUNG -lh_bootstrap_cdebootstrap respektiert die folgenden Umgebungsvariablen, sofern verf\[:u]gbar, andernfalls werden Standardwerte benutzt. -.IP "\fI$LH_BOOTSTRAP\fR" 4 -kontrolliert das zu benutzende bootstrap-Programm (Standard: cdebootstrap) -.IP "\fI$LH_CACHE\fR" 4 -kontrolliert ob heruntergeladene Pakete zwischengespeichert werden sollen (Standard: enabled) -.PP -.IP "\fI$LIVE_ARCHITECTURE\fR" 4 -w\[:a]hlt die chroot-Architektur aus (Standard: automatisch) -.IP "\fI$LIVE_BOOTSTRAP_CONFIG\fR" 4 -bestimmt das Distributions-Konfiguration Verzeichnis (Standard: leer) -.IP "\fI$LIVE_BOOTSTRAP_FLAVOUR\fR" 4 -w\[:a]hlt die Bootstrap-Variante aus (Standard: standard) -.IP "\fI$LIVE_DISTRIBUTION\fR" 4 -w\[:a]hlt die Distribution aus (Standard: etch) -.IP "\fI$LIVE_MIRROR_BUILD\fR" 4 -bestimmt den Spiegelserver (Standard: http://ftp.debian.org/debian/) - -.SH SIEHE AUCH -\fIcdebootstrap\fR(1) -.PP -\fIlive\-helper\fR(7) -.PP -Dieses Programm ist Teil von live\-helper. - -.SH FEHLER -Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden. - -.SH HOMEPAGE -Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden. - -.SH AUTOR -live\-helper wurde von Daniel Baumann <\fIdaniel@debian.org\fR> f\[:u]r das Debian\-Projekt geschrieben. diff --git a/manpages/lh_bootstrap_cdebootstrap.1.en b/manpages/lh_bootstrap_cdebootstrap.1.en deleted file mode 100644 index 7737c51..0000000 --- a/manpages/lh_bootstrap_cdebootstrap.1.en +++ /dev/null @@ -1,47 +0,0 @@ -.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "2007\-05\-07" "1.0~a9" "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_BOOTSTRAP\fR" 4 -control the bootstrap program to be used (Default: cdebootstrap) -.IP "\fI$LH_CACHE\fR" 4 -control if downloaded packages should be cached (Default: enabled) -.PP -.IP "\fI$LIVE_ARCHITECTURE\fR" 4 -select the chroot architecture (Default: autodetected) -.IP "\fI$LIVE_BOOTSTRAP_CONFIG\fR" 4 -set distribution config directory (Default: empty) -.IP "\fI$LIVE_BOOTSTRAP_FLAVOUR\fR" 4 -select the flavour to use (Default: standard) -.IP "\fI$LIVE_DISTRIBUTION\fR" 4 -select the distribution to use (Default: sid) -.IP "\fI$LIVE_MIRROR_BUILD\fR" 4 -set the mirror to use (Default: http://ftp.debian.org/debian/) - -.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> for the Debian project. diff --git a/manpages/lh_bootstrap_cdebootstrap.de.1 b/manpages/lh_bootstrap_cdebootstrap.de.1 new file mode 100644 index 0000000..326dfbc --- /dev/null +++ b/manpages/lh_bootstrap_cdebootstrap.de.1 @@ -0,0 +1,47 @@ +.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "14.05.2007" "1.0~a10" "live\-helper" + +.SH NAME +lh_bootstrap_cdebootstrap \- erstellt ein Debian-System mit \fIcdebootstrap\fR(1) + +.SH SYNTAX +.B lh_bootstrap_cdebootstrap [\fIlive\-helper\ Optionen\fR\|] + +.SH BESCHREIBUNG +lh_bootstrap_cdebootstrap benutzt \fIcdebootstrap\fR(1) um ein Debian Grundsystem zu erstellen. + +.SH KONFIGURATIONSDATEI +lh_bootstrap_cdebootstrap liest config/common und config/bootstrap wenn verf\[:u]gbar. Siehe UMGEBUNG zur Benutzung der korrekten Umgebungsvariablen. + +.SH UMGEBUNG +lh_bootstrap_cdebootstrap respektiert die folgenden Umgebungsvariablen, sofern verf\[:u]gbar, andernfalls werden Standardwerte benutzt. +.IP "\fI$LH_BOOTSTRAP\fR" 4 +kontrolliert das zu benutzende bootstrap-Programm (Standard: cdebootstrap) +.IP "\fI$LH_CACHE\fR" 4 +kontrolliert ob heruntergeladene Pakete zwischengespeichert werden sollen (Standard: enabled) +.PP +.IP "\fI$LIVE_ARCHITECTURE\fR" 4 +w\[:a]hlt die chroot-Architektur aus (Standard: automatisch) +.IP "\fI$LIVE_BOOTSTRAP_CONFIG\fR" 4 +bestimmt das Distributions-Konfiguration Verzeichnis (Standard: leer) +.IP "\fI$LIVE_BOOTSTRAP_FLAVOUR\fR" 4 +w\[:a]hlt die Bootstrap-Variante aus (Standard: standard) +.IP "\fI$LIVE_DISTRIBUTION\fR" 4 +w\[:a]hlt die Distribution aus (Standard: etch) +.IP "\fI$LIVE_MIRROR_BUILD\fR" 4 +bestimmt den Spiegelserver (Standard: http://ftp.debian.org/debian/) + +.SH SIEHE AUCH +\fIcdebootstrap\fR(1) +.PP +\fIlive\-helper\fR(7) +.PP +Dieses Programm ist Teil von live\-helper. + +.SH FEHLER +Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden. + +.SH HOMEPAGE +Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden. + +.SH AUTOR +live\-helper wurde von Daniel Baumann <\fIdaniel@debian.org\fR> f\[:u]r das Debian\-Projekt geschrieben. diff --git a/manpages/lh_bootstrap_cdebootstrap.en.1 b/manpages/lh_bootstrap_cdebootstrap.en.1 new file mode 100644 index 0000000..f810457 --- /dev/null +++ b/manpages/lh_bootstrap_cdebootstrap.en.1 @@ -0,0 +1,47 @@ +.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "2007\-05\-14" "1.0~a10" "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_BOOTSTRAP\fR" 4 +control the bootstrap program to be used (Default: cdebootstrap) +.IP "\fI$LH_CACHE\fR" 4 +control if downloaded packages should be cached (Default: enabled) +.PP +.IP "\fI$LIVE_ARCHITECTURE\fR" 4 +select the chroot architecture (Default: autodetected) +.IP "\fI$LIVE_BOOTSTRAP_CONFIG\fR" 4 +set distribution config directory (Default: empty) +.IP "\fI$LIVE_BOOTSTRAP_FLAVOUR\fR" 4 +select the flavour to use (Default: standard) +.IP "\fI$LIVE_DISTRIBUTION\fR" 4 +select the distribution to use (Default: sid) +.IP "\fI$LIVE_MIRROR_BUILD\fR" 4 +set the mirror to use (Default: http://ftp.debian.org/debian/) + +.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> for the Debian project. diff --git a/manpages/lh_bootstrap_debootstrap.1.de b/manpages/lh_bootstrap_debootstrap.1.de deleted file mode 100644 index 7dbbfec..0000000 --- a/manpages/lh_bootstrap_debootstrap.1.de +++ /dev/null @@ -1,47 +0,0 @@ -.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "07.05.2007" "1.0~a9" "live\-helper" - -.SH NAME -lh_bootstrap_debootstrap \- erstellt ein Debian-System mit \fIdebootstrap\fR(8) - -.SH SYNTAX -.B lh_bootstrap_debootstrap [\fIlive\-helper\ Optionen\fR\|] - -.SH BESCHREIBUNG -lh_bootstrap_debootstrap benutzt \fIdebootstrap\fR(8) um ein Debian Grundsystem zu erstellen. - -.SH KONFIGURATIONSDATEI -lh_bootstrap_debootstrap liest config/common und config/bootstrap wenn verf\[:ugbar]. Siehe UMGEBUNG zur Benutzung der korrekten Umgebungsvariablen. - -.SH UMGEBUNG -lh_bootstrap_debootstrap respektiert die folgenden Umgebungsvariablen, sofern verf\[:u]gbar, andernfalls werden Standardwerte benutzt. -.IP "\fI$LH_BOOTSTRAP\fR" 4 -kontrolliert das zu benutzende bootstrap-Programm (Standard: debootstrap) -.IP "\fI$LH_CACHE\fR" 4 -kontrolliert ob heruntergeladene Pakete zwischengespeichert werden sollen (Standard: enabled) -.PP -.IP "\fI$LIVE_ARCHITECTURE\fR" 4 -w\[:a]hlt die chroot-Architektur aus (Standard: automatisch) -.IP "\fI$LIVE_BOOTSTRAP_CONFIG\fR" 4 -bestimmt das Distributions-Konfiguration Verzeichnis (Standard: leer) -.IP "\fI$LIVE_BOOTSTRAP_FLAVOUR\fR" 4 -w\[:a]hlt die Bootstrap-Variante aus (Standard: standard) -.IP "\fI$LIVE_DISTRIBUTION\fR" 4 -w\[:a]hlt die Distribution aus (Standard: etch) -.IP "\fI$LIVE_MIRROR_BUILD\fR" 4 -bestimmt den Spiegelserver (Standard: http://ftp.debian.org/debian/) - -.SH SIEHE AUCH -\fIdebootstrap\fR(8) -.PP -\fIlive\-helper\fR(7) -.PP -Dieses Programm ist Teil von live\-helper. - -.SH FEHLER -Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden. - -.SH HOMEPAGE -Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden. - -.SH AUTOR -live\-helper wurde von Daniel Baumann <\fIdaniel@debian.org\fR> f\[:u]r das Debian\-Projekt geschrieben. diff --git a/manpages/lh_bootstrap_debootstrap.1.en b/manpages/lh_bootstrap_debootstrap.1.en deleted file mode 100644 index e26dc02..0000000 --- a/manpages/lh_bootstrap_debootstrap.1.en +++ /dev/null @@ -1,47 +0,0 @@ -.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "2007\-05\-07" "1.0~a9" "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_BOOTSTRAP\fR" 4 -control the bootstrap program to be used (Default: cdebootstrap) -.IP "\fI$LH_CACHE\fR" 4 -control if downloaded packages should be cached (Default: enabled) -.PP -.IP "\fI$LIVE_ARCHITECTURE\fR" 4 -select the chroot architecture (Default: autodetected) -.IP "\fI$LIVE_BOOTSTRAP_CONFIG\fR" 4 -set distribution config directory (Default: empty) -.IP "\fI$LIVE_BOOTSTRAP_FLAVOUR\fR" 4 -select the flavour to use (Default: standard) -.IP "\fI$LIVE_DISTRIBUTION\fR" 4 -select the distribution to use (Default: sid) -.IP "\fI$LIVE_MIRROR_BUILD\fR" 4 -set the mirror to use (Default: http://ftp.debian.org/debian/) - -.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> for the Debian project. diff --git a/manpages/lh_bootstrap_debootstrap.de.1 b/manpages/lh_bootstrap_debootstrap.de.1 new file mode 100644 index 0000000..cec8083 --- /dev/null +++ b/manpages/lh_bootstrap_debootstrap.de.1 @@ -0,0 +1,47 @@ +.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "14.05.2007" "1.0~a10" "live\-helper" + +.SH NAME +lh_bootstrap_debootstrap \- erstellt ein Debian-System mit \fIdebootstrap\fR(8) + +.SH SYNTAX +.B lh_bootstrap_debootstrap [\fIlive\-helper\ Optionen\fR\|] + +.SH BESCHREIBUNG +lh_bootstrap_debootstrap benutzt \fIdebootstrap\fR(8) um ein Debian Grundsystem zu erstellen. + +.SH KONFIGURATIONSDATEI +lh_bootstrap_debootstrap liest config/common und config/bootstrap wenn verf\[:u]gbar. Siehe UMGEBUNG zur Benutzung der korrekten Umgebungsvariablen. + +.SH UMGEBUNG +lh_bootstrap_debootstrap respektiert die folgenden Umgebungsvariablen, sofern verf\[:u]gbar, andernfalls werden Standardwerte benutzt. +.IP "\fI$LH_BOOTSTRAP\fR" 4 +kontrolliert das zu benutzende bootstrap-Programm (Standard: debootstrap) +.IP "\fI$LH_CACHE\fR" 4 +kontrolliert ob heruntergeladene Pakete zwischengespeichert werden sollen (Standard: enabled) +.PP +.IP "\fI$LIVE_ARCHITECTURE\fR" 4 +w\[:a]hlt die chroot-Architektur aus (Standard: automatisch) +.IP "\fI$LIVE_BOOTSTRAP_CONFIG\fR" 4 +bestimmt das Distributions-Konfiguration Verzeichnis (Standard: leer) +.IP "\fI$LIVE_BOOTSTRAP_FLAVOUR\fR" 4 +w\[:a]hlt die Bootstrap-Variante aus (Standard: standard) +.IP "\fI$LIVE_DISTRIBUTION\fR" 4 +w\[:a]hlt die Distribution aus (Standard: etch) +.IP "\fI$LIVE_MIRROR_BUILD\fR" 4 +bestimmt den Spiegelserver (Standard: http://ftp.debian.org/debian/) + +.SH SIEHE AUCH +\fIdebootstrap\fR(8) +.PP +\fIlive\-helper\fR(7) +.PP +Dieses Programm ist Teil von live\-helper. + +.SH FEHLER +Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden. + +.SH HOMEPAGE +Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden. + +.SH AUTOR +live\-helper wurde von Daniel Baumann <\fIdaniel@debian.org\fR> f\[:u]r das Debian\-Projekt geschrieben. diff --git a/manpages/lh_bootstrap_debootstrap.en.1 b/manpages/lh_bootstrap_debootstrap.en.1 new file mode 100644 index 0000000..e4aa1a6 --- /dev/null +++ b/manpages/lh_bootstrap_debootstrap.en.1 @@ -0,0 +1,47 @@ +.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "2007\-05\-14" "1.0~a10" "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_BOOTSTRAP\fR" 4 +control the bootstrap program to be used (Default: cdebootstrap) +.IP "\fI$LH_CACHE\fR" 4 +control if downloaded packages should be cached (Default: enabled) +.PP +.IP "\fI$LIVE_ARCHITECTURE\fR" 4 +select the chroot architecture (Default: autodetected) +.IP "\fI$LIVE_BOOTSTRAP_CONFIG\fR" 4 +set distribution config directory (Default: empty) +.IP "\fI$LIVE_BOOTSTRAP_FLAVOUR\fR" 4 +select the flavour to use (Default: standard) +.IP "\fI$LIVE_DISTRIBUTION\fR" 4 +select the distribution to use (Default: sid) +.IP "\fI$LIVE_MIRROR_BUILD\fR" 4 +set the mirror to use (Default: http://ftp.debian.org/debian/) + +.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> for the Debian project. diff --git a/manpages/lh_build.1.de b/manpages/lh_build.1.de deleted file mode 100644 index ca95cf2..0000000 --- a/manpages/lh_build.1.de +++ /dev/null @@ -1,35 +0,0 @@ -.TH LH_BUILD 1 "07.05.2007" "1.0~a9" "live\-helper" - -.SH NAME -lh_build \- erstellen eines Live-Systemes - -.SH SYNOPSIS -.B lh_build [\fIlive\-helper\ Optionen\fR\|] - -.SH BESCHREIBUNG -lh_build ist ein Helper-Script. Es ruft alle n\[:o]tigen Meta\-Helper auf um ein Live-System erfolgreich zu erstellen. - -.SH META\-HELPER -Hier ist eine vollst\[:a]ndige Liste aller verf\[:u]gbaren Meta\-Helper Kommandos. Siehe deren Hilfeseiten f\[:u]r zus\[:a]tzliche Dokumentation. -.IP "\fIlh_binary\fR(1)" 4 -erstellt ein Binary\-Image. -.IP "\fIlh_bootstrap\fR(1)" 4 -erstellt das Grundsystem. -.IP "\fIlh_chroot\fR(1)" 4 -individualisiert chroot. -.IP "\fIlh_source\fR(1)" 4 -erstellt ein Source-Image. - -.SH SIEHE AUCH -\fIlive\-helper\fR(7) -.PP -Dieses Programm ist Teil von live\-helper. - -.SH FEHLER -Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden. - -.SH HOMEPAGE -Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden. - -.SH AUTOR -live\-helper wurde von Daniel Baumann <\fIdaniel@debian.org\fR> f\[:u]r das Debian\-Projekt geschrieben. diff --git a/manpages/lh_build.1.en b/manpages/lh_build.1.en deleted file mode 100644 index a8be3e0..0000000 --- a/manpages/lh_build.1.en +++ /dev/null @@ -1,35 +0,0 @@ -.TH LH_BUILD 1 "2007\-05\-07" "1.0~a9" "live\-helper" - -.SH NAME -lh_build \- building a live system - -.SH SYNOPSIS -.B lh_build [\fIlive\-helper\ options\fR\|] - -.SH DESCRIPTION -lh_build is a helper script. It calls all required meta\-helper scripts to successfully build a live system. - -.SH META\-HELPERS -Here is the complete list of available meta\-helper commands. See their man pages for additional documentation. -.IP "\fIlh_binary\fR(1)" 4 -builds a binary image. -.IP "\fIlh_bootstrap\fR(1)" 4 -bootstraps a system. -.IP "\fIlh_chroot\fR(1)" 4 -customizes a chroot. -.IP "\fIlh_source\fR(1)" 4 -builds a source 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> for the Debian project. diff --git a/manpages/lh_build.de.1 b/manpages/lh_build.de.1 new file mode 100644 index 0000000..703cea4 --- /dev/null +++ b/manpages/lh_build.de.1 @@ -0,0 +1,35 @@ +.TH LH_BUILD 1 "14.05.2007" "1.0~a10" "live\-helper" + +.SH NAME +lh_build \- erstellen eines Live-Systemes + +.SH SYNOPSIS +.B lh_build [\fIlive\-helper\ Optionen\fR\|] + +.SH BESCHREIBUNG +lh_build ist ein Helper-Script. Es ruft alle n\[:o]tigen Meta\-Helper auf um ein Live-System erfolgreich zu erstellen. + +.SH META\-HELPER +Hier ist eine vollst\[:a]ndige Liste aller verf\[:u]gbaren Meta\-Helper Kommandos. Siehe deren Hilfeseiten f\[:u]r zus\[:a]tzliche Dokumentation. +.IP "\fIlh_binary\fR(1)" 4 +erstellt ein Binary\-Image. +.IP "\fIlh_bootstrap\fR(1)" 4 +erstellt das Grundsystem. +.IP "\fIlh_chroot\fR(1)" 4 +individualisiert chroot. +.IP "\fIlh_source\fR(1)" 4 +erstellt ein Source-Image. + +.SH SIEHE AUCH +\fIlive\-helper\fR(7) +.PP +Dieses Programm ist Teil von live\-helper. + +.SH FEHLER +Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden. + +.SH HOMEPAGE +Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden. + +.SH AUTOR +live\-helper wurde von Daniel Baumann <\fIdaniel@debian.org\fR> f\[:u]r das Debian\-Projekt geschrieben. diff --git a/manpages/lh_build.en.1 b/manpages/lh_build.en.1 new file mode 100644 index 0000000..adc25dc --- /dev/null +++ b/manpages/lh_build.en.1 @@ -0,0 +1,35 @@ +.TH LH_BUILD 1 "2007\-05\-14" "1.0~a10" "live\-helper" + +.SH NAME +lh_build \- building a live system + +.SH SYNOPSIS +.B lh_build [\fIlive\-helper\ options\fR\|] + +.SH DESCRIPTION +lh_build is a helper script. It calls all required meta\-helper scripts to successfully build a live system. + +.SH META\-HELPERS +Here is the complete list of available meta\-helper commands. See their man pages for additional documentation. +.IP "\fIlh_binary\fR(1)" 4 +builds a binary image. +.IP "\fIlh_bootstrap\fR(1)" 4 +bootstraps a system. +.IP "\fIlh_chroot\fR(1)" 4 +customizes a chroot. +.IP "\fIlh_source\fR(1)" 4 +builds a source 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> for the Debian project. diff --git a/manpages/lh_chroot.1.de b/manpages/lh_chroot.1.de deleted file mode 100644 index cec3342..0000000 --- a/manpages/lh_chroot.1.de +++ /dev/null @@ -1,71 +0,0 @@ -.TH LH_CHROOT 1 "07.05.2007" "1.0~a9" "live\-helper" - -.SH NAME -lh_chroot \- Meta\-Helper f\[:u]r lh_chroot_* - -.SH SYNOPSIS -.B lh_chroot [\fIlive\-helper\ Optionen\fR\|] - -.SH BESCHREIBUNG -lh_chroot ist ein Meta\-Helper. Es ruft alle n\[:o]tigen Helper auf um die chroot\-Stufe zu vervollst\[:a]ndigen. - -.SH CHROOT HELPER -Hier ist eine vollst\[:a]ndige Liste aller verf\[:u]gbaren chroot\-Helper Kommandos. Siehe deren Hilfeseiten f\[:u]r zus\[:a]tzliche Dokumentation. -.IP "\fIlh_chroot_apt\fR(1)" 4 -verwaltet /etc/apt/apt.conf. -.IP "\fIlh_chroot_debianchroot\fR(1)" 4 -verwaltet /etc/debian_chroot. -.IP "\fIlh_chroot_hacks\fR(1)" 4 -f\[:u]hrt Hacks im chroot aus. -.IP "\fIlh_chroot_hooks\fR(1)" 4 -f\[:u]hrt Hooks im chroot aus. -.IP "\fIlh_chroot_hosts\fR(1)" 4 -verwaltet /etc/hosts. -.IP "\fIlh_chroot_interactive\fR(1)" 4 -macht Bauprozess interaktiv. -.IP "\fIlh_chroot_linuximage\fR(1)" 4 -verwaltet /etc/kernel\-img.conf. -.IP "\fIlh_chroot_localhooks\fR(1)" 4 -f\[:u]hrt lokale Hooks im chroot aus. -.IP "\fIlh_chroot_localincludes\fR(1)" 4 -kopiert lokale Dateien in den chroot. -.IP "\fIlh_chroot_localization\fR(1)" 4 -installiert Lokalisierungspakete im chroot. -.IP "\fIlh_chroot_localpackages\fR(1)" 4 -installiert lokale Pakete im chroot. -.IP "\fIlh_chroot_localpackageslists\fR(1)" 4 -installiert lokale Paketlisten im chroot. -.IP "\fIlh_chroot_packages\fR(1)" 4 -installiert Pakete im chroot. -.IP "\fIlh_chroot_packageslists\fR(1)" 4 -installiert Paketlisten im chroot. -.IP "\fIlh_chroot_proc\fR(1)" 4 -bindet /proc ein. -.IP "\fIlh_chroot_resolv\fR(1)" 4 -verwaltet /etc/resolv.conf. -.IP "\fIlh_chroot_sources\fR(1)" 4 -verwaltet /etc/apt/apt.conf. -.IP "\fIlh_chroot_symlinks\fR(1)" 4 -konvertiert symbolische Links. -.IP "\fIlh_chroot_sysfs\fR(1)" 4 -bindet /sys ein. -.IP "\fIlh_chroot_sysvinit\fR(1)" 4 -konfiguriert sysvinit. -.IP "\fIlh_chroot_sysvrc\fR(1)" 4 -verwaltet /usr/sbin/policy\-rc.d. -.IP "\fIlh_chroot_tasks\fR(1)" 4 -installiert Paket-Tasks im chroot. - -.SH SIEHE AUCH -\fIlive\-helper\fR(7) -.PP -Dieses Programm ist Teil von live\-helper. - -.SH FEHLER -Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden. - -.SH HOMEPAGE -Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden. - -.SH AUTOR -live\-helper wurde von Daniel Baumann <\fIdaniel@debian.org\fR> f\[:u]r das Debian\-Projekt geschrieben. diff --git a/manpages/lh_chroot.1.en b/manpages/lh_chroot.1.en deleted file mode 100644 index 9b8322d..0000000 --- a/manpages/lh_chroot.1.en +++ /dev/null @@ -1,71 +0,0 @@ -.TH LH_CHROOT 1 "2007\-05\-07" "1.0~a9" "live\-helper" - -.SH NAME -lh_chroot \- meta\-helper for lh_chroot_* - -.SH SYNOPSIS -.B lh_chroot [\fIlive\-helper\ options\fR\|] - -.SH DESCRIPTION -lh_chroot is a meta\-helper. It calls all necessary helpers to complete the chroot stage. - -.SH CHROOT HELPERS -Here is the complete list of available chroot helper commands. See their man pages for additional documentation. -.IP "\fIlh_chroot_apt\fR(1)" 4 -manages /etc/apt/apt.conf. -.IP "\fIlh_chroot_debianchroot\fR(1)" 4 -manages /etc/debian_chroot. -.IP "\fIlh_chroot_hacks\fR(1)" 4 -executes hacks in chroot. -.IP "\fIlh_chroot_hooks\fR(1)" 4 -executes hooks in chroot. -.IP "\fIlh_chroot_hosts\fR(1)" 4 -manages /etc/hosts. -.IP "\fIlh_chroot_interactive\fR(1)" 4 -makes build interactive. -.IP "\fIlh_chroot_linuximage\fR(1)" 4 -manages /etc/kernel\-img.conf. -.IP "\fIlh_chroot_localhooks\fR(1)" 4 -executes local hooks in chroot. -.IP "\fIlh_chroot_localincludes\fR(1)" 4 -copies local files into chroot. -.IP "\fIlh_chroot_localization\fR(1)" 4 -installs localization packages into chroot. -.IP "\fIlh_chroot_localpackages\fR(1)" 4 -installs local packages into chroot. -.IP "\fIlh_chroot_localpackageslists\fR(1)" 4 -installs local packages lists into chroot. -.IP "\fIlh_chroot_packages\fR(1)" 4 -installs packages into chroot. -.IP "\fIlh_chroot_packageslists\fR(1)" 4 -installs packages lists into chroot. -.IP "\fIlh_chroot_proc\fR(1)" 4 -mounts /proc. -.IP "\fIlh_chroot_resolv\fR(1)" 4 -manages /etc/resolv.conf. -.IP "\fIlh_chroot_sources\fR(1)" 4 -manages /etc/apt/apt.conf. -.IP "\fIlh_chroot_symlinks\fR(1)" 4 -convers symlinks. -.IP "\fIlh_chroot_sysfs\fR(1)" 4 -mounts /sys. -.IP "\fIlh_chroot_sysvinit\fR(1)" 4 -configures sysvinit. -.IP "\fIlh_chroot_sysvrc\fR(1)" 4 -manages /usr/sbin/policy\-rc.d. -.IP "\fIlh_chroot_tasks\fR(1)" 4 -installs tasks into chroot. - -.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> for the Debian project. diff --git a/manpages/lh_chroot.de.1 b/manpages/lh_chroot.de.1 new file mode 100644 index 0000000..b5310e8 --- /dev/null +++ b/manpages/lh_chroot.de.1 @@ -0,0 +1,71 @@ +.TH LH_CHROOT 1 "14.05.2007" "1.0~a10" "live\-helper" + +.SH NAME +lh_chroot \- Meta\-Helper f\[:u]r lh_chroot_* + +.SH SYNOPSIS +.B lh_chroot [\fIlive\-helper\ Optionen\fR\|] + +.SH BESCHREIBUNG +lh_chroot ist ein Meta\-Helper. Es ruft alle n\[:o]tigen Helper auf um die chroot\-Stufe zu vervollst\[:a]ndigen. + +.SH CHROOT HELPER +Hier ist eine vollst\[:a]ndige Liste aller verf\[:u]gbaren chroot\-Helper Kommandos. Siehe deren Hilfeseiten f\[:u]r zus\[:a]tzliche Dokumentation. +.IP "\fIlh_chroot_apt\fR(1)" 4 +verwaltet /etc/apt/apt.conf. +.IP "\fIlh_chroot_debianchroot\fR(1)" 4 +verwaltet /etc/debian_chroot. +.IP "\fIlh_chroot_hacks\fR(1)" 4 +f\[:u]hrt Hacks im chroot aus. +.IP "\fIlh_chroot_hooks\fR(1)" 4 +f\[:u]hrt Hooks im chroot aus. +.IP "\fIlh_chroot_hosts\fR(1)" 4 +verwaltet /etc/hosts. +.IP "\fIlh_chroot_interactive\fR(1)" 4 +macht Bauprozess interaktiv. +.IP "\fIlh_chroot_linux-image\fR(1)" 4 +verwaltet /etc/kernel\-img.conf. +.IP "\fIlh_chroot_local-hooks\fR(1)" 4 +f\[:u]hrt lokale Hooks im chroot aus. +.IP "\fIlh_chroot_local-includes\fR(1)" 4 +kopiert lokale Dateien in den chroot. +.IP "\fIlh_chroot_localization\fR(1)" 4 +installiert Lokalisierungspakete im chroot. +.IP "\fIlh_chroot_local-packages\fR(1)" 4 +installiert lokale Pakete im chroot. +.IP "\fIlh_chroot_local-packageslists\fR(1)" 4 +installiert lokale Paketlisten im chroot. +.IP "\fIlh_chroot_packages\fR(1)" 4 +installiert Pakete im chroot. +.IP "\fIlh_chroot_packageslists\fR(1)" 4 +installiert Paketlisten im chroot. +.IP "\fIlh_chroot_proc\fR(1)" 4 +bindet /proc ein. +.IP "\fIlh_chroot_resolv\fR(1)" 4 +verwaltet /etc/resolv.conf. +.IP "\fIlh_chroot_sources\fR(1)" 4 +verwaltet /etc/apt/apt.conf. +.IP "\fIlh_chroot_symlinks\fR(1)" 4 +konvertiert symbolische Links. +.IP "\fIlh_chroot_sysfs\fR(1)" 4 +bindet /sys ein. +.IP "\fIlh_chroot_sysvinit\fR(1)" 4 +konfiguriert sysvinit. +.IP "\fIlh_chroot_sysvrc\fR(1)" 4 +verwaltet /usr/sbin/policy\-rc.d. +.IP "\fIlh_chroot_tasks\fR(1)" 4 +installiert Paket-Tasks im chroot. + +.SH SIEHE AUCH +\fIlive\-helper\fR(7) +.PP +Dieses Programm ist Teil von live\-helper. + +.SH FEHLER +Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden. + +.SH HOMEPAGE +Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden. + +.SH AUTOR +live\-helper wurde von Daniel Baumann <\fIdaniel@debian.org\fR> f\[:u]r das Debian\-Projekt geschrieben. diff --git a/manpages/lh_chroot.en.1 b/manpages/lh_chroot.en.1 new file mode 100644 index 0000000..fb33484 --- /dev/null +++ b/manpages/lh_chroot.en.1 @@ -0,0 +1,71 @@ +.TH LH_CHROOT 1 "2007\-05\-14" "1.0~a10" "live\-helper" + +.SH NAME +lh_chroot \- meta\-helper for lh_chroot_* + +.SH SYNOPSIS +.B lh_chroot [\fIlive\-helper\ options\fR\|] + +.SH DESCRIPTION +lh_chroot is a meta\-helper. It calls all necessary helpers to complete the chroot stage. + +.SH CHROOT HELPERS +Here is the complete list of available chroot helper commands. See their man pages for additional documentation. +.IP "\fIlh_chroot_apt\fR(1)" 4 +manages /etc/apt/apt.conf. +.IP "\fIlh_chroot_debianchroot\fR(1)" 4 +manages /etc/debian_chroot. +.IP "\fIlh_chroot_hacks\fR(1)" 4 +executes hacks in chroot. +.IP "\fIlh_chroot_hooks\fR(1)" 4 +executes hooks in chroot. +.IP "\fIlh_chroot_hosts\fR(1)" 4 +manages /etc/hosts. +.IP "\fIlh_chroot_interactive\fR(1)" 4 +makes build interactive. +.IP "\fIlh_chroot_linux-image\fR(1)" 4 +manages /etc/kernel\-img.conf. +.IP "\fIlh_chroot_local-hooks\fR(1)" 4 +executes local hooks in chroot. +.IP "\fIlh_chroot_local-includes\fR(1)" 4 +copies local files into chroot. +.IP "\fIlh_chroot_localization\fR(1)" 4 +installs localization packages into chroot. +.IP "\fIlh_chroot_local-packages\fR(1)" 4 +installs local packages into chroot. +.IP "\fIlh_chroot_local-packageslists\fR(1)" 4 +installs local packages lists into chroot. +.IP "\fIlh_chroot_packages\fR(1)" 4 +installs packages into chroot. +.IP "\fIlh_chroot_packageslists\fR(1)" 4 +installs packages lists into chroot. +.IP "\fIlh_chroot_proc\fR(1)" 4 +mounts /proc. +.IP "\fIlh_chroot_resolv\fR(1)" 4 +manages /etc/resolv.conf. +.IP "\fIlh_chroot_sources\fR(1)" 4 +manages /etc/apt/apt.conf. +.IP "\fIlh_chroot_symlinks\fR(1)" 4 +convers symlinks. +.IP "\fIlh_chroot_sysfs\fR(1)" 4 +mounts /sys. +.IP "\fIlh_chroot_sysvinit\fR(1)" 4 +configures sysvinit. +.IP "\fIlh_chroot_sysvrc\fR(1)" 4 +manages /usr/sbin/policy\-rc.d. +.IP "\fIlh_chroot_tasks\fR(1)" 4 +installs tasks into chroot. + +.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> for the Debian project. diff --git a/manpages/lh_clean.1.de b/manpages/lh_clean.1.de deleted file mode 100644 index f6fe1a8..0000000 --- a/manpages/lh_clean.1.de +++ /dev/null @@ -1,44 +0,0 @@ -.TH LH_CLEAN 1 "07.05.2007" "1.0~a9" "live\-helper" - -.SH NAME -lh_clean \- r\[:a]umt das Build-Verzeichnis auf - -.SH SYNOPSIS -.B lh_clean [\fIlive\-helper\ Optionen\fR\|] -.B lh_clean [\fRall\fB|\fRcache\fB|\fRchroot\fB|\fRbinary\fB|\fRlock\fB|\fRpurge\fB|\fRstage\fB|\fRsource\fB] - -.SH BESCHREIBUNG -lh_clean ist ein live\-helper\-Program das daf\[:u]r verwantwortlich ist, nach dem Bauen eines Live-Systemes das Build-Verzeichnis aufzur\[:a]umen. Es entfernt das Build-Verzeichnis und auch alle anderen Dateien, inklusive den Stage-Dateien die von einem live\-helper-Programm hinterlassen worden ist. - -.SH OPTIONEN -Die folgenden Optionen werden von lh_clean unterst\[:u]tzt. -.IP "\fBall\fR" 4 -entfernt chroot, binary, lock, stage und source. Das ist die Standardoperation. -.IP "\fBcache\fR" 4 -entfernt alle cache-Verzeichnisse. -.IP "\fBchroot\fR" 4 -entbindet und entfernt das chroot-Verzeichnis. Wenn ein Cache von bootstrap verf\[:u]gbar ist, wird chroot auf diese Stufe zur\[:u]ck gesetzt. -.IP "\fBbinary\fR" 4 -entfernt alle Caches, Verzeichnisse und Stage-Dateien der Binary-Stufe. -.IP "\fBlock\fR" 4 -entfernt alle lock-Dateien. -.IP "\fBpurge\fR" 4 -entfernt alles (inlusive cache) ausser config. -.IP "\fBstage\fR" 4 -entfernt alle Stage-Dateien. -.IP "\fBsource\fR" 4 -entfernt alle Caches, Verzeichnisse und Stage-Dateien der Source-Stufe. - -.SH SIEHE AUCH -\fIlive\-helper\fR(7) -.PP -Dieses Programm ist Teil von live\-helper. - -.SH FEHLER -Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden. - -.SH HOMEPAGE -Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden. - -.SH AUTOR -live\-helper wurde von Daniel Baumann <\fIdaniel@debian.org\fR> f\[:u]r das Debian\-Projekt geschrieben. diff --git a/manpages/lh_clean.1.en b/manpages/lh_clean.1.en deleted file mode 100644 index d9eb998..0000000 --- a/manpages/lh_clean.1.en +++ /dev/null @@ -1,44 +0,0 @@ -.TH LH_CLEAN 1 "2007\-05\-07" "1.0~a9" "live\-helper" - -.SH NAME -lh_clean \- clean up system build directories - -.SH SYNOPSIS -.B lh_clean [\fIlive\-helper\ options\fR\|] -.B lh_clean [\fRall\fB|\fRcache\fB|\fRchroot\fB|\fRbinary\fB|\fRlock\fB|\fRpurge\fB|\fRstage\fB|\fRsource\fB] - -.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 -The following command line options are supported by lh_clean. -.IP "\fBall\fR" 4 -removes chroot, binary, lock, stage, and source. This is the default operation. -.IP "\fBcache\fR" 4 -removes all cache directories. -.IP "\fBchroot\fR" 4 -unmounts and removes the chroot directory. If bootstrap cache is available, the system is reset to bootstrap stage. -.IP "\fBbinary\fR" 4 -removes all binary related caches, directories, and stages files. -.IP "\fBlock\fR" 4 -removes all lock files. -.IP "\fBpurge\fR" 4 -removes everything (including cache) but config. -.IP "\fBstage\fR" 4 -removes all stage files. -.IP "\fBsource\fR" 4 -removes all source related caches, directories, and stage files. - -.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> for the Debian project. diff --git a/manpages/lh_clean.de.1 b/manpages/lh_clean.de.1 new file mode 100644 index 0000000..02bdce8 --- /dev/null +++ b/manpages/lh_clean.de.1 @@ -0,0 +1,44 @@ +.TH LH_CLEAN 1 "14.05.2007" "1.0~a10" "live\-helper" + +.SH NAME +lh_clean \- r\[:a]umt das Build-Verzeichnis auf + +.SH SYNOPSIS +.B lh_clean [\fIlive\-helper\ Optionen\fR\|] +.B lh_clean [\fRall\fB|\fRcache\fB|\fRchroot\fB|\fRbinary\fB|\fRlock\fB|\fRpurge\fB|\fRstage\fB|\fRsource\fB] + +.SH BESCHREIBUNG +lh_clean ist ein live\-helper\-Program das daf\[:u]r verwantwortlich ist, nach dem Bauen eines Live-Systemes das Build-Verzeichnis aufzur\[:a]umen. Es entfernt das Build-Verzeichnis und auch alle anderen Dateien, inklusive den Stage-Dateien die von einem live\-helper-Programm hinterlassen worden ist. + +.SH OPTIONEN +Die folgenden Optionen werden von lh_clean unterst\[:u]tzt. +.IP "\fBall\fR" 4 +entfernt chroot, binary, lock, stage und source. Das ist die Standardoperation. +.IP "\fBcache\fR" 4 +entfernt alle cache-Verzeichnisse. +.IP "\fBchroot\fR" 4 +entbindet und entfernt das chroot-Verzeichnis. Wenn ein Cache von bootstrap verf\[:u]gbar ist, wird chroot auf diese Stufe zur\[:u]ck gesetzt. +.IP "\fBbinary\fR" 4 +entfernt alle Caches, Verzeichnisse und Stage-Dateien der Binary-Stufe. +.IP "\fBlock\fR" 4 +entfernt alle lock-Dateien. +.IP "\fBpurge\fR" 4 +entfernt alles (inlusive cache) ausser config. +.IP "\fBstage\fR" 4 +entfernt alle Stage-Dateien. +.IP "\fBsource\fR" 4 +entfernt alle Caches, Verzeichnisse und Stage-Dateien der Source-Stufe. + +.SH SIEHE AUCH +\fIlive\-helper\fR(7) +.PP +Dieses Programm ist Teil von live\-helper. + +.SH FEHLER +Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden. + +.SH HOMEPAGE +Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden. + +.SH AUTOR +live\-helper wurde von Daniel Baumann <\fIdaniel@debian.org\fR> f\[:u]r das Debian\-Projekt geschrieben. diff --git a/manpages/lh_clean.en.1 b/manpages/lh_clean.en.1 new file mode 100644 index 0000000..cc88418 --- /dev/null +++ b/manpages/lh_clean.en.1 @@ -0,0 +1,44 @@ +.TH LH_CLEAN 1 "2007\-05\-14" "1.0~a10" "live\-helper" + +.SH NAME +lh_clean \- clean up system build directories + +.SH SYNOPSIS +.B lh_clean [\fIlive\-helper\ options\fR\|] +.B lh_clean [\fRall\fB|\fRcache\fB|\fRchroot\fB|\fRbinary\fB|\fRlock\fB|\fRpurge\fB|\fRstage\fB|\fRsource\fB] + +.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 +The following command line options are supported by lh_clean. +.IP "\fBall\fR" 4 +removes chroot, binary, lock, stage, and source. This is the default operation. +.IP "\fBcache\fR" 4 +removes all cache directories. +.IP "\fBchroot\fR" 4 +unmounts and removes the chroot directory. If bootstrap cache is available, the system is reset to bootstrap stage. +.IP "\fBbinary\fR" 4 +removes all binary related caches, directories, and stages files. +.IP "\fBlock\fR" 4 +removes all lock files. +.IP "\fBpurge\fR" 4 +removes everything (including cache) but config. +.IP "\fBstage\fR" 4 +removes all stage files. +.IP "\fBsource\fR" 4 +removes all source related caches, directories, and stage files. + +.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> for the Debian project. diff --git a/manpages/lh_source.1.de b/manpages/lh_source.1.de deleted file mode 100644 index e5f38e9..0000000 --- a/manpages/lh_source.1.de +++ /dev/null @@ -1,43 +0,0 @@ -.TH LH_SOURCE 1 "07.05.2007" "1.0~a9" "live\-helper" - -.SH NAME -lh_source \- Meta\-Helper f\[:u]r lh_source_* - -.SH SYNTAX -.B lh_source [\fIlive\-helper\ Optionen\fR\|] - -.SH BESCHREIBUNG -lh_source ist ein Meta\-Helper. Es ruft alle n\[:o]tigen Helper auf um die source\-Stufe zu vervollst\[:a]ndigen. - -.SH SOURCE HELPER -Hier ist eine vollst\[:a]ndige Liste aller verf\[:u]gbaren source\-Helper Kommandos. Siehe deren Hilfeseiten f\[:u]r zus\[:a]tzliche Dokumentation. -.IP "\fIlh_source_config\fR(1)" 4 -kopiert debian\-live Konfiguration in source. -.IP "\fIlh_source_download\fR(1)" 4 -l\[:a]dt Paketquellen herunter. -.IP "\fIlh_source_generic\fR(1)" 4 -erstellt den generischen Source-Tarball. -.IP "\fIlh_source_hdd\fR(1)" 4 -erstellt den Harddisk Source-Tarball. -.IP "\fIlh_source_iso\fR(1)" 4 -erstellt CD/DVD Source-Image. -.IP "\fIlh_source_md5sum\fR(1)" 4 -erstellt md5sum.txt im Source-Image. -.IP "\fIlh_source_net\fR(1)" 4 -erstellt Netboot Source-Tarball. -.IP "\fIlh_source_usb-hdd\fR(1)" 4 -erstellt USB-hdd Source-Tarball. - -.SH SIEHE AUCH -\fIlive\-helper\fR(7) -.PP -Dieses Programm ist Teil von live\-helper. - -.SH FEHLER -Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden. - -.SH HOMEPAGE -Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden. - -.SH AUTOR -live\-helper wurde von Daniel Baumann <\fIdaniel@debian.org\fR> f\[:u]r das Debian\-Projekt geschrieben. diff --git a/manpages/lh_source.1.en b/manpages/lh_source.1.en deleted file mode 100644 index dfa0848..0000000 --- a/manpages/lh_source.1.en +++ /dev/null @@ -1,43 +0,0 @@ -.TH LH_SOURCE 1 "2007\-05\-07" "1.0~a9" "live\-helper" - -.SH NAME -lh_source \- meta\-helper for lh_source_* - -.SH SYNOPSIS -.B lh_source [\fIlive\-helper\ options\fR\|] - -.SH DESCRIPTION -lh_source is a meta\-helper. It calls all necessary helpers to complete the source stage. - -.SH SOURCE HELPERS -Here is the complete list of available source helper commands. See their man pages for additional documentation. -.IP "\fIlh_source_config\fR(1)" 4 -copies debian\-live config into source. -.IP "\fIlh_source_download\fR(1)" 4 -downloads sources. -.IP "\fIlh_source_generic\fR(1)" 4 -creates the generic source tarball. -.IP "\fIlh_source_hdd\fR(1)" 4 -creates the harddisk source tarball. -.IP "\fIlh_source_iso\fR(1)" 4 -creates the CD/DVD source image. -.IP "\fIlh_source_md5sum\fR(1)" 4 -creates md5sum.txt in the source image. -.IP "\fIlh_source_net\fR(1)" 4 -creates the netboot source tarball. -.IP "\fIlh_source_usb-hdd\fR(1)" 4 -creates the USB-hdd source 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> for the Debian project. diff --git a/manpages/lh_source.de.1 b/manpages/lh_source.de.1 new file mode 100644 index 0000000..0176769 --- /dev/null +++ b/manpages/lh_source.de.1 @@ -0,0 +1,43 @@ +.TH LH_SOURCE 1 "14.05.2007" "1.0~a10" "live\-helper" + +.SH NAME +lh_source \- Meta\-Helper f\[:u]r lh_source_* + +.SH SYNTAX +.B lh_source [\fIlive\-helper\ Optionen\fR\|] + +.SH BESCHREIBUNG +lh_source ist ein Meta\-Helper. Es ruft alle n\[:o]tigen Helper auf um die source\-Stufe zu vervollst\[:a]ndigen. + +.SH SOURCE HELPER +Hier ist eine vollst\[:a]ndige Liste aller verf\[:u]gbaren source\-Helper Kommandos. Siehe deren Hilfeseiten f\[:u]r zus\[:a]tzliche Dokumentation. +.IP "\fIlh_source_debian-live\fR(1)" 4 +kopiert debian\-live Konfiguration in source. +.IP "\fIlh_source_debian\fR(1)" 4 +l\[:a]dt Paketquellen herunter. +.IP "\fIlh_source_generic\fR(1)" 4 +erstellt den generischen Source-Tarball. +.IP "\fIlh_source_hdd\fR(1)" 4 +erstellt den Harddisk Source-Tarball. +.IP "\fIlh_source_iso\fR(1)" 4 +erstellt CD/DVD Source-Image. +.IP "\fIlh_source_md5sum\fR(1)" 4 +erstellt md5sum.txt im Source-Image. +.IP "\fIlh_source_net\fR(1)" 4 +erstellt Netboot Source-Tarball. +.IP "\fIlh_source_usb-hdd\fR(1)" 4 +erstellt USB-hdd Source-Tarball. + +.SH SIEHE AUCH +\fIlive\-helper\fR(7) +.PP +Dieses Programm ist Teil von live\-helper. + +.SH FEHLER +Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden. + +.SH HOMEPAGE +Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden. + +.SH AUTOR +live\-helper wurde von Daniel Baumann <\fIdaniel@debian.org\fR> f\[:u]r das Debian\-Projekt geschrieben. diff --git a/manpages/lh_source.en.1 b/manpages/lh_source.en.1 new file mode 100644 index 0000000..51ec621 --- /dev/null +++ b/manpages/lh_source.en.1 @@ -0,0 +1,43 @@ +.TH LH_SOURCE 1 "2007\-05\-14" "1.0~a10" "live\-helper" + +.SH NAME +lh_source \- meta\-helper for lh_source_* + +.SH SYNOPSIS +.B lh_source [\fIlive\-helper\ options\fR\|] + +.SH DESCRIPTION +lh_source is a meta\-helper. It calls all necessary helpers to complete the source stage. + +.SH SOURCE HELPERS +Here is the complete list of available source helper commands. See their man pages for additional documentation. +.IP "\fIlh_source_debian-live\fR(1)" 4 +copies debian\-live config into source. +.IP "\fIlh_source_debian\fR(1)" 4 +downloads sources. +.IP "\fIlh_source_generic\fR(1)" 4 +creates the generic source tarball. +.IP "\fIlh_source_hdd\fR(1)" 4 +creates the harddisk source tarball. +.IP "\fIlh_source_iso\fR(1)" 4 +creates the CD/DVD source image. +.IP "\fIlh_source_md5sum\fR(1)" 4 +creates md5sum.txt in the source image. +.IP "\fIlh_source_net\fR(1)" 4 +creates the netboot source tarball. +.IP "\fIlh_source_usb-hdd\fR(1)" 4 +creates the USB-hdd source 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> for the Debian project. diff --git a/manpages/lh_testroot.1.de b/manpages/lh_testroot.1.de deleted file mode 100644 index a49cbb9..0000000 --- a/manpages/lh_testroot.1.de +++ /dev/null @@ -1,24 +0,0 @@ -.TH LH_TESTROOT 1 "07.05.2007" "1.0~a9" "live\-helper" - -.SH NAME -lh_testroot \- stellt sicher dass das System als root gebaut wird - -.SH SYNTAX -.B lh_testroot [\fIlive\-helper\ Optionen\fR\|] - -.SH BESCHREIBUNG -lh_testroot kontrolliert ob root-Rechte vorhanden sind. Wenn nicht, endet es mit einem Fehler. Debian Live-Images m\[:u]ssen momentan als root gebaut werden, \fIfakeroot\fR(1) oder \fIsudo\fR(8) funktioniert nicht. - -.SH SIEHE AUCH -\fIlive\-helper\fR(7) -.PP -Dieses Programm ist Teil von live\-helper. - -.SH FEHLER -Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden. - -.SH HOMEPAGE -Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden. - -.SH AUTOR -live\-helper wurde von Daniel Baumann <\fIdaniel@debian.org\fR> f\[:u]r das Debian\-Projekt geschrieben. diff --git a/manpages/lh_testroot.1.en b/manpages/lh_testroot.1.en deleted file mode 100644 index 44b0f92..0000000 --- a/manpages/lh_testroot.1.en +++ /dev/null @@ -1,24 +0,0 @@ -.TH LH_TESTROOT 1 "2007\-05\-07" "1.0~a9" "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 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> for the Debian project. diff --git a/manpages/lh_testroot.de.1 b/manpages/lh_testroot.de.1 new file mode 100644 index 0000000..c00aaac --- /dev/null +++ b/manpages/lh_testroot.de.1 @@ -0,0 +1,24 @@ +.TH LH_TESTROOT 1 "14.05.2007" "1.0~a10" "live\-helper" + +.SH NAME +lh_testroot \- stellt sicher dass das System als root gebaut wird + +.SH SYNTAX +.B lh_testroot [\fIlive\-helper\ Optionen\fR\|] + +.SH BESCHREIBUNG +lh_testroot kontrolliert ob root-Rechte vorhanden sind. Wenn nicht, endet es mit einem Fehler. Debian Live-Images m\[:u]ssen momentan als root gebaut werden, \fIfakeroot\fR(1) oder \fIsudo\fR(8) funktioniert nicht. + +.SH SIEHE AUCH +\fIlive\-helper\fR(7) +.PP +Dieses Programm ist Teil von live\-helper. + +.SH FEHLER +Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden. + +.SH HOMEPAGE +Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden. + +.SH AUTOR +live\-helper wurde von Daniel Baumann <\fIdaniel@debian.org\fR> f\[:u]r das Debian\-Projekt geschrieben. diff --git a/manpages/lh_testroot.en.1 b/manpages/lh_testroot.en.1 new file mode 100644 index 0000000..a6e80a9 --- /dev/null +++ b/manpages/lh_testroot.en.1 @@ -0,0 +1,24 @@ +.TH LH_TESTROOT 1 "2007\-05\-14" "1.0~a10" "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 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> for the Debian project. diff --git a/manpages/live-helper.7.de b/manpages/live-helper.7.de deleted file mode 100644 index 33159ca..0000000 --- a/manpages/live-helper.7.de +++ /dev/null @@ -1,175 +0,0 @@ -.TH LIVE\-HELPER 7 "07.05.2007" "1.0~a9" "live\-helper" - -.SH NAME -live\-helper \- Debian Live Helper-Programme - -.SH SYNTAX -.B lh_* [\fIlive\-helper\ Optionen\fR\|] - -.SH BESCHREIBUNG -Live\-helper ist eine Sammlung von programmen die dazu benutzt werden k\[:o]nnen, Debian Live Systeme zu erstellen. Die Philosophie hinter live\-helper ist eine kleine Sammlung von kleinen, kurzen und einfach zu verstehenden Werkzeugen zur verf\[:u]gung zu stellen, welche auch in anderen Programmen benutzt werden k\[:o]nnen um automatisch Live-Systeme erstellen. -.PP -Ein typisches Programm das live\-helper benutzt wird verschiedene live\-helper Kommandos nacheinander aufrufen. Live\-helper Kommandos haben alle einen "lh_"-Pr\[:a]fix im Namen. Beispiele eines solchen Programmes das live\-helper benutzt ist \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 KOMMANDOS -Hier ist eine vollst\[:a]ndige Liste aller verf\[:u]gbaren live\-helper Kommandos. Siehe deren Hilfeseiten f\[:u]r zus\[:a]tzliche Dokumentation. -.IP "\fIlh_binary\fR(1)" 4 -Meta\-Helper f\[:u]r lh_binary_* -.IP "\fIlh_binary_chroot\fR(1)" 4 -kopiert chroot in chroot. -.IP "\fIlh_binary_debian\-installer\fR(1)" 4 -kopiert debian-\installer in das Binary\-Image. -.IP "\fIlh_binary_encryption\fR(1)" 4 -verschl\[:u]sselt das Root\-Dateisystem. -.IP "\fIlh_binary_grub\fR(1)" 4 -kopiert grub in das Binary\-Image. -.IP "\fIlh_binary_hdd\fR(1)" 4 -erstellt den Festplatten Binary\-Tarball. -.IP "\fIlh_binary_includes\fR(1)" 4 -kopiert Dateien in das Binary\-Image. -.IP "\fIlh_binary_iso\fR(1)" 4 -erstell das CD/DVD Binary\-Image. -.IP "\fIlh_binary_linuximage\fR(1)" 4 -kopiert linux\-image in das Binary\-Image. -.IP "\fIlh_binary_localincludes\fR(1)" 4 -kopiert lokale Dateien in das Binary\-Image. -.IP "\fIlh_binary_manifest\fR(1)" 4 -erstellt die Paketliste des Root\-Dateisystemes. -.IP "\fIlh_binary_md5sum\fR(1)" 4 -erstellt md5sum.txt im Binary\-Image. -.IP "\fIlh_binary_memtest\fR(1)" 4 -kopiert ein memtest in das Binary\-Image. -.IP "\fIlh_binary_net\fR(1)" 4 -erstellt den Netboot Binary\-Tarball. -.IP "\fIlh_binary_rootfs\fR(1)" 4 -erstell das Root\-Dateisystem. -.IP "\fIlh_binary_syslinux\fR(1)" 4 -kopiert syslinux in das Binary\-Image. -.IP "\fIlh_binary_usb-hdd\fR(1)" 4 -erstellt das USB-hdd Binary\-Image. -.IP "\fIlh_binary_yaboot\fR(1)" 4 -kopiert yaboot in das Binary\-Image. -.IP "\fIlh_bootstrap\fR(1)" 4 -Meta\-Helper f\[:u]r lh_bootstrap_* -.IP "\fIlh_bootstrap_cdebootstrap\fR(1)" 4 -erstellt ein Debian-System mit cdebootstrap. -.IP "\fIlh_bootstrap_debootstrap\fR(1)" 4 -erstellt ein Debian-System mit debootstrap. -.IP "\fIlh_build\fR(1)" 4 -erstellen eines Live-Systemes -.IP "\fIlh_chroot\fR(1)" 4 -Meta\-Helper f\[:u]r lh_chroot_* -.IP "\fIlh_chroot_apt\fR(1)" 4 -verwaltet /etc/apt/apt.conf. -.IP "\fIlh_chroot_debianchroot\fR(1)" 4 -verwaltet /etc/debian_chroot. -.IP "\fIlh_chroot_hacks\fR(1)" 4 -f\[:u]hrt Hacks im chroot aus. -.IP "\fIlh_chroot_hooks\fR(1)" 4 -f\[:u]hrt Hooks im chroot aus. -.IP "\fIlh_chroot_hosts\fR(1)" 4 -verwaltet /etc/hosts. -.IP "\fIlh_chroot_interactive\fR(1)" 4 -macht Bauprozess interaktiv. -.IP "\fIlh_chroot_linuximage\fR(1)" 4 -verwaltet /etc/kernel\-img.conf. -.IP "\fIlh_chroot_localhooks\fR(1)" 4 -f\[:u]hrt lokale Hooks im chroot aus. -.IP "\fIlh_chroot_localincludes\fR(1)" 4 -kopiert lokale Dateien in den chroot. -.IP "\fIlh_chroot_localization\fR(1)" 4 -installiert Lokalisierungspakete im chroot. -.IP "\fIlh_chroot_localpackages\fR(1)" 4 -installiert lokale Pakete im chroot. -.IP "\fIlh_chroot_localpackageslists\fR(1)" 4 -installiert lokale Paketlisten im chroot. -.IP "\fIlh_chroot_packages\fR(1)" 4 -installiert Pakete im chroot. -.IP "\fIlh_chroot_packageslists\fR(1)" 4 -installiert Paketlisten im chroot. -.IP "\fIlh_chroot_proc\fR(1)" 4 -bindet /proc ein. -.IP "\fIlh_chroot_resolv\fR(1)" 4 -verwaltet /etc/resolv.conf. -.IP "\fIlh_chroot_sources\fR(1)" 4 -verwaltet /etc/apt/apt.conf. -.IP "\fIlh_chroot_symlinks\fR(1)" 4 -konvertiert symbolische Links. -.IP "\fIlh_chroot_sysfs\fR(1)" 4 -bindet /sys ein. -.IP "\fIlh_chroot_sysvinit\fR(1)" 4 -konfiguriert sysvinit. -.IP "\fIlh_chroot_sysvrc\fR(1)" 4 -verwaltet /usr/sbin/policy\-rc.d. -.IP "\fIlh_chroot_tasks\fR(1)" 4 -installiert Paket-Tasks im chroot. -.IP "\fIlh_clean\fR(1)" 4 -r\[:a]umt das Build-Verzeichnis auf -.IP "\fIlh_config\fR(1)" 4 -erstellt eine Beispielkonfiguration -.IP "\fIlh_losetup\fR(1)" 4 -verwaltet Loop-Ger\[:a]te -.IP "\fIlh_source\fR(1)" 4 -Meta\-Helper f\[:u]r lh_source_* -.IP "\fIlh_source_config\fR(1)" 4 -kopiert debian\-live Konfiguration in source. -.IP "\fIlh_source_download\fR(1)" 4 -l\[:a]dt Paketquellen herunter. -.IP "\fIlh_source_generic\fR(1)" 4 -erstellt den generischen Source-Tarball. -.IP "\fIlh_source_hdd\fR(1)" 4 -erstellt den Harddisk Source-Tarball. -.IP "\fIlh_source_iso\fR(1)" 4 -erstellt CD/DVD Source-Image. -.IP "\fIlh_source_md5sum\fR(1)" 4 -erstellt md5sum.txt im Source-Image. -.IP "\fIlh_source_net\fR(1)" 4 -erstellt Netboot Source-Tarball. -.IP "\fIlh_source_usb-hdd\fR(1)" 4 -erstellt USB-hdd Source-Tarball. -.IP "\fIlh_testroot\fR(1)" 4 -stellt sicher dass das System als root gebaut wird. - -.SH LIVE\-HELPER OPTIONEN -Die folgenden Kommandozeilenoptionen werden von allen live\-helper-Programmen unterst\[:u]tzt. -.IP "\fB\-\-breakpoints\fR" 4 -Ausf\[:u]hrung mit Breakpoints. -.IP "\fB\-\-conffile\fR" 4 -benutzen von eigenen Konfigurationsdateien. -.IP "\fB\-\-debug\fR" 4 -zeigt Debug Informationen. -.IP "\fB\-\-force\fR" 4 -erzwingt Helper Ausf\[:u]hrung, auch wenn Stage-Datei existiert. -.IP "\fB\-h, \-\-help\fR" 4 -zeigt Hilfe Informationen und stoppt. -.IP "\fB\-\-logfile\fR" 4 -benutzen von eigener Log-Datei. -.IP "\fB\-\-quiet\fR" 4 -still -.IP "\fB\-u, \-\-usage\fR" 4 -zeigt Anwedungshinweise und stoppt. -.IP "\fB\-\-verbose\fR" 4 -gespr\[:a]chig -.IP "\fB\-v, \-\-version\fR" 4 -gibt Versionsinformationen aus und stoppt. - -.SH FEHLER -Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden. - -.SH HOMEPAGE -Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden. - -.SH AUTOR -live\-helper wurde von Daniel Baumann <\fIdaniel@debian.org\fR> f\[:u]r das Debian\-Projekt geschrieben. diff --git a/manpages/live-helper.7.en b/manpages/live-helper.7.en deleted file mode 100644 index 9d795df..0000000 --- a/manpages/live-helper.7.en +++ /dev/null @@ -1,173 +0,0 @@ -.TH LIVE\-HELPER 7 "2007\-05\-07" "1.0~a9" "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_chroot\fR(1)" 4 -copies chroot into chroot. -.IP "\fIlh_binary_debian\-installer\fR(1)" 4 -copies debian-installer into the binary image. -.IP "\fIlh_binary_encryption\fR(1)" 4 -encrypts the root filesystem. -.IP "\fIlh_binary_grub\fR(1)" 4 -copies grub into the binary image. -.IP "\fIlh_binary_hdd\fR(1)" 4 -creates the harddisk binary tarball. -.IP "\fIlh_binary_includes\fR(1)" 4 -copies files into the binary image. -.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_memtest\fR(1)" 4 -copies a memtest 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-hdd\fR(1)" 4 -creates the USB-hdd binary image. -.IP "\fIlh_binary_yaboot\fR(1)" 4 -copies yaboot into the 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_interactive\fR(1)" 4 -makes build interactive. -.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_localpackageslists\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_packageslists\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_generic\fR(1)" 4 -creates generic source tarball. -.IP "\fIlh_source_hdd\fR(1)" 4 -creates harddisk 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-hdd\fR(1)" 4 -creates USB-hdd source image. -.IP "\fIlh_testroot\fR(1)" 4 -checks for root privileges. - -.SH LIVE\-HELPER OPTIONS -The following command line options are supported by all live\-helper programs. -.IP "\fB\-\-breakpoints\fR" 4 -run with breakpoints -.IP "\fB\-\-conffile\fR" 4 -use custom configuration file -.IP "\fB\-\-debug\fR" 4 -show debug information -.IP "\fB\-\-force\fR" 4 -force helper execution, even if stage file exists. -.IP "\fB\-h, \-\-help\fR" 4 -display help and exit -.IP "\fB\-\-logfile\fR" 4 -use custom log file -.IP "\fB\-\-quiet\fR" 4 -be quiet -.IP "\fB\-u, \-\-usage\fR" 4 -show usage and exit -.IP "\fB\-\-verbose\fR" 4 -be verbose -.IP "\fB\-v, \-\-version\fR" 4 -output version information and exit - -.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> for the Debian project. diff --git a/manpages/live-helper.de.7 b/manpages/live-helper.de.7 new file mode 100644 index 0000000..5c22b0f --- /dev/null +++ b/manpages/live-helper.de.7 @@ -0,0 +1,178 @@ +.TH LIVE\-HELPER 7 "14.05.2007" "1.0~a10" "live\-helper" + +.SH NAME +live\-helper \- Debian Live Helper-Programme + +.SH SYNTAX +.B lh_* [\fIlive\-helper\ Optionen\fR\|] + +.SH BESCHREIBUNG +Live\-helper ist eine Sammlung von programmen die dazu benutzt werden k\[:o]nnen, Debian Live Systeme zu erstellen. Die Philosophie hinter live\-helper ist eine kleine Sammlung von kleinen, kurzen und einfach zu verstehenden Werkzeugen zur verf\[:u]gung zu stellen, welche auch in anderen Programmen benutzt werden k\[:o]nnen um automatisch Live-Systeme erstellen. +.PP +Ein typisches Programm das live\-helper benutzt wird verschiedene live\-helper Kommandos nacheinander aufrufen. Live\-helper Kommandos haben alle einen "lh_"-Pr\[:a]fix im Namen. Beispiele eines solchen Programmes das live\-helper benutzt ist \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 KOMMANDOS +Hier ist eine vollst\[:a]ndige Liste aller verf\[:u]gbaren live\-helper Kommandos. Siehe deren Hilfeseiten f\[:u]r zus\[:a]tzliche Dokumentation. +.IP "\fIlh_binary\fR(1)" 4 +Meta\-Helper f\[:u]r lh_binary_* +.IP "\fIlh_binary_chroot\fR(1)" 4 +kopiert chroot in chroot. +.IP "\fIlh_binary_debian\-installer\fR(1)" 4 +kopiert debian-\installer in das Binary\-Image. +.IP "\fIlh_binary_encryption\fR(1)" 4 +verschl\[:u]sselt das Root\-Dateisystem. +.IP "\fIlh_binary_grub\fR(1)" 4 +kopiert grub in das Binary\-Image. +.IP "\fIlh_binary_hdd\fR(1)" 4 +erstellt den Festplatten Binary\-Tarball. +.IP "\fIlh_binary_includes\fR(1)" 4 +kopiert Dateien in das Binary\-Image. +.IP "\fIlh_binary_iso\fR(1)" 4 +erstell das CD/DVD Binary\-Image. +.IP "\fIlh_binary_linux-image\fR(1)" 4 +kopiert linux\-image in das Binary\-Image. +.IP "\fIlh_binary_local-includes\fR(1)" 4 +kopiert lokale Dateien in das Binary\-Image. +.IP "\fIlh_binary_manifest\fR(1)" 4 +erstellt die Paketliste des Root\-Dateisystemes. +.IP "\fIlh_binary_md5sum\fR(1)" 4 +erstellt md5sum.txt im Binary\-Image. +.IP "\fIlh_binary_memtest\fR(1)" 4 +kopiert ein memtest in das Binary\-Image. +.IP "\fIlh_binary_net\fR(1)" 4 +erstellt den Netboot Binary\-Tarball. +.IP "\fIlh_binary_rootfs\fR(1)" 4 +erstell das Root\-Dateisystem. +.IP "\fIlh_binary_syslinux\fR(1)" 4 +kopiert syslinux in das Binary\-Image. +.IP "\fIlh_binary_usb-hdd\fR(1)" 4 +erstellt das USB-hdd Binary\-Image. +.IP "\fIlh_binary_yaboot\fR(1)" 4 +kopiert yaboot in das Binary\-Image. +.IP "\fIlh_bootstrap\fR(1)" 4 +Meta\-Helper f\[:u]r lh_bootstrap_* +.IP "\fIlh_bootstrap_cdebootstrap\fR(1)" 4 +erstellt ein Debian-System mit cdebootstrap. +.IP "\fIlh_bootstrap_debootstrap\fR(1)" 4 +erstellt ein Debian-System mit debootstrap. +.IP "\fIlh_build\fR(1)" 4 +erstellen eines Live-Systemes +.IP "\fIlh_chroot\fR(1)" 4 +Meta\-Helper f\[:u]r lh_chroot_* +.IP "\fIlh_chroot_apt\fR(1)" 4 +verwaltet /etc/apt/apt.conf. +.IP "\fIlh_chroot_debianchroot\fR(1)" 4 +verwaltet /etc/debian_chroot. +.IP "\fIlh_chroot_hacks\fR(1)" 4 +f\[:u]hrt Hacks im chroot aus. +.IP "\fIlh_chroot_hooks\fR(1)" 4 +f\[:u]hrt Hooks im chroot aus. +.IP "\fIlh_chroot_hosts\fR(1)" 4 +verwaltet /etc/hosts. +.IP "\fIlh_chroot_interactive\fR(1)" 4 +macht Bauprozess interaktiv. +.IP "\fIlh_chroot_linux-image\fR(1)" 4 +verwaltet /etc/kernel\-img.conf. +.IP "\fIlh_chroot_local-hooks\fR(1)" 4 +f\[:u]hrt lokale Hooks im chroot aus. +.IP "\fIlh_chroot_local-includes\fR(1)" 4 +kopiert lokale Dateien in den chroot. +.IP "\fIlh_chroot_localization\fR(1)" 4 +installiert Lokalisierungspakete im chroot. +.IP "\fIlh_chroot_local-packages\fR(1)" 4 +installiert lokale Pakete im chroot. +.IP "\fIlh_chroot_local-packageslists\fR(1)" 4 +installiert lokale Paketlisten im chroot. +.IP "\fIlh_chroot_packages\fR(1)" 4 +installiert Pakete im chroot. +.IP "\fIlh_chroot_packageslists\fR(1)" 4 +installiert Paketlisten im chroot. +.IP "\fIlh_chroot_proc\fR(1)" 4 +bindet /proc ein. +.IP "\fIlh_chroot_resolv\fR(1)" 4 +verwaltet /etc/resolv.conf. +.IP "\fIlh_chroot_sources\fR(1)" 4 +verwaltet /etc/apt/apt.conf. +.IP "\fIlh_chroot_symlinks\fR(1)" 4 +konvertiert symbolische Links. +.IP "\fIlh_chroot_sysfs\fR(1)" 4 +bindet /sys ein. +.IP "\fIlh_chroot_sysvinit\fR(1)" 4 +konfiguriert sysvinit. +.IP "\fIlh_chroot_sysvrc\fR(1)" 4 +verwaltet /usr/sbin/policy\-rc.d. +.IP "\fIlh_chroot_tasks\fR(1)" 4 +installiert Paket-Tasks im chroot. +.IP "\fIlh_clean\fR(1)" 4 +r\[:a]umt das Build-Verzeichnis auf +.IP "\fIlh_config\fR(1)" 4 +erstellt eine Beispielkonfiguration +.IP "\fIlh_losetup\fR(1)" 4 +verwaltet Loop-Ger\[:a]te +.IP "\fIlh_source\fR(1)" 4 +Meta\-Helper f\[:u]r lh_source_* +.IP "\fIlh_source_debian-live\fR(1)" 4 +kopiert debian\-live Konfiguration in source. +.IP "\fIlh_source_debian\fR(1)" 4 +l\[:a]dt Paketquellen herunter. +.IP "\fIlh_source_generic\fR(1)" 4 +erstellt den generischen Source-Tarball. +.IP "\fIlh_source_hdd\fR(1)" 4 +erstellt den Harddisk Source-Tarball. +.IP "\fIlh_source_iso\fR(1)" 4 +erstellt CD/DVD Source-Image. +.IP "\fIlh_source_md5sum\fR(1)" 4 +erstellt md5sum.txt im Source-Image. +.IP "\fIlh_source_net\fR(1)" 4 +erstellt Netboot Source-Tarball. +.IP "\fIlh_source_usb-hdd\fR(1)" 4 +erstellt USB-hdd Source-Tarball. +.IP "\fIlh_testroot\fR(1)" 4 +stellt sicher dass das System als root gebaut wird. + +.SH LIVE\-HELPER OPTIONEN +Die folgenden Kommandozeilenoptionen werden von allen live\-helper-Programmen unterst\[:u]tzt. +.IP "\fB\-\-breakpoints\fR" 4 +Ausf\[:u]hrung mit Breakpoints. +.IP "\fB\-\-conffile\fR" 4 +benutzen von eigenen Konfigurationsdateien. +.IP "\fB\-\-debug\fR" 4 +zeigt Debug Informationen. +.IP "\fB\-\-force\fR" 4 +erzwingt Helper Ausf\[:u]hrung, auch wenn Stage-Datei existiert. +.IP "\fB\-h, \-\-help\fR" 4 +zeigt Hilfe Informationen und stoppt. +.IP "\fB\-\-logfile\fR" 4 +benutzen von eigener Log-Datei. +.IP "\fB\-\-quiet\fR" 4 +still +.IP "\fB\-u, \-\-usage\fR" 4 +zeigt Anwedungshinweise und stoppt. +.IP "\fB\-\-verbose\fR" 4 +gespr\[:a]chig +.IP "\fB\-v, \-\-version\fR" 4 +gibt Versionsinformationen aus und stoppt. + +.SH SIEHE AUCH +\fIlive\-initramfs\fR(7) + +.SH FEHLER +Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden. + +.SH HOMEPAGE +Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden. + +.SH AUTOR +live\-helper wurde von Daniel Baumann <\fIdaniel@debian.org\fR> f\[:u]r das Debian\-Projekt geschrieben. diff --git a/manpages/live-helper.en.7 b/manpages/live-helper.en.7 new file mode 100644 index 0000000..70979e7 --- /dev/null +++ b/manpages/live-helper.en.7 @@ -0,0 +1,176 @@ +.TH LIVE\-HELPER 7 "2007\-05\-14" "1.0~a10" "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_chroot\fR(1)" 4 +copies chroot into chroot. +.IP "\fIlh_binary_debian\-installer\fR(1)" 4 +copies debian-installer into the binary image. +.IP "\fIlh_binary_encryption\fR(1)" 4 +encrypts the root filesystem. +.IP "\fIlh_binary_grub\fR(1)" 4 +copies grub into the binary image. +.IP "\fIlh_binary_hdd\fR(1)" 4 +creates the harddisk binary tarball. +.IP "\fIlh_binary_includes\fR(1)" 4 +copies files into the binary image. +.IP "\fIlh_binary_iso\fR(1)" 4 +creates the CD/DVD binary image. +.IP "\fIlh_binary_linux-image\fR(1)" 4 +copies linux\-image into the binary image. +.IP "\fIlh_binary_local-includes\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_memtest\fR(1)" 4 +copies a memtest 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-hdd\fR(1)" 4 +creates the USB-hdd binary image. +.IP "\fIlh_binary_yaboot\fR(1)" 4 +copies yaboot into the 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_interactive\fR(1)" 4 +makes build interactive. +.IP "\fIlh_chroot_linux-image\fR(1)" 4 +configures /etc/kernel\-img.conf in the chroot. +.IP "\fIlh_chroot_local-hooks\fR(1)" 4 +executes additional local commands in the chroot. +.IP "\fIlh_chroot_local-includes\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_local-packages\fR(1)" 4 +installs local packages in the chroot. +.IP "\fIlh_chroot_local-packageslists\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_packageslists\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_debian-live\fR(1)" 4 +copies config into source directory. +.IP "\fIlh_source_debian\fR(1)" 4 +downloads source packages. +.IP "\fIlh_source_generic\fR(1)" 4 +creates generic source tarball. +.IP "\fIlh_source_hdd\fR(1)" 4 +creates harddisk 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-hdd\fR(1)" 4 +creates USB-hdd source image. +.IP "\fIlh_testroot\fR(1)" 4 +checks for root privileges. + +.SH LIVE\-HELPER OPTIONS +The following command line options are supported by all live\-helper programs. +.IP "\fB\-\-breakpoints\fR" 4 +run with breakpoints +.IP "\fB\-\-conffile\fR" 4 +use custom configuration file +.IP "\fB\-\-debug\fR" 4 +show debug information +.IP "\fB\-\-force\fR" 4 +force helper execution, even if stage file exists. +.IP "\fB\-h, \-\-help\fR" 4 +display help and exit +.IP "\fB\-\-logfile\fR" 4 +use custom log file +.IP "\fB\-\-quiet\fR" 4 +be quiet +.IP "\fB\-u, \-\-usage\fR" 4 +show usage and exit +.IP "\fB\-\-verbose\fR" 4 +be verbose +.IP "\fB\-v, \-\-version\fR" 4 +output version information and exit + +.SH SEE ALSO +\fIlive\-initramfs\fR(7) + +.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> for the Debian project. diff --git a/manpages/make-live.1.de b/manpages/make-live.1.de deleted file mode 100644 index 61beb62..0000000 --- a/manpages/make-live.1.de +++ /dev/null @@ -1,88 +0,0 @@ -.TH MAKE\-LIVE 1 "07.05.2007" "1.0~a9" "live\-helper" - -.SH NAME -make\-live \- erstellt ein Debian Live-System - -.SH SYNOPSIS -.B make\-live -[config] -[\-\-mode \fIMODE\fR] -[\-\-config \fICONFIG\fR] -[\-\-apt \fIapt\fR|\fIaptitude\fR] -[\-\-apt\-ftpproxy \fIURL\fR] -[\-\-apt\-httpproxy \fIURL\fR] -[\-\-apt\-generic \fIenabled\fR|\fIdisabled\fR] -[\-\-apt\-pdiffs \fIenabled\fR|\fIdisabled\fR] -[\-\-apt\-recommends \fIenabled\fR|\fIdisabled] -[\-\-apt\-secure \fIenabled\fR|\fIdisabled\fR] -[\-\-bootstrap \fIcdebootstrap\fR|\fIdeboostrap\fR] -[\-\-cache \fIenabled\fR|\fIdisabled\fR] -[\-\-debconf\-frontend \fIdialog\fR|\fIreadline\fR|\fInoninteractive\fR] -[\-\-debconf\-priority \fIlow\fR|\fImedium\fR|\fIhigh\fR|\fIcritical\fR] -[\-\-debconf\-nowarnings \fIyes\fR|\fIno\fR] -[\-\-genisoimage \fIgenisoimage\fR|\fImkisofs\fR] -[\-\-losetup \fIlosetup\fR|\fIlosetup.org\fR] -[\-\-tasksel \fIaptitude\fR|\fItasksel\fR] -[\-r|\-\-root \fIDIRECTORY\fR] -[\-a|\-\-archi\fItecture \fIARCHITECTURE\fR] -[\-d|\-\-distribution \fIstable\fR|\fItesting\fR|\fIunstable\fR|\fIetch\fR|\fIlenny\fR|\fIsid\fR] -[\-\-distribution\-config \fIDIRECTORY\fR] -[\-f|\-\-bootstrap\-flavour \fIminimal\fR|\fIstandard\fR] -[\-m|\-\-mirror\-build \fIURL\fR] -[\-\-mirror\-build\-security \fIURL\fR] -[\-\-mirror\-image \fIURL\fR] -[\-\-mirror\-image\-security \fIURL\fR] -[\-\-sections \fISECTION\fR|\fI\"SECTIONS\"\fR] -[\-\-interactive \fIshell\fR|\fIx11\fR|\fIxnest\fR] -[\-k|\-\-kernel\-flavour \fIFLAVOUR\fR] -[\-\-kernel\-packages \fIPACKAGE\fR|\fI\"PACKAGES\"\fR] -[\-\-keyring\-packages \fIPACKAGE\fR|\fI\"PACKAGES\"\fR] -[\-\-hooks \fI\"COMMAND\"\fR|\fI\"COMMANDS\"\fR] -[\-l|\-\-language \fILANGUAGE\fR] -[\-\-packages \fIPACKAGE\fR|\fI\"PACKAGES\"\fR] -[\-p|\-\-packages\-lists \fILIST\fR|\fI\"LISTS\"\fR] -[\-\-tasks \fITASK\fR|\fI\"TASKS\"\fR] -[\-\-security \fIenabled\fR|\fIdisabled\fR] -[\-\-symlinks \fIenabled\fR|\fIdisabled\fR] -[\-\-sysvinit \fIenabled\fR|\fIdisabled\fR] -[\-\-bootappend \fIKERNEL_PARAMETER\fR|\fI\"KERNEL_PARAMETERS\"\fR] -[\-e|\-\-encryption \fIALGORITHM\fR] -[\-\-username \fINAME\fR] -[\-\-hostname \fINAME\fR] -[\-\-filesystem \fIext2\fR|\fIplain\fR|\fIsquashfs\fR] -[\-\-memtest \fImemtest86\fR|\fImemtest86+\fR] -[\-\-iso\-volume \fISTRING\fR] -[\-\-server\-address \fIHOSTNAME\fR|\fIIP\fR] -[\-\-server\-path \fIDIRECTORY\fR] -[\-\-source \fIenabled\fR|\fIdisabled\fR] -[\-\-bootloader \fIgrub\fR|\fIsyslinux\fR] -[\-\-grub\-splash \fIFILE\fR] -[\-\-syslinux\-splash \fIFILE\fR] -[\-b|\-\-binary\-image \fIhdd\fR|\fIiso\fR|\fIusb-hdd\fR|\fInet\fR] -[\-s|\-\-source\-image \fIgeneric\fR|\fIhdd\fR|\fIiso\fR|\fIusb-hdd\fR|\fInet\fR] -[\-\-includes \fIPATH\fR] -[\-\-templates \fIPATH\fR] -[\-\-breakpoints] -[\-\-debug] -[\-\-force] -[\-\-quiet] -[\-\-verbose] - -.SH BESCHREIBUNG -make\-live is ein Script das alle n\[:o]tigen live\-helper Programme aufruft um ein Live-System zu erstellen. - -.SH OPTIONEN - -.SH SIEHE AUCH -\fIlive\-helper\fR(7) -.PP -Dieses Programm ist Teil von live\-helper. - -.SH FEHLER -Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden. - -.SH HOMEPAGE -Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden. - -.SH AUTOR -live\-helper wurde von Daniel Baumann <\fIdaniel@debian.org\fR> f\[:u]r das Debian\-Projekt geschrieben. diff --git a/manpages/make-live.1.en b/manpages/make-live.1.en deleted file mode 100644 index 3555333..0000000 --- a/manpages/make-live.1.en +++ /dev/null @@ -1,88 +0,0 @@ -.TH MAKE\-LIVE 1 "2007\-05\-07" "1.0~a9" "live\-helper" - -.SH NAME -make\-live \- build a Debian Live system - -.SH SYNOPSIS -.B make\-live -[config] -[\-\-mode \fIMODE\fR] -[\-\-config \fICONFIG\fR] -[\-\-apt \fIapt\fR|\fIaptitude\fR] -[\-\-apt\-ftpproxy \fIURL\fR] -[\-\-apt\-httpproxy \fIURL\fR] -[\-\-apt\-generic \fIenabled\fR|\fIdisabled\fR] -[\-\-apt\-pdiffs \fIenabled\fR|\fIdisabled\fR] -[\-\-apt\-recommends \fIenabled\fR|\fIdisabled] -[\-\-apt\-secure \fIenabled\fR|\fIdisabled\fR] -[\-\-bootstrap \fIcdebootstrap\fR|\fIdeboostrap\fR] -[\-\-cache \fIenabled\fR|\fIdisabled\fR] -[\-\-debconf\-frontend \fIdialog\fR|\fIreadline\fR|\fInoninteractive\fR] -[\-\-debconf\-priority \fIlow\fR|\fImedium\fR|\fIhigh\fR|\fIcritical\fR] -[\-\-debconf\-nowarnings \fIyes\fR|\fIno\fR] -[\-\-genisoimage \fIgenisoimage\fR|\fImkisofs\fR] -[\-\-losetup \fIlosetup\fR|\fIlosetup.org\fR] -[\-\-tasksel \fIaptitude\fR|\fItasksel\fR] -[\-r|\-\-root \fIDIRECTORY\fR] -[\-a|\-\-archi\fItecture \fIARCHITECTURE\fR] -[\-d|\-\-distribution \fIstable\fR|\fItesting\fR|\fIunstable\fR|\fIetch\fR|\fIlenny\fR|\fIsid\fR] -[\-\-distribution\-config \fIDIRECTORY\fR] -[\-f|\-\-bootstrap\-flavour \fIminimal\fR|\fIstandard\fR] -[\-m|\-\-mirror\-build \fIURL\fR] -[\-\-mirror\-build\-security \fIURL\fR] -[\-\-mirror\-image \fIURL\fR] -[\-\-mirror\-image\-security \fIURL\fR] -[\-\-sections \fISECTION\fR|\fI\"SECTIONS\"\fR] -[\-\-interactive \fIshell\fR|\fIx11\fR|\fIxnest\fR] -[\-k|\-\-kernel\-flavour \fIFLAVOUR\fR] -[\-\-kernel\-packages \fIPACKAGE\fR|\fI\"PACKAGES\"\fR] -[\-\-keyring\-packages \fIPACKAGE\fR|\fI\"PACKAGES\"\fR] -[\-\-hooks \fI\"COMMAND\"\fR|\fI\"COMMANDS\"\fR] -[\-l|\-\-language \fILANGUAGE\fR] -[\-\-packages \fIPACKAGE\fR|\fI\"PACKAGES\"\fR] -[\-p|\-\-packages\-lists \fILIST\fR|\fI\"LISTS\"\fR] -[\-\-tasks \fITASK\fR|\fI\"TASKS\"\fR] -[\-\-security \fIenabled\fR|\fIdisabled\fR] -[\-\-symlinks \fIenabled\fR|\fIdisabled\fR] -[\-\-sysvinit \fIenabled\fR|\fIdisabled\fR] -[\-\-bootappend \fIKERNEL_PARAMETER\fR|\fI\"KERNEL_PARAMETERS\"\fR] -[\-e|\-\-encryption \fIALGORITHM\fR] -[\-\-username \fINAME\fR] -[\-\-hostname \fINAME\fR] -[\-\-filesystem \fIext2\fR|\fIplain\fR|\fIsquashfs\fR] -[\-\-memtest \fImemtest86\fR|\fImemtest86+\fR] -[\-\-iso\-volume \fISTRING\fR] -[\-\-server\-address \fIHOSTNAME\fR|\fIIP\fR] -[\-\-server\-path \fIDIRECTORY\fR] -[\-\-source \fIenabled\fR|\fIdisabled\fR] -[\-\-bootloader \fIgrub\fR|\fIsyslinux\fR] -[\-\-grub\-splash \fIFILE\fR] -[\-\-syslinux\-splash \fIFILE\fR] -[\-b|\-\-binary\-image \fIhdd\fR|\fIiso\fR|\fIusb-hdd\fR|\fInet\fR] -[\-s|\-\-source\-image \fIgeneric\fR|\fIhdd\fR|\fIiso\fR|\fIusb-hdd\fR|\fInet\fR] -[\-\-includes \fIPATH\fR] -[\-\-templates \fIPATH\fR] -[\-\-breakpoints] -[\-\-debug] -[\-\-force] -[\-\-quiet] -[\-\-verbose] - -.SH DESCRIPTION -make\-live is a script calling all required live\-helper(7) programs to build a live system. - -.SH OPTIONS - -.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> for the Debian project. diff --git a/manpages/make-live.de.1 b/manpages/make-live.de.1 new file mode 100644 index 0000000..f380daf --- /dev/null +++ b/manpages/make-live.de.1 @@ -0,0 +1,88 @@ +.TH MAKE\-LIVE 1 "14.05.2007" "1.0~a10" "live\-helper" + +.SH NAME +make\-live \- erstellt ein Debian Live-System + +.SH SYNOPSIS +.B make\-live +[config] +[\-\-mode \fIMODE\fR] +[\-\-config \fICONFIG\fR] +[\-\-apt \fIapt\fR|\fIaptitude\fR] +[\-\-apt\-ftpproxy \fIURL\fR] +[\-\-apt\-httpproxy \fIURL\fR] +[\-\-apt\-generic \fIenabled\fR|\fIdisabled\fR] +[\-\-apt\-pdiffs \fIenabled\fR|\fIdisabled\fR] +[\-\-apt\-recommends \fIenabled\fR|\fIdisabled] +[\-\-apt\-secure \fIenabled\fR|\fIdisabled\fR] +[\-\-bootstrap \fIcdebootstrap\fR|\fIdeboostrap\fR] +[\-\-cache \fIenabled\fR|\fIdisabled\fR] +[\-\-debconf\-frontend \fIdialog\fR|\fIreadline\fR|\fInoninteractive\fR] +[\-\-debconf\-priority \fIlow\fR|\fImedium\fR|\fIhigh\fR|\fIcritical\fR] +[\-\-debconf\-nowarnings \fIyes\fR|\fIno\fR] +[\-\-genisoimage \fIgenisoimage\fR|\fImkisofs\fR] +[\-\-losetup \fIlosetup\fR|\fIlosetup.org\fR] +[\-\-tasksel \fIaptitude\fR|\fItasksel\fR] +[\-r|\-\-root \fIDIRECTORY\fR] +[\-a|\-\-archi\fItecture \fIARCHITECTURE\fR] +[\-d|\-\-distribution \fIstable\fR|\fItesting\fR|\fIunstable\fR|\fIetch\fR|\fIlenny\fR|\fIsid\fR] +[\-\-distribution\-config \fIDIRECTORY\fR] +[\-f|\-\-bootstrap\-flavour \fIminimal\fR|\fIstandard\fR] +[\-m|\-\-mirror\-build \fIURL\fR] +[\-\-mirror\-build\-security \fIURL\fR] +[\-\-mirror\-image \fIURL\fR] +[\-\-mirror\-image\-security \fIURL\fR] +[\-\-sections \fISECTION\fR|\fI\"SECTIONS\"\fR] +[\-\-interactive \fIshell\fR|\fIx11\fR|\fIxnest\fR] +[\-k|\-\-kernel\-flavour \fIFLAVOUR\fR] +[\-\-kernel\-packages \fIPACKAGE\fR|\fI\"PACKAGES\"\fR] +[\-\-keyring\-packages \fIPACKAGE\fR|\fI\"PACKAGES\"\fR] +[\-\-hooks \fI\"COMMAND\"\fR|\fI\"COMMANDS\"\fR] +[\-l|\-\-language \fILANGUAGE\fR] +[\-\-packages \fIPACKAGE\fR|\fI\"PACKAGES\"\fR] +[\-p|\-\-packages\-lists \fILIST\fR|\fI\"LISTS\"\fR] +[\-\-tasks \fITASK\fR|\fI\"TASKS\"\fR] +[\-\-security \fIenabled\fR|\fIdisabled\fR] +[\-\-symlinks \fIenabled\fR|\fIdisabled\fR] +[\-\-sysvinit \fIenabled\fR|\fIdisabled\fR] +[\-\-bootappend \fIKERNEL_PARAMETER\fR|\fI\"KERNEL_PARAMETERS\"\fR] +[\-e|\-\-encryption \fIALGORITHM\fR] +[\-\-username \fINAME\fR] +[\-\-hostname \fINAME\fR] +[\-\-filesystem \fIext2\fR|\fIplain\fR|\fIsquashfs\fR] +[\-\-memtest \fImemtest86\fR|\fImemtest86+\fR] +[\-\-iso\-volume \fISTRING\fR] +[\-\-server\-address \fIHOSTNAME\fR|\fIIP\fR] +[\-\-server\-path \fIDIRECTORY\fR] +[\-\-source \fIenabled\fR|\fIdisabled\fR] +[\-\-bootloader \fIgrub\fR|\fIsyslinux\fR] +[\-\-grub\-splash \fIFILE\fR] +[\-\-syslinux\-splash \fIFILE\fR] +[\-b|\-\-binary\-image \fIhdd\fR|\fIiso\fR|\fIusb-hdd\fR|\fInet\fR] +[\-s|\-\-source\-image \fIgeneric\fR|\fIhdd\fR|\fIiso\fR|\fIusb-hdd\fR|\fInet\fR] +[\-\-includes \fIPATH\fR] +[\-\-templates \fIPATH\fR] +[\-\-breakpoints] +[\-\-debug] +[\-\-force] +[\-\-quiet] +[\-\-verbose] + +.SH BESCHREIBUNG +make\-live is ein Script das alle n\[:o]tigen live\-helper Programme aufruft um ein Live-System zu erstellen. + +.SH OPTIONEN + +.SH SIEHE AUCH +\fIlive\-helper\fR(7) +.PP +Dieses Programm ist Teil von live\-helper. + +.SH FEHLER +Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden. + +.SH HOMEPAGE +Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden. + +.SH AUTOR +live\-helper wurde von Daniel Baumann <\fIdaniel@debian.org\fR> f\[:u]r das Debian\-Projekt geschrieben. diff --git a/manpages/make-live.en.1 b/manpages/make-live.en.1 new file mode 100644 index 0000000..fa51dcc --- /dev/null +++ b/manpages/make-live.en.1 @@ -0,0 +1,88 @@ +.TH MAKE\-LIVE 1 "2007\-05\-14" "1.0~a10" "live\-helper" + +.SH NAME +make\-live \- build a Debian Live system + +.SH SYNOPSIS +.B make\-live +[config] +[\-\-mode \fIMODE\fR] +[\-\-config \fICONFIG\fR] +[\-\-apt \fIapt\fR|\fIaptitude\fR] +[\-\-apt\-ftpproxy \fIURL\fR] +[\-\-apt\-httpproxy \fIURL\fR] +[\-\-apt\-generic \fIenabled\fR|\fIdisabled\fR] +[\-\-apt\-pdiffs \fIenabled\fR|\fIdisabled\fR] +[\-\-apt\-recommends \fIenabled\fR|\fIdisabled] +[\-\-apt\-secure \fIenabled\fR|\fIdisabled\fR] +[\-\-bootstrap \fIcdebootstrap\fR|\fIdeboostrap\fR] +[\-\-cache \fIenabled\fR|\fIdisabled\fR] +[\-\-debconf\-frontend \fIdialog\fR|\fIreadline\fR|\fInoninteractive\fR] +[\-\-debconf\-priority \fIlow\fR|\fImedium\fR|\fIhigh\fR|\fIcritical\fR] +[\-\-debconf\-nowarnings \fIyes\fR|\fIno\fR] +[\-\-genisoimage \fIgenisoimage\fR|\fImkisofs\fR] +[\-\-losetup \fIlosetup\fR|\fIlosetup.org\fR] +[\-\-tasksel \fIaptitude\fR|\fItasksel\fR] +[\-r|\-\-root \fIDIRECTORY\fR] +[\-a|\-\-archi\fItecture \fIARCHITECTURE\fR] +[\-d|\-\-distribution \fIstable\fR|\fItesting\fR|\fIunstable\fR|\fIetch\fR|\fIlenny\fR|\fIsid\fR] +[\-\-distribution\-config \fIDIRECTORY\fR] +[\-f|\-\-bootstrap\-flavour \fIminimal\fR|\fIstandard\fR] +[\-m|\-\-mirror\-build \fIURL\fR] +[\-\-mirror\-build\-security \fIURL\fR] +[\-\-mirror\-image \fIURL\fR] +[\-\-mirror\-image\-security \fIURL\fR] +[\-\-sections \fISECTION\fR|\fI\"SECTIONS\"\fR] +[\-\-interactive \fIshell\fR|\fIx11\fR|\fIxnest\fR] +[\-k|\-\-kernel\-flavour \fIFLAVOUR\fR] +[\-\-kernel\-packages \fIPACKAGE\fR|\fI\"PACKAGES\"\fR] +[\-\-keyring\-packages \fIPACKAGE\fR|\fI\"PACKAGES\"\fR] +[\-\-hooks \fI\"COMMAND\"\fR|\fI\"COMMANDS\"\fR] +[\-l|\-\-language \fILANGUAGE\fR] +[\-\-packages \fIPACKAGE\fR|\fI\"PACKAGES\"\fR] +[\-p|\-\-packages\-lists \fILIST\fR|\fI\"LISTS\"\fR] +[\-\-tasks \fITASK\fR|\fI\"TASKS\"\fR] +[\-\-security \fIenabled\fR|\fIdisabled\fR] +[\-\-symlinks \fIenabled\fR|\fIdisabled\fR] +[\-\-sysvinit \fIenabled\fR|\fIdisabled\fR] +[\-\-bootappend \fIKERNEL_PARAMETER\fR|\fI\"KERNEL_PARAMETERS\"\fR] +[\-e|\-\-encryption \fIALGORITHM\fR] +[\-\-username \fINAME\fR] +[\-\-hostname \fINAME\fR] +[\-\-filesystem \fIext2\fR|\fIplain\fR|\fIsquashfs\fR] +[\-\-memtest \fImemtest86\fR|\fImemtest86+\fR] +[\-\-iso\-volume \fISTRING\fR] +[\-\-server\-address \fIHOSTNAME\fR|\fIIP\fR] +[\-\-server\-path \fIDIRECTORY\fR] +[\-\-source \fIenabled\fR|\fIdisabled\fR] +[\-\-bootloader \fIgrub\fR|\fIsyslinux\fR] +[\-\-grub\-splash \fIFILE\fR] +[\-\-syslinux\-splash \fIFILE\fR] +[\-b|\-\-binary\-image \fIhdd\fR|\fIiso\fR|\fIusb-hdd\fR|\fInet\fR] +[\-s|\-\-source\-image \fIgeneric\fR|\fIhdd\fR|\fIiso\fR|\fIusb-hdd\fR|\fInet\fR] +[\-\-includes \fIPATH\fR] +[\-\-templates \fIPATH\fR] +[\-\-breakpoints] +[\-\-debug] +[\-\-force] +[\-\-quiet] +[\-\-verbose] + +.SH DESCRIPTION +make\-live is a script calling all required live\-helper(7) programs to build a live system. + +.SH OPTIONS + +.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> for the Debian project. diff --git a/templates/grub/menu.lst b/templates/grub/menu.lst index 22355b8..efa0d82 100644 --- a/templates/grub/menu.lst +++ b/templates/grub/menu.lst @@ -2,6 +2,6 @@ default 0 color cyan/blue white/blue splashimage /boot/grub/splash.xpm.gz -LIVE_KERNEL_LIVE +LIVE_LINUX_LIVE -LIVE_KERNEL_INSTALL +LIVE_LINUX_INSTALL diff --git a/templates/syslinux/isolinux.cfg b/templates/syslinux/isolinux.cfg index c44e657..571914a 100644 --- a/templates/syslinux/isolinux.cfg +++ b/templates/syslinux/isolinux.cfg @@ -14,9 +14,9 @@ F0 f10.txt DEFAULT live -LIVE_KERNEL_LIVE +LIVE_LINUX_LIVE -LIVE_KERNEL_INSTALL +LIVE_LINUX_INSTALL LIVE_MEMTEST diff --git a/templates/syslinux/pxelinux.cfg b/templates/syslinux/pxelinux.cfg index 8b138c4..379414c 100644 --- a/templates/syslinux/pxelinux.cfg +++ b/templates/syslinux/pxelinux.cfg @@ -1,19 +1,19 @@ default live label live kernel vmlinuz - append initrd=initrd.img boot=casper netboot nfsroot=LIVE_SERVER_ADDRESS:LIVE_SERVER_PATH LIVE_BOOTAPPEND + append initrd=initrd.img boot=casper netboot nfsroot=LIVE_NET_SERVER:LIVE_NET_PATH LIVE_BOOTAPPEND label nfs kernel vmlinuz - append initrd=initrd.img boot=casper netboot=nfs nfsroot=LIVE_SERVER_ADDRESS:LIVE_SERVER_PATH LIVE_BOOTAPPEND + append initrd=initrd.img boot=casper netboot=nfs nfsroot=LIVE_NET_SERVER:LIVE_NET_PATH LIVE_BOOTAPPEND label nfslegacy kernel vmlinuz - append initrd=initrd.img boot=casper root=/dev/nfs nfsroot=LIVE_SERVER_ADDRESS:LIVE_SERVER_PATH LIVE_BOOTAPPEND + append initrd=initrd.img boot=casper root=/dev/nfs nfsroot=LIVE_NET_SERVER:LIVE_NET_PATH LIVE_BOOTAPPEND label cifs kernel vmlinuz - append initrd=initrd.img boot=casper netboot=cifs nfsroot=LIVE_SERVER_ADDRESS:LIVE_SERVER_PATH LIVE_BOOTAPPEND + append initrd=initrd.img boot=casper netboot=cifs nfsroot=LIVE_NET_SERVER:LIVE_NET_PATH LIVE_BOOTAPPEND label cifslegacy kernel vmlinuz - append initrd=initrd.img boot=casper root=/dev/cifs nfsroot=LIVE_SERVER_ADDRESS:LIVE_SERVER_PATH LIVE_BOOTAPPEND + append initrd=initrd.img boot=casper root=/dev/cifs nfsroot=LIVE_NET_SERVER:LIVE_NET_PATH LIVE_BOOTAPPEND label memtest kernel memtest display pxelinux.cfg/isolinux.txt diff --git a/templates/yaboot/yaboot.conf b/templates/yaboot/yaboot.conf index 8170d70..12a7dff 100644 --- a/templates/yaboot/yaboot.conf +++ b/templates/yaboot/yaboot.conf @@ -1,6 +1,6 @@ default=live message=/install/boot.msg -LIVE_KERNEL_LIVE +LIVE_LINUX_LIVE -LIVE_KERNEL_INSTALL +LIVE_LINUX_INSTALL -- cgit v1.0