Commit 8b22917e authored by Daniel Baumann's avatar Daniel Baumann
Browse files

Adding upstream version 4.0~alpha34.

parent b4f3c5ac
......@@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
"Project-Id-Version: live-build 4.0~alpha33-1\n"
"POT-Creation-Date: 2014-03-31 21:43+0200\n"
"Project-Id-Version: live-build 4.0~alpha34-1\n"
"POT-Creation-Date: 2014-04-26 08:03+0200\n"
"PO-Revision-Date: 2013-11-05 19:30+0100\n"
"Last-Translator: Carlos Zuferri <chals@altorricon.com>\n"
"Language-Team: none\n"
......@@ -31,8 +31,8 @@ msgstr "LIVE-BUILD"
#: en/lb-chroot-hooks.1:9 en/lb-chroot-includes.1:9 en/lb-init.1:9
#: en/lb-source-hooks.1:9 en/lb-source-includes.1:9
#, no-wrap
msgid "2014-03-31"
msgstr "31.03.2014"
msgid "2014-04-26"
msgstr "26.04.2014"
#. type: TH
#: en/lb-binary-hooks.1:9 en/lb-binary-includes.1:9
......@@ -41,8 +41,8 @@ msgstr "31.03.2014"
#: en/lb-chroot-hooks.1:9 en/lb-chroot-includes.1:9 en/lb-init.1:9
#: en/lb-source-hooks.1:9 en/lb-source-includes.1:9
#, no-wrap
msgid "4.0~alpha33-1"
msgstr "4.0~alpha33-1"
msgid "4.0~alpha34-1"
msgstr "4.0~alpha34-1"
#. type: TH
#: en/lb-binary-hooks.1:9 en/lb-binary-includes.1:9
......
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
"POT-Creation-Date: 2014-03-31 21:43+0200\n"
"POT-Creation-Date: 2014-04-26 08:03+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -33,7 +33,7 @@ msgstr ""
#: en/lb-chroot-hooks.1:9 en/lb-chroot-includes.1:9 en/lb-init.1:9
#: en/lb-source-hooks.1:9 en/lb-source-includes.1:9
#, no-wrap
msgid "2014-03-31"
msgid "2014-04-26"
msgstr ""
#. type: TH
......@@ -43,7 +43,7 @@ msgstr ""
#: en/lb-chroot-hooks.1:9 en/lb-chroot-includes.1:9 en/lb-init.1:9
#: en/lb-source-hooks.1:9 en/lb-source-includes.1:9
#, no-wrap
msgid "4.0~alpha33-1"
msgid "4.0~alpha34-1"
msgstr ""
#. type: TH
......
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
"POT-Creation-Date: 2014-03-31 21:43+0200\n"
"POT-Creation-Date: 2014-04-26 08:03+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -33,7 +33,7 @@ msgstr ""
#: en/lb-chroot-hooks.1:9 en/lb-chroot-includes.1:9 en/lb-init.1:9
#: en/lb-source-hooks.1:9 en/lb-source-includes.1:9
#, no-wrap
msgid "2014-03-31"
msgid "2014-04-26"
msgstr ""
#. type: TH
......@@ -43,7 +43,7 @@ msgstr ""
#: en/lb-chroot-hooks.1:9 en/lb-chroot-includes.1:9 en/lb-init.1:9
#: en/lb-source-hooks.1:9 en/lb-source-includes.1:9
#, no-wrap
msgid "4.0~alpha33-1"
msgid "4.0~alpha34-1"
msgstr ""
#. type: TH
......
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
"POT-Creation-Date: 2014-03-31 21:43+0200\n"
"POT-Creation-Date: 2014-04-26 08:03+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -33,7 +33,7 @@ msgstr ""
#: en/lb-chroot-hooks.1:9 en/lb-chroot-includes.1:9 en/lb-init.1:9
#: en/lb-source-hooks.1:9 en/lb-source-includes.1:9
#, no-wrap
msgid "2014-03-31"
msgid "2014-04-26"
msgstr ""
#. type: TH
......@@ -43,7 +43,7 @@ msgstr ""
#: en/lb-chroot-hooks.1:9 en/lb-chroot-includes.1:9 en/lb-init.1:9
#: en/lb-source-hooks.1:9 en/lb-source-includes.1:9
#, no-wrap
msgid "4.0~alpha33-1"
msgid "4.0~alpha34-1"
msgstr ""
#. type: TH
......
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
"POT-Creation-Date: 2014-03-31 21:43+0200\n"
"POT-Creation-Date: 2014-04-26 08:03+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -33,7 +33,7 @@ msgstr ""
#: en/lb-chroot-hooks.1:9 en/lb-chroot-includes.1:9 en/lb-init.1:9
#: en/lb-source-hooks.1:9 en/lb-source-includes.1:9
#, no-wrap
msgid "2014-03-31"
msgid "2014-04-26"
msgstr ""
#. type: TH
......@@ -43,7 +43,7 @@ msgstr ""
#: en/lb-chroot-hooks.1:9 en/lb-chroot-includes.1:9 en/lb-init.1:9
#: en/lb-source-hooks.1:9 en/lb-source-includes.1:9
#, no-wrap
msgid "4.0~alpha33-1"
msgid "4.0~alpha34-1"
msgstr ""
#. type: TH
......
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
"POT-Creation-Date: 2014-03-31 21:43+0200\n"
"POT-Creation-Date: 2014-04-26 08:03+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -33,7 +33,7 @@ msgstr ""
#: en/lb-chroot-hooks.1:9 en/lb-chroot-includes.1:9 en/lb-init.1:9
#: en/lb-source-hooks.1:9 en/lb-source-includes.1:9
#, no-wrap
msgid "2014-03-31"
msgid "2014-04-26"
msgstr ""
#. type: TH
......@@ -43,7 +43,7 @@ msgstr ""
#: en/lb-chroot-hooks.1:9 en/lb-chroot-includes.1:9 en/lb-init.1:9
#: en/lb-source-hooks.1:9 en/lb-source-includes.1:9
#, no-wrap
msgid "4.0~alpha33-1"
msgid "4.0~alpha34-1"
msgstr ""
#. type: TH
......
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
"POT-Creation-Date: 2014-03-31 21:43+0200\n"
"POT-Creation-Date: 2014-04-26 08:03+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -33,7 +33,7 @@ msgstr ""
#: en/lb-chroot-hooks.1:9 en/lb-chroot-includes.1:9 en/lb-init.1:9
#: en/lb-source-hooks.1:9 en/lb-source-includes.1:9
#, no-wrap
msgid "2014-03-31"
msgid "2014-04-26"
msgstr ""
#. type: TH
......@@ -43,7 +43,7 @@ msgstr ""
#: en/lb-chroot-hooks.1:9 en/lb-chroot-includes.1:9 en/lb-init.1:9
#: en/lb-source-hooks.1:9 en/lb-source-includes.1:9
#, no-wrap
msgid "4.0~alpha33-1"
msgid "4.0~alpha34-1"
msgstr ""
#. type: TH
......
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
"POT-Creation-Date: 2014-03-31 21:43+0200\n"
"POT-Creation-Date: 2014-04-26 08:03+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -33,7 +33,7 @@ msgstr ""
#: en/lb-chroot-hooks.1:9 en/lb-chroot-includes.1:9 en/lb-init.1:9
#: en/lb-source-hooks.1:9 en/lb-source-includes.1:9
#, no-wrap
msgid "2014-03-31"
msgid "2014-04-26"
msgstr ""
#. type: TH
......@@ -43,7 +43,7 @@ msgstr ""
#: en/lb-chroot-hooks.1:9 en/lb-chroot-includes.1:9 en/lb-init.1:9
#: en/lb-source-hooks.1:9 en/lb-source-includes.1:9
#, no-wrap
msgid "4.0~alpha33-1"
msgid "4.0~alpha34-1"
msgstr ""
#. type: TH
......
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
"POT-Creation-Date: 2014-03-31 21:43+0200\n"
"POT-Creation-Date: 2014-04-26 08:03+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -33,7 +33,7 @@ msgstr ""
#: en/lb-chroot-hooks.1:9 en/lb-chroot-includes.1:9 en/lb-init.1:9
#: en/lb-source-hooks.1:9 en/lb-source-includes.1:9
#, no-wrap
msgid "2014-03-31"
msgid "2014-04-26"
msgstr ""
#. type: TH
......@@ -43,7 +43,7 @@ msgstr ""
#: en/lb-chroot-hooks.1:9 en/lb-chroot-includes.1:9 en/lb-init.1:9
#: en/lb-source-hooks.1:9 en/lb-source-includes.1:9
#, no-wrap
msgid "4.0~alpha33-1"
msgid "4.0~alpha34-1"
msgstr ""
#. type: TH
......
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
"POT-Creation-Date: 2014-03-31 21:43+0200\n"
"POT-Creation-Date: 2014-04-26 08:03+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -33,7 +33,7 @@ msgstr ""
#: en/lb-chroot-hooks.1:9 en/lb-chroot-includes.1:9 en/lb-init.1:9
#: en/lb-source-hooks.1:9 en/lb-source-includes.1:9
#, no-wrap
msgid "2014-03-31"
msgid "2014-04-26"
msgstr ""
#. type: TH
......@@ -43,7 +43,7 @@ msgstr ""
#: en/lb-chroot-hooks.1:9 en/lb-chroot-includes.1:9 en/lb-init.1:9
#: en/lb-source-hooks.1:9 en/lb-source-includes.1:9
#, no-wrap
msgid "4.0~alpha33-1"
msgid "4.0~alpha34-1"
msgstr ""
#. type: TH
......
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
"POT-Creation-Date: 2014-03-31 21:43+0200\n"
"POT-Creation-Date: 2014-04-26 08:03+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -33,7 +33,7 @@ msgstr ""
#: en/lb-chroot-hooks.1:9 en/lb-chroot-includes.1:9 en/lb-init.1:9
#: en/lb-source-hooks.1:9 en/lb-source-includes.1:9
#, no-wrap
msgid "2014-03-31"
msgid "2014-04-26"
msgstr ""
#. type: TH
......@@ -43,7 +43,7 @@ msgstr ""
#: en/lb-chroot-hooks.1:9 en/lb-chroot-includes.1:9 en/lb-init.1:9
#: en/lb-source-hooks.1:9 en/lb-source-includes.1:9
#, no-wrap
msgid "4.0~alpha33-1"
msgid "4.0~alpha34-1"
msgstr ""
#. type: TH
......
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
"POT-Creation-Date: 2014-03-31 21:43+0200\n"
"POT-Creation-Date: 2014-04-26 08:03+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -33,7 +33,7 @@ msgstr ""
#: en/lb-chroot-hooks.1:9 en/lb-chroot-includes.1:9 en/lb-init.1:9
#: en/lb-source-hooks.1:9 en/lb-source-includes.1:9
#, no-wrap
msgid "2014-03-31"
msgid "2014-04-26"
msgstr ""
#. type: TH
......@@ -43,7 +43,7 @@ msgstr ""
#: en/lb-chroot-hooks.1:9 en/lb-chroot-includes.1:9 en/lb-init.1:9
#: en/lb-source-hooks.1:9 en/lb-source-includes.1:9
#, no-wrap
msgid "4.0~alpha33-1"
msgid "4.0~alpha34-1"
msgstr ""
#. type: TH
......
......@@ -239,13 +239,17 @@ esac
case "${LB_BINARY_FILESYSTEM}" in
fat*)
CP_OPTIONS="-L"
CP_OPTIONS="-r -L"
;;
*)
CP_OPTIONS="-a"
;;
esac
mkdir -p chroot/binary.tmp
mount ${MOUNT_OPTIONS} ${FREELO} chroot/binary.tmp
cp -r -T ${CP_OPTIONS} binary/ chroot/binary.tmp
cp -T ${CP_OPTIONS} binary/ chroot/binary.tmp
FIXME()
{
......
......@@ -253,7 +253,7 @@ esac
for _FILE in "${_TARGET}"/*.cfg ${_TARGET}/*.svg
do
if [ -e "${_FILE}" ]
if [ -e "${_FILE}" ] && [ ! -d "${_FILE}" ]
then
sed -i -e "s#@APPEND_LIVE@#${LB_BOOTAPPEND_LIVE}#g" \
-e "s#@APPEND_LIVE_FAILSAFE@#${LB_BOOTAPPEND_LIVE_FAILSAFE}#g" \
......
......@@ -90,16 +90,15 @@ case "${LB_INITRAMFS_COMPRESSION}" in
for INITRAMFS in $(find chroot/boot -name 'initrd*'); do
zcat "${INITRAMFS}" | bzip2 -c ${BZIP2_OPTIONS} > "${INITRAMFS}.new"
mv "${INITRAMFS}.new" "${INITRAMFS}"
echo "$(sha1sum ${INITRAMFS} | awk '{ print $1 }') /boot/$(basename ${INITRAMFS})" > chroot/var/lib/initramfs-tools/$(basename ${INITRAMFS} | sed -e 's|initrd.img-||')
done
;;
lzma)
# We probably ought to use COMPRESS= in a temporary file in
# /etc/initramfs-tools/conf.d/ instead, but it's hard to
# pass options that way.
for INITRAMFS in $(find chroot/boot -name 'initrd*'); do
zcat "${INITRAMFS}" | lzma -c ${LZMA_OPTIONS} > "${INITRAMFS}.new"
mv "${INITRAMFS}.new" "${INITRAMFS}"
echo "$(sha1sum ${INITRAMFS} | awk '{ print $1 }') /boot/$(basename ${INITRAMFS})" > chroot/var/lib/initramfs-tools/$(basename ${INITRAMFS} | sed -e 's|initrd.img-||')
done
;;
esac
......
......@@ -883,7 +883,8 @@ Check_defaults
if [ ! -e config ]
then
Echo_message "Creating config tree for a ${LB_MODE}/${LB_DISTRIBUTION}/${LIVE_IMAGE_ARCHITECTURE} system"
Echo_error "fatal: Not a live-build directory: use 'lb init' to initialize it"
exit 1
else
Echo_message "Updating config tree for a ${LB_MODE}/${LB_DISTRIBUTION}/${LIVE_IMAGE_ARCHITECTURE} system"
fi
......
......@@ -477,11 +477,11 @@ then
# Drop the packages already installed that d-i doesn't explicitely need
_REMAINING_PACKAGES="$(echo ${DI_FIRMWARE_PACKAGES} ${DI_REQ_PACKAGES} | sed -e 's# #|#g')"
_REMAINING_PACKAGES="$(sed -n -e 's|Package: ||p' chroot/var/lib/dpkg/status.tmp | grep -E -v \"^${_REMAINING_PACKAGES}$\")"
_REMAINING_PACKAGES="$(sed -n -e 's|Package: ||p' chroot/var/lib/dpkg/status.tmp | grep -E -v "^(${_REMAINING_PACKAGES})\$")"
for _PACKAGE in ${_REMAINING_PACKAGES}
do
rm -f "chroot/binary.deb/archives/${_PACKAGE}_*.deb"
rm -f chroot/binary.deb/archives/${_PACKAGE}_*.deb
done
else
# Download .debs of the required packages
......
......@@ -24,6 +24,14 @@ Arguments "${@}"
Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
# Check d-i configuration
case "${LB_DEBIAN_INSTALLER}" in
false)
exit 0
;;
esac
Echo_message "Begin including local preseeds..."
# Checking stage file
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment