1 files changed, 12 insertions, 8 deletions
diff --git a/scripts/build/source_iso b/scripts/build/source_iso
index a9f0c281f..81b4f5cef 100755
--- 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"