diff options
| -rw-r--r-- | Makefile | 76 | ||||
| -rw-r--r-- | contrib/casper-manpage/casper-snapshot.1 | 70 | ||||
| -rw-r--r-- | contrib/casper-manpage/casper.7 | 111 | ||||
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/control | 1 | ||||
| -rw-r--r-- | debian/cron.daily | 182 | ||||
| -rw-r--r-- | debian/default | 20 | ||||
| -rw-r--r-- | debian/postrm | 25 | ||||
| -rw-r--r-- | debian/preinst | 25 | ||||
| -rwxr-xr-x | debian/rules | 2 | ||||
| -rw-r--r-- | doc/TODO | 16 | ||||
| -rw-r--r-- | docs/AUTHORS (renamed from doc/AUTHORS) | 0 | ||||
| -rw-r--r-- | docs/BUGS (renamed from doc/BUGS) | 2 | ||||
| -rw-r--r-- | docs/CREDITS (renamed from doc/CREDITS) | 0 | ||||
| -rw-r--r-- | docs/ChangeLog (renamed from doc/ChangeLog) | 70 | ||||
| -rw-r--r-- | docs/ChangeLog.old (renamed from doc/ChangeLog.old) | 0 | ||||
| -rw-r--r-- | docs/DOWNLOAD (renamed from doc/DOWNLOAD) | 0 | ||||
| -rw-r--r-- | docs/FAQ (renamed from doc/FAQ) | 0 | ||||
| -rw-r--r-- | docs/NEWS (renamed from doc/NEWS) | 3 | ||||
| -rw-r--r-- | docs/README (renamed from doc/README) | 10 | ||||
| -rw-r--r-- | docs/TODO | 51 | ||||
| -rwxr-xr-x | examples/beryl-hook.sh | 50 | ||||
| -rwxr-xr-x | examples/cron/daily.sh | 166 | ||||
| -rwxr-xr-x | examples/cron/etch+beryl.sh | 175 | ||||
| -rwxr-xr-x | examples/cron/etch.sh | 166 | ||||
| -rwxr-xr-x | examples/cron/snapshots.sh | 130 | ||||
| -rwxr-xr-x | examples/cron/weekly.sh | 166 | ||||
| -rwxr-xr-x | examples/daily-cron.sh | 140 | ||||
| -rwxr-xr-x | examples/etch+beryl-cron.sh | 150 | ||||
| -rwxr-xr-x | examples/etch-cron.sh | 140 | ||||
| -rwxr-xr-x | examples/hooks/beryl.sh | 78 | ||||
| -rwxr-xr-x | examples/hooks/ipw2100.sh | 28 | ||||
| -rwxr-xr-x | examples/hooks/ipw2200.sh | 28 | ||||
| -rwxr-xr-x | examples/hooks/ipw3945.sh | 23 | ||||
| -rwxr-xr-x | examples/hooks/madwifi.sh | 23 | ||||
| -rwxr-xr-x | examples/hooks/nvidia-legacy.sh | 51 | ||||
| -rwxr-xr-x | examples/hooks/rt2570.sh | 15 | ||||
| -rwxr-xr-x | examples/hooks/rt2x00.sh | 24 | ||||
| -rwxr-xr-x | examples/hooks/sun-java5.sh | 15 | ||||
| -rwxr-xr-x | examples/hooks/sun-java6.sh (renamed from examples/java-hook.sh) | 2 | ||||
| -rw-r--r-- | examples/sources.list/beryl (renamed from examples/beryl.sources.list) | 6 | ||||
| -rw-r--r-- | examples/sources.list/debian-backports (renamed from examples/bpo.sources.list) | 2 | ||||
| -rw-r--r-- | examples/sources.list/debian-edu (renamed from examples/edu.sources.list) | 2 | ||||
| -rw-r--r-- | examples/sources.list/fai (renamed from examples/fai.sources.list) | 2 | ||||
| -rw-r--r-- | examples/sources.list/live-backports (renamed from examples/live.sources.list) | 2 | ||||
| -rw-r--r-- | examples/sources.list/live-snapshot | 9 | ||||
| -rwxr-xr-x | examples/weekly-cron.sh | 140 | ||||
| -rwxr-xr-x | functions/chroot.sh | 2 | ||||
| -rwxr-xr-x | functions/common.sh | 2 | ||||
| -rwxr-xr-x | functions/defaults.sh | 93 | ||||
| -rwxr-xr-x | functions/echo.sh | 2 | ||||
| -rwxr-xr-x | helpers/lh_binary | 4 | ||||
| -rwxr-xr-x | helpers/lh_binary_debian-installer | 18 | ||||
| -rwxr-xr-x | helpers/lh_binary_encryption | 14 | ||||
| -rwxr-xr-x | helpers/lh_binary_grub | 38 | ||||
| -rwxr-xr-x | helpers/lh_binary_hdd | 2 | ||||
| -rwxr-xr-x | helpers/lh_binary_includes | 8 | ||||
| -rwxr-xr-x | helpers/lh_binary_iso | 36 | ||||
| -rwxr-xr-x | helpers/lh_binary_linux-image (renamed from helpers/lh_binary_linuximage) | 14 | ||||
| -rwxr-xr-x | helpers/lh_binary_local-includes (renamed from helpers/lh_binary_localincludes) | 14 | ||||
| -rwxr-xr-x | helpers/lh_binary_md5sum | 4 | ||||
| -rwxr-xr-x | helpers/lh_binary_memtest | 6 | ||||
| -rwxr-xr-x | helpers/lh_binary_net | 12 | ||||
| -rwxr-xr-x | helpers/lh_binary_rootfs | 12 | ||||
| -rwxr-xr-x | helpers/lh_binary_syslinux | 88 | ||||
| -rwxr-xr-x | helpers/lh_binary_usb-hdd | 2 | ||||
| -rwxr-xr-x | helpers/lh_binary_yaboot | 38 | ||||
| -rwxr-xr-x | helpers/lh_bootstrap_cdebootstrap | 9 | ||||
| -rwxr-xr-x | helpers/lh_bootstrap_debootstrap | 9 | ||||
| -rwxr-xr-x | helpers/lh_chroot | 12 | ||||
| -rwxr-xr-x | helpers/lh_chroot_apt | 2 | ||||
| -rwxr-xr-x | helpers/lh_chroot_hacks | 2 | ||||
| -rwxr-xr-x | helpers/lh_chroot_linux-image (renamed from helpers/lh_chroot_linuximage) | 16 | ||||
| -rwxr-xr-x | helpers/lh_chroot_local-hooks (renamed from helpers/lh_chroot_localhooks) | 14 | ||||
| -rwxr-xr-x | helpers/lh_chroot_local-includes (renamed from helpers/lh_chroot_localincludes) | 12 | ||||
| -rwxr-xr-x | helpers/lh_chroot_local-packages (renamed from helpers/lh_chroot_localpackages) | 22 | ||||
| -rwxr-xr-x | helpers/lh_chroot_local-packageslists (renamed from helpers/lh_chroot_localpackageslists) | 16 | ||||
| -rwxr-xr-x | helpers/lh_chroot_sources | 94 | ||||
| -rwxr-xr-x | helpers/lh_config | 92 | ||||
| -rwxr-xr-x | helpers/lh_source | 4 | ||||
| -rwxr-xr-x | helpers/lh_source_debian (renamed from helpers/lh_source_download) | 10 | ||||
| -rwxr-xr-x | helpers/lh_source_debian-live (renamed from helpers/lh_source_config) | 8 | ||||
| -rwxr-xr-x | helpers/lh_source_generic | 4 | ||||
| -rwxr-xr-x | helpers/lh_source_hdd | 4 | ||||
| -rwxr-xr-x | helpers/lh_source_iso | 36 | ||||
| -rwxr-xr-x | helpers/lh_source_md5sum | 5 | ||||
| -rwxr-xr-x | helpers/lh_source_net | 4 | ||||
| -rwxr-xr-x | helpers/lh_source_usb-hdd | 4 | ||||
| -rwxr-xr-x | helpers/make-live | 50 | ||||
| l--------- | includes/lenny | 1 | ||||
| l--------- | includes/stable | 1 | ||||
| l--------- | includes/testing | 1 | ||||
| l--------- | includes/unstable | 1 | ||||
| -rw-r--r-- | manpages/lh_binary.de.1 (renamed from manpages/lh_binary.1.de) | 6 | ||||
| -rw-r--r-- | manpages/lh_binary.en.1 (renamed from manpages/lh_binary.1.en) | 6 | ||||
| -rw-r--r-- | manpages/lh_bootstrap.de.1 (renamed from manpages/lh_bootstrap.1.de) | 2 | ||||
| -rw-r--r-- | manpages/lh_bootstrap.en.1 (renamed from manpages/lh_bootstrap.1.en) | 2 | ||||
| -rw-r--r-- | manpages/lh_bootstrap_cdebootstrap.de.1 (renamed from manpages/lh_bootstrap_cdebootstrap.1.de) | 4 | ||||
| -rw-r--r-- | manpages/lh_bootstrap_cdebootstrap.en.1 (renamed from manpages/lh_bootstrap_cdebootstrap.1.en) | 2 | ||||
| -rw-r--r-- | manpages/lh_bootstrap_debootstrap.de.1 (renamed from manpages/lh_bootstrap_debootstrap.1.de) | 4 | ||||
| -rw-r--r-- | manpages/lh_bootstrap_debootstrap.en.1 (renamed from manpages/lh_bootstrap_debootstrap.1.en) | 2 | ||||
| -rw-r--r-- | manpages/lh_build.de.1 (renamed from manpages/lh_build.1.de) | 2 | ||||
| -rw-r--r-- | manpages/lh_build.en.1 (renamed from manpages/lh_build.1.en) | 2 | ||||
| -rw-r--r-- | manpages/lh_chroot.de.1 (renamed from manpages/lh_chroot.1.de) | 12 | ||||
| -rw-r--r-- | manpages/lh_chroot.en.1 (renamed from manpages/lh_chroot.1.en) | 12 | ||||
| -rw-r--r-- | manpages/lh_clean.de.1 (renamed from manpages/lh_clean.1.de) | 2 | ||||
| -rw-r--r-- | manpages/lh_clean.en.1 (renamed from manpages/lh_clean.1.en) | 2 | ||||
| -rw-r--r-- | manpages/lh_source.de.1 (renamed from manpages/lh_source.1.de) | 6 | ||||
| -rw-r--r-- | manpages/lh_source.en.1 (renamed from manpages/lh_source.1.en) | 6 | ||||
| -rw-r--r-- | manpages/lh_testroot.de.1 (renamed from manpages/lh_testroot.1.de) | 2 | ||||
| -rw-r--r-- | manpages/lh_testroot.en.1 (renamed from manpages/lh_testroot.1.en) | 2 | ||||
| -rw-r--r-- | manpages/live-helper.de.7 (renamed from manpages/live-helper.7.de) | 23 | ||||
| -rw-r--r-- | manpages/live-helper.en.7 (renamed from manpages/live-helper.7.en) | 23 | ||||
| -rw-r--r-- | manpages/make-live.de.1 (renamed from manpages/make-live.1.de) | 2 | ||||
| -rw-r--r-- | manpages/make-live.en.1 (renamed from manpages/make-live.1.en) | 2 | ||||
| -rw-r--r-- | templates/grub/menu.lst | 4 | ||||
| -rw-r--r-- | templates/syslinux/isolinux.cfg | 4 | ||||
| -rw-r--r-- | templates/syslinux/pxelinux.cfg | 10 | ||||
| -rw-r--r-- | templates/yaboot/yaboot.conf | 4 |
119 files changed, 1943 insertions, 1451 deletions
@@ -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 8f27412c9..000000000 --- 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 <http://live.debian.net/> - -.SH SEE ALSO -.BR casper(7) - -.SH AUTHOR -casper-snapshot was written Marco Amadori <marco.amadori@gmail.com>. -.TP -This manual page was written by Marco Amadori <marco.amadori@gmail.com>, -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 9ebbd402b..000000000 --- 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 <http://live.debian.net/> - -.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 <tfheen@canonical.com>, Matt Zimmerman <mdz@canonical.com>, and Marco Amadori <marco.amadori@gmail.com>. -.TP -This manual page was written by Marco Amadori <marco.amadori@gmail.com>, -for the Debian project (but may be used by others). diff --git a/debian/changelog b/debian/changelog index 5c84dd1bf..d9ac44795 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 <daniel@debian.org> 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 88cd72138..2e2aac16b 100644 --- a/debian/control +++ b/debian/control @@ -6,6 +6,7 @@ Uploaders: Daniel Baumann <daniel@debian.org>, Marco Amadori <marco.amadori@gmai Build-Depends: debhelper (>= 5) Standards-Version: 3.7.2 XS-Vcs-Svn: svn://svn.debian.org/debian-live/dists/trunk/live-helper/ +XS-VCS-Browse: http://svn.debian.org/wsvn/debian-live/dists/trunk/live-helper/ Package: live-helper Architecture: all diff --git a/debian/cron.daily b/debian/cron.daily index 633cc2569..f7e205b6f 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 5d26a7214..8aebe5a2f 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 08e1cb376..000000000 --- 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 6ea28e51b..000000000 --- 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 687cd3cfc..a6357069b 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/TODO b/doc/TODO deleted file mode 100644 index 5d314647b..000000000 --- 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/doc/AUTHORS b/docs/AUTHORS index ce0a01a76..ce0a01a76 100644 --- a/doc/AUTHORS +++ b/docs/AUTHORS @@ -45,7 +45,7 @@ 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 +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 <debian-devel-live@lists.alioth.debian.org>. We will help you to figure it out. diff --git a/doc/CREDITS b/docs/CREDITS index 48b40140e..48b40140e 100644 --- a/doc/CREDITS +++ b/docs/CREDITS diff --git a/doc/ChangeLog b/docs/ChangeLog index 6269da324..6ae509cef 100644 --- a/doc/ChangeLog +++ b/docs/ChangeLog @@ -1,3 +1,72 @@ +2007-05-18 Daniel Baumann <daniel@debian.org> + + * 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 <mathieu.geli@gmail.com> + + * 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 <daniel@debian.org> + + * helpers/lh_binary_md5sum, lh_source,md5sum: + - Fixed accidentally inclusion of md5sum.txt itself into + binary/md5sum.txt. + +2007-05-16 Daniel Baumann <daniel@debian.org> + + * 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 <daniel@debian.org> + + * 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 <daniel@debian.org> + + * 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 <daniel@debian.org> + + * examples/snapshot-build.sh, live-snapshot.sources.list: + - Added. + * helpers/lh_binary_rootfs: + - Fixed wrong order of squashfs options. + 2007-05-06 Daniel Baumann <daniel@debian.org> * templates/syslinux: @@ -7,6 +76,7 @@ * 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 <daniel@debian.org> diff --git a/doc/ChangeLog.old b/docs/ChangeLog.old index 03dba6415..03dba6415 100644 --- a/doc/ChangeLog.old +++ b/docs/ChangeLog.old diff --git a/doc/DOWNLOAD b/docs/DOWNLOAD index 60b67533e..60b67533e 100644 --- a/doc/DOWNLOAD +++ b/docs/DOWNLOAD @@ -35,3 +35,6 @@ News: * 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/doc/README b/docs/README index dec5fe755..f5dc64989 100644 --- a/doc/README +++ b/docs/README @@ -13,7 +13,7 @@ |_ lh_chroot_resolv install |_ lh_chroot_apt install |_ lh_chroot_sources install - |_ lh_chroot_linuximage install + |_ lh_chroot_linux-image install | |_ lh_chroot_tasks |_ lh_chroot_packageslists @@ -22,14 +22,14 @@ |_ lh_chroot_localpackageslists |_ lh_chroot_localization |_ lh_chroot_hacks - |_ lh_chroot_localincludes + |_ lh_chroot_local-includes |_ lh_chroot_sysvinit |_ lh_chroot_hooks |_ lh_chroot_localhooks |_ lh_chroot_symlinks |_ lh_chroot_interactive | - |_ lh_chroot_linuximage remove + |_ lh_chroot_linux-image remove |_ lh_chroot_sources remove |_ lh_chroot_apt remove |_ lh_chroot_resolv remove @@ -52,12 +52,12 @@ |_ lh_binary_manifest |_ lh_binary_encryption | - |_ lh_binary_linuximage + |_ lh_binary_linux-image |_ lh_binary_memtest86 |_ lh_binary_grub |_ lh_binary_syslinux |_ lh_binary_includes - |_ lh_binary_localincludes + |_ lh_binary_local-includes |_ lh_binary_md5sum | |_ lh_binary_hdd diff --git a/docs/TODO b/docs/TODO new file mode 100644 index 000000000..780925f75 --- /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 <debian-live-devel@lists.alioth.debian.org>. + +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 a58056d9d..000000000 --- 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 <inigo@navarrux.org>. -# -# 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/cron/daily.sh b/examples/cron/daily.sh new file mode 100755 index 000000000..3d93a3375 --- /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 000000000..a3d3defc7 --- /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 000000000..a53452c44 --- /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 000000000..199dc2902 --- /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 000000000..98bd7ffff --- /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 9dbe245b4..000000000 --- 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/etch+beryl-cron.sh b/examples/etch+beryl-cron.sh deleted file mode 100755 index 372f7e2c3..000000000 --- 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 0e526f712..000000000 --- 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/hooks/beryl.sh b/examples/hooks/beryl.sh new file mode 100755 index 000000000..e201d81c8 --- /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 <inigo@navarrux.org>. +# +# 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 000000000..fc9e0330f --- /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 000000000..fd2fc9917 --- /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 000000000..04d235ba0 --- /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 000000000..f45b96806 --- /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 000000000..cc1ceb4c7 --- /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 000000000..bbf79c1d9 --- /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 000000000..8c5153c71 --- /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 000000000..987b0b298 --- /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/java-hook.sh b/examples/hooks/sun-java6.sh index 77c931b68..f400b4dd3 100755 --- a/examples/java-hook.sh +++ b/examples/hooks/sun-java6.sh @@ -2,7 +2,7 @@ # 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 +# 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 diff --git a/examples/beryl.sources.list b/examples/sources.list/beryl index 82952306a..9c1cd2e32 100644 --- a/examples/beryl.sources.list +++ b/examples/sources.list/beryl @@ -2,9 +2,9 @@ ## 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. +## 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. diff --git a/examples/bpo.sources.list b/examples/sources.list/debian-backports index 461c66f6d..04362f059 100644 --- a/examples/bpo.sources.list +++ b/examples/sources.list/debian-backports @@ -2,7 +2,7 @@ ## 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. +## 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 diff --git a/examples/edu.sources.list b/examples/sources.list/debian-edu index 79acacd7c..9fb05e113 100644 --- a/examples/edu.sources.list +++ b/examples/sources.list/debian-edu @@ -2,7 +2,7 @@ ## 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. +## as e.g. edu.bootstrap and once as edu.binary. ## ## Remeber to add debian-edu-archive-keyring to your package selection. diff --git a/examples/fai.sources.list b/examples/sources.list/fai index 2c6e80fef..7d2d7ecf6 100644 --- a/examples/fai.sources.list +++ b/examples/sources.list/fai @@ -2,7 +2,7 @@ ## 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. +## 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 diff --git a/examples/live.sources.list b/examples/sources.list/live-backports index 98212f1ff..3c1a2c190 100644 --- a/examples/live.sources.list +++ b/examples/sources.list/live-backports @@ -2,7 +2,7 @@ ## 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. +## as e.g. live-backports.bootstrap and once as live-backports.binary. ## ## Remeber to add debian-unofficial-archive-keyring to your package selection. diff --git a/examples/sources.list/live-snapshot b/examples/sources.list/live-snapshot new file mode 100644 index 000000000..763deda1d --- /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 4d87671ed..000000000 --- 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 77232a170..26ecec979 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 88a883a1f..d97ce044d 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 0c923b60b..0cbbfeb90 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 f28879c61..f30438149 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 038a19a4a..45c405a10 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 b5927a090..034430393 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 e40420788..f055a076c 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 35e3e4867..6476f0c72 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 a3af088fd..8841d155b 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 4a1bc9331..92b6a685a 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 a949ff6f3..2f9fc2e5c 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_linuximage b/helpers/lh_binary_linux-image index 629ef7782..c7e5dd6f1 100755 --- a/helpers/lh_binary_linuximage +++ b/helpers/lh_binary_linux-image @@ -1,6 +1,6 @@ #!/bin/sh -# lh_binary_linuximage(1) - install linux-image into binary +# lh_binary_linux-image(1) - install linux-image into binary # Copyright (C) 2006-2007 Daniel Baumann <daniel@debian.org> # # live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING. @@ -32,13 +32,13 @@ Read_conffile config/binary Read_conffile config/source Set_defaults -Breakpoint "binary_linuximage: Init" +Breakpoint "binary_linux-image: Init" # Requiring stage file Require_stagefile .stage/bootstrap # Checking stage file -Check_stagefile .stage/binary_linuximage +Check_stagefile .stage/binary_linux-image # Checking lock file Check_lockfile .lock @@ -50,7 +50,7 @@ Create_lockfile .lock rm -f chroot/boot/initrd*bak* # Setting destination directory -case "${LIVE_BINARY_IMAGE}" in +case "${LIVE_BINARY_IMAGES}" in iso) DESTDIR="binary/live" ;; @@ -60,12 +60,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}" ] @@ -97,4 +97,4 @@ cp chroot/boot/vmlinuz* "${DESTDIR}" cp chroot/boot/initrd.img* "${DESTDIR}" # Creating stage file -Create_stagefile .stage/binary_linuximage +Create_stagefile .stage/binary_linux-image diff --git a/helpers/lh_binary_localincludes b/helpers/lh_binary_local-includes index 66504c1d2..8b6e5aa6f 100755 --- a/helpers/lh_binary_localincludes +++ b/helpers/lh_binary_local-includes @@ -1,6 +1,6 @@ #!/bin/sh -# lh_binary_localincludes(1) - copy files into binary +# lh_binary_local-includes(1) - copy files into binary # Copyright (C) 2006-2007 Daniel Baumann <daniel@debian.org> # # live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING. @@ -32,13 +32,13 @@ Read_conffile config/binary Read_conffile config/source Set_defaults -Breakpoint "binary_localincludes: Init" +Breakpoint "binary_local-includes: Init" # Requiring stage file Require_stagefile .stage/bootstrap # Checking stage file -Check_stagefile .stage/binary_localincludes +Check_stagefile .stage/binary_local-includes # Checking lock file Check_lockfile .lock @@ -46,19 +46,19 @@ Check_lockfile .lock # Creating lock file Create_lockfile .lock -if ls config/binary_localincludes/* &> /dev/null +if ls config/binary_local-includes/* &> /dev/null then # Copying includes - cd config/binary_localincludes + cd config/binary_local-includes find . | cpio -dmpu "${OLDPWD}"/binary cd "${OLDPWD}" # Removing symlinks - if [ "${LIVE_BINARY_IMAGE}" = "usb-hdd" ] + if [ "${LIVE_BINARY_IMAGES}" = "usb-hdd" ] then find binary -type l | xargs rm -f fi # Creating stage file - Create_stagefile .stage/binary_localincludes + Create_stagefile .stage/binary_local-includes fi diff --git a/helpers/lh_binary_md5sum b/helpers/lh_binary_md5sum index 8964593ba..e04440645 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 edf3830ed..eedc0547b 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 47ed7d238..6ebe7ea74 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 ce93038dc..47529a297 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 4ca64086f..ea78c8626 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 e643966cf..5185a95a0 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 7f82d404f..b8da49923 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 cc7ffca7e..dad894865 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 0538422b1..c3e4cada4 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 451a6b463..7c0015e2c 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 c7cce8906..97d70879b 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 ea746665b..1c828dc25 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_linuximage b/helpers/lh_chroot_linux-image index bd0c22895..660ae401d 100755 --- a/helpers/lh_chroot_linuximage +++ b/helpers/lh_chroot_linux-image @@ -1,6 +1,6 @@ #!/bin/sh -# lh_chroot_linuximage(1) - manage /etc/kernel-img.conf +# lh_chroot_linux-image(1) - manage /etc/kernel-img.conf # Copyright (C) 2006-2007 Daniel Baumann <daniel@debian.org> # # live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING. @@ -32,7 +32,7 @@ Read_conffile config/binary Read_conffile config/source Set_defaults -Breakpoint "chroot_linuximage: Init" +Breakpoint "chroot_linux-image: Init" # Requiring stage file Require_stagefile .stage/bootstrap @@ -40,7 +40,7 @@ Require_stagefile .stage/bootstrap case "${1}" in install) # Checking stage file - Check_stagefile .stage/chroot_linuximage + Check_stagefile .stage/chroot_linux-image # Checking lock file Check_lockfile .lock @@ -61,11 +61,11 @@ do_initrd = Yes warn_initrd = No EOF - if [ "${LIVE_KERNEL_PACKAGES}" != "none" ] + if [ "${LIVE_LINUX_PACKAGES}" != "none" ] then - for FLAVOUR in ${LIVE_KERNEL_FLAVOUR} + for FLAVOUR in ${LIVE_LINUX_FLAVOURS} do - for PACKAGE in ${LIVE_KERNEL_PACKAGES} + for PACKAGE in ${LIVE_LINUX_PACKAGES} do PACKAGES="${PACKAGES} ${PACKAGE}-${FLAVOUR}" done @@ -86,7 +86,7 @@ EOF esac # Creating stage file - Create_stagefile .stage/chroot_linuximage + Create_stagefile .stage/chroot_linux-image ;; remove) @@ -106,7 +106,7 @@ EOF fi # Removing stage file - rm -f .stage/chroot_linuximage + rm -f .stage/chroot_linux-image ;; *) diff --git a/helpers/lh_chroot_localhooks b/helpers/lh_chroot_local-hooks index 2dca7f7ba..953a1f13d 100755 --- a/helpers/lh_chroot_localhooks +++ b/helpers/lh_chroot_local-hooks @@ -1,6 +1,6 @@ #!/bin/sh -# lh_chroot_localhooks(1) - execute local hooks in chroot +# lh_chroot_local-hooks(1) - execute local hooks in chroot # Copyright (C) 2006-2007 Daniel Baumann <daniel@debian.org> # # live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING. @@ -32,13 +32,13 @@ Read_conffile config/binary Read_conffile config/source Set_defaults -Breakpoint "chroot_localhooks: Init" +Breakpoint "chroot_local-hooks: Init" # Requiring stage file Require_stagefile .stage/bootstrap # Checking stage file -Check_stagefile .stage/chroot_localhooks +Check_stagefile .stage/chroot_local-hooks # Checking lock file Check_lockfile .lock @@ -46,10 +46,10 @@ Check_lockfile .lock # Creating lock file Create_lockfile .lock -# Processing localhooks -if ls config/chroot_localhooks/* &> /dev/null +# Processing local-hooks +if ls config/chroot_local-hooks/* &> /dev/null then - for HOOK in config/chroot_localhooks/* + for HOOK in config/chroot_local-hooks/* do # Copying hook cp "${HOOK}" chroot/root @@ -68,5 +68,5 @@ then done # Creating stage file - Create_stagefile .stage/chroot_localhooks + Create_stagefile .stage/chroot_local-hooks fi diff --git a/helpers/lh_chroot_localincludes b/helpers/lh_chroot_local-includes index 40e9a76d2..0d94703bd 100755 --- a/helpers/lh_chroot_localincludes +++ b/helpers/lh_chroot_local-includes @@ -1,6 +1,6 @@ #!/bin/sh -# lh_chroot_localincludes(1) - copy local files into chroot +# lh_chroot_local-includes(1) - copy local files into chroot # Copyright (C) 2006-2007 Daniel Baumann <daniel@debian.org> # # live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING. @@ -32,13 +32,13 @@ Read_conffile config/binary Read_conffile config/source Set_defaults -Breakpoint "chroot_localincludes: Init" +Breakpoint "chroot_local-includes: Init" # Requiring stage file Require_stagefile .stage/bootstrap # Checking stage file -Check_stagefile .stage/chroot_localincludes +Check_stagefile .stage/chroot_local-includes # Checking lock file Check_lockfile .lock @@ -46,13 +46,13 @@ Check_lockfile .lock # Creating lock file Create_lockfile .lock -if ls config/chroot_localincludes/* &> /dev/null +if ls config/chroot_local-includes/* &> /dev/null then # Copying includes - cd config/chroot_localincludes + cd config/chroot_local-includes find . | cpio -dmpu "${OLDPWD}"/chroot cd "${OLDPWD}" # Creating stage file - Create_stagefile .stage/chroot_localincludes + Create_stagefile .stage/chroot_local-includes fi diff --git a/helpers/lh_chroot_localpackages b/helpers/lh_chroot_local-packages index 516e08a21..07c9eb2e3 100755 --- a/helpers/lh_chroot_localpackages +++ b/helpers/lh_chroot_local-packages @@ -1,6 +1,6 @@ #!/bin/sh -# lh_chroot_localpackages(1) - install local packages into chroot +# lh_chroot_local-packages(1) - install local packages into chroot # Copyright (C) 2006-2007 Daniel Baumann <daniel@debian.org> # # live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING. @@ -32,13 +32,13 @@ Read_conffile config/binary Read_conffile config/source Set_defaults -Breakpoint "chroot_localpackages: Init" +Breakpoint "chroot_local-packages: Init" # Requiring stage file Require_stagefile .stage/bootstrap # Checking stage file -Check_stagefile .stage/chroot_localpackages +Check_stagefile .stage/chroot_local-packages # Checking lock file Check_lockfile .lock @@ -46,17 +46,17 @@ Check_lockfile .lock # Creating lock file Create_lockfile .lock -if ls config/chroot_localpackages/*.deb &> /dev/null +if ls config/chroot_local-packages/*.deb &> /dev/null then # Restoring cache - Restore_cache cache/packages_localpackages + Restore_cache cache/packages_local-packages # Copying packages - cp config/chroot_localpackages/*.deb chroot/root + cp config/chroot_local-packages/*.deb chroot/root # Installing packages - Chroot "find /root -name *.deb" > chroot/root/localpackages - Chroot "xargs --arg-file=/root/localpackages dpkg -i" || true + 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 @@ -71,11 +71,11 @@ then # Removing package files rm -f chroot/root/*.deb - rm -f chroot/root/localpackages + rm -f chroot/root/local-packages # Saving cache - Save_cache cache/packages_localpackages + Save_cache cache/packages_local-packages # Creating stage file - Create_stagefile .stage/chroot_localpackages + Create_stagefile .stage/chroot_local-packages fi diff --git a/helpers/lh_chroot_localpackageslists b/helpers/lh_chroot_local-packageslists index 4cda34ecd..f358fca87 100755 --- a/helpers/lh_chroot_localpackageslists +++ b/helpers/lh_chroot_local-packageslists @@ -1,6 +1,6 @@ #!/bin/sh -# lh_chroot_localpackageslists(1) - install local packages lists into chroot +# lh_chroot_local-packageslists(1) - install local packages lists into chroot # Copyright (C) 2006-2007 Daniel Baumann <daniel@debian.org> # # live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING. @@ -32,13 +32,13 @@ Read_conffile config/binary Read_conffile config/source Set_defaults -Breakpoint "chroot_localpackageslists: Init" +Breakpoint "chroot_local-packageslists: Init" # Requiring stage file Require_stagefile .stage/bootstrap # Checking stage file -Check_stagefile .stage/chroot_localpackageslists +Check_stagefile .stage/chroot_local-packageslists # Checking lock file Check_lockfile .lock @@ -46,12 +46,12 @@ Check_lockfile .lock # Creating lock file Create_lockfile .lock -if ls config/chroot_localpackageslists/* &> /dev/null +if ls config/chroot_local-packageslists/* &> /dev/null then # Restoring cache - Restore_cache cache/packages_localpackageslists + Restore_cache cache/packages_local-packageslists - for PACKAGESLIST in config/chroot_localpackageslists/* + for PACKAGESLIST in config/chroot_local-packageslists/* do # Copying package list grep -v "^#" "${PACKAGESLIST}" > chroot/root/"`basename ${PACKAGESLIST}`" @@ -72,8 +72,8 @@ then done # Saving cache - Save_cache cache/packages_localpackageslists + Save_cache cache/packages_local-packageslists # Creating stage file - Create_stagefile .stage/chroot_localpackageslists + Create_stagefile .stage/chroot_local-packageslists fi diff --git a/helpers/lh_chroot_sources b/helpers/lh_chroot_sources index cb8962715..bdbe85611 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 8e9e11754..5477dd006 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 ff5df201f..56c18492b 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_download b/helpers/lh_source_debian index cdae2c979..eb43e18d2 100755 --- a/helpers/lh_source_download +++ b/helpers/lh_source_debian @@ -1,6 +1,6 @@ #!/bin/sh -# lh_source_download(1) - download sources +# lh_source_debian(1) - download sources # Copyright (C) 2006-2007 Daniel Baumann <daniel@debian.org> # # live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING. @@ -16,7 +16,7 @@ do done # Set static variables -DESCRIPTION="download sources" +DESCRIPTION="debian sources" HELP="" USAGE="${PROGRAM} [--force]" @@ -32,7 +32,7 @@ Read_conffile config/binary Read_conffile config/source Set_defaults -Breakpoint "source_download: Init" +Breakpoint "source_debian: Init" if [ "${LIVE_SOURCE}" != "enabled" ] then @@ -43,7 +43,7 @@ fi Require_stagefile .stage/bootstrap # Checking stage file -Check_stagefile .stage/source_download +Check_stagefile .stage/source_debian # Checking lock file Check_lockfile .lock @@ -87,4 +87,4 @@ do done # Creating stage file -Create_stagefile .stage/source_download +Create_stagefile .stage/source_debian diff --git a/helpers/lh_source_config b/helpers/lh_source_debian-live index 2c3db263b..06f9d86a3 100755 --- a/helpers/lh_source_config +++ b/helpers/lh_source_debian-live @@ -1,6 +1,6 @@ #!/bin/sh -# lh_source_config(1) - copy debian-live config into source +# lh_source_debian-live(1) - copy debian-live config into source # Copyright (C) 2006-2007 Daniel Baumann <daniel@debian.org> # # live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING. @@ -32,7 +32,7 @@ Read_conffile config/binary Read_conffile config/source Set_defaults -Breakpoint "source_config: Init" +Breakpoint "source_debian-live: Init" if [ "${LIVE_SOURCE}" != "enabled" ] then @@ -43,7 +43,7 @@ fi Require_stagefile .stage/bootstrap # Checking stage file -Check_stagefile .stage/source_config +Check_stagefile .stage/source_debian-live # Checking lock file Check_lockfile .lock @@ -70,4 +70,4 @@ rm -rf source/debian-live/config mv source/debian-live-config_*.tar.gz source/debian-live # Creating stage file -Create_stagefile .stage/source_config +Create_stagefile .stage/source_debian-live diff --git a/helpers/lh_source_generic b/helpers/lh_source_generic index 6bd2a7770..4db80a017 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 ac5ff730e..74b88891b 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 b00172787..078474785 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 9569c22aa..e458ed848 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 4b63befa1..90e519126 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 4eca22a79..ec853a1d6 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 36546dd18..08e7cc116 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 000000000..190cf3519 --- /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 000000000..190cf3519 --- /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 000000000..fb5b6534f --- /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 000000000..9a63c961d --- /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.de.1 index ffd67595b..5b3e10a01 100644 --- a/manpages/lh_binary.1.de +++ b/manpages/lh_binary.de.1 @@ -1,4 +1,4 @@ -.TH LH_BINARY 1 "07.05.2007" "1.0~a9" "live\-helper" +.TH LH_BINARY 1 "14.05.2007" "1.0~a10" "live\-helper" .SH NAME lh_binary \- Meta\-Helper f\[:u]r lh_binary_* @@ -25,9 +25,9 @@ erstellt den Festplatten Binary\-Tarball. 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 +.IP "\fIlh_binary_linux-image\fR(1)" 4 kopiert linux\-image in das Binary\-Image. -.IP "\fIlh_binary_localincludes\fR(1)" 4 +.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. diff --git a/manpages/lh_binary.1.en b/manpages/lh_binary.en.1 index 0d2bb4506..268209a2a 100644 --- a/manpages/lh_binary.1.en +++ b/manpages/lh_binary.en.1 @@ -1,4 +1,4 @@ -.TH LH_BINARY 1 "2007\-05\-07" "1.0~a9" "live\-helper" +.TH LH_BINARY 1 "2007\-05\-14" "1.0~a10" "live\-helper" .SH NAME lh_binary \- meta\-helper for lh_binary_* @@ -25,9 +25,9 @@ creates the harddisk binary tarball. 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 +.IP "\fIlh_binary_linux-image\fR(1)" 4 copies linux\-image into the binary image. -.IP "\fIlh_binary_localincludes\fR(1)" 4 +.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. diff --git a/manpages/lh_bootstrap.1.de b/manpages/lh_bootstrap.de.1 index 44269c11a..fcc29a37c 100644 --- a/manpages/lh_bootstrap.1.de +++ b/manpages/lh_bootstrap.de.1 @@ -1,4 +1,4 @@ -.TH LH_BOOTSTRAP 1 "07.05.2007" "1.0~a9" "live\-helper" +.TH LH_BOOTSTRAP 1 "14.05.2007" "1.0~a10" "live\-helper" .SH NAME lh_bootstrap \- Meta\-Helper f\[:u]r lh_bootstrap_* diff --git a/manpages/lh_bootstrap.1.en b/manpages/lh_bootstrap.en.1 index af9d414f4..50db5fb7e 100644 --- a/manpages/lh_bootstrap.1.en +++ b/manpages/lh_bootstrap.en.1 @@ -1,4 +1,4 @@ -.TH LH_BOOTSTRAP 1 "2007\-05\-07" "1.0~a9" "live\-helper" +.TH LH_BOOTSTRAP 1 "2007\-05\-14" "1.0~a10" "live\-helper" .SH NAME lh_bootstrap \- meta\-helper for lh_bootstrap_* diff --git a/manpages/lh_bootstrap_cdebootstrap.1.de b/manpages/lh_bootstrap_cdebootstrap.de.1 index 7ef881dfe..326dfbc49 100644 --- a/manpages/lh_bootstrap_cdebootstrap.1.de +++ b/manpages/lh_bootstrap_cdebootstrap.de.1 @@ -1,4 +1,4 @@ -.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "07.05.2007" "1.0~a9" "live\-helper" +.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) @@ -10,7 +10,7 @@ lh_bootstrap_cdebootstrap \- erstellt ein Debian-System mit \fIcdebootstrap\fR(1 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. +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. diff --git a/manpages/lh_bootstrap_cdebootstrap.1.en b/manpages/lh_bootstrap_cdebootstrap.en.1 index 7737c51b0..f8104574b 100644 --- a/manpages/lh_bootstrap_cdebootstrap.1.en +++ b/manpages/lh_bootstrap_cdebootstrap.en.1 @@ -1,4 +1,4 @@ -.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "2007\-05\-07" "1.0~a9" "live\-helper" +.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) diff --git a/manpages/lh_bootstrap_debootstrap.1.de b/manpages/lh_bootstrap_debootstrap.de.1 index 7dbbfece9..cec808360 100644 --- a/manpages/lh_bootstrap_debootstrap.1.de +++ b/manpages/lh_bootstrap_debootstrap.de.1 @@ -1,4 +1,4 @@ -.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "07.05.2007" "1.0~a9" "live\-helper" +.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) @@ -10,7 +10,7 @@ lh_bootstrap_debootstrap \- erstellt ein Debian-System mit \fIdebootstrap\fR(8) 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. +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. diff --git a/manpages/lh_bootstrap_debootstrap.1.en b/manpages/lh_bootstrap_debootstrap.en.1 index e26dc0296..e4aa1a649 100644 --- a/manpages/lh_bootstrap_debootstrap.1.en +++ b/manpages/lh_bootstrap_debootstrap.en.1 @@ -1,4 +1,4 @@ -.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "2007\-05\-07" "1.0~a9" "live\-helper" +.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) diff --git a/manpages/lh_build.1.de b/manpages/lh_build.de.1 index ca95cf22e..703cea4dc 100644 --- a/manpages/lh_build.1.de +++ b/manpages/lh_build.de.1 @@ -1,4 +1,4 @@ -.TH LH_BUILD 1 "07.05.2007" "1.0~a9" "live\-helper" +.TH LH_BUILD 1 "14.05.2007" "1.0~a10" "live\-helper" .SH NAME lh_build \- erstellen eines Live-Systemes diff --git a/manpages/lh_build.1.en b/manpages/lh_build.en.1 index a8be3e030..adc25dcfc 100644 --- a/manpages/lh_build.1.en +++ b/manpages/lh_build.en.1 @@ -1,4 +1,4 @@ -.TH LH_BUILD 1 "2007\-05\-07" "1.0~a9" "live\-helper" +.TH LH_BUILD 1 "2007\-05\-14" "1.0~a10" "live\-helper" .SH NAME lh_build \- building a live system diff --git a/manpages/lh_chroot.1.de b/manpages/lh_chroot.de.1 index cec3342db..b5310e8a2 100644 --- a/manpages/lh_chroot.1.de +++ b/manpages/lh_chroot.de.1 @@ -1,4 +1,4 @@ -.TH LH_CHROOT 1 "07.05.2007" "1.0~a9" "live\-helper" +.TH LH_CHROOT 1 "14.05.2007" "1.0~a10" "live\-helper" .SH NAME lh_chroot \- Meta\-Helper f\[:u]r lh_chroot_* @@ -23,17 +23,17 @@ f\[:u]hrt Hooks im chroot aus. verwaltet /etc/hosts. .IP "\fIlh_chroot_interactive\fR(1)" 4 macht Bauprozess interaktiv. -.IP "\fIlh_chroot_linuximage\fR(1)" 4 +.IP "\fIlh_chroot_linux-image\fR(1)" 4 verwaltet /etc/kernel\-img.conf. -.IP "\fIlh_chroot_localhooks\fR(1)" 4 +.IP "\fIlh_chroot_local-hooks\fR(1)" 4 f\[:u]hrt lokale Hooks im chroot aus. -.IP "\fIlh_chroot_localincludes\fR(1)" 4 +.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_localpackages\fR(1)" 4 +.IP "\fIlh_chroot_local-packages\fR(1)" 4 installiert lokale Pakete im chroot. -.IP "\fIlh_chroot_localpackageslists\fR(1)" 4 +.IP "\fIlh_chroot_local-packageslists\fR(1)" 4 installiert lokale Paketlisten im chroot. .IP "\fIlh_chroot_packages\fR(1)" 4 installiert Pakete im chroot. diff --git a/manpages/lh_chroot.1.en b/manpages/lh_chroot.en.1 index 9b8322d82..fb3348470 100644 --- a/manpages/lh_chroot.1.en +++ b/manpages/lh_chroot.en.1 @@ -1,4 +1,4 @@ -.TH LH_CHROOT 1 "2007\-05\-07" "1.0~a9" "live\-helper" +.TH LH_CHROOT 1 "2007\-05\-14" "1.0~a10" "live\-helper" .SH NAME lh_chroot \- meta\-helper for lh_chroot_* @@ -23,17 +23,17 @@ executes hooks in chroot. manages /etc/hosts. .IP "\fIlh_chroot_interactive\fR(1)" 4 makes build interactive. -.IP "\fIlh_chroot_linuximage\fR(1)" 4 +.IP "\fIlh_chroot_linux-image\fR(1)" 4 manages /etc/kernel\-img.conf. -.IP "\fIlh_chroot_localhooks\fR(1)" 4 +.IP "\fIlh_chroot_local-hooks\fR(1)" 4 executes local hooks in chroot. -.IP "\fIlh_chroot_localincludes\fR(1)" 4 +.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_localpackages\fR(1)" 4 +.IP "\fIlh_chroot_local-packages\fR(1)" 4 installs local packages into chroot. -.IP "\fIlh_chroot_localpackageslists\fR(1)" 4 +.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. diff --git a/manpages/lh_clean.1.de b/manpages/lh_clean.de.1 index f6fe1a81a..02bdce883 100644 --- a/manpages/lh_clean.1.de +++ b/manpages/lh_clean.de.1 @@ -1,4 +1,4 @@ -.TH LH_CLEAN 1 "07.05.2007" "1.0~a9" "live\-helper" +.TH LH_CLEAN 1 "14.05.2007" "1.0~a10" "live\-helper" .SH NAME lh_clean \- r\[:a]umt das Build-Verzeichnis auf diff --git a/manpages/lh_clean.1.en b/manpages/lh_clean.en.1 index d9eb9981f..cc884181f 100644 --- a/manpages/lh_clean.1.en +++ b/manpages/lh_clean.en.1 @@ -1,4 +1,4 @@ -.TH LH_CLEAN 1 "2007\-05\-07" "1.0~a9" "live\-helper" +.TH LH_CLEAN 1 "2007\-05\-14" "1.0~a10" "live\-helper" .SH NAME lh_clean \- clean up system build directories diff --git a/manpages/lh_source.1.de b/manpages/lh_source.de.1 index e5f38e9e3..01767695a 100644 --- a/manpages/lh_source.1.de +++ b/manpages/lh_source.de.1 @@ -1,4 +1,4 @@ -.TH LH_SOURCE 1 "07.05.2007" "1.0~a9" "live\-helper" +.TH LH_SOURCE 1 "14.05.2007" "1.0~a10" "live\-helper" .SH NAME lh_source \- Meta\-Helper f\[:u]r lh_source_* @@ -11,9 +11,9 @@ lh_source ist ein Meta\-Helper. Es ruft alle n\[:o]tigen Helper auf um die sourc .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 +.IP "\fIlh_source_debian-live\fR(1)" 4 kopiert debian\-live Konfiguration in source. -.IP "\fIlh_source_download\fR(1)" 4 +.IP "\fIlh_source_debian\fR(1)" 4 l\[:a]dt Paketquellen herunter. .IP "\fIlh_source_generic\fR(1)" 4 erstellt den generischen Source-Tarball. diff --git a/manpages/lh_source.1.en b/manpages/lh_source.en.1 index dfa0848d2..51ec6217d 100644 --- a/manpages/lh_source.1.en +++ b/manpages/lh_source.en.1 @@ -1,4 +1,4 @@ -.TH LH_SOURCE 1 "2007\-05\-07" "1.0~a9" "live\-helper" +.TH LH_SOURCE 1 "2007\-05\-14" "1.0~a10" "live\-helper" .SH NAME lh_source \- meta\-helper for lh_source_* @@ -11,9 +11,9 @@ lh_source is a meta\-helper. It calls all necessary helpers to complete the sour .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 +.IP "\fIlh_source_debian-live\fR(1)" 4 copies debian\-live config into source. -.IP "\fIlh_source_download\fR(1)" 4 +.IP "\fIlh_source_debian\fR(1)" 4 downloads sources. .IP "\fIlh_source_generic\fR(1)" 4 creates the generic source tarball. diff --git a/manpages/lh_testroot.1.de b/manpages/lh_testroot.de.1 index a49cbb9a5..c00aaac49 100644 --- a/manpages/lh_testroot.1.de +++ b/manpages/lh_testroot.de.1 @@ -1,4 +1,4 @@ -.TH LH_TESTROOT 1 "07.05.2007" "1.0~a9" "live\-helper" +.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 diff --git a/manpages/lh_testroot.1.en b/manpages/lh_testroot.en.1 index 44b0f9209..a6e80a9e4 100644 --- a/manpages/lh_testroot.1.en +++ b/manpages/lh_testroot.en.1 @@ -1,4 +1,4 @@ -.TH LH_TESTROOT 1 "2007\-05\-07" "1.0~a9" "live\-helper" +.TH LH_TESTROOT 1 "2007\-05\-14" "1.0~a10" "live\-helper" .SH NAME lh_testroot \- ensure that a system is built as root diff --git a/manpages/live-helper.7.de b/manpages/live-helper.de.7 index 33159ca7e..5c22b0fc3 100644 --- a/manpages/live-helper.7.de +++ b/manpages/live-helper.de.7 @@ -1,4 +1,4 @@ -.TH LIVE\-HELPER 7 "07.05.2007" "1.0~a9" "live\-helper" +.TH LIVE\-HELPER 7 "14.05.2007" "1.0~a10" "live\-helper" .SH NAME live\-helper \- Debian Live Helper-Programme @@ -41,9 +41,9 @@ erstellt den Festplatten Binary\-Tarball. 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 +.IP "\fIlh_binary_linux-image\fR(1)" 4 kopiert linux\-image in das Binary\-Image. -.IP "\fIlh_binary_localincludes\fR(1)" 4 +.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. @@ -83,17 +83,17 @@ f\[:u]hrt Hooks im chroot aus. verwaltet /etc/hosts. .IP "\fIlh_chroot_interactive\fR(1)" 4 macht Bauprozess interaktiv. -.IP "\fIlh_chroot_linuximage\fR(1)" 4 +.IP "\fIlh_chroot_linux-image\fR(1)" 4 verwaltet /etc/kernel\-img.conf. -.IP "\fIlh_chroot_localhooks\fR(1)" 4 +.IP "\fIlh_chroot_local-hooks\fR(1)" 4 f\[:u]hrt lokale Hooks im chroot aus. -.IP "\fIlh_chroot_localincludes\fR(1)" 4 +.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_localpackages\fR(1)" 4 +.IP "\fIlh_chroot_local-packages\fR(1)" 4 installiert lokale Pakete im chroot. -.IP "\fIlh_chroot_localpackageslists\fR(1)" 4 +.IP "\fIlh_chroot_local-packageslists\fR(1)" 4 installiert lokale Paketlisten im chroot. .IP "\fIlh_chroot_packages\fR(1)" 4 installiert Pakete im chroot. @@ -123,9 +123,9 @@ erstellt eine Beispielkonfiguration 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 +.IP "\fIlh_source_debian-live\fR(1)" 4 kopiert debian\-live Konfiguration in source. -.IP "\fIlh_source_download\fR(1)" 4 +.IP "\fIlh_source_debian\fR(1)" 4 l\[:a]dt Paketquellen herunter. .IP "\fIlh_source_generic\fR(1)" 4 erstellt den generischen Source-Tarball. @@ -165,6 +165,9 @@ 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. diff --git a/manpages/live-helper.7.en b/manpages/live-helper.en.7 index 9d795dfb7..70979e7d5 100644 --- a/manpages/live-helper.7.en +++ b/manpages/live-helper.en.7 @@ -1,4 +1,4 @@ -.TH LIVE\-HELPER 7 "2007\-05\-07" "1.0~a9" "live\-helper" +.TH LIVE\-HELPER 7 "2007\-05\-14" "1.0~a10" "live\-helper" .SH NAME live\-helper \- Debian Live helper programs @@ -41,9 +41,9 @@ creates the harddisk binary tarball. 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 +.IP "\fIlh_binary_linux-image\fR(1)" 4 copies linux\-image into the binary image. -.IP "\fIlh_binary_localincludes\fR(1)" 4 +.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. @@ -83,17 +83,17 @@ executes additional commands in the chroot. configures /etc/hosts in the chroot. .IP "\fIlh_chroot_interactive\fR(1)" 4 makes build interactive. -.IP "\fIlh_chroot_linuximage\fR(1)" 4 +.IP "\fIlh_chroot_linux-image\fR(1)" 4 configures /etc/kernel\-img.conf in the chroot. -.IP "\fIlh_chroot_localhooks\fR(1)" 4 +.IP "\fIlh_chroot_local-hooks\fR(1)" 4 executes additional local commands in the chroot. -.IP "\fIlh_chroot_localincludes\fR(1)" 4 +.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_localpackages\fR(1)" 4 +.IP "\fIlh_chroot_local-packages\fR(1)" 4 installs local packages in the chroot. -.IP "\fIlh_chroot_localpackageslists\fR(1)" 4 +.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. @@ -123,9 +123,9 @@ creates sample configuration. manages loop device handling .IP "\fIlh_source\fR(1)" 4 meta\-helper for lh_source_*. -.IP "\fIlh_source_config\fR(1)" 4 +.IP "\fIlh_source_debian-live\fR(1)" 4 copies config into source directory. -.IP "\fIlh_source_download\fR(1)" 4 +.IP "\fIlh_source_debian\fR(1)" 4 downloads source packages. .IP "\fIlh_source_generic\fR(1)" 4 creates generic source tarball. @@ -163,6 +163,9 @@ 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>. diff --git a/manpages/make-live.1.de b/manpages/make-live.de.1 index 61beb624d..f380dafcf 100644 --- a/manpages/make-live.1.de +++ b/manpages/make-live.de.1 @@ -1,4 +1,4 @@ -.TH MAKE\-LIVE 1 "07.05.2007" "1.0~a9" "live\-helper" +.TH MAKE\-LIVE 1 "14.05.2007" "1.0~a10" "live\-helper" .SH NAME make\-live \- erstellt ein Debian Live-System diff --git a/manpages/make-live.1.en b/manpages/make-live.en.1 index 355533355..fa51dcca5 100644 --- a/manpages/make-live.1.en +++ b/manpages/make-live.en.1 @@ -1,4 +1,4 @@ -.TH MAKE\-LIVE 1 "2007\-05\-07" "1.0~a9" "live\-helper" +.TH MAKE\-LIVE 1 "2007\-05\-14" "1.0~a10" "live\-helper" .SH NAME make\-live \- build a Debian Live system diff --git a/templates/grub/menu.lst b/templates/grub/menu.lst index 22355b84d..efa0d822f 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 c44e6576e..571914a88 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 8b138c48b..379414ca3 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 8170d7046..12a7dff28 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 |