Switching from genisoimage to xorriso.

diff --git a/debian/control b/debian/control
index 3b957e9..fc32657 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Recommends:
  live-boot-doc, live-config-doc, live-manual-html | live-manual, cpio,
  gnu-fdisk
 Suggests:
- dosfstools, genisoimage, git, loadlin, memtest86+ | memtest86, mtools, parted,
+ dosfstools, xorriso, git, loadlin, memtest86+ | memtest86, mtools, parted,
  squashfs-tools | mtd-tools, sudo | fakeroot, syslinux | grub,
  uuid-runtime, win32-loader
 Description: Live System Build Scripts

diff --git a/debian/live-build.bug-script b/debian/live-build.bug-script
index 7927624..a9f5a6f 100644 (file)
--- a/debian/live-build.bug-script
+++ b/debian/live-build.bug-script
@@ -6,7 +6,7 @@ DEFAULT_SETTINGS="/etc/live/build.conf"
 dpkg -l debootstrap cdebootstrap
 
 # Checking suggests
-dpkg -l dosfstools genisoimage loadlin memtest86+ memtest86 mtools parted squashfs-tools mtd-tools sudo fakeroot syslinux grub uuid-runtime win32-loader
+dpkg -l dosfstools xorriso loadlin memtest86+ memtest86 mtools parted squashfs-tools mtd-tools sudo fakeroot syslinux grub uuid-runtime win32-loader
 
 if [ -e "${DEFAULT_SETTINGS}" ]; then
        echo "Contents of ${DEFAULT_SETTINGS}:"

diff --git a/manpages/de/lb.de.1 b/manpages/de/lb.de.1
index b852e1a..1a2b92d 100644 (file)
--- a/manpages/de/lb.de.1
+++ b/manpages/de/lb.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BUILD 1 2012\-12\-10 3.0~b1\-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-12\-16 3.0~b1\-1 "Debian Live Project"
 
 .SH NAME
 \fBlb\fP \- wrapper for live\-build programs

diff --git a/manpages/de/lb_binary.de.1 b/manpages/de/lb_binary.de.1
index 2d6fbc1..4699d27 100644 (file)
--- a/manpages/de/lb_binary.de.1
+++ b/manpages/de/lb_binary.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BUILD 1 2012\-12\-10 3.0~b1\-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-12\-16 3.0~b1\-1 "Debian Live Project"
 
 .SH NAME
 \fBlb binary\fP \- Complete the binary stage

diff --git a/manpages/de/lb_bootstrap.de.1 b/manpages/de/lb_bootstrap.de.1
index 9dcf195..c8fe50d 100644 (file)
--- a/manpages/de/lb_bootstrap.de.1
+++ b/manpages/de/lb_bootstrap.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BUILD 1 2012\-12\-10 3.0~b1\-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-12\-16 3.0~b1\-1 "Debian Live Project"
 
 .SH NAME
 \fBlb bootstrap\fP \- Complete the bootstrap stage

diff --git a/manpages/de/lb_build.de.1 b/manpages/de/lb_build.de.1
index 227ce8b..b4b83a3 100644 (file)
--- a/manpages/de/lb_build.de.1
+++ b/manpages/de/lb_build.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BUILD 1 2012\-12\-10 3.0~b1\-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-12\-16 3.0~b1\-1 "Debian Live Project"
 
 .SH NAME
 \fBlb build\fP \- Complete the bootstrap, chroot, binary, and source stages

diff --git a/manpages/de/lb_chroot.de.1 b/manpages/de/lb_chroot.de.1
index 563c16b..0b4e277 100644 (file)
--- a/manpages/de/lb_chroot.de.1
+++ b/manpages/de/lb_chroot.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BUILD 1 2012\-12\-10 3.0~b1\-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-12\-16 3.0~b1\-1 "Debian Live Project"
 
 .SH NAME
 \fBlb chroot\fP \- Complete the chroot stage

diff --git a/manpages/de/lb_clean.de.1 b/manpages/de/lb_clean.de.1
index c33affe..d3907b8 100644 (file)
--- a/manpages/de/lb_clean.de.1
+++ b/manpages/de/lb_clean.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BUILD 1 2012\-12\-10 3.0~b1\-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-12\-16 3.0~b1\-1 "Debian Live Project"
 
 .SH NAME
 \fBlb clean\fP \- Clean build directory

diff --git a/manpages/de/lb_config.de.1 b/manpages/de/lb_config.de.1
index 33a3cc6..76ffdb0 100644 (file)
--- a/manpages/de/lb_config.de.1
+++ b/manpages/de/lb_config.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BUILD 1 2012\-12\-10 3.0~b1\-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-12\-16 3.0~b1\-1 "Debian Live Project"
 
 .SH NAME
 \fBlb config\fP \- Create config directory
