--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package live-build
Numerous minor fixes that are nevertheless important for the
release, including wheezy release-specific updates (new wheezy-backports
address scheme, updated splash screen, etc.), live-build-cgi adjustments
for the live-build.debian.net service, win32-loader, derivatives and
upstart support.
unblock live-build/3.0.3-1
-- System Information:
Debian Release: 7.0
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.8-trunk-amd64 (SMP w/2 CPU cores)
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru live-build-3.0.1/bin/live-build live-build-3.0.3/bin/live-build
--- live-build-3.0.1/bin/live-build 2013-02-14 14:13:25.000000000 -0400
+++ live-build-3.0.3/bin/live-build 2013-04-25 12:40:07.000000000 -0300
@@ -30,10 +30,9 @@
man live-build
exit 0
else
- Echo "live-build is a set of scripts to build Debian Live system images."
- echo
- Echo "The idea behind live-build is a framework that uses a configuration directory to completely automate and customize all aspects of building a Live image."
+ Echo "live-build contains the scripts to build a Debian Live system from a configuration directory."
echo
Echo "An introduction to live-build can be found in the live-build(7) manpage."
+
exit 0
fi
diff -Nru live-build-3.0.1/contrib/grub-splash/lenny/COPYING live-build-3.0.3/contrib/grub-splash/lenny/COPYING
--- live-build-3.0.1/contrib/grub-splash/lenny/COPYING 2013-02-14 14:13:24.000000000 -0400
+++ live-build-3.0.3/contrib/grub-splash/lenny/COPYING 1969-12-31 20:00:00.000000000 -0400
@@ -1,26 +0,0 @@
-The grub splash for Debian Live was made by Daniel Baumann <daniel@debian.org>
-based on the original work of Mark Riedesel.
-
-The contribution of Daniel is hereby placed in the public domain (no rights
-reserved).
-
----------------
-http://dugnet.com/klown/pics/klowner_debboot.png
-by Mark Riedesel, license same as open use logo
-
-To create klowner.rle:
-
- 1. convert klowner.png klowner.bmp
- 2. bmptoppm < klowner.bmp | ppmtolss16 #FBFDFA=7 > klowner.rle
-
- (FBFDFA is the color used for the inside of the "n" in Debian.)
----------------
-
-Debian Open Use Logo License
-
-Copyright (c) 1999 Software in the Public Interest
-This logo or a modified version may be used by anyone to refer to the Debian
-project, but does not indicate endorsement by the project.
-
-Note: we would appreciate that you make the image a link to
-http://www.debian.org/ if you use it on a web page.
Binary files /tmp/z0NXgfPzeX/live-build-3.0.1/contrib/grub-splash/lenny/klowner_debboot.png and /tmp/Soc3fVKLZn/live-build-3.0.3/contrib/grub-splash/lenny/klowner_debboot.png differ
Binary files /tmp/z0NXgfPzeX/live-build-3.0.1/contrib/grub-splash/lenny/klowner.rle and /tmp/Soc3fVKLZn/live-build-3.0.3/contrib/grub-splash/lenny/klowner.rle differ
Binary files /tmp/z0NXgfPzeX/live-build-3.0.1/contrib/grub-splash/lenny/live_debboot.png and /tmp/Soc3fVKLZn/live-build-3.0.3/contrib/grub-splash/lenny/live_debboot.png differ
Binary files /tmp/z0NXgfPzeX/live-build-3.0.1/contrib/grub-splash/lenny/live.xpm.gz and /tmp/Soc3fVKLZn/live-build-3.0.3/contrib/grub-splash/lenny/live.xpm.gz differ
diff -Nru live-build-3.0.1/debian/changelog live-build-3.0.3/debian/changelog
--- live-build-3.0.1/debian/changelog 2013-02-14 14:31:42.000000000 -0400
+++ live-build-3.0.3/debian/changelog 2013-04-25 12:41:14.000000000 -0300
@@ -1,3 +1,76 @@
+live-build (3.0.3-1) unstable; urgency=low
+
+ * Updating debian-backports mirrors for wheezy.
+ * Enabling release updates (formerly known as volatile) for wheezy.
+
+ -- Daniel Baumann <daniel@debian.org> Thu, 25 Apr 2013 17:39:31 +0200
+
+live-build (3.0.2-1) unstable; urgency=low
+
+ [ Daniel Baumann ]
+ * Allowing to use parted its automatic offset handling at the beginning
+ of a disk, rather than to harcode it to first block (Closes: #647607).
+ * Aborting with error if hdd label has a whitespace (Closes: #648861).
+ * Updating d-i suite symlink for wheezy release.
+ * Correcting typo in grub2 config template.
+ * Synchronise grub and grub2 splashes with internal live-build splash
+ for syslinux bootloaders.
+ * Removing non-existent --apt-indices none references.
+ * Also showing distribution in lb config initial messages.
+ * Making messages about reading system conffiles in lb config more
+ accurate.
+ * Harmonize handling of pre-existing gnupg dotfiles in chroot when
+ handling fake signing keys for local repository.
+ * Making some more debian source-selections conditional on certain image
+ options.
+ * Adding source_hooks for hooks on source images like already supported
+ on binary images.
+
+ [ Richard Nelson ]
+ * Add sanity check on config type to build for l-b-cgi.
+ * Add _CGI_CONFIG_APPEND varialbe for appending options to lb config
+ call on l-b-cgi frontend.
+ * Change _CGI_CONFIG_APPEND to front of the lb config call on l-b-cgi
+ frontend.
+ * Removing quotes around _CGI_CONFIG_APPEND to handle multiple
+ parameters correctly on l-b-cgi frontend.
+ * Adding binary image type to config call on l-b-cgi frontend.
+ * Add log information of git:://url for l-b-cgi frontend.
+ * Append to log file on errors and not truncate the file on l-b-cgi
+ frontend.
+
+ [ Daniel Baumann ]
+ * Correcting spelling typos, thanks to Adam D. Barratt <adam@adam-
+ barratt.org.uk>.
+
+ [ Raphaël Hertzog ]
+ * Fixing win32-loader.ini by including the GTK related entries.
+
+ [ Daniel Baumann ]
+ * Correcting typo directory when dereferencing syslinux symlinks when
+ building chrooted, thanks to Luigi Capriotti <l.capriotti@xbmc.org>.
+ * Using dpkg-divert in chroot_upstart script to handle upgrades of
+ upstart during the build (Closes: #702537).
+ * Using dpkg-divert for other diversions too to handle upgrades of the
+ diverted stuff during build.
+ * Adding generic live-build handle in chroot_dpkg for other live
+ packages to act upon.
+ * Updating fallback help message in live-build pseudo-command.
+ * Correcting grammer error in live-build description.
+ * Adding set -e in example auto scripts.
+
+ [ Richard Nelson ]
+ * Converting l-b-cgi frontend to process forms with post.
+
+ [ Daniel Baumann ]
+ * Cleaning up installer file locations for progress-linux.
+ * Stripping out comments in package lists.
+ * Updating derivatives archive-key signature validiation to look by
+ default at both debian and debian-maintainers keyrings.
+ * Updating bootstrap mirror for progress-linux.
+
+ -- Daniel Baumann <daniel@debian.org> Thu, 25 Apr 2013 12:41:54 +0200
+
live-build (3.0.1-1) unstable; urgency=low
* Removing superfluous menu default directive in installer syslinux
diff -Nru live-build-3.0.1/debian/control live-build-3.0.3/debian/control
--- live-build-3.0.1/debian/control 2013-02-14 14:13:25.000000000 -0400
+++ live-build-3.0.3/debian/control 2013-04-25 12:41:14.000000000 -0300
@@ -20,7 +20,7 @@
mtools, parted, squashfs-tools | mtd-tools, sudo | fakeroot, syslinux | grub,
uuid-runtime, win32-loader
Description: Live System Build Scripts
- live-build contains the scripts that build a live system from a configuration
+ live-build contains the scripts to build a live system from a configuration
directory.
Package: live-build-cgi
@@ -28,7 +28,7 @@
Depends: ${misc:Depends}, live-build (= ${source:Version})
Recommends: apache2 | httpd, cron
Description: Live System Build Scripts (CGI frontend)
- live-build contains the scripts that build a live system from a configuration
+ live-build contains the scripts to build a live system from a configuration
directory.
.
This package contains the CGI frontend (experimental!).
diff -Nru live-build-3.0.1/debian/copyright live-build-3.0.3/debian/copyright
--- live-build-3.0.1/debian/copyright 2013-02-14 14:13:25.000000000 -0400
+++ live-build-3.0.3/debian/copyright 2013-04-25 12:41:14.000000000 -0300
@@ -7,10 +7,6 @@
Copyright: 2006-2013 Daniel Baumann <daniel@debian.org>
License: GPL-3+
-Files: contrib/grub-splash/lenny
-Copyright: n/a
-License: other
-
Files: share/bootloaders/*/splash.svg.in
Copyright: 2006-2013 Daniel Baumann <daniel@debian.org>
License: other
@@ -34,33 +30,6 @@
License: other
The splash for Debian Live was made by Daniel Baumann <daniel@debian.org> based
- on the original work of Mark Riedesel.
- .
- The contribution of Daniel is hereby placed in the public domain (no rights
- reserved).
- .
- ---------------
- http://dugnet.com/klown/pics/klowner_debboot.png
- by Mark Riedesel, license same as open use logo
- .
- To create klowner.rle:
- .
- 1. convert klowner.png klowner.bmp
- 2. bmptoppm < klowner.bmp | ppmtolss16 #FBFDFA=7 > klowner.rle
- (FBFDFA is the color used for the inside of the "n" in Debian.)
- ---------------
- .
- Debian Open Use Logo License
- .
- Copyright (c) 1999 Software in the Public Interest
- This logo or a modified version may be used by anyone to refer to the Debian
- project, but does not indicate endorsement by the project.
- .
- Note: we would appreciate that you make the image a link to
- http://www.debian.org/ if you use it on a web page.
-
-License: other
- The splash for Debian Live was made by Daniel Baumann <daniel@debian.org> based
on the Debian Open Use Logo.
.
The contribution of Daniel is hereby placed in the public domain (no rights
diff -Nru live-build-3.0.1/examples/auto/build live-build-3.0.3/examples/auto/build
--- live-build-3.0.1/examples/auto/build 2013-02-14 14:13:25.000000000 -0400
+++ live-build-3.0.3/examples/auto/build 2013-04-25 12:40:07.000000000 -0300
@@ -1,3 +1,5 @@
#!/bin/sh
+set -e
+
lb build noauto "${@}" 2>&1 | tee build.log
diff -Nru live-build-3.0.1/examples/auto/clean live-build-3.0.3/examples/auto/clean
--- live-build-3.0.1/examples/auto/clean 2013-02-14 14:13:25.000000000 -0400
+++ live-build-3.0.3/examples/auto/clean 2013-04-25 12:40:07.000000000 -0300
@@ -1,5 +1,7 @@
#!/bin/sh
+set -e
+
lb clean noauto "${@}"
rm -f config/binary config/bootstrap config/chroot config/common config/source
diff -Nru live-build-3.0.1/examples/auto/config live-build-3.0.3/examples/auto/config
--- live-build-3.0.1/examples/auto/config 2013-02-14 14:13:25.000000000 -0400
+++ live-build-3.0.3/examples/auto/config 2013-04-25 12:40:07.000000000 -0300
@@ -1,4 +1,6 @@
#!/bin/sh
+set -e
+
lb config noauto \
"${@}"
diff -Nru live-build-3.0.1/frontends/cgi/live-build-cgi live-build-3.0.3/frontends/cgi/live-build-cgi
--- live-build-3.0.1/frontends/cgi/live-build-cgi 2013-02-14 14:22:28.000000000 -0400
+++ live-build-3.0.3/frontends/cgi/live-build-cgi 2013-04-25 12:40:07.000000000 -0300
@@ -32,6 +32,14 @@
echo "Content-type: text/html"
echo
+#QUERY_STRING=`cat /dev/stdin`
+QUERY_STRING=$(cat /dev/stdin)
+# Translate parameters
+QUERY_STRING=$(echo "${QUERY_STRING}" | sed -e 's/%2F/\//g' -e 's/+/ /g' -e 's/%3B/;/g' -e 's/%7E/~/g' -e 's/%3A/:/g' -e 's/%40/@/g' -e 's/%3D/=/g' -e 's/%2B/+/g')
+# Debug the filtering string
+# echo ${QUERY_STRING}
+
+
# Sending html header
cat "${_TEMPLATES}"/header.html
@@ -52,11 +60,6 @@
# Converting '=': sed 's/%3D/=/g'
# Converting '+': sed 's/%2B/+/g'
- # Translate parameters
- QUERY_STRING=$(echo "${QUERY_STRING}" | sed -e 's/%2F/\//g' -e 's/+/ /g' -e 's/%3B/;/g' -e 's/%7E/~/g' -e 's/%3A/:/g' -e 's/%40/@/g' -e 's/%3D/=/g' -e 's/%2B/+/g')
- # Debug the filtering string
- # echo ${QUERY_STRING}
-
# Email
_EMAIL=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])email=[-0-9a-zA-Z._@]+' | cut -f 2 -d '=' | head -n1)
diff -Nru live-build-3.0.1/frontends/cgi/live-build-cgi.cron live-build-3.0.3/frontends/cgi/live-build-cgi.cron
--- live-build-3.0.1/frontends/cgi/live-build-cgi.cron 2013-02-14 14:22:28.000000000 -0400
+++ live-build-3.0.3/frontends/cgi/live-build-cgi.cron 2013-04-25 12:40:07.000000000 -0300
@@ -63,15 +63,25 @@
# Pull in variables from the build file.
. "${_FILE}"
+ # Drop out some build data for information if something goes wrong.
+ echo "`date +%b\ %d\ %H:%M:%S` ${_HOSTNAME} live-build-cgi: begin web build (${_BUILD})." >> /var/log/live
+
# Clone the git config to target build directory
git clone ${_LB_GIT} "${_TEMPDIR}"/"${_BUILD}" >> /var/log/live
_ERRORGIT="${?}"
+ # Sanity check to default to something since we are going to build from git clone.
+ if [ -z "${_LB_CONFIG}" ]
+ then
+ _LB_CONFIG="standard"
+ fi
+
# Now set a variable for the correct build path
_BUILD_PATH="${_TEMPDIR}/${_BUILD}/images/${_LB_CONFIG}"
- # Drop out some build data for information if something goes wrong.
- echo "`date +%b\ %d\ %H:%M:%S` ${_HOSTNAME} live-build-cgi: begin web build (${_BUILD})." >> /var/log/live
+ _DATE_START="`date -R`"
+ echo "Begin live-build-cgi: ${_DATE_START}" > "${_BUILD_PATH}"/log
+ echo "Info live-build-cgi: Config tree cloned from ${_LB_GIT} for build ${_BUILD}" >> "${_BUILD_PATH}"/log
# Creating directory for the config/package-lists
mkdir -p "${_BUILD_PATH}"/config/package-lists
@@ -82,18 +92,15 @@
echo "${_LB_CGIPACKAGES}" > "${_BUILD_PATH}"/config/package-lists/cgipackages.list.chroot
fi
- _DATE_START="`date -R`"
- echo "Begin: ${_DATE_START}" > "${_BUILD_PATH}"/log
-
# Generating config here
if [ "${_ERRORGIT}" -eq "0" ]
then
cd "${_BUILD_PATH}"
# Do config with git and stack on config file params to build
- lb config --distribution "${LB_DISTRIBUTION}" --architectures "${LB_ARCHITECTURES}" --archive-areas "${LB_ARCHIVE_AREAS}" --chroot-filesystem "${LB_CHROOT_FILESYSTEM}" --linux-flavours "${LB_LINUX_FLAVOURS}" --security "${LB_SECURITY}" --apt-indices "${LB_APT_INDICES}" --bootappend-install "${LB_BOOTAPPEND_INSTALL}" --bootappend-live "${LB_BOOTAPPEND_LIVE}" --bootloader "${LB_BOOTLOADER}" --debian-installer "${LB_DEBIAN_INSTALLER}" --iso-application "${LB_ISO_APPLICATION}" --iso-preparer "${LB_ISO_PREPARER}" --iso-publisher "${LB_ISO_PUBLISHER}" --iso-volume "${LB_ISO_VOLUME}" --memtest "${LB_MEMTEST}" --net-root-path "${LB_NET_ROOT_PATH}" --net-root-server "${LB_NET_ROOT_SERVER}" --source-images "${LB_SOURCE_IMAGES}" --source "${LB_SOURCE}"
+ lb config ${_CGI_CONFIG_APPEND} --distribution "${LB_DISTRIBUTION}" --binary-images "${LB_BINARY_IMAGES}" --architectures "${LB_ARCHITECTURES}" --archive-areas "${LB_ARCHIVE_AREAS}" --chroot-filesystem "${LB_CHROOT_FILESYSTEM}" --linux-flavours "${LB_LINUX_FLAVOURS}" --security "${LB_SECURITY}" --apt-indices "${LB_APT_INDICES}" --bootappend-install "${LB_BOOTAPPEND_INSTALL}" --bootappend-live "${LB_BOOTAPPEND_LIVE}" --bootloader "${LB_BOOTLOADER}" --debian-installer "${LB_DEBIAN_INSTALLER}" --iso-application "${LB_ISO_APPLICATION}" --iso-preparer "${LB_ISO_PREPARER}" --iso-publisher "${LB_ISO_PUBLISHER}" --iso-volume "${LB_ISO_VOLUME}" --memtest "${LB_MEMTEST}" --net-root-path "${LB_NET_ROOT_PATH}" --net-root-server "${LB_NET_ROOT_SERVER}" --source-images "${LB_SOURCE_IMAGES}" --source "${LB_SOURCE}"
_ERRORCONFIG="${?}"
else
- echo "Config stage skipped. The git clone produced an error: ${_ERRORGIT}" > "${_BUILD_PATH}"/log
+ echo "Config stage skipped. The git clone produced an error: ${_ERRORGIT}" >> "${_BUILD_PATH}"/log
fi
# Run build if config went ok
@@ -102,7 +109,7 @@
lb build >> "${_BUILD_PATH}"/log 2>&1
_ERRORBUILD="${?}"
else
- echo "Build stage skipped. Config produced an error: ${_ERRORCONFIG}" > "${_BUILD_PATH}"/log
+ echo "Build stage skipped. Config produced an error: ${_ERRORCONFIG}" >> "${_BUILD_PATH}"/log
fi
_DATE_END="`date -R`"
diff -Nru live-build-3.0.1/frontends/cgi/live-build-cgi.default live-build-3.0.3/frontends/cgi/live-build-cgi.default
--- live-build-3.0.1/frontends/cgi/live-build-cgi.default 2013-02-14 14:13:25.000000000 -0400
+++ live-build-3.0.3/frontends/cgi/live-build-cgi.default 2013-04-25 12:40:07.000000000 -0300
@@ -13,3 +13,5 @@
_SERVER="http://live.debian.net/build";
_LB_GIT="git://live-systems.org/git/live-images.git"
+
+_CGI_CONFIG_APPEND=""
diff -Nru live-build-3.0.1/functions/defaults.sh live-build-3.0.3/functions/defaults.sh
--- live-build-3.0.1/functions/defaults.sh 2013-02-14 14:22:28.000000000 -0400
+++ live-build-3.0.3/functions/defaults.sh 2013-04-25 12:40:10.000000000 -0300
@@ -362,7 +362,7 @@
progress-linux)
LB_PARENT_MIRROR_BOOTSTRAP="${LB_PARENT_MIRROR_BOOTSTRAP:-http://ftp.debian.org/debian/}";
- LB_MIRROR_BOOTSTRAP="${LB_MIRROR_BOOTSTRAP:-http://cdn.archive.progress-linux.org/progress/}";
+ LB_MIRROR_BOOTSTRAP="${LB_MIRROR_BOOTSTRAP:-http://cdn.archive.progress-linux.org/packages/}";
;;
ubuntu)
@@ -445,7 +445,16 @@
# Setting backports mirror to fetch packages from
case "${LB_MODE}" in
debian)
- LB_MIRROR_CHROOT_BACKPORTS="${LB_MIRROR_CHROOT_BACKPORTS:-http://backports.debian.org/debian-backports/}";
+ case "${LB_DISTRIBUTION}" in
+ squeeze)
+ LB_MIRROR_CHROOT_BACKPORTS="${LB_MIRROR_CHROOT_BACKPORTS:-http://backports.debian.org/debian-backports/}";
+ ;;
+
+ *)
+ LB_MIRROR_CHROOT_BACKPORTS="${LB_MIRROR_CHROOT_BACKPORTS:-${LB_MIRROR_CHROOT}}"
+ ;;
+ esac
+
LB_PARENT_MIRROR_CHROOT_BACKPORTS="${LB_PARENT_MIRROR_CHROOT_BACKPORTS:-${LB_MIRROR_CHROOT_BACKPORTS}}"
;;
@@ -557,7 +566,16 @@
# Setting backports mirror which ends up in the image
case "${LB_MODE}" in
debian)
- LB_MIRROR_BINARY_BACKPORTS="${LB_MIRROR_BINARY_BACKPORTS:-http://http.debian.net/debian-backports/}";
+ case "${LB_DISTRIBUTIO}" in
+ squeeze)
+ LB_MIRROR_BINARY_BACKPORTS="${LB_MIRROR_BINARY_BACKPORTS:-http://http.debian.net/debian-backports/}";
+ ;;
+
+ *)
+ LB_MIRROR_BINARY_BACKPORTS="${LB_MIRROR_BINARY_BACKPORTS:-${LB_MIRROR_BINARY}}"
+ ;;
+ esac
+
LB_PARENT_MIRROR_BINARY_BACKPORTS="${LB_PARENT_MIRROR_BINARY_BACKPORTS:-${LB_MIRROR_BINARY_BACKPORTS}}"
;;
@@ -813,7 +831,7 @@
# Setting updates updates option
case "${LB_PARENT_DISTRIBUTION}" in
- wheezy|jessie|sid)
+ jessie|sid)
LB_UPDATES="${LB_UPDATES:-false}"
;;
@@ -849,7 +867,7 @@
# Setting apt indices
case "${LB_MODE}" in
progress-linux)
- LB_APT_INDICES="${LB_APT_INDICES:-none}"
+ LB_APT_INDICES="${LB_APT_INDICES:-false}"
;;
*)
@@ -1201,6 +1219,13 @@
fi
fi
+ if echo ${LB_HDD_LABEL} | grep -qs ' '
+ then
+ Echo_error "There are currently no whitespaces supported in hdd labels."
+
+ exit 1
+ fi
+
if [ "${LB_DEBIAN_INSTALLER}" != "false" ]
then
# d-i true, no caching
diff -Nru live-build-3.0.1/manpages/en/lb.1 live-build-3.0.3/manpages/en/lb.1
diff -Nru live-build-3.0.1/manpages/en/lb_binary.1 live-build-3.0.3/manpages/en/lb_binary.1
diff -Nru live-build-3.0.1/manpages/en/lb_bootstrap.1 live-build-3.0.3/manpages/en/lb_bootstrap.1
diff -Nru live-build-3.0.1/manpages/en/lb_build.1 live-build-3.0.3/manpages/en/lb_build.1
diff -Nru live-build-3.0.1/manpages/en/lb_chroot.1 live-build-3.0.3/manpages/en/lb_chroot.1
diff -Nru live-build-3.0.1/manpages/en/lb_clean.1 live-build-3.0.3/manpages/en/lb_clean.1
diff -Nru live-build-3.0.1/manpages/en/lb_config.1 live-build-3.0.3/manpages/en/lb_config.1
diff -Nru live-build-3.0.1/manpages/en/lb_source.1 live-build-3.0.3/manpages/en/lb_source.1
diff -Nru live-build-3.0.1/manpages/en/lb_testroot.1 live-build-3.0.3/manpages/en/lb_testroot.1
diff -Nru live-build-3.0.1/manpages/en/live-build.7 live-build-3.0.3/manpages/en/live-build.7
diff -Nru live-build-3.0.1/manpages/Makefile live-build-3.0.3/manpages/Makefile
--- live-build-3.0.1/manpages/Makefile 2013-02-14 14:13:25.000000000 -0400
+++ live-build-3.0.3/manpages/Makefile 2013-04-25 12:40:07.000000000 -0300
@@ -23,7 +23,7 @@
@if [ ! -x "$$(which po4a 2>/dev/null)" ]; \
then \
echo "E: po4a - command not found"; \
- echo "I: po4a can be optained from http://po4a.alioth.debian.org/";; \
+ echo "I: po4a can be obtained from http://po4a.alioth.debian.org/";; \
echo "I: On Debian based systems, po4a can be installed with 'apt-get install po4a'."; \
exit 1; \
fi
diff -Nru live-build-3.0.1/manpages/pot/lb.1.pot live-build-3.0.3/manpages/pot/lb.1.pot
diff -Nru live-build-3.0.1/manpages/pot/lb_binary.1.pot live-build-3.0.3/manpages/pot/lb_binary.1.pot
diff -Nru live-build-3.0.1/manpages/pot/lb_bootstrap.1.pot live-build-3.0.3/manpages/pot/lb_bootstrap.1.pot
diff -Nru live-build-3.0.1/manpages/pot/lb_build.1.pot live-build-3.0.3/manpages/pot/lb_build.1.pot
diff -Nru live-build-3.0.1/manpages/pot/lb_chroot.1.pot live-build-3.0.3/manpages/pot/lb_chroot.1.pot
diff -Nru live-build-3.0.1/manpages/pot/lb_clean.1.pot live-build-3.0.3/manpages/pot/lb_clean.1.pot
diff -Nru live-build-3.0.1/manpages/pot/lb_config.1.pot live-build-3.0.3/manpages/pot/lb_config.1.pot
diff -Nru live-build-3.0.1/manpages/pot/lb_source.1.pot live-build-3.0.3/manpages/pot/lb_source.1.pot
diff -Nru live-build-3.0.1/manpages/pot/lb_testroot.1.pot live-build-3.0.3/manpages/pot/lb_testroot.1.pot
diff -Nru live-build-3.0.1/manpages/pot/live-build.7.pot live-build-3.0.3/manpages/pot/live-build.7.pot
diff -Nru live-build-3.0.1/scripts/build/binary_debian-installer live-build-3.0.3/scripts/build/binary_debian-installer
--- live-build-3.0.1/scripts/build/binary_debian-installer 2013-02-14 14:22:28.000000000 -0400
+++ live-build-3.0.3/scripts/build/binary_debian-installer 2013-04-25 12:40:07.000000000 -0300
@@ -806,7 +806,7 @@
case "${LB_PARENT_DISTRIBUTION}" in
wheezy)
- DISTRIBUTIONS="testing"
+ DISTRIBUTIONS="stable"
;;
*)
@@ -908,6 +908,22 @@
fi
fi
+case "${LB_MODE}" in
+ progress-linux)
+ mv binary/install binary/installer
+
+ rm -f binary/debian
+
+ for _DIRECTORY in dists pool project firmware
+ do
+ if [ -e "${_DIRECTORY}" ]
+ then
+ mv binary/"${_DIRECTORY}" binary/installer
+ fi
+ done
+ ;;
+esac
+
# Saving cache
Save_cache cache/packages.binary
diff -Nru live-build-3.0.1/scripts/build/binary_hdd live-build-3.0.3/scripts/build/binary_hdd
--- live-build-3.0.1/scripts/build/binary_hdd 2013-02-14 14:22:28.000000000 -0400
+++ live-build-3.0.3/scripts/build/binary_hdd 2013-04-25 12:40:07.000000000 -0300
@@ -175,7 +175,7 @@
case "${LB_BUILD_WITH_CHROOT}" in
true)
Chroot chroot "parted -s ${FREELO} mklabel ${PARTITION_TABLE_TYPE}" || true
- Chroot chroot "parted -s ${FREELO} mkpart primary ${PARTITION_TYPE} 0.0 100%" || true
+ Chroot chroot "parted -s ${FREELO} mkpart primary ${PARTITION_TYPE} 0% 100%" || true
Chroot chroot "parted -s ${FREELO} set 1 boot on" || true
Chroot chroot "parted -s ${FREELO} set 1 lba off" || true
@@ -187,7 +187,7 @@
false)
parted -s ${FREELO} mklabel ${PARTITION_TABLE_TYPE} || true
- parted -s ${FREELO} mkpart primary ${PARTITION_TYPE} 0.0 100% || true
+ parted -s ${FREELO} mkpart primary ${PARTITION_TYPE} 0% 100% || true
parted -s "${FREELO}" set 1 boot on || true
parted -s "${FREELO}" set 1 lba off || true
diff -Nru live-build-3.0.1/scripts/build/binary_syslinux live-build-3.0.3/scripts/build/binary_syslinux
--- live-build-3.0.1/scripts/build/binary_syslinux 2013-02-14 14:22:28.000000000 -0400
+++ live-build-3.0.3/scripts/build/binary_syslinux 2013-04-25 12:40:07.000000000 -0300
@@ -150,7 +150,7 @@
# Copy in two steps since the theme can have absolute symlinks and would therefore not be dereferenced correctly
cp -a ${_SOURCE} chroot/root
Chroot chroot cp -aL /root/$(basename ${_SOURCE}) /root/$(basename ${_SOURCE}).tmp || true
- rm -rf chroot/$(basename ${_SOURCE})
+ rm -rf chroot/root/$(basename ${_SOURCE})
mv chroot/root/$(basename ${_SOURCE}).tmp ${_TARGET}
;;
diff -Nru live-build-3.0.1/scripts/build/binary_win32-loader live-build-3.0.3/scripts/build/binary_win32-loader
--- live-build-3.0.1/scripts/build/binary_win32-loader 2013-02-14 14:22:28.000000000 -0400
+++ live-build-3.0.3/scripts/build/binary_win32-loader 2013-04-25 12:40:07.000000000 -0300
@@ -85,16 +85,16 @@
kernel=linux
arch=${LB_ARCHITECTURES}
default_desktop=gnome
-i386/linux=install/vmlinuz
-i386/initrd=install/initrd.gz
+${LB_ARCHITECTURES}/linux=install/vmlinuz
+${LB_ARCHITECTURES}/initrd=install/initrd.gz
EOF
- if [ -e install/gtk ]
+ if [ -e binary/install/gtk ]
then
cat >> binary/win32-loader.ini << EOF
-i386/gtk/linux=install/vmlinuz
-i386/gtk/initrd=install/gtk/initrd.gz
+${LB_ARCHITECTURES}/gtk/linux=install/vmlinuz
+${LB_ARCHITECTURES}/gtk/initrd=install/gtk/initrd.gz
EOF
fi
diff -Nru live-build-3.0.1/scripts/build/bootstrap_archive-keys live-build-3.0.3/scripts/build/bootstrap_archive-keys
--- live-build-3.0.1/scripts/build/bootstrap_archive-keys 2013-02-14 14:13:25.000000000 -0400
+++ live-build-3.0.3/scripts/build/bootstrap_archive-keys 2013-04-25 12:40:07.000000000 -0300
@@ -32,16 +32,28 @@
case "${LB_MODE}" in
progress-linux)
case "${LB_DISTRIBUTION}" in
- artax*)
- _KEYS="1.0-artax 1.0-artax-packages"
+ artax)
+ _KEYS="1.0-artax"
;;
- baureo*)
- _KEYS="2.0-baureo 2.0-baureo-packages"
+ artax-backports)
+ _KEYS="1.0-artax 1.9-artax-backports"
;;
- chairon*)
- _KEYS="3.0-chairon 3.0-chairon-packages"
+ baureo)
+ _KEYS="2.0-baureo"
+ ;;
+
+ baureo-backports)
+ _KEYS="2.0-baureo 2.9-baureo-backports"
+ ;;
+
+ chairon)
+ _KEYS="3.0-chairon"
+ ;;
+
+ chairon-backports)
+ _KEYS="3.0-chairon 3.9-chairon-backports"
;;
esac
@@ -56,13 +68,39 @@
wget -q "${_URL}/archive-key-${_KEY}.asc" -O chroot/key.asc
wget -q "${_URL}/archive-key-${_KEY}.asc.sig" -O chroot/key.asc.sig
- if [ -e /usr/bin/gpgv ] && [ -e /usr/share/keyrings/debian-keyring.gpg ]
+ if [ -e /usr/bin/gpgv ]
then
- Echo_message "Verifying archive-key ${_KEY} against debian-keyring..."
-
- /usr/bin/gpgv --quiet --keyring /usr/share/keyrings/debian-keyring.gpg chroot/key.asc.sig chroot/key.asc > /dev/null 2>&1 || { Echo_error "archive-key ${_KEY} has invalid signature."; return 1;}
+ if [ -e /usr/share/keyrings/debian-keyring.gpg ] || [ -e /usr/share/keyrings/debian-maintainers.gpg ]
+ then
+ _KEY_VALID=""
+
+ for _KEYRING in /usr/share/keyrings/debian-keyring.gpg /usr/share/keyrings/debian-maintainers.gpg
+ do
+ if [ -e "${_KEYRING}" ]
+ then
+ Echo_message "Verifying archive-key ${_KEY} against $(basename ${_KEYRING} .gpg | sed -e 's|-keyring||') keyring..."
+
+ set +e
+ /usr/bin/gpgv --quiet --keyring ${_KEYRING} chroot/key.asc.sig chroot/key.asc > /dev/null 2>&1 && _KEY_VALID="true" && break
+ set -e
+ fi
+ done
+
+ case "${_KEY_VALID}" in
+ true)
+ Echo_message "Verifying ${_KEY} signature successful."
+ ;;
+
+ *)
+ Echo_error "Verifying ${_KEY} signature failed."
+ return 1
+ ;;
+ esac
+ else
+ Echo_warning "Skipping archive-key ${_KEY} verification, debian-keyring not available..."
+ fi
else
- Echo_warning "Skipping archive-key ${_KEY} verification, either gpgv or debian-keyring not available on host system..."
+ Echo_warning "Skipping archive-key ${_KEY} verification, gpgv not available..."
fi
Echo_message "Importing archive-key ${_KEY}..."
diff -Nru live-build-3.0.1/scripts/build/bootstrap_cdebootstrap live-build-3.0.3/scripts/build/bootstrap_cdebootstrap
--- live-build-3.0.1/scripts/build/bootstrap_cdebootstrap 2013-02-14 14:22:28.000000000 -0400
+++ live-build-3.0.3/scripts/build/bootstrap_cdebootstrap 2013-04-25 12:40:07.000000000 -0300
@@ -32,8 +32,8 @@
if [ ! -x "$(which cdebootstrap 2>/dev/null)" ]
then
echo "E: cdebootstrap - command not found"
- echo "I: cdebootstrap can be optained from http://ftp.debian.org/debian/pool/main/d/cdebootstrap/";
- echo "I: On Debian based systems, cdebootstrap can be installed with 'apt-get install debootstrap'."
+ echo "I: cdebootstrap can be obtained from http://ftp.debian.org/debian/pool/main/d/cdebootstrap/";
+ echo "I: On Debian based systems, cdebootstrap can be installed with 'apt-get install cdebootstrap'."
exit 1
fi
diff -Nru live-build-3.0.1/scripts/build/bootstrap_debootstrap live-build-3.0.3/scripts/build/bootstrap_debootstrap
--- live-build-3.0.1/scripts/build/bootstrap_debootstrap 2013-02-14 14:22:28.000000000 -0400
+++ live-build-3.0.3/scripts/build/bootstrap_debootstrap 2013-04-25 12:40:07.000000000 -0300
@@ -32,7 +32,7 @@
if [ ! -x "$(which debootstrap 2>/dev/null)" ]
then
echo "E: debootstrap - command not found"
- echo "I: debootstrap can be optained from http://ftp.debian.org/debian/pool/main/d/debootstrap/";
+ echo "I: debootstrap can be obtained from http://ftp.debian.org/debian/pool/main/d/debootstrap/";
echo "I: On Debian based systems, debootstrap can be installed with 'apt-get install debootstrap'."
exit 1
fi
diff -Nru live-build-3.0.1/scripts/build/chroot_archives live-build-3.0.3/scripts/build/chroot_archives
--- live-build-3.0.1/scripts/build/chroot_archives 2013-02-14 14:22:28.000000000 -0400
+++ live-build-3.0.3/scripts/build/chroot_archives 2013-04-25 12:40:07.000000000 -0300
@@ -366,13 +366,12 @@
if [ "${LB_APT_SECURE}" = "true" ]
then
- _LB_DOTGNUPG_EXISTED=0
- if [ -d chroot/root/.gnupg ]
+ if [ -e chroot/root/.gnupg ]
then
- _LB_DOTGNUPG_EXISTED=1
+ mv chroot/root/.gnupg chroot/root/.gnupg.orig
fi
- # Ensure ~/.gnupg exists (required for gnupg >= ~1.4.9)
+ # Ensure ~/.gnupg exists
mkdir -p chroot/root/.gnupg
# Temporarily replace /dev/random with /dev/urandom so as not
@@ -436,10 +435,11 @@
mv chroot/dev/random.orig chroot/dev/random
fi
- # Remove /root/.gnupg if we created it during the signing process
- if [ "${_LB_DOTGNUPG_EXISTED}" -eq 0 ]
+ rm -rf chroot/root/.gnupg
+
+ if [ -e chroot/root/.gnupg.orig ]
then
- rm -rf chroot/root/.gnupg
+ mv chroot/root/.gnupg.orig chroot/root/.gnupg
fi
fi
diff -Nru live-build-3.0.1/scripts/build/chroot_dpkg live-build-3.0.3/scripts/build/chroot_dpkg
--- live-build-3.0.1/scripts/build/chroot_dpkg 2013-02-14 14:13:25.000000000 -0400
+++ live-build-3.0.3/scripts/build/chroot_dpkg 2013-04-25 12:40:07.000000000 -0300
@@ -40,10 +40,8 @@
# Creating lock file
Create_lockfile .lock
- # Save start-stop-daemon program
- mv chroot/sbin/start-stop-daemon chroot/sbin/start-stop-daemon.orig
-
- # Create start-stop-daemon program
+ # Create custom start-stop-daemon program
+ Chroot chroot dpkg-divert --rename --quiet --add /sbin/start-stop-daemon
cat > chroot/sbin/start-stop-daemon << EOF
#!/bin/sh
@@ -61,6 +59,9 @@
# Manual hacks for special packages
+ # Generic live-build handle for other live packages to act upon
+ touch chroot/.live-build
+
# samhain
if [ -e /var/state/samhain/samhain_file ]
then
@@ -89,6 +90,9 @@
# Manual hacks for special packages
+ # Generic live-build handle
+ rm -f chroot/.live-build
+
# flash-kernel
rm -f chroot/usr/sbin/flash-kernel
Chroot chroot dpkg-divert --rename --quiet --remove /usr/sbin/flash-kernel
@@ -103,11 +107,9 @@
${LB_ROOT_COMMAND} rmdir --ignore-fail-on-non-empty /var/state/samhain || true
fi
- # Restore start-stop-daemon program
- if [ -e chroot/sbin/start-stop-daemon.orig ]
- then
- mv chroot/sbin/start-stop-daemon.orig chroot/sbin/start-stop-daemon
- fi
+ # Remove custom start-stop-daemon program
+ rm -f chroot/sbin/start-stop-daemon
+ Chroot chroot dpkg-divert --rename --quiet --remove /sbin/start-stop-daemon
# Remove dpkg sync configuration
rm -f chroot/etc/dpkg/dpkg.cfg.d/live-build
diff -Nru live-build-3.0.1/scripts/build/chroot_hostname live-build-3.0.3/scripts/build/chroot_hostname
--- live-build-3.0.1/scripts/build/chroot_hostname 2013-02-14 14:13:25.000000000 -0400
+++ live-build-3.0.3/scripts/build/chroot_hostname 2013-04-25 12:40:07.000000000 -0300
@@ -29,8 +29,6 @@
case "${1}" in
install)
- Echo_message "Configuring file /etc/hostname"
-
# Checking stage file
Check_stagefile .build/chroot_hostname
@@ -40,15 +38,15 @@
# Creating lock file
Create_lockfile .lock
- # Save hostname
- mv chroot/bin/hostname chroot/bin/hostname.orig
-
# Create hostname file
+ Echo_message "Configuring file /etc/hostname"
+
echo "localhost.localdomain" > chroot/etc/hostname
+ # Create custom hostname
Echo_message "Configuring file /bin/hostname"
- # Create hostname program
+ Chroot chroot dpkg-divert --rename --quiet --add /bin/hostname
cat > chroot/bin/hostname << EOF
#!/bin/sh
@@ -79,11 +77,9 @@
Echo_message "Deconfiguring file /bin/hostname"
- # Restore hostname file
- if [ -e chroot/bin/hostname.orig ]
- then
- mv chroot/bin/hostname.orig chroot/bin/hostname
- fi
+ # Remove custom hostname
+ rm -f chroot/bin/hostname
+ Chroot chroot dpkg-divert --rename --quiet --remove /bin/hostname
# Removing stage file
rm -f .build/chroot_hostname
diff -Nru live-build-3.0.1/scripts/build/chroot_package-lists live-build-3.0.3/scripts/build/chroot_package-lists
--- live-build-3.0.1/scripts/build/chroot_package-lists 2013-02-14 14:13:25.000000000 -0400
+++ live-build-3.0.3/scripts/build/chroot_package-lists 2013-04-25 12:40:07.000000000 -0300
@@ -82,7 +82,7 @@
then
# Generating package list
Expand_packagelist "$(basename ${LIST})" "config/package-lists" \
- >> chroot/root/packages.chroot
+ | grep -v '^#' >> chroot/root/packages.chroot
fi
done
diff -Nru live-build-3.0.1/scripts/build/chroot_sysv-rc live-build-3.0.3/scripts/build/chroot_sysv-rc
--- live-build-3.0.1/scripts/build/chroot_sysv-rc 2013-02-14 14:13:25.000000000 -0400
+++ live-build-3.0.3/scripts/build/chroot_sysv-rc 2013-04-25 12:40:07.000000000 -0300
@@ -40,10 +40,10 @@
# Creating lock file
Create_lockfile .lock
- if [ -f chroot/usr/sbin/policy-rc.d ]
+ if [ -e chroot/usr/sbin/policy-rc.d ]
then
# Save policy-rc.d file
- mv chroot/usr/sbin/policy-rc.d chroot/usr/sbin/policy-rc.d.orig
+ Chroot chroot dpkg-divert --rename --quiet --add /usr/sbin/policy-rc.d
fi
# Create policy-rc.d file
@@ -68,13 +68,13 @@
# Creating lock file
Create_lockfile .lock
- if [ -f chroot/usr/sbin/policy-rc.d.orig ]
+ # Remove custom policy-rc.d file
+ rm -f chroot/usr/sbin/policy-rc.d
+
+ if [ -e chroot/usr/sbin/policy-rc.d.distrib ]
then
# Restore policy-rc.d file
- mv chroot/usr/sbin/policy-rc.d.orig chroot/usr/sbin/policy-rc.d
- else
- # Remove policy-rc.d file
- rm -f chroot/usr/sbin/policy-rc.d
+ Chroot chroot dpkg-divert --rename --quiet --remove /usr/sbin/policy-rc.d
fi
# Removing stage file
diff -Nru live-build-3.0.1/scripts/build/chroot_upstart live-build-3.0.3/scripts/build/chroot_upstart
--- live-build-3.0.1/scripts/build/chroot_upstart 2013-02-14 14:13:25.000000000 -0400
+++ live-build-3.0.3/scripts/build/chroot_upstart 2013-04-25 12:40:07.000000000 -0300
@@ -27,6 +27,12 @@
# Requiring stage file
Require_stagefile .build/config .build/bootstrap
+# Check if system uses upstart
+if [ ! -e chroot/sbin/initctl ]
+then
+ exit 0
+fi
+
case "${1}" in
install)
Echo_message "Configuring file /sbin/initctl"
@@ -40,13 +46,9 @@
# Creating lock file
Create_lockfile .lock
- if [ -f chroot/sbin/initctl ]
- then
- # Save initctl file
- mv chroot/sbin/initctl chroot/sbin/initctl.orig
- fi
+ # Create custom initctl file
+ Chroot chroot dpkg-divert --rename --quiet --add /sbin/initctl
- # Create initctl file
cat > chroot/sbin/initctl << EOF
#!/bin/sh
echo "All runlevel operations denied by policy" >&2
@@ -68,14 +70,9 @@
# Creating lock file
Create_lockfile .lock
- if [ -f chroot/sbin/initctl.orig ]
- then
- # Restore initctl file
- mv chroot/sbin/initctl.orig chroot/sbin/initctl
- else
- # Remove initctl file
- rm -f chroot/sbin/initctl
- fi
+ # Remove custom initctl file
+ rm -f chroot/sbin/initctl
+ Chroot chroot dpkg-divert --rename --quiet --remove /sbin/initctl
# Removing stage file
rm -f .build/chroot_upstart
diff -Nru live-build-3.0.1/scripts/build/config live-build-3.0.3/scripts/build/config
--- live-build-3.0.1/scripts/build/config 2013-02-14 14:22:28.000000000 -0400
+++ live-build-3.0.3/scripts/build/config 2013-04-25 12:40:07.000000000 -0300
@@ -19,7 +19,7 @@
USAGE="${PROGRAM} [--apt apt|aptitude]\n\
\t [--apt-ftp-proxy URL]\n\
\t [--apt-http-proxy URL]\n\
-\t [--apt-indices true|false|none]\n\
+\t [--apt-indices true|false\n\
\t [--apt-options OPTION|\"OPTIONS\"]\n\
\t [--aptitude-options OPTION|\"OPTIONS\"]\n\
\t [--apt-pipeline DEPTH]\n\
@@ -925,11 +925,16 @@
fi
# Reading system configuration
-if ! In_list "--ignore-system-defaults" "${@}"
+if ls /etc/live/build.conf > /dev/null 2>&1 || ls /etc/live/build/* > /dev/null 2>&1
then
- Echo_message "Considering defaults defined in %s" "/etc/live/build.conf"
+ if In_list "--ignore-system-defaults" "${@}"
+ then
+ Echo_message "Ignoring defaults in %s" "/etc/live/build.conf"
+ else
+ Echo_message "Using defaults in %s" "/etc/live/build.conf"
- Read_conffiles /etc/live/build.conf /etc/live/build/*
+ Read_conffiles /etc/live/build.conf /etc/live/build/*
+ fi
fi
# Reading existing configuration
@@ -950,9 +955,9 @@
if [ ! -e config ]
then
- Echo_message "Creating config tree for a ${LB_MODE}/${LB_ARCHITECTURES} system"
+ Echo_message "Creating config tree for a ${LB_MODE}/${LB_DISTRIBUTION}/${LB_ARCHITECTURES} system"
else
- Echo_message "Updating config tree for a ${LB_MODE}/${LB_ARCHITECTURES} system"
+ Echo_message "Updating config tree for a ${LB_MODE}/${LB_DISTRIBUTION}/${LB_ARCHITECTURES} system"
fi
# Creating bootstrap configuration
diff -Nru live-build-3.0.1/scripts/build/source live-build-3.0.3/scripts/build/source
--- live-build-3.0.1/scripts/build/source 2013-02-14 14:13:25.000000000 -0400
+++ live-build-3.0.3/scripts/build/source 2013-04-25 12:40:07.000000000 -0300
@@ -51,6 +51,7 @@
lb source_debian-live ${@}
lb source_debian ${@}
lb source_disk ${@}
+lb source_hooks ${@}
lb source_checksums ${@}
# Building images
diff -Nru live-build-3.0.1/scripts/build/source_debian live-build-3.0.3/scripts/build/source_debian
--- live-build-3.0.1/scripts/build/source_debian 2013-02-14 14:22:28.000000000 -0400
+++ live-build-3.0.3/scripts/build/source_debian 2013-04-25 12:40:07.000000000 -0300
@@ -55,12 +55,24 @@
cat >> source-selection.txt << EOF
${LB_BOOTLOADER}
live-build
-xorriso
-parted
-squashfs-tools
-mtd-tools
EOF
+case "${LB_BINARY_IMAGES}" in
+ iso*)
+ echo "xorriso" >> source-selection.txt
+ ;;
+
+ hdd*)
+ echo "parted" >> source-selection.txt
+ ;;
+esac
+
+case "${LB_CHROOT_FILESYSTEM}" in
+ squashfs)
+ echo "squashfs-tools" >> source-selection.txt
+ ;;
+esac
+
case "${LB_BINARY_FILESYSTEM}" in
fat*)
echo "dosfstools" >> source-selection.txt
diff -Nru live-build-3.0.1/scripts/build/source_hooks live-build-3.0.3/scripts/build/source_hooks
--- live-build-3.0.1/scripts/build/source_hooks 1969-12-31 20:00:00.000000000 -0400
+++ live-build-3.0.3/scripts/build/source_hooks 2013-04-25 12:40:07.000000000 -0300
@@ -0,0 +1,78 @@
+#!/bin/sh
+
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+##
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This is free software, and you are welcome to redistribute it
+## under certain conditions; see COPYING for details.
+
+
+set -e
+
+# Including common functions
+[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
+
+# Setting static variables
+DESCRIPTION="$(Echo 'execute hooks in source')"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/source config/source
+Set_defaults
+
+Echo_message "Begin executing hooks..."
+
+# Requiring stage file
+Require_stagefile .build/config .build/bootstrap
+
+# Checking stage file
+Check_stagefile .build/source_hooks
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+## Processing distribution hooks
+
+# Running hooks
+for _HOOK in ${LB_BINARY_HOOKS}
+do
+ for LOCATION in "${LIVE_BUILD}/hooks" /usr/share/live/build/hooks
+ do
+ for FILE in "${LOCATION}"/????-"${_HOOK}".source
+ do
+ if [ -e "${FILE}" ]
+ then
+ cd source
+ "${FILE}" || { Echo_error "${_HOOK} failed (exit non-zero). You should check for errors."; exit 1 ;}
+ cd "${OLDPWD}"
+ fi
+ done
+ done
+done
+
+## Processing local hooks
+
+if Find_files config/hooks/*.source
+then
+ for HOOK in config/hooks/*.source
+ do
+ # Making hook executable
+ if [ ! -x "${HOOK}" ]
+ then
+ chmod +x "${HOOK}"
+ fi
+
+ # Executing hook
+ ./"${HOOK}" || { Echo_error "${HOOK} failed (exit non-zero). You should check for errors."; exit 1 ;}
+ done
+
+ # Creating stage file
+ Create_stagefile .build/source_hooks
+fi
diff -Nru live-build-3.0.1/templates/cgi/debian/form.html live-build-3.0.3/templates/cgi/debian/form.html
--- live-build-3.0.1/templates/cgi/debian/form.html 2013-02-14 14:22:28.000000000 -0400
+++ live-build-3.0.3/templates/cgi/debian/form.html 2013-04-25 12:40:07.000000000 -0300
@@ -1,7 +1,7 @@
<h3>Submit your parameters (<b>working</b> email address is required) to generate your very own Debian Live system.</h3>
-<form action="live-build" method="get">
+<form action="live-build" method="post">
<fieldset>
Binary files /tmp/z0NXgfPzeX/live-build-3.0.1/templates/grub/splash.xpm.gz and /tmp/Soc3fVKLZn/live-build-3.0.3/templates/grub/splash.xpm.gz differ
diff -Nru live-build-3.0.1/templates/grub2/grub.cfg live-build-3.0.3/templates/grub2/grub.cfg
--- live-build-3.0.1/templates/grub2/grub.cfg 2013-02-14 14:13:24.000000000 -0400
+++ live-build-3.0.3/templates/grub2/grub.cfg 2013-04-25 12:40:07.000000000 -0300
@@ -1,7 +1,7 @@
set default=0
insmod tga
-background_image ($root)/boot/grub/xbmc.tga
+background_image ($root)/boot/grub/splash.tga
set color_normal=cyan/blue
set color_highlight=white/blue
Binary files /tmp/z0NXgfPzeX/live-build-3.0.1/templates/grub2/splash.tga and /tmp/Soc3fVKLZn/live-build-3.0.3/templates/grub2/splash.tga differ
diff -Nru live-build-3.0.1/VERSION live-build-3.0.3/VERSION
--- live-build-3.0.1/VERSION 2013-02-14 14:31:42.000000000 -0400
+++ live-build-3.0.3/VERSION 2013-04-25 12:40:10.000000000 -0300
@@ -1 +1 @@
-3.0.1-1
+3.0.3-1
--- End Message ---