Commit 96f53102 authored by amnesia's avatar amnesia

Use live-helper brand new support for isohybrid options.

... instead of doing the isohybrid conversion ourselves.
The default binary image type we build is now iso-hybrid.

Bump dependency on live-helper to current Squeeze's 2.0~a14-1, and on syslinux
to current Squeeze's 3.86 to make sure isohybrid is supported by both.
parent a3a27893
......@@ -35,9 +35,9 @@ chmod -R go+rx config/chroot_local-includes/usr/local/sbin
# build the image
case "$LH_BINARY_IMAGES" in
iso)
iso|iso-hybrid)
BUILD_FILENAME_EXT=iso
BUILD_FILENAME=binary
BUILD_FILENAME=binary-hybrid
;;
tar)
BUILD_FILENAME_EXT=tar.gz
......@@ -61,14 +61,6 @@ BUILD_LOG="${BUILD_DEST_FILENAME}.buildlog"
echo "Building $LH_BINARY_IMAGES image ${BUILD_BASENAME}..."
if lh build noauto ${@} 2>&1 | tee "${BUILD_LOG}" ; then
echo "Image was successfully created"
if [ "${LH_BINARY_IMAGES}" = iso ]; then
if [ -x "`which isohybrid`" -a "${LH_ARCHITECTURE}" = 'i386' ]; then
echo "Turning the ISO image into a hybrid one..."
isohybrid $AMNESIA_ISOHYBRID_OPTS "${BUILD_FILENAME}.${BUILD_FILENAME_EXT}"
else
echo "isohybrid was not found, the ISO image won't be a hybrid one"
fi
fi
echo "Renaming generated files..."
mv -i "${BUILD_FILENAME}.${BUILD_FILENAME_EXT}" "${BUILD_DEST_FILENAME}"
mv -i "${BUILD_FILENAME}.list" "${BUILD_MANIFEST}"
......
......@@ -15,7 +15,8 @@ $RUN_LH_CONFIG --distribution lenny ${@}
# set Amnesia's general options
$RUN_LH_CONFIG \
--apt-recommends false \
--binary-images iso \
--binary-images iso-hybrid \
--isohybrid-options "$AMNESIA_ISOHYBRID_OPTS" \
--bootappend-live "${AMNESIA_APPEND}" \
--archive-areas "main contrib non-free" \
--hostname="amnesia" \
......
......@@ -21,7 +21,7 @@ Echo_message "removing buggy syslinux help"
# Setting boot method specific variables
case "${LH_BINARY_IMAGES}" in
iso)
iso|iso-hybrid)
SYSLINUX_PATH="binary/isolinux"
;;
usb-hdd)
......
......@@ -27,7 +27,7 @@ fi
# Setting boot method specific variables
case "${LH_BINARY_IMAGES}" in
iso)
iso|iso-hybrid)
SYSLINUX_PATH="binary/isolinux"
;;
usb-hdd)
......
......@@ -9,7 +9,7 @@ Homepage: https://amnesia.boum.org/
Package: tails
Architecture: all
Depends: ${misc:Depends}, live-helper (>= 2.0~a11-1), dpkg-dev, ikiwiki, gettext
Depends: ${misc:Depends}, live-helper (>= 2.0~a14-1), syslinux (>= 2:3.86), dpkg-dev, ikiwiki, gettext
Description: a Tor-ified, amnesic Live System
The (Amnesic) Incognito Live System is aimed at preserving its users' privacy:
- any outgoing connection to the Internet is forced to go through
......
......@@ -16,18 +16,18 @@ For the impatient ones:
Dependencies
============
* `live-helper` 2.0~a11 or newer; T(A)ILS code is usually tested
* `live-helper` 2.0~a13 or newer; T(A)ILS code is usually tested
against Squeeze's live-helper, but a Debian Live snapshot package
can sometimes be needed during a development cycle: see the [Debian
Live manual](http://live.debian.net/manual/html/) for details.
* `syslinux` >= 3.86, so that the built ISO images are
converted to hybrid ones: they can be either a CD-ROM or a hard disk
(USB disk, etc.).
* A patched ikiwiki is needed so that the static version of the wiki
included in the image has correct links to the online wiki; see this
[wishlist item](http://ikiwiki.info/todo/mirrorlist_with_per-mirror_usedirs_settings/)
to get the custom ikiwiki branch that has the needed code. It is
not critical to do so.
* If `syslinux` > 3.72 is installed, the built ISO images are
converted to hybrid ones: they can be either a CD-ROM or a hard disk
(USB disk, etc.).
Build process
=============
......
Markdown is supported
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