@@ -386,7 +386,7 @@ build the binary image or not by using and including the host systems
 tools. This is a very dangerous option, using the tools of the host system
 can lead to tainted and even non\-bootable images if the host systems version
 of the required tools (mainly these are the bootloaders such as syslinux,
-grub and yaboot, and the auxilliary tools such as dosfstools, genisoimage,
+grub and yaboot, and the auxilliary tools such as dosfstools, xorriso,
 squashfs\-tools and others) do not \fBexactely\fP match what is present at
 build\-time in the target distribution. Never do disable this option unless
 you are \fBexactely\fP sure what you are doing and have \fBcompletely\fP\fI

diff --git a/manpages/de/lb_source.de.1 b/manpages/de/lb_source.de.1
index 868e390..034235e 100644 (file)
--- a/manpages/de/lb_source.de.1
+++ b/manpages/de/lb_source.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BUILD 1 2012\-12\-10 3.0~b1\-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-12\-16 3.0~b1\-1 "Debian Live Project"
 
 .SH NAME
 \fBlb source\fP \- Complete the source stage

diff --git a/manpages/de/lb_testroot.de.1 b/manpages/de/lb_testroot.de.1
index 5016a0a..5bace4e 100644 (file)
--- a/manpages/de/lb_testroot.de.1
+++ b/manpages/de/lb_testroot.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BUILD 1 2012\-12\-10 3.0~b1\-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-12\-16 3.0~b1\-1 "Debian Live Project"
 
 .SH NAME
 \fBlb testroot\fP \- Ensure that a system is built as root

diff --git a/manpages/de/live-build.de.7 b/manpages/de/live-build.de.7
index 2a788b9..47527d1 100644 (file)
--- a/manpages/de/live-build.de.7
+++ b/manpages/de/live-build.de.7
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BUILD 7 2012\-12\-10 3.0~b1\-1 "Debian Live Project"
+.TH LIVE\-BUILD 7 2012\-12\-16 3.0~b1\-1 "Debian Live Project"
 
 .SH NAME
 \fBlive\-build\fP \- the Debian Live tool suite

diff --git a/manpages/en/lb.1 b/manpages/en/lb.1
index 2232cf3..845d91c 100644 (file)
--- a/manpages/en/lb.1
+++ b/manpages/en/lb.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2012\-12\-10 3.0~b1-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-12\-16 3.0~b1-1 "Debian Live Project"
 
 .SH NAME
 \fBlb\fR \- wrapper for live\-build programs

diff --git a/manpages/en/lb_binary.1 b/manpages/en/lb_binary.1
index 180828b..a4bb549 100644 (file)
--- a/manpages/en/lb_binary.1
+++ b/manpages/en/lb_binary.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2012\-12\-10 3.0~b1-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-12\-16 3.0~b1-1 "Debian Live Project"
 
 .SH NAME
 \fBlb binary\fR \- Complete the binary stage

diff --git a/manpages/en/lb_bootstrap.1 b/manpages/en/lb_bootstrap.1
index 1fe59d0..c90f6c4 100644 (file)
--- a/manpages/en/lb_bootstrap.1
+++ b/manpages/en/lb_bootstrap.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2012\-12\-10 3.0~b1-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-12\-16 3.0~b1-1 "Debian Live Project"
 
 .SH NAME
 \fBlb bootstrap\fR \- Complete the bootstrap stage

diff --git a/manpages/en/lb_build.1 b/manpages/en/lb_build.1
index 3b6c1cd..7476592 100644 (file)
--- a/manpages/en/lb_build.1
+++ b/manpages/en/lb_build.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2012\-12\-10 3.0~b1-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-12\-16 3.0~b1-1 "Debian Live Project"
 
 .SH NAME
 \fBlb build\fR \- Complete the bootstrap, chroot, binary, and source stages

diff --git a/manpages/en/lb_chroot.1 b/manpages/en/lb_chroot.1
index 8c8913f..d91962f 100644 (file)
--- a/manpages/en/lb_chroot.1
+++ b/manpages/en/lb_chroot.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2012\-12\-10 3.0~b1-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-12\-16 3.0~b1-1 "Debian Live Project"
 
 .SH NAME
 \fBlb chroot\fR \- Complete the chroot stage

diff --git a/manpages/en/lb_clean.1 b/manpages/en/lb_clean.1
index 194aaf0..896ad2a 100644 (file)
--- a/manpages/en/lb_clean.1
+++ b/manpages/en/lb_clean.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2012\-12\-10 3.0~b1-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-12\-16 3.0~b1-1 "Debian Live Project"
 
 .SH NAME
 \fBlb clean\fR \- Clean build directory

diff --git a/manpages/en/lb_config.1 b/manpages/en/lb_config.1
index e828586..6e8ee3e 100644 (file)
--- a/manpages/en/lb_config.1
+++ b/manpages/en/lb_config.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2012\-12\-10 3.0~b1-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-12\-16 3.0~b1-1 "Debian Live Project"
 
 .SH NAME
 \fBlb config\fR \- Create config directory
@@ -296,7 +296,7 @@ defines the compression program to be used to compress tarballs. Defaults to gzi
 .IP "\fB\-\-config\fR \fIGIT_URL\fR::\fIGIT_ID\fR" 4
 allows to bootstrap a config tree from a git repositories, optionally appended by a Git Id (branch, commit, tag, etc.).
 .IP "\fB\-\-build\-with\-chroot\fR true|false" 4
-defines whetever live\-build should use the tools from within the chroot to build the binary image or not by using and including the host systems tools. This is a very dangerous option, using the tools of the host system can lead to tainted and even non-bootable images if the host systems version of the required tools (mainly these are the bootloaders such as syslinux, grub and yaboot, and the auxilliary tools such as dosfstools, genisoimage, squashfs-tools and others) do not \fBexactely\fR match what is present at build-time in the target distribution. Never do disable this option unless you are \fBexactely\fR sure what you are doing and have \fBcompletely\fI understood its consequences.
+defines whetever live\-build should use the tools from within the chroot to build the binary image or not by using and including the host systems tools. This is a very dangerous option, using the tools of the host system can lead to tainted and even non-bootable images if the host systems version of the required tools (mainly these are the bootloaders such as syslinux, grub and yaboot, and the auxilliary tools such as dosfstools, xorriso, squashfs-tools and others) do not \fBexactely\fR match what is present at build-time in the target distribution. Never do disable this option unless you are \fBexactely\fR sure what you are doing and have \fBcompletely\fI understood its consequences.
 .IP "\fB\-\-chroot\-filesystem\fR ext2|ext3|ext4|squashfs|jffs2|none" 4
 defines which filesystem type should be used for the root filesystem image. If you use none, then no filesystem image is created and the root filesystem content is copied on the binary image filesystem as flat files. Depending on what binary filesystem you have choosen, it may not be possible to build with such a plain root filesystem, e.g. fat16/fat32 will not work as linux does not support to run directly on them.
 .IP "\fB\-\-clean\fR" 4

diff --git a/manpages/en/lb_source.1 b/manpages/en/lb_source.1
index 9ebd166..a91d634 100644 (file)
--- a/manpages/en/lb_source.1
+++ b/manpages/en/lb_source.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2012\-12\-10 3.0~b1-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-12\-16 3.0~b1-1 "Debian Live Project"
 
 .SH NAME
 \fBlb source\fR \- Complete the source stage

diff --git a/manpages/en/lb_testroot.1 b/manpages/en/lb_testroot.1
index 1bbcc7b..174516f 100644 (file)
--- a/manpages/en/lb_testroot.1
+++ b/manpages/en/lb_testroot.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2012\-12\-10 3.0~b1-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-12\-16 3.0~b1-1 "Debian Live Project"
 
 .SH NAME
 \fBlb testroot\fR \- Ensure that a system is built as root

diff --git a/manpages/en/live-build.7 b/manpages/en/live-build.7
index f363b99..6fbea5c 100644 (file)
--- a/manpages/en/live-build.7
+++ b/manpages/en/live-build.7
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 7 2012\-12\-10 3.0~b1-1 "Debian Live Project"
+.TH LIVE\-BUILD 7 2012\-12\-16 3.0~b1-1 "Debian Live Project"
 
 .SH NAME
 \fBlive\-build\fR \- the Debian Live tool suite

diff --git a/manpages/po/de/lb.1.po b/manpages/po/de/lb.1.po
index cf365e4..5d9b0a2 100644 (file)
--- a/manpages/po/de/lb.1.po
+++ b/manpages/po/de/lb.1.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-12-10 20:38+0100\n"
+"POT-Creation-Date: 2012-12-16 21:41+0100\n"
 "PO-Revision-Date: 2012-08-02 18:55+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -29,7 +29,7 @@ msgstr ""
 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
 #: en/lb_testroot.1:1 en/live-build.7:1
 #, no-wrap
-msgid "2012-12-10"
+msgid "2012-12-16"
 msgstr ""
 
 #. type: TH

diff --git a/manpages/po/de/lb_binary.1.po b/manpages/po/de/lb_binary.1.po
index 5573cbc..5b17ee4 100644 (file)
--- a/manpages/po/de/lb_binary.1.po
+++ b/manpages/po/de/lb_binary.1.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-12-10 20:38+0100\n"
+"POT-Creation-Date: 2012-12-16 21:41+0100\n"
 "PO-Revision-Date: 2012-08-02 18:55+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -29,7 +29,7 @@ msgstr ""
 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
 #: en/lb_testroot.1:1 en/live-build.7:1
 #, no-wrap
-msgid "2012-12-10"
+msgid "2012-12-16"
 msgstr ""
 
 #. type: TH

diff --git a/manpages/po/de/lb_bootstrap.1.po b/manpages/po/de/lb_bootstrap.1.po
index 9439dfd..a82e893 100644 (file)
--- a/manpages/po/de/lb_bootstrap.1.po
+++ b/manpages/po/de/lb_bootstrap.1.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-12-10 20:38+0100\n"
+"POT-Creation-Date: 2012-12-16 21:41+0100\n"
 "PO-Revision-Date: 2012-08-02 18:55+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -29,7 +29,7 @@ msgstr ""
 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
 #: en/lb_testroot.1:1 en/live-build.7:1
 #, no-wrap
-msgid "2012-12-10"
+msgid "2012-12-16"
 msgstr ""
 
 #. type: TH

diff --git a/manpages/po/de/lb_build.1.po b/manpages/po/de/lb_build.1.po
index eef1330..404b7db 100644 (file)
--- a/manpages/po/de/lb_build.1.po
+++ b/manpages/po/de/lb_build.1.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-12-10 20:38+0100\n"
+"POT-Creation-Date: 2012-12-16 21:41+0100\n"
 "PO-Revision-Date: 2012-08-02 18:55+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -29,7 +29,7 @@ msgstr ""
 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
 #: en/lb_testroot.1:1 en/live-build.7:1
 #, no-wrap
-msgid "2012-12-10"
+msgid "2012-12-16"
 msgstr ""
 
 #. type: TH

diff --git a/manpages/po/de/lb_chroot.1.po b/manpages/po/de/lb_chroot.1.po
index e2a3e27..6fcd1a1 100644 (file)
--- a/manpages/po/de/lb_chroot.1.po
+++ b/manpages/po/de/lb_chroot.1.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-12-10 20:38+0100\n"
+"POT-Creation-Date: 2012-12-16 21:41+0100\n"
 "PO-Revision-Date: 2012-08-02 18:55+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -29,7 +29,7 @@ msgstr ""
 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
 #: en/lb_testroot.1:1 en/live-build.7:1
 #, no-wrap
-msgid "2012-12-10"
+msgid "2012-12-16"
 msgstr ""
 
 #. type: TH

diff --git a/manpages/po/de/lb_clean.1.po b/manpages/po/de/lb_clean.1.po
index e7771f3..37a7803 100644 (file)
--- a/manpages/po/de/lb_clean.1.po
+++ b/manpages/po/de/lb_clean.1.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-12-10 20:38+0100\n"
+"POT-Creation-Date: 2012-12-16 21:41+0100\n"
 "PO-Revision-Date: 2012-08-02 18:55+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -29,7 +29,7 @@ msgstr ""
 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
 #: en/lb_testroot.1:1 en/live-build.7:1
 #, no-wrap
-msgid "2012-12-10"
+msgid "2012-12-16"
 msgstr ""
 
 #. type: TH

diff --git a/manpages/po/de/lb_config.1.po b/manpages/po/de/lb_config.1.po
index c9c56dc..aea2c42 100644 (file)
--- a/manpages/po/de/lb_config.1.po
+++ b/manpages/po/de/lb_config.1.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-12-10 20:38+0100\n"
+"POT-Creation-Date: 2012-12-16 21:41+0100\n"
 "PO-Revision-Date: 2012-08-02 18:55+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -29,7 +29,7 @@ msgstr ""
 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
 #: en/lb_testroot.1:1 en/live-build.7:1
 #, no-wrap
-msgid "2012-12-10"
+msgid "2012-12-16"
 msgstr ""
 
 #. type: TH
@@ -1149,11 +1149,11 @@ msgid ""
 "This is a very dangerous option, using the tools of the host system can lead "
 "to tainted and even non-bootable images if the host systems version of the "
 "required tools (mainly these are the bootloaders such as syslinux, grub and "
-"yaboot, and the auxilliary tools such as dosfstools, genisoimage, squashfs-"
-"tools and others) do not B<exactely> match what is present at build-time in "
-"the target distribution. Never do disable this option unless you are "
-"B<exactely> sure what you are doing and have B<completely>I< understood its "
-"consequences.>"
+"yaboot, and the auxilliary tools such as dosfstools, xorriso, squashfs-tools "
+"and others) do not B<exactely> match what is present at build-time in the "
+"target distribution. Never do disable this option unless you are B<exactely> "
+"sure what you are doing and have B<completely>I< understood its consequences."
+">"
 msgstr ""
 
 #. type: IP

diff --git a/manpages/po/de/lb_source.1.po b/manpages/po/de/lb_source.1.po
index d94b4c0..834255a 100644 (file)
--- a/manpages/po/de/lb_source.1.po
+++ b/manpages/po/de/lb_source.1.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-12-10 20:38+0100\n"
+"POT-Creation-Date: 2012-12-16 21:41+0100\n"
 "PO-Revision-Date: 2012-08-02 18:55+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -29,7 +29,7 @@ msgstr ""
 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
 #: en/lb_testroot.1:1 en/live-build.7:1
 #, no-wrap
-msgid "2012-12-10"
+msgid "2012-12-16"
 msgstr ""
 
 #. type: TH

diff --git a/manpages/po/de/lb_testroot.1.po b/manpages/po/de/lb_testroot.1.po
index 5747235..00f2ff6 100644 (file)
--- a/manpages/po/de/lb_testroot.1.po
+++ b/manpages/po/de/lb_testroot.1.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-12-10 20:38+0100\n"
+"POT-Creation-Date: 2012-12-16 21:41+0100\n"
 "PO-Revision-Date: 2012-08-02 18:55+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -29,7 +29,7 @@ msgstr ""
 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
 #: en/lb_testroot.1:1 en/live-build.7:1
 #, no-wrap
-msgid "2012-12-10"
+msgid "2012-12-16"
 msgstr ""
 
 #. type: TH

diff --git a/manpages/po/de/live-build.7.po b/manpages/po/de/live-build.7.po
index 99513f9..4b7c0bf 100644 (file)
--- a/manpages/po/de/live-build.7.po
+++ b/manpages/po/de/live-build.7.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-12-10 20:38+0100\n"
+"POT-Creation-Date: 2012-12-16 21:41+0100\n"
 "PO-Revision-Date: 2012-08-02 18:55+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -29,7 +29,7 @@ msgstr ""
 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
 #: en/lb_testroot.1:1 en/live-build.7:1
 #, no-wrap
-msgid "2012-12-10"
+msgid "2012-12-16"
 msgstr ""
 
 #. type: TH

diff --git a/manpages/pot/lb.1.pot b/manpages/pot/lb.1.pot
index 13b7270..ed16530 100644 (file)
--- a/manpages/pot/lb.1.pot
+++ b/manpages/pot/lb.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-12-10 20:38+0100\n"
+"POT-Creation-Date: 2012-12-16 21:41+0100\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"
@@ -29,7 +29,7 @@ msgstr ""
 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
 #: en/lb_testroot.1:1 en/live-build.7:1
 #, no-wrap
-msgid "2012-12-10"
+msgid "2012-12-16"
 msgstr ""
 
 #. type: TH

diff --git a/manpages/pot/lb_binary.1.pot b/manpages/pot/lb_binary.1.pot
index 62d9418..8a942c4 100644 (file)
--- a/manpages/pot/lb_binary.1.pot
+++ b/manpages/pot/lb_binary.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-12-10 20:38+0100\n"
+"POT-Creation-Date: 2012-12-16 21:41+0100\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"
@@ -29,7 +29,7 @@ msgstr ""
 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
 #: en/lb_testroot.1:1 en/live-build.7:1
 #, no-wrap
-msgid "2012-12-10"
+msgid "2012-12-16"
 msgstr ""
 
 #. type: TH

diff --git a/manpages/pot/lb_bootstrap.1.pot b/manpages/pot/lb_bootstrap.1.pot
index 7691617..28e54b9 100644 (file)
--- a/manpages/pot/lb_bootstrap.1.pot
+++ b/manpages/pot/lb_bootstrap.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-12-10 20:38+0100\n"
+"POT-Creation-Date: 2012-12-16 21:41+0100\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"
@@ -29,7 +29,7 @@ msgstr ""
 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
 #: en/lb_testroot.1:1 en/live-build.7:1
 #, no-wrap
-msgid "2012-12-10"
+msgid "2012-12-16"
 msgstr ""
 
 #. type: TH

diff --git a/manpages/pot/lb_build.1.pot b/manpages/pot/lb_build.1.pot
index 7705b7f..34d9c34 100644 (file)
--- a/manpages/pot/lb_build.1.pot
+++ b/manpages/pot/lb_build.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-12-10 20:38+0100\n"
+"POT-Creation-Date: 2012-12-16 21:41+0100\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"
@@ -29,7 +29,7 @@ msgstr ""
 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
 #: en/lb_testroot.1:1 en/live-build.7:1
 #, no-wrap
-msgid "2012-12-10"
+msgid "2012-12-16"
 msgstr ""
 
 #. type: TH

diff --git a/manpages/pot/lb_chroot.1.pot b/manpages/pot/lb_chroot.1.pot
index 01d5914..a41b696 100644 (file)
--- a/manpages/pot/lb_chroot.1.pot
+++ b/manpages/pot/lb_chroot.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-12-10 20:38+0100\n"
+"POT-Creation-Date: 2012-12-16 21:41+0100\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"
@@ -29,7 +29,7 @@ msgstr ""
 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
 #: en/lb_testroot.1:1 en/live-build.7:1
 #, no-wrap
-msgid "2012-12-10"
+msgid "2012-12-16"
 msgstr ""
 
 #. type: TH

diff --git a/manpages/pot/lb_clean.1.pot b/manpages/pot/lb_clean.1.pot
index 1f77ed5..45f9b01 100644 (file)
--- a/manpages/pot/lb_clean.1.pot
+++ b/manpages/pot/lb_clean.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-12-10 20:38+0100\n"
+"POT-Creation-Date: 2012-12-16 21:41+0100\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"
@@ -29,7 +29,7 @@ msgstr ""
 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
 #: en/lb_testroot.1:1 en/live-build.7:1
 #, no-wrap
-msgid "2012-12-10"
+msgid "2012-12-16"
 msgstr ""
 
 #. type: TH

diff --git a/manpages/pot/lb_config.1.pot b/manpages/pot/lb_config.1.pot
index 2563881..5954739 100644 (file)
--- a/manpages/pot/lb_config.1.pot
+++ b/manpages/pot/lb_config.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-12-10 20:38+0100\n"
+"POT-Creation-Date: 2012-12-16 21:41+0100\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"
@@ -29,7 +29,7 @@ msgstr ""
 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
 #: en/lb_testroot.1:1 en/live-build.7:1
 #, no-wrap
-msgid "2012-12-10"
+msgid "2012-12-16"
 msgstr ""
 
 #. type: TH
@@ -1149,11 +1149,11 @@ msgid ""
 "This is a very dangerous option, using the tools of the host system can lead "
 "to tainted and even non-bootable images if the host systems version of the "
 "required tools (mainly these are the bootloaders such as syslinux, grub and "
-"yaboot, and the auxilliary tools such as dosfstools, genisoimage, squashfs-"
-"tools and others) do not B<exactely> match what is present at build-time in "
-"the target distribution. Never do disable this option unless you are "
-"B<exactely> sure what you are doing and have B<completely>I< understood its "
-"consequences.>"
+"yaboot, and the auxilliary tools such as dosfstools, xorriso, squashfs-tools "
+"and others) do not B<exactely> match what is present at build-time in the "
+"target distribution. Never do disable this option unless you are B<exactely> "
+"sure what you are doing and have B<completely>I< understood its consequences."
+">"
 msgstr ""
 
 #. type: IP

diff --git a/manpages/pot/lb_source.1.pot b/manpages/pot/lb_source.1.pot
index 8088007..c353649 100644 (file)
--- a/manpages/pot/lb_source.1.pot
+++ b/manpages/pot/lb_source.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-12-10 20:38+0100\n"
+"POT-Creation-Date: 2012-12-16 21:41+0100\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"
@@ -29,7 +29,7 @@ msgstr ""
 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
 #: en/lb_testroot.1:1 en/live-build.7:1
 #, no-wrap
-msgid "2012-12-10"
+msgid "2012-12-16"
 msgstr ""
 
 #. type: TH

diff --git a/manpages/pot/lb_testroot.1.pot b/manpages/pot/lb_testroot.1.pot
index 3be55bd..03c143a 100644 (file)
--- a/manpages/pot/lb_testroot.1.pot
+++ b/manpages/pot/lb_testroot.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-12-10 20:38+0100\n"
+"POT-Creation-Date: 2012-12-16 21:41+0100\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"
@@ -29,7 +29,7 @@ msgstr ""
 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
 #: en/lb_testroot.1:1 en/live-build.7:1
 #, no-wrap
-msgid "2012-12-10"
+msgid "2012-12-16"
 msgstr ""
 
 #. type: TH

diff --git a/manpages/pot/live-build.7.pot b/manpages/pot/live-build.7.pot
index e1f5a8d..9b0400c 100644 (file)
--- a/manpages/pot/live-build.7.pot
+++ b/manpages/pot/live-build.7.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-12-10 20:38+0100\n"
+"POT-Creation-Date: 2012-12-16 21:41+0100\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"
@@ -29,7 +29,7 @@ msgstr ""
 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
 #: en/lb_testroot.1:1 en/live-build.7:1
 #, no-wrap
-msgid "2012-12-10"
+msgid "2012-12-16"
 msgstr ""
 
 #. type: TH

diff --git a/scripts/build/binary_iso b/scripts/build/binary_iso
index d9a2773..7802f04 100755 (executable)
--- a/scripts/build/binary_iso
+++ b/scripts/build/binary_iso
@@ -53,11 +53,11 @@ Check_lockfile .lock
 Create_lockfile .lock
 
 # Checking depends
-Check_package chroot/usr/bin/genisoimage genisoimage
+Check_package chroot/usr/bin/xorriso xorriso
 
 if [ "${LB_BINARY_IMAGES}" = "iso-hybrid" ]
 then
-       Check_package chroot/usr/bin/isohybrid syslinux
+       Check_package chroot/usr/lib/syslinux/isohdpfx.bin syslinux-common
 fi
 
 # Restoring cache
@@ -72,79 +72,85 @@ then
        rm -f ${IMAGE}
 fi
 
-# Handle genisoimage generic options
-GENISOIMAGE_OPTIONS="-J -l -cache-inodes -allow-multidot"
+# Handle xorriso generic options
+XORRISO_OPTIONS="-as mkisofs -r -J -joliet-long -l -cache-inodes"
+
+# Handle xorriso live-build specific options
+if [ "${LB_BINARY_IMAGES}" = "iso-hybrid" ]
+then
+       XORRISO_OPTIONS="${XORRISO_OPTIONS} -isohybrid-mbr /usr/lib/syslinux/isohdpfx.bin -partition_offset 16"
+fi
 
-# Handle genisoimage live-build specific options
 if [ "${_QUIET}" = "true" ]
 then
-       GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -quiet"
+       XORRISO_OPTIONS="${XORRISO_OPTIONS} -quiet"
 fi
 
 if [ "${_VERBOSE}" = "true" ]
 then
-       GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -v"
+       XORRISO_OPTIONS="${XORRISO_OPTIONS} -v"
 fi
 
 if [ -n "${LB_ISO_APPLICATION}" ] && [ "${LB_ISO_APPLICATION}" != "none" ]
 then
-       GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -A \"${LB_ISO_APPLICATION}\""
+       XORRISO_OPTIONS="${XORRISO_OPTIONS} -A \"${LB_ISO_APPLICATION}\""
 fi
 
 if [ -n "${LB_ISO_PREPARER}" ] && [ "${LB_ISO_PREPARER}" != "none" ]
 then
-       GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -p \"${LB_ISO_PREPARER}\""
+       XORRISO_OPTIONS="${XORRISO_OPTIONS} -p \"${LB_ISO_PREPARER}\""
 fi
 
 if [ -n "${LB_ISO_PUBLISHER}" ] && [ "${LB_ISO_PUBLISHER}" != "none" ]
 then
-       GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -publisher \"${LB_ISO_PUBLISHER}\""
+       XORRISO_OPTIONS="${XORRISO_OPTIONS} -publisher \"${LB_ISO_PUBLISHER}\""
 fi
 
 if [ -n "${LB_ISO_VOLUME}" ] && [ "${LB_ISO_VOLUME}" != "none" ]
 then
-       GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -V \"${LB_ISO_VOLUME}\""
+       XORRISO_OPTIONS="${XORRISO_OPTIONS} -V \"${LB_ISO_VOLUME}\""
 fi
 
-# Handle genisoimage architecture specific options
+# Handle xorriso architecture specific options
 case "${LB_BOOTLOADER}" in
        grub)
-               GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -no-emul-boot -boot-load-size 4 -boot-info-table"
-               GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -r -b boot/grub/stage2_eltorito"
-               GENISOIMAGE_EXCLUDE="boot/grub/stage2_eltorito"
+               XORRISO_OPTIONS="${XORRISO_OPTIONS} -no-emul-boot -boot-load-size 4 -boot-info-table"
+               XORRISO_OPTIONS="${XORRISO_OPTIONS} -b boot/grub/stage2_eltorito"
+               XORRISO_EXCLUDE="boot/grub/stage2_eltorito"
                ;;
 
        grub2)
-               GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -no-emul-boot -boot-load-size 4 -boot-info-table"
-               GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -r -b boot/grub/grub_eltorito -J"
-               GENISOIMAGE_EXCLUDE="boot/grub/grub_eltorito"
+               XORRISO_OPTIONS="${XORRISO_OPTIONS} -no-emul-boot -boot-load-size 4 -boot-info-table"
+               XORRISO_OPTIONS="${XORRISO_OPTIONS} -b boot/grub/grub_eltorito -J"
+               XORRISO_EXCLUDE="boot/grub/grub_eltorito"
                ;;
 
        silo)
-               GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -r -G boot/isofs.b -B ..."
-               GENISOIMAGE_EXCLUDE="boot/isofs.b"
+               XORRISO_OPTIONS="${XORRISO_OPTIONS} -G boot/isofs.b -B ..."
+               XORRISO_EXCLUDE="boot/isofs.b"
                ;;
 
        syslinux)
-               GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -no-emul-boot -boot-load-size 4 -boot-info-table"
                case "${LB_MODE}" in
                        progress-linux)
-                               GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -r -b boot/boot.bin -c boot/boot.cat"
-                               GENISOIMAGE_EXCLUDE="boot/boot.bin"
+                               XORRISO_OPTIONS="${XORRISO_OPTIONS} -b boot/boot.bin -c boot/boot.cat"
+                               XORRISO_EXCLUDE="boot/boot.bin"
                                ;;
 
                        *)
-                               GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -r -b isolinux/isolinux.bin -c isolinux/boot.cat"
-                               GENISOIMAGE_EXCLUDE="isolinux/isolinux.bin"
+                               XORRISO_OPTIONS="${XORRISO_OPTIONS} -b isolinux/isolinux.bin -c isolinux/boot.cat"
+                               XORRISO_EXCLUDE="isolinux/isolinux.bin"
                                ;;
                esac
+
+               XORRISO_OPTIONS="${XORRISO_OPTIONS} -no-emul-boot -boot-load-size 4 -boot-info-table"
                ;;
 
        yaboot)
-               GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -r --iso-level 2 --netatalk -hfs -probe -map"
-               GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} binary/yaboot/hfs.map --chrp-boot -part -no-desktop"
-               GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -hfs-bless binary/yaboot -hfs-volid Debian/Live_powerpc"
-               GENISOIMAGE_EXCLUDE="yaboot/hfs.map"
+               XORRISO_OPTIONS="${XORRISO_OPTIONS} --iso-level 2 --netatalk -hfs -probe -map"
+               XORRISO_OPTIONS="${XORRISO_OPTIONS} binary/yaboot/hfs.map --chrp-boot -part -no-desktop"
+               XORRISO_OPTIONS="${XORRISO_OPTIONS} -hfs-bless binary/yaboot -hfs-volid Debian/Live_powerpc"
+               XORRISO_EXCLUDE="yaboot/hfs.map"
                ;;
 
        *)
@@ -156,7 +162,7 @@ esac
 
 #if [ "${LB_DEBIAN_INSTALLER}" != "live" ]
 #then
-#      GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -m ${GENISOIMAGE_EXCLUDE}"
+#      XORRISO_OPTIONS="${XORRISO_OPTIONS} -m ${XORRISO_EXCLUDE}"
 #fi
 
 if [ "${LB_BOOTLOADER}" = "grub2" ]
@@ -193,19 +199,9 @@ fi
 
 cat >> binary.sh << EOF
 
-genisoimage ${GENISOIMAGE_OPTIONS} -o ${IMAGE} binary
-EOF
-
-if [ "${LB_BINARY_IMAGES}" = "iso-hybrid" ]
-then
-
-cat >> binary.sh << EOF
-
-isohybrid ${ISOHYBRID_OPTIONS} ${IMAGE}
+xorriso ${XORRISO_OPTIONS} -o ${IMAGE} binary
 EOF
 
-fi
-
 case "${LB_BUILD_WITH_CHROOT}" in
        true)
                # Moving image

diff --git a/scripts/build/source_debian b/scripts/build/source_debian
index 95a155d..502bd82 100755 (executable)
--- a/scripts/build/source_debian
+++ b/scripts/build/source_debian
@@ -55,7 +55,7 @@ Chroot chroot "dpkg --get-selections" | awk '{ print $1 }' > source-selection.tx
 cat >> source-selection.txt << EOF
 ${LB_BOOTLOADER}
 live-build
-genisoimage
+xorriso
 parted
 squashfs-tools
 mtd-tools

diff --git a/scripts/build/source_iso b/scripts/build/source_iso
index a9f0c28..81b4f5c 100755 (executable)
--- a/scripts/build/source_iso
+++ b/scripts/build/source_iso
@@ -53,7 +53,7 @@ Check_lockfile .lock
 Create_lockfile .lock
 
 # Checking depends
-Check_package chroot/usr/bin/genisoimage genisoimage
+Check_package chroot/usr/bin/xorriso xorriso
 
 # Installing depends
 Install_package
@@ -64,41 +64,45 @@ then
        rm -f source.iso
 fi
 
+# Handle xorriso generic options
+XORRISO_OPTIONS="-as mkisofs -r -J -joliet-long -l -cache-inodes"
+
+# Handle xorriso live-build specific options
 if [ "${_QUIET}" = "true" ]
 then
-       GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -quiet"
+       XORRISO_OPTIONS="${XORRISO_OPTIONS} -quiet"
 fi
 
 if [ "${_VERBOSE}" = "true" ]
 then
-       GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -v"
+       XORRISO_OPTIONS="${XORRISO_OPTIONS} -v"
 fi
 
 if [ -n "${LB_ISO_APPLICATION}" ] && [ "${LB_ISO_APPLICATION}" != "none" ]
 then
-       GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -A \"${LB_ISO_APPLICATION}\""
+       XORRISO_OPTIONS="${XORRISO_OPTIONS} -A \"${LB_ISO_APPLICATION}\""
 fi
 
 if [ -n "${LB_ISO_PREPARER}" ] && [ "${LB_ISO_PREPARER}" != "none" ]
 then
-       GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -p \"${LB_ISO_PREPARER}\""
+       XORRISO_OPTIONS="${XORRISO_OPTIONS} -p \"${LB_ISO_PREPARER}\""
 fi
 
 if [ -n "${LB_ISO_PUBLISHER}" ] && [ "${LB_ISO_PUBLISHER}" != "none" ]
 then
-       GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -publisher \"${LB_ISO_PUBLISHER}\""
+       XORRISO_OPTIONS="${XORRISO_OPTIONS} -publisher \"${LB_ISO_PUBLISHER}\""
 fi
 
 if [ -n "${LB_ISO_VOLUME}" ] && [ "${LB_ISO_VOLUME}" != "none" ]
 then
-       GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -V \"${LB_ISO_VOLUME}\""
+       XORRISO_OPTIONS="${XORRISO_OPTIONS} -V \"${LB_ISO_VOLUME}\""
 fi
 
 # Moving image
 mv source chroot
 
 cat >> chroot/source.sh << EOF
-genisoimage ${GENISOIMAGE_OPTIONS} -o source.iso -r -J -l -cache-inodes source
+xorriso ${XORRISO_OPTIONS} -o source.iso source
 EOF
 
 Chroot chroot "sh source.sh